From e54017d06b511942c68037997d64ff4bfa1d725e Mon Sep 17 00:00:00 2001 From: Janusz Mordarski Date: Tue, 10 May 2016 17:40:53 +0200 Subject: [PATCH 1/5] cache_template_loading should be set in an environment file in Rails app It defaults to whatever is set for config.cache_classes, so it is set to false in development anyway. --- lib/slim-rails.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/slim-rails.rb b/lib/slim-rails.rb index 1d5408a..134d78b 100644 --- a/lib/slim-rails.rb +++ b/lib/slim-rails.rb @@ -27,7 +27,6 @@ class Railtie < ::Rails::Railtie # will only apply if Rails 4, which includes 'action_view/dependency_tracker' require 'action_view/dependency_tracker' ActionView::DependencyTracker.register_tracker :slim, ActionView::DependencyTracker::ERBTracker - ActionView::Base.cache_template_loading = false if ::Rails.env.development? end rescue # likely this version of Rails doesn't support dependency tracking From 94d40640fcbc93d65ac8492894ba57a17e46b859 Mon Sep 17 00:00:00 2001 From: Janusz Mordarski Date: Sat, 21 May 2016 19:09:13 +0200 Subject: [PATCH 2/5] Update gemspec structure --- slim-rails.gemspec | 53 +++++++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 24 deletions(-) diff --git a/slim-rails.gemspec b/slim-rails.gemspec index 810b714..82db2b2 100644 --- a/slim-rails.gemspec +++ b/slim-rails.gemspec @@ -1,29 +1,34 @@ -# -*- encoding: utf-8 -*- -require File.expand_path('../lib/slim-rails/version', __FILE__) +# coding: utf-8 +lib = File.expand_path('../lib', __FILE__) +$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) +require 'slim-rails/version' -Gem::Specification.new do |gem| - gem.authors = ["Leonardo Almeida"] - gem.email = ["lalmeida08@gmail.com"] - gem.description = 'Provides the generator settings required for Rails 3 and 4 to use Slim' - gem.summary = 'Slim templates generator for Rails 3 and 4' - gem.homepage = 'https://github.com/slim-template/slim-rails' - gem.license = 'MIT' +Gem::Specification.new do |spec| + spec.name = 'slim-rails' + spec.version = Slim::Rails::VERSION + spec.authors = ["Leonardo Almeida"] + spec.email = ["lalmeida08@gmail.com"] - gem.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) } - gem.files = `git ls-files`.split("\n") - gem.test_files = `git ls-files -- {test,spec,features}/*`.split("\n") - gem.name = 'slim-rails' - gem.require_paths = ['lib'] - gem.version = Slim::Rails::VERSION + spec.summary = 'Slim templates generator for Rails 3 and 4' + spec.description = 'Provides the generator settings required for Rails 3 and 4 to use Slim' + spec.homepage = 'https://github.com/slim-template/slim-rails' + spec.license = 'MIT' - gem.required_ruby_version = '>= 2.0.0' + spec.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) } + spec.files = `git ls-files`.split("\n") + spec.test_files = `git ls-files -- {test,spec,features}/*`.split("\n") + spec.require_paths = ['lib'] + + spec.required_ruby_version = '>= 2.0.0' + + spec.add_runtime_dependency 'actionpack', ['>= 3.1', '< 5.0'] + spec.add_runtime_dependency 'railties', ['>= 3.1', '< 5.0'] + spec.add_runtime_dependency 'slim', ['~> 3.0'] + + spec.add_development_dependency 'rake', '~> 10.4' + spec.add_development_dependency 'rocco', '~> 0.8' + spec.add_development_dependency 'redcarpet', '~> 3.2' + spec.add_development_dependency 'awesome_print', '~> 1.2' + spec.add_development_dependency 'actionmailer', ['>= 3.1'] - gem.add_development_dependency 'rake', '~> 10.4' - gem.add_development_dependency 'rocco', '~> 0.8' - gem.add_development_dependency 'redcarpet', '~> 3.2' - gem.add_development_dependency 'awesome_print', '~> 1.2' - gem.add_development_dependency 'actionmailer', ['>= 3.1'] - gem.add_runtime_dependency 'actionpack', ['>= 3.1', '< 5.0'] - gem.add_runtime_dependency 'railties', ['>= 3.1', '< 5.0'] - gem.add_runtime_dependency 'slim', '~> 3.0' end From 15bd0145d01cfea02f1e8aef66e5492cc3679b36 Mon Sep 17 00:00:00 2001 From: Janusz Mordarski Date: Wed, 11 May 2016 20:57:26 +0200 Subject: [PATCH 3/5] Add ruby-head to travis.yml and use 2.2.2 - issue with json --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 05a44a8..7001f77 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,7 @@ language: ruby before_install: - gem install bundler rvm: - - 2.2 + - ruby-head + - 2.2.2 - 2.1 - - 2.0.0 + - 2.0 From 087837197a2aa3f80bf77163247c93f66d35ca02 Mon Sep 17 00:00:00 2001 From: Janusz Mordarski Date: Sat, 21 May 2016 19:20:16 +0200 Subject: [PATCH 4/5] Relax development dependencies --- slim-rails.gemspec | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/slim-rails.gemspec b/slim-rails.gemspec index 82db2b2..dcdcc84 100644 --- a/slim-rails.gemspec +++ b/slim-rails.gemspec @@ -25,10 +25,9 @@ Gem::Specification.new do |spec| spec.add_runtime_dependency 'railties', ['>= 3.1', '< 5.0'] spec.add_runtime_dependency 'slim', ['~> 3.0'] - spec.add_development_dependency 'rake', '~> 10.4' - spec.add_development_dependency 'rocco', '~> 0.8' - spec.add_development_dependency 'redcarpet', '~> 3.2' - spec.add_development_dependency 'awesome_print', '~> 1.2' + spec.add_development_dependency 'rocco' + spec.add_development_dependency 'redcarpet' + spec.add_development_dependency 'awesome_print' spec.add_development_dependency 'actionmailer', ['>= 3.1'] end From e553fb3f935d874c13ebff8d5b735f678582c059 Mon Sep 17 00:00:00 2001 From: Janusz Mordarski Date: Sat, 21 May 2016 19:25:01 +0200 Subject: [PATCH 5/5] Bump version to 3.0.2 --- lib/slim-rails/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/slim-rails/version.rb b/lib/slim-rails/version.rb index c16bd23..c15efa7 100644 --- a/lib/slim-rails/version.rb +++ b/lib/slim-rails/version.rb @@ -1,5 +1,5 @@ module Slim module Rails - VERSION = "3.0.1" + VERSION = "3.0.2" end end