merged with master

chamnap · chamnap · commit 02a7a9a7a1e0 · 2015-02-05T15:48:56.000+07:00
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-ruby-2.1.3
+ruby-2.2.0
diff --git a/.travis.yml b/.travis.yml
@@ -2,16 +2,21 @@ language: ruby
 script: "bundle exec rake spec"
 rvm:
   - 2.0.0
-  - 2.1.0
-  - 2.1.1
-  - 2.1.2
+  - 2.1.5
+  - 2.2.0
 env:
   - CODECLIMATE_REPO_TOKEN=891d362268d07d6ff0f5534f92252b6195f6be8795054d3627643eb6314a8c9e
 gemfile:
+  - gemfiles/rails_32.gemfile
   - gemfiles/rails_40.gemfile
   - gemfiles/rails_41.gemfile
+  - gemfiles/rails_42.gemfile
 notifications:
   email: false
+matrix:
+  exclude:
+    - rvm: 2.2.0
+      gemfile: gemfiles/rails_32.gemfile
 addons:
   code_climate:
     repo_token: 891d362268d07d6ff0f5534f92252b6195f6be8795054d3627643eb6314a8c9e
diff --git a/Gemfile b/Gemfile
@@ -3,10 +3,10 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in liquid-rails.gemspec
 gemspec
 
-gem 'rails',       '~> 4.0.10'
-gem 'rspec-rails', '~> 2.14.2'
+gem 'rails',       '~> 4.0.13'
+gem 'rspec-rails', '~> 3.2.0'
+gem 'guard-rspec', '~> 4.5.0'
 gem 'capybara',    '~> 2.4.1'
 gem 'pry-rails'
 gem 'coveralls'
-gem 'simplecov'
-gem 'guard-rspec'
+gem 'simplecov'
diff --git a/Rakefile b/Rakefile
@@ -9,7 +9,7 @@ end
 task default: 'spec:all'
 
 namespace :spec do
-  %w(rails_41 rails_40 rails_32).each do |gemfile|
+  %w(rails_42 rails_41 rails_40 rails_32).each do |gemfile|
     desc "Run Tests against #{gemfile}"
     task gemfile do
       sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle --quiet"
@@ -19,7 +19,7 @@ namespace :spec do
 
   desc "Run Tests against rails versions"
   task :all do
-    %w(rails_41 rails_40 rails_32).each do |gemfile|
+    %w(rails_42 rails_41 rails_40 rails_32).each do |gemfile|
       sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle --quiet"
       sh "BUNDLE_GEMFILE='gemfiles/#{gemfile}.gemfile' bundle exec rake spec"
     end
diff --git a/gemfiles/rails_32.gemfile b/gemfiles/rails_32.gemfile
@@ -1,11 +1,11 @@
 source 'https://rubygems.org'
 
-gem 'rails',       '~> 3.2.19'
-gem 'rspec-rails', '~> 2.14.2'
+gem 'rails',       '~> 3.2.21'
+gem 'rspec-rails', '~> 3.2.0'
+gem 'guard-rspec', '~> 4.5.0'
 gem 'capybara',    '~> 2.4.1'
 gem 'pry-rails'
 gem 'coveralls'
 gem 'simplecov'
-gem 'guard-rspec'
 
 gemspec path: '../'
diff --git a/gemfiles/rails_40.gemfile b/gemfiles/rails_40.gemfile
@@ -1,11 +1,11 @@
 source 'https://rubygems.org'
 
-gem 'rails',       '~> 4.0.10'
-gem 'rspec-rails', '~> 2.14.2'
+gem 'rails',       '~> 4.0.13'
+gem 'rspec-rails', '~> 3.2.0'
+gem 'guard-rspec', '~> 4.5.0'
 gem 'capybara',    '~> 2.4.1'
 gem 'pry-rails'
 gem 'coveralls'
 gem 'simplecov'
-gem 'guard-rspec'
 
 gemspec path: '../'
diff --git a/gemfiles/rails_41.gemfile b/gemfiles/rails_41.gemfile
@@ -1,11 +1,11 @@
 source 'https://rubygems.org'
 
-gem 'rails',       '~> 4.1.6'
-gem 'rspec-rails', '~> 2.14.2'
+gem 'rails',       '~> 4.1.9'
+gem 'rspec-rails', '~> 3.2.0'
+gem 'guard-rspec', '~> 4.5.0'
 gem 'capybara',    '~> 2.4.1'
 gem 'pry-rails'
 gem 'coveralls'
 gem 'simplecov'
-gem 'guard-rspec'
 
 gemspec path: '../'
