fix #content_for, update rspec 3, and support rails 4.2

chamnap · chamnap · commit 4e74e4a0b609 · 2015-02-02T14:43:16.000+07:00
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.1.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.1.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.1.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.1.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.1.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/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
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/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/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
@@ -1,6 +1,6 @@
 # RSpec matcher to spec delegations.
-# Forked from https://gist.github.com/ssimeonov/5942729 with fixes
-# for arity + custom prefix.
+# Gist Version https://gist.github.com/joeytheman/0fe021821e4c62f552ce
+#
 #
 # Usage:
 #
@@ -30,7 +30,7 @@
       unless [0,-1].include?(@delegator.method(@to).arity)
         raise "#{@delegator}'s' #{@to} method does not have zero or -1 arity (it expects parameters)"
       end
-      @delegator.stub(@to).and_return receiver_double(method)
+      allow(@delegator).to receive(@to).and_return(receiver_double(method))
       @delegator.send(@method) == :called
     else
       raise "#{@delegator} does not respond to #{@to}"
@@ -41,20 +41,20 @@
     "delegate :#{@method} to its #{@to}#{@prefix ? ' with prefix' : ''}"
   end
 
-  failure_message_for_should do |text|
+  failure_message do |text|
     "expected #{@delegator} to delegate :#{@method} to its #{@to}#{@prefix ? ' with prefix' : ''}"
   end
 
-  failure_message_for_should_not do |text|
+  failure_message_when_negated do |text|
     "expected #{@delegator} not to delegate :#{@method} to its #{@to}#{@prefix ? ' with prefix' : ''}"
   end
 
   chain(:to) { |receiver| @to = receiver }
-  chain(:with_prefix) { |prefix| @prefix = prefix || @to }
+  chain(:with_prefix) { |*prefix| @prefix = prefix.first || @to }
 
   def receiver_double(method)
     double('receiver').tap do |receiver|
-      receiver.stub(method).and_return :called
+      allow(receiver).to receive(method).and_return(:called)
     end
   end
 end
