erector-rails4 0.1.3 → 0.2.0

data/spec/dummy/app/views/test_caching/cache_helper_with_partial.rb

@@ -0,0 +1,10 @@
+class Views::TestCaching::CacheHelperWithPartial < Erector::Widget
+
+  def content
+    cache 'cache_helper_with_partial_key' do
+      text DateTime.current
+      render 'partial'
+    end
+  end
+
+end

data/spec/dummy/app/views/test_caching/cache_helper_with_skip_digest.rb

@@ -0,0 +1,9 @@
+class Views::TestCaching::CacheHelperWithSkipDigest < Erector::Widget
+
+  def content
+    cache 'cache_helper_with_skip_digest_key', skip_digest: true do
+      text DateTime.current
+    end
+  end
+
+end

data/spec/dummy/app/views/test_caching/cacheable_widget_with_dynamic_keys.rb

@@ -0,0 +1,13 @@
+class Views::TestCaching::CacheableWidgetWithDynamicKeys < Erector::Widget
+
+  cacheable :current_user
+
+  def content
+    text DateTime.current
+  end
+
+  def current_user
+    'the current user'
+  end
+
+end

data/spec/dummy/app/views/test_caching/cacheable_widget_with_needs.rb

@@ -0,0 +1,11 @@
+class Views::TestCaching::CacheableWidgetWithNeeds < Erector::Widget
+
+  needs :person, :food
+
+  cacheable
+
+  def content
+    text DateTime.current
+  end
+
+end

data/spec/dummy/app/views/test_caching/cacheable_widget_with_needs_keys.rb

@@ -0,0 +1,11 @@
+class Views::TestCaching::CacheableWidgetWithNeedsKeys < Erector::Widget
+
+  needs :person, :food, beer: 'beer'
+
+  cacheable needs_keys: [:person, :beer]
+
+  def content
+    text DateTime.current
+  end
+
+end

data/spec/dummy/app/views/test_caching/cacheable_widget_with_skip_digest.rb

@@ -0,0 +1,9 @@
+class Views::TestCaching::CacheableWidgetWithSkipDigest < Erector::Widget
+
+  cacheable skip_digest: true
+
+  def content
+    text DateTime.current
+  end
+
+end

data/spec/dummy/app/views/test_caching/cacheable_widget_with_static_keys.rb

@@ -0,0 +1,9 @@
+class Views::TestCaching::CacheableWidgetWithStaticKeys < Erector::Widget
+
+  cacheable 'v1'
+
+  def content
+    text DateTime.current
+  end
+
+end

data/spec/dummy/config/application.rb

@@ -13,7 +13,7 @@ module Dummy
     # -- all .rb files in that directory are automatically loaded.
 
     # Custom directories with classes and modules you want to be autoloadable.