diff --git a/gemfiles/rails_42.gemfile b/gemfiles/rails_42.gemfile
@@ -0,0 +1,11 @@
+source 'https://rubygems.org'
+
+gem 'rails',       '~> 4.2.0'
+gem 'rspec-rails', '~> 3.2.0'
+gem 'guard-rspec', '~> 4.5.0'
+gem 'capybara',    '~> 2.4.1'
+gem 'pry-rails'
+gem 'coveralls'
+gem 'simplecov'
+
+gemspec path: '../'
diff --git a/lib/liquid-rails/file_system.rb b/lib/liquid-rails/file_system.rb
@@ -4,11 +4,10 @@ module Liquid
   module Rails
     class FileSystem < ::Liquid::LocalFileSystem
       def read_template_file(template_path, context)
-        controller_name = context.registers[:controller].controller_name
-        template_path   = "#{controller_name}/#{template_path}" unless template_path.include?('/')
-
+        controller_path = context.registers[:controller].controller_path
+        template_path   = "#{controller_path}/#{template_path}" unless template_path.include?('/')
         super
       end
     end
   end
-end
+end
diff --git a/lib/liquid-rails/filters/translate_filter.rb b/lib/liquid-rails/filters/translate_filter.rb
@@ -1,17 +1,12 @@
 module Liquid
   module Rails
     module TranslateFilter
-      def translate(key, locale = nil, scope = nil)
-        locale ||= ::I18n.locale.to_s
+      def translate(key, options={})
+        options = { 'locale' => ::I18n.locale.to_s }.merge(options)
 
-        @context.registers[:view].translate(key.to_s, locale: locale, scope: scope)
-      end
-
-      def t(name, vars={})
-        @context.registers[:view].translate(name).gsub(/\{\{(.*?)\}\}/) {
-          "#{vars[$1.strip]}"
-        }
+        @context.registers[:view].translate(key.to_s, options.with_indifferent_access)
       end
+      alias_method :t, :translate
     end
   end
 end
diff --git a/lib/liquid-rails/rspec/view_controller_context.rb b/lib/liquid-rails/rspec/view_controller_context.rb
@@ -7,7 +7,7 @@ module ViewControllerContext
         def setup_view_and_controller
           @view                 = ActionView::Base.new
           @controller           = ApplicationController.new
-          @request              = ActionController::TestRequest.new
+          @request              = ActionController::TestRequest.new('PATH_INFO' => '/')
           @response             = ActionController::TestResponse.new
           @response.request     = @request
           @controller.request   = @request
@@ -37,7 +37,7 @@ def expect_template_result(template, expected, assigns={})
           end
 
           actual = Liquid::Template.parse(template).render!(context)
-          expect(actual).to eq(expected)
+          expect(actual.strip).to eq(expected.strip)
         end
       end
     end
diff --git a/lib/liquid-rails/tags/content_for_tag.rb b/lib/liquid-rails/tags/content_for_tag.rb
@@ -22,18 +22,27 @@ def initialize(tag_name, markup, context)
         super
 
         if markup =~ Syntax
-          @identifier = $1.to_s
           @flush = $3
+          @identifier = $1.gsub('\'', '')
         else
           raise SyntaxError.new("Syntax Error - Valid syntax: {% content_for [name] %}")
         end
       end
 
       def render(context)
         @context = context
+        content  = super.html_safe
 
-        options = @flush == 'true' ? { flush: true } : {}
-        @context.registers[:view].content_for(@identifier, super.html_safe, options)
+        if ::Rails::VERSION::MAJOR == 3 && ::Rails::VERSION::MINOR == 2
+          if @flush == 'true'
+            @context.registers[:view].view_flow.set(@identifier, content) if content
+          else
+            @context.registers[:view].view_flow.append(@identifier, content) if content
+          end
+        else
+          options = @flush == 'true' ? { flush: true } : {}
+          @context.registers[:view].content_for(@identifier, content, options)
+        end
         ''
       end
     end
@@ -49,7 +58,7 @@ def initialize(tag_name, markup, context)
         super
 
         if markup =~ Syntax
-          @identifier = $1
+          @identifier = $1.gsub('\'', '')
         else
           raise SyntaxError.new("Syntax Error - Valid syntax: {% yield [name] %}")
         end
diff --git a/liquid-rails.gemspec b/liquid-rails.gemspec
@@ -21,6 +21,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'rails',    '>= 3.2'
-  spec.add_dependency 'liquid',   '~> 3.0.0'
+  spec.add_dependency 'liquid',   '>= 3.0.0'
   spec.add_dependency 'kaminari', '~> 0.16.1'
 end
diff --git a/spec/dummy/app/controllers/foospace/bar_controller.rb b/spec/dummy/app/controllers/foospace/bar_controller.rb
@@ -0,0 +1,5 @@
+class Foospace::BarController < ApplicationController
+  def index_partial
+    render layout: false
+  end
+end
diff --git a/spec/dummy/app/views/foospace/bar/_partial.liquid b/spec/dummy/app/views/foospace/bar/_partial.liquid
@@ -0,0 +1 @@
+Bar Partial
diff --git a/spec/dummy/app/views/foospace/bar/index_partial.liquid b/spec/dummy/app/views/foospace/bar/index_partial.liquid
@@ -0,0 +1,3 @@
+Foospace::BarController
+
+{% include 'partial' %}
diff --git a/spec/dummy/config/locales/en.yml b/spec/dummy/config/locales/en.yml
@@ -1,4 +1,5 @@
 en:
   welcome: 'Welcome everyone!'
+  welcome_name: 'Welcome, %{name}'
   links:
     home: 'Home'
diff --git a/spec/dummy/config/locales/km.yml b/spec/dummy/config/locales/km.yml
@@ -1,4 +1,5 @@
 km:
   welcome: 'សូមស្វាគមន៍'
+  welcome_name: 'សូមស្វាគមន៍ %{name}'
   links:
     home: 'ទំព័រដើម'
diff --git a/spec/dummy/config/routes.rb b/spec/dummy/config/routes.rb
@@ -7,4 +7,6 @@
 
   get  '/index_partial',                to: 'home#index_partial'
   get  '/index_partial_with_full_path', to: 'home#index_partial_with_full_path'
-end
+
+  get '/foospace/bar/index_partial',    to: 'foospace/bar#index_partial'
+end
diff --git a/spec/lib/liquid-rails/filters/translate_filter_spec.rb b/spec/lib/liquid-rails/filters/translate_filter_spec.rb
@@ -14,11 +14,15 @@ module Rails
       end
 
       it 'translate with specified locale' do
-        expect(::Liquid::Variable.new("'welcome' | translate: 'km'").render(context)).to eq('សូមស្វាគមន៍')
+        expect(::Liquid::Variable.new("'welcome' | translate: locale: 'km'").render(context)).to eq('សូមស្វាគមន៍')
       end
 
       it 'translate with scope' do
-        expect(::Liquid::Variable.new("'home' | translate: 'km', 'links'").render(context)).to eq('ទំព័រដើម')
+        expect(::Liquid::Variable.new("'home' | translate: locale: 'km', scope: 'links'").render(context)).to eq('ទំព័រដើម')
+      end
+
+      it 'translate with interpolation' do
+        expect(::Liquid::Variable.new("'welcome_name' | translate: locale: 'en', name: 'Jeremy'").render(context)).to eq('Welcome, Jeremy')
       end
     end
   end
diff --git a/spec/lib/liquid-rails/tags/content_for_tag_spec.rb b/spec/lib/liquid-rails/tags/content_for_tag_spec.rb
@@ -3,7 +3,13 @@
 module Liquid
   module Rails
     describe ContentForTag, type: :tag do
-      it 'content_for and yield' do
+      it 'content_for and yield with non-quoted key' do
+        Liquid::Template.parse(%|{% content_for not_authorized0 %}alert('You are not authorized to do that!');{% endcontent_for %}|).render(context)
+
+        expect_template_result(%|{% yield not_authorized0 %}|, "alert('You are not authorized to do that!');")
+      end
+
+      it 'content_for and yield with quoted key' do
         Liquid::Template.parse(%|{% content_for 'not_authorized1' %}alert('You are not authorized to do that!');{% endcontent_for %}|).render(context)
 
         expect_template_result(%|{% yield 'not_authorized1' %}|, "alert('You are not authorized to do that!');")
diff --git a/spec/lib/liquid-rails/tags/csrf_meta_tag_spec.rb b/spec/lib/liquid-rails/tags/csrf_meta_tag_spec.rb
@@ -6,10 +6,19 @@ module Rails
       let(:context) { ::Liquid::Context.new({}, {}, { view: view }) }
 
       it '#crsf_meta_tags' do
-        view.stub(:protect_against_forgery?).and_return(true)
+        allow(view).to receive(:protect_against_forgery?).and_return(true)
+        allow(view).to receive(:form_authenticity_token).and_return('rails_form_authenticity_token')
 
         result = Liquid::Template.parse('{% csrf_meta_tags %}').render(context)