-    config.autoload_paths += %W(#{config.root}/app)
+    # config.autoload_paths += %W(#{config.root}/app)
 
     config.cache_store = :memory_store
 

data/spec/dummy/spec/autoload_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/rails_spec_helper")
+require 'spec_helper'
 
 describe 'Autoload' do
 
@@ -10,4 +10,4 @@ describe 'Autoload' do
     Views::Test::Erector.new
   end
 
-end
+end

data/spec/dummy/spec/caching_spec.rb

@@ -0,0 +1,180 @@
+require 'ostruct'
+require 'spec_helper'
+
+describe 'Caching' do
+
+  next unless Gem::Version.new(::Rails.version) >= Gem::Version.new('4.0.0')
+
+  class TestCachingController < ActionController::Base
+    layout false
+
+    # Let exceptions propagate rather than generating the usual error page.
+    include ActionController::TestCase::RaiseActionExceptions
+
+    def cache_helper
+    end
+
+    def cache_helper_with_partial
+    end
+
+    def cache_helper_with_skip_digest
+    end
+
+    def cache_helper_with_implicit_dependencies
+    end
+
+    def cacheable_widget_with_needs
+      @person = 'person'
+      @food = 'food'
+    end
+
+    def cacheable_widget_with_needs_keys
+      @person = 'person'
+      @food = 'food'
+    end
+
+    def cacheable_widget_with_skip_digest
+    end
+
+    def cacheable_widget_with_static_keys
+    end
+
+    def cacheable_widget_with_dynamic_keys
+    end
+  end
+
+  def test_action(action)
+    @response = TestCachingController.action(action).call(Rack::MockRequest.env_for("/path"))[2]
+    @response.body
+  end
+
+  def digestor_for(template_name)
+    if Gem::Version.new(::Rails.version) > Gem::Version.new('4.0.0')
+      ActionView::Digestor.new(name: "test_caching/#{template_name}.rb", finder: ActionController::Base.new.lookup_context)
+    else
+      ActionView::Digestor.new("test_caching/#{template_name}", :rb, ActionController::Base.new.lookup_context)
+    end
+  end
+
+  context 'disabled in Rails config' do
+    before do
+      allow_any_instance_of(TestCachingController).to receive(:perform_caching).and_return(false)
+    end
+
+    it 'does not perform caching' do
+      expect(DateTime).to receive(:current).exactly(2).times
+      2.times { test_action(:cache_helper) }
+    end
+  end
+
+  before(:each) do
+    ::Rails.cache.clear
+  end
+
+  describe 'helpers.cache' do
+    context 'for a template' do
+      it 'calculates the fragment' do
+        expect_any_instance_of(TestCachingController).to receive(:read_fragment).
+          with(['cache_helper_key', 'bb530bfa0e2512415cc491ae2cb67b31'], nil)
+
+        test_action(:cache_helper)
+      end
+
+      it 'caches properly' do
+        expect(DateTime).to receive(:current).exactly(1).times
+        2.times { test_action(:cache_helper) }
+      end
+    end
+
+    context 'for a partial' do
+      it 'calculates the fragment' do
+        expect_any_instance_of(TestCachingController).to receive(:read_fragment).
+          with(['cache_helper_with_partial_key', 'd344d73b7967f342b19f502ed75bf787'], nil)
+
+        expect_any_instance_of(TestCachingController).to receive(:read_fragment).
+          with(['partial_key', '50a64015c65ef2b37558333733245988'], nil)
+
+        test_action(:cache_helper_with_partial)
+      end
+
+      it 'caches properly' do
+        expect(DateTime).to receive(:current).exactly(2).times
+        2.times { test_action(:cache_helper_with_partial) }
+      end
+    end
+
+    it 'can skip the digest with skip_digest: true' do
+      expect_any_instance_of(TestCachingController).to receive(:read_fragment).
+        with('cache_helper_with_skip_digest_key', skip_digest: true)
+
+      test_action(:cache_helper_with_skip_digest)
+    end
+
+    it 'honors implicit dependencies' do
+      digestor = digestor_for(:cache_helper_with_implicit_dependencies)
+      expect(digestor.dependencies).to eq ['test_caching/foos']
+    end
+
+    it 'honors explicit dependencies' do
+      digestor = digestor_for(:cache_helper_with_explicit_dependencies)
+      expect(digestor.dependencies).to eq ['test_caching/foos']
+    end
+  end
+
+  describe 'Widget.cacheable' do
+    it 'sets as cacheable' do
+      expect(Views::TestCaching::CacheableWidgetWithNeeds.new(person: nil, food: nil)).to be_cacheable
+    end
+
+    context ':needs as cache key' do
+      it 'calculates the fragment key' do
+        expect_any_instance_of(ActionView::Base).to receive(:cache).
+          with(['person', 'food'], skip_digest: nil)
+
+        test_action(:cacheable_widget_with_needs)
+      end
+    end
+
+    it 'can select using the :needs_keys option' do
+      expect_any_instance_of(ActionView::Base).to receive(:cache).
+        with(['person', 'beer'], skip_digest: nil)
+
+      test_action(:cacheable_widget_with_needs_keys)
+    end
+
+    it 'can skip the digest with skip_digest: true' do
+      expect_any_instance_of(ActionView::Base).to receive(:cache).
+        with([], skip_digest: true)
+
+      test_action(:cacheable_widget_with_skip_digest)
+    end
+
+    it 'can add dynamic keys' do
+      expect_any_instance_of(ActionView::Base).to receive(:cache).
+        with(['the current user'], skip_digest: nil)
+
+      test_action(:cacheable_widget_with_dynamic_keys)
+    end
+
+    it 'can add static keys' do
+      expect_any_instance_of(ActionView::Base).to receive(:cache).
+        with(['v1'], skip_digest: nil)
+
+      test_action(:cacheable_widget_with_static_keys)
+    end
+
+    it 'caches appropriately' do
+      expect(DateTime).to receive(:current).exactly(1).times
+      2.times { test_action(:cacheable_widget_with_static_keys) }
+    end
+
+    it 'does not cache when called without rails helpers' do
+      expect(DateTime).to receive(:current).exactly(2).times
+      2.times do
+        Views::TestCaching::CacheableWidgetWithStaticKeys.new.to_html
+      end
+    end
+
+  end
+
+end

data/spec/dummy/spec/form_builder_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/rails_spec_helper")
+require 'spec_helper'
 
 describe Erector::Rails::FormBuilder do
   describe ".parent_builder_class" do

data/spec/dummy/spec/rails_helpers_spec.rb

@@ -1,10 +1,10 @@
-require File.expand_path("#{File.dirname(__FILE__)}/rails_spec_helper")
+require 'spec_helper'
 require 'simple_form'
 
 describe Erector::Rails do
   before do
     @controller         = ApplicationController.new
-    @controller.request = ActionController::TestRequest.new
+    @controller.request = ActionDispatch::TestRequest.new
 
     @view            = ActionView::Base.new
     @view.controller = @controller
@@ -53,6 +53,14 @@ describe Erector::Rails do
     end
   end
 
+  describe 'from a partial' do
+    it 'still works' do
+      test_render do
+        widget Views::Test::PartialWithRailsHelpers.new
+      end.should match('<form')
+    end
+  end
+
   describe "#link_to" do
     it "renders a link" do
       test_render do
@@ -107,7 +115,7 @@ describe Erector::Rails do
         root :to => "rails_helpers_spec#index"
       end
       @app_controller         = ApplicationController.new
-      @app_controller.request = ActionController::TestRequest.new
+      @app_controller.request = ActionDispatch::TestRequest.new
       def app_render(&block)
         Erector::Rails.render(Erector.inline(&block), @app_controller.view_context)
       end
@@ -187,7 +195,7 @@ describe Erector::Rails do
     it "supports block syntax" do
       test_render do
         javascript_tag do
-          text! "alert('All is good')"
+          rawtext "alert('All is good')"
         end
       end.should == %{<script#{@script_type_tag}>\n//<![CDATA[\nalert('All is good')\n//]]>\n</script>}
     end
@@ -256,14 +264,14 @@ describe Erector::Rails do
     end
   end
 
-  # describe "#simple_form_for" do
-  #   it "instantiates a SimpleForm builder" do
-  #     test_render do
-  #       simple_form_for(:something, :url => "/test") do |form|
-  #         form.input :foobar
-  #       end
-  #     end.should =~ /foobar/
-  #   end
-  # end
+  describe "#simple_form_for" do
+    it "instantiates a SimpleForm builder" do
+      test_render do
+        simple_form_for(:something, :url => "/test") do |form|
+          form.input :foobar
+        end
+      end.should =~ /foobar/
+    end
+  end
 
 end

data/spec/dummy/spec/rails_widget_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path("#{File.dirname(__FILE__)}/rails_spec_helper")
+require 'spec_helper'
 
 describe Erector::Rails do
   include Erector::Mixin

data/spec/dummy/spec/render_spec.rb

@@ -1,27 +1,10 @@
-require File.expand_path("#{File.dirname(__FILE__)}/rails_spec_helper")
+require 'spec_helper'
 
 describe ActionController::Base do
   class TestController < ActionController::Base
     # Let exceptions propagate rather than generating the usual error page.
     include ActionController::TestCase::RaiseActionExceptions
 
-    # We need this, because we reference Views::Test::Needs below, and it
-    # doesn't auto-load otherwise.
-    require 'views/test/needs.html.rb'
-
-    # replicate deprecated use for rails <3.2
-    if (Gem::Version.new(Rails.version) < Gem::Version.new('3.2.0') rescue false)
-      def render(*args, &block)
-        options = args.extract_options!
-        if options[:template]
-          handlers = options.delete(:handlers)
-          format = '.html' unless options.delete(:bare)
-          options[:template] += "#{format}.#{handlers.first}"
-        end
-        render(*(args << options), &block)
-      end
-    end
-
     def render_widget_class
       @foobar = "foobar"
       render :widget => TestWidget
@@ -49,16 +32,6 @@ describe ActionController::Base do
       render :widget => TestWidget, :content_method_name => :content_method
     end
 
-    def render_with_cache_one
-      @name = 'One'
-      render :widget => CashWidget
-    end
-
-    def render_with_cache_two
-      @name = 'Two'
-      render :widget => CashWidget
-    end
-
     def render_with_rails_options
       render :widget => TestWidget, :status => 500, :content_type => "application/json"
     end
@@ -139,6 +112,10 @@ describe ActionController::Base do
       render :template => 'test/erector_with_locals_from_erb', :handlers => [:erb]
     end
 
+    def render_erector_with_helpers_from_erb
+      render :template => 'test/erector_with_helpers_from_erb', :handlers => [:erb]
+    end
+
     def render_erector_with_locals_from_erb_defaulted
       @local_foo = "hihi"
       render :template => 'test/erector_with_locals_from_erb', :handlers => [:erb]
@@ -207,9 +184,17 @@ describe ActionController::Base do
       render :template => "test/render_with_widget_as_layout", :layout => "layouts/widget_as_layout"
     end
 
+    def render_with_needs_name_same_as_partial_name
+      render template: 'test/users', layout: false
+    end
+
     def render_with_widget_as_layout_using_content_for
       render :template => "test/render_with_widget_as_layout_using_content_for", :layout => "layouts/widget_as_layout"
     end
+
+    def render_virtual_path
+      render template: "test/render_virtual_path", layout: false
+    end
   end
 
   class TestWidget < Erector::Widget
@@ -239,15 +224,6 @@ describe ActionController::Base do
     end
   end
 
-  class CashWidget < Erector::Widget
-    needs :name
-    cacheable 'v1'
-
-    def content
-      text @name
-    end
-  end
-
   def test_action(action)
     @response = TestController.action(action).call(Rack::MockRequest.env_for("/path"))[2]
     @response.body
@@ -324,6 +300,10 @@ describe ActionController::Base do
       test_action(:render_erector_with_locals_from_erb).should == "Partial, foo hihi, bar byebye"
     end
 
+    it "should render an ERB template which uses an erector widget partial with helpers" do
+      test_action(:render_erector_with_helpers_from_erb).should match '<form'
+    end
+
     it "should render an ERB template which uses an erector widget partial with a defaulted local" do
       test_action(:render_erector_with_locals_from_erb_defaulted).should == "Partial, foo hihi, bar 12345"
     end
@@ -384,11 +364,12 @@ describe ActionController::Base do
       test_action(:render_with_widget_as_layout_using_content_for).should == "TOPBEFOREDURINGAFTER"
     end
 
-    it "should cache properly" do
-      test_action(:render_with_cache_one).should == "One"
-      test_action(:render_with_cache_one).should == "One"
-      test_action(:render_with_cache_two).should == "Two"
-      test_action(:render_with_cache_two).should == "Two"
+    it "allows for the same needs name as partial name" do
+      test_action(:render_with_needs_name_same_as_partial_name).should == "FooBar"
+    end
+
+    it "passes the correct virtual path" do
+      test_action(:render_virtual_path).should == "test/render_virtual_path.rb,test/_virtual_path_partial.rb"
     end
 
   end