-        expect(result).to eq(%|<meta content=\"authenticity_token\" name=\"csrf-param\" />\n<meta content=\"#{view.form_authenticity_token}\" name=\"csrf-token\" />|)
+        metas  = result.split("\n").map { |item| Nokogiri::XML(item).children.first }
+        expect(metas.length).to eq(2)
+        expect(metas[0].name).to eq('meta')
+        expect(metas[0]['name']).to eq('csrf-param')
+        expect(metas[0]['content']).to eq('authenticity_token')
+
+        expect(metas[1].name).to eq('meta')
+        expect(metas[1]['name']).to eq('csrf-token')
+        expect(metas[1]['content']).to eq('rails_form_authenticity_token')
       end
     end
   end
diff --git a/spec/lib/liquid-rails/tags/paginate_tag_spec.rb b/spec/lib/liquid-rails/tags/paginate_tag_spec.rb
@@ -44,11 +44,11 @@ module Rails
         end
 
         it '#next' do
-          expect_template_result("{% paginate post.comments by 2 %}{{ paginate.next }}{% endpaginate %}", %|{"title"=>"Next &raquo;", "url"=>"?page=2", "is_link"=>true}|, { 'post' => @post_drop })
+          expect_template_result("{% paginate post.comments by 2 %}{{ paginate.next }}{% endpaginate %}", %|{"title"=>"Next &raquo;", "url"=>"/?page=2", "is_link"=>true}|, { 'post' => @post_drop })
         end
 
         it '#parts' do
-          expect_template_result("{% paginate post.comments by 2 %}{{ paginate.parts }}{% endpaginate %}", %|{"title"=>1, "is_link"=>false, "hellip_break"=>false}{"title"=>2, "url"=>"?page=2", "is_link"=>true}{"title"=>3, "url"=>"?page=3", "is_link"=>true}|, { 'post' => @post_drop })
+          expect_template_result("{% paginate post.comments by 2 %}{{ paginate.parts }}{% endpaginate %}", %|{"title"=>1, "is_link"=>false, "hellip_break"=>false}{"title"=>2, "url"=>"/?page=2", "is_link"=>true}{"title"=>3, "url"=>"/?page=3", "is_link"=>true}|, { 'post' => @post_drop })
         end
       end
 
@@ -80,15 +80,15 @@ module Rails
         end
 
         it '#previous' do
-          expect_template_result("{% paginate post.comments by 2 %}{{ paginate.previous }}{% endpaginate %}", %|{"title"=>"&laquo; Previous", "url"=>"?page=2", "is_link"=>true}|, { 'post' => @post_drop })
+          expect_template_result("{% paginate post.comments by 2 %}{{ paginate.previous }}{% endpaginate %}", %|{"title"=>"&laquo; Previous", "url"=>"/?page=2", "is_link"=>true}|, { 'post' => @post_drop })
         end
 
         it '#next' do
           expect_template_result("{% paginate post.comments by 2 %}{{ paginate.next }}{% endpaginate %}", %||, { 'post' => @post_drop })
         end
 
         it '#parts' do
-          expect_template_result("{% paginate post.comments by 2 %}{{ paginate.parts }}{% endpaginate %}", %|{"title"=>1, "url"=>"?page=1", "is_link"=>true}{"title"=>2, "url"=>"?page=2", "is_link"=>true}{"title"=>3, "is_link"=>false, "hellip_break"=>false}|, { 'post' => @post_drop })
+          expect_template_result("{% paginate post.comments by 2 %}{{ paginate.parts }}{% endpaginate %}", %|{"title"=>1, "url"=>"/?page=1", "is_link"=>true}{"title"=>2, "url"=>"/?page=2", "is_link"=>true}{"title"=>3, "is_link"=>false, "hellip_break"=>false}|, { 'post' => @post_drop })
         end
       end
     end
diff --git a/spec/lib/liquid-rails/template_handler_spec.rb b/spec/lib/liquid-rails/template_handler_spec.rb
@@ -35,6 +35,12 @@
 
       expect(page.body).to eq "Application Layout\nLiquid on Rails\n\nHome Partial\nShared Partial"
     end
+
+    it 'respects namespace of original template for partials path' do
+      visit '/foospace/bar/index_partial'
+      expect(page.body.strip).to eq("Foospace::BarController\n\nBar Partial")
+    end
+
   end
 
   context 'render with filter' do
@@ -50,4 +56,4 @@
       expect(page.body).to eq("Application Layout\nLiquid on Rails\nThis is a long section of text")
     end
   end
-end
+end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -22,7 +22,6 @@
 require 'pry'
 require 'liquid-rails'
 require 'rspec/rails'
-require 'rspec/autorun'
 require 'capybara/rspec'
 require 'liquid-rails/matchers'
 
@@ -35,7 +34,6 @@
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.filter_run focus: true
   config.run_all_when_everything_filtered = true
   config.include Capybara::RSpecMatchers
diff --git a/spec/support/delegate_matcher.rb b/spec/support/delegate_matcher.rb
