draper 3.0.0.pre1 → 3.0.0

data/spec/draper/view_context_spec.rb

@@ -7,7 +7,7 @@ module Draper
       let(:controller) { Class.new(base) { include ViewContext } }
 
       it "saves the superclass's view context" do
-        ViewContext.should_receive(:current=).with(:controller_view_context)
+        expect(ViewContext).to receive(:current=).with(:controller_view_context)
         controller.new.view_context
       end
 
@@ -18,7 +18,7 @@ module Draper
 
     describe ".controller" do
       it "returns the stored controller from RequestStore" do
-        RequestStore.stub store: {current_controller: :stored_controller}
+        allow(RequestStore).to receive_messages store: {current_controller: :stored_controller}
 
         expect(ViewContext.controller).to be :stored_controller
       end
@@ -27,34 +27,62 @@ module Draper
     describe ".controller=" do
       it "stores a controller in RequestStore" do
         store = {}
-        RequestStore.stub store: store
+        allow(RequestStore).to receive_messages store: store
 
         ViewContext.controller = :stored_controller
         expect(store[:current_controller]).to be :stored_controller
       end
+
+      it "cleans context when controller changes" do
+        store = {
+          current_controller: :stored_controller,
+          current_view_context: :stored_view_context
+        }
+
+        allow(RequestStore).to receive_messages store: store
+
+        ViewContext.controller = :other_stored_controller
+
+        expect(store).to include(current_controller: :other_stored_controller)
+        expect(store).not_to include(:current_view_context)
+      end
+
+      it "doesn't clean context when controller is the same" do
+        store = {
+          current_controller: :stored_controller,
+          current_view_context: :stored_view_context
+        }
+
+        allow(RequestStore).to receive_messages store: store
+
+        ViewContext.controller = :stored_controller
+
+        expect(store).to include(current_controller: :stored_controller)
+        expect(store).to include(current_view_context: :stored_view_context)
+      end
     end
 
     describe ".current" do
       it "returns the stored view context from RequestStore" do
-        RequestStore.stub store: {current_view_context: :stored_view_context}
+        allow(RequestStore).to receive_messages store: {current_view_context: :stored_view_context}
 
         expect(ViewContext.current).to be :stored_view_context
       end
 
       context "when no view context is stored" do
         it "builds a view context" do
-          RequestStore.stub store: {}
-          ViewContext.stub build_strategy: ->{ :new_view_context }
-          HelperProxy.stub(:new).with(:new_view_context).and_return(:new_helper_proxy)
+          allow(RequestStore).to receive_messages store: {}
+          allow(ViewContext).to receive_messages build_strategy: ->{ :new_view_context }
+          allow(HelperProxy).to receive(:new).with(:new_view_context).and_return(:new_helper_proxy)
 
           expect(ViewContext.current).to be :new_helper_proxy
         end
 
         it "stores the built view context" do
           store = {}
-          RequestStore.stub store: store
-          ViewContext.stub build_strategy: ->{ :new_view_context }
-          HelperProxy.stub(:new).with(:new_view_context).and_return(:new_helper_proxy)
+          allow(RequestStore).to receive_messages store: store
+          allow(ViewContext).to receive_messages build_strategy: ->{ :new_view_context }
+          allow(HelperProxy).to receive(:new).with(:new_view_context).and_return(:new_helper_proxy)
 
           ViewContext.current
           expect(store[:current_view_context]).to be :new_helper_proxy
@@ -65,8 +93,8 @@ module Draper
     describe ".current=" do
       it "stores a helper proxy for the view context in RequestStore" do
         store = {}
-        RequestStore.stub store: store
-        HelperProxy.stub(:new).with(:stored_view_context).and_return(:stored_helper_proxy)
+        allow(RequestStore).to receive_messages store: store
+        allow(HelperProxy).to receive(:new).with(:stored_view_context).and_return(:stored_helper_proxy)
 
         ViewContext.current = :stored_view_context
         expect(store[:current_view_context]).to be :stored_helper_proxy
@@ -76,7 +104,7 @@ module Draper
     describe ".clear!" do
       it "clears the stored controller and view controller" do
         store = {current_controller: :stored_controller, current_view_context: :stored_view_context}
-        RequestStore.stub store: store
+        allow(RequestStore).to receive_messages store: store
 
         ViewContext.clear!
         expect(store).not_to have_key :current_controller
@@ -86,7 +114,7 @@ module Draper
 
     describe ".build" do
       it "returns a new view context using the build strategy" do
-        ViewContext.stub build_strategy: ->{ :new_view_context }
+        allow(ViewContext).to receive_messages build_strategy: ->{ :new_view_context }
 
         expect(ViewContext.build).to be :new_view_context
       end
@@ -94,17 +122,17 @@ module Draper
 
     describe ".build!" do
       it "returns a helper proxy for the new view context" do
-        ViewContext.stub build_strategy: ->{ :new_view_context }
-        HelperProxy.stub(:new).with(:new_view_context).and_return(:new_helper_proxy)
+        allow(ViewContext).to receive_messages build_strategy: ->{ :new_view_context }
+        allow(HelperProxy).to receive(:new).with(:new_view_context).and_return(:new_helper_proxy)
 
         expect(ViewContext.build!).to be :new_helper_proxy
       end
 
       it "stores the helper proxy" do
         store = {}
-        RequestStore.stub store: store
-        ViewContext.stub build_strategy: ->{ :new_view_context }
-        HelperProxy.stub(:new).with(:new_view_context).and_return(:new_helper_proxy)
+        allow(RequestStore).to receive_messages store: store
+        allow(ViewContext).to receive_messages build_strategy: ->{ :new_view_context }
+        allow(HelperProxy).to receive(:new).with(:new_view_context).and_return(:new_helper_proxy)
 
         ViewContext.build!
         expect(store[:current_view_context]).to be :new_helper_proxy
@@ -131,7 +159,7 @@ module Draper
         end
 
         it "passes a block to the strategy" do
-          ViewContext::BuildStrategy::Fast.stub(:new) { |&block| block.call }
+          allow(ViewContext::BuildStrategy::Fast).to receive(:new) { |&block| block.call }
 
           expect(ViewContext.test_strategy(:fast){:passed}).to be :passed
         end
@@ -144,7 +172,7 @@ module Draper
         end
 
         it "passes a block to the strategy" do
-          ViewContext::BuildStrategy::Full.stub(:new) { |&block| block.call }
+          allow(ViewContext::BuildStrategy::Full).to receive(:new) { |&block| block.call }
 
           expect(ViewContext.test_strategy(:full){:passed}).to be :passed
         end

data/spec/dummy/app/controllers/base_controller.rb

@@ -0,0 +1,4 @@
+class BaseController < ActionController::Base
+  include LocalizedUrls
+  protect_from_forgery
+end

data/spec/dummy/app/controllers/posts_controller.rb

@@ -1,4 +1,4 @@
-class PostsController < ApplicationController
+class PostsController < BaseController
   decorates_assigned :post
 
   def show
@@ -8,7 +8,7 @@ class PostsController < ApplicationController
   def mail
     post = Post.find(params[:id])
     email = PostMailer.decorated_email(post).deliver
-    render text: email.body
+    render html: email.body.to_s.html_safe
   end
 
   private

data/spec/dummy/config/boot.rb

@@ -2,4 +2,4 @@ require 'rubygems'
 
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
 
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])

data/spec/dummy/config/initializers/draper.rb

@@ -0,0 +1,3 @@
+Draper.configure do |config|
+  config.default_controller = BaseController
+end

data/spec/dummy/db/schema.rb

@@ -11,11 +11,11 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20121019115657) do
+ActiveRecord::Schema.define(version: 20121019115657) do
 
-  create_table "posts", :force => true do |t|
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
+  create_table "posts", force: true do |t|
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
 end

data/spec/dummy/fast_spec/post_decorator_spec.rb

@@ -32,6 +32,6 @@ describe PostDecorator do
   end
 
   it "can't be passed implicitly to url_for" do
-    expect{decorator.link}.to raise_error
+    expect{decorator.link}.to raise_error ArgumentError
   end
 end

data/spec/dummy/lib/tasks/test.rake

@@ -13,4 +13,4 @@ RSpec::Core::RakeTask.new :fast_spec do |t|
   t.pattern = "fast_spec/**/*_spec.rb"
 end
 
-task :default => [:test, :spec, :fast_spec]
+task default: [:test, :spec, :fast_spec]

data/spec/dummy/spec/decorators/devise_spec.rb

@@ -51,14 +51,5 @@ if defined?(Devise)
 
       expect(helper.current_user).to be_nil
     end
-
-    it "is backwards-compatible" do
-      user = double("User")
-      ActiveSupport::Deprecation.silence do
-        sign_in user
-      end
-
-      expect(helper.current_user).to be user
-    end
   end
 end

data/spec/dummy/spec/decorators/post_decorator_spec.rb

@@ -58,7 +58,7 @@ describe PostDecorator do
     expect(xml).to have_css "post > updated-at", text: "overridden"
   end
 
-  it "uses a test view context from ApplicationController" do
-    expect(Draper::ViewContext.current.controller).to be_an ApplicationController
+  it "uses a test view context from BaseController" do
+    expect(Draper::ViewContext.current.controller).to be_an BaseController
   end
 end

data/spec/dummy/test/decorators/minitest/devise_test.rb

@@ -51,14 +51,5 @@ if defined?(Devise)
 
       assert helper.current_user.nil?
     end
-
-    it "is backwards-compatible" do
-      user = Object.new
-      ActiveSupport::Deprecation.silence do
-        sign_in user
-      end
-
-      assert_same user, helper.current_user
-    end
   end
 end

data/spec/dummy/test/decorators/minitest/view_context_test.rb

@@ -13,12 +13,12 @@ describe "A decorator test" do
   it_does_not_leak_view_context
 end
 
-describe "A controller test" do
-  subject{ Class.new(ActionController::Base) }
+describe "A controller decorator test" do
+  subject { Class.new(ActionController::Base) }
 
   it_does_not_leak_view_context
 end
 
-describe "A mailer test" do
+describe "A mailer decorator test" do
   it_does_not_leak_view_context
 end

data/spec/dummy/test/decorators/test_unit/devise_test.rb

@@ -51,14 +51,5 @@ if defined?(Devise)
 
       assert helper.current_user.nil?
     end
-
-    def test_backwards_compatibility
-      user = Object.new
-      ActiveSupport::Deprecation.silence do
-        sign_in user
-      end
-
-      assert_same user, helper.current_user
-    end
   end
 end

data/spec/generators/controller/controller_generator_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-require 'rails'
+require 'dummy/config/environment'
 require 'ammeter/init'
 require 'generators/controller_override'
 require 'generators/rails/decorator_generator'
@@ -16,7 +16,7 @@ describe Rails::Generators::ControllerGenerator do
     describe "naming" do
       before { run_generator %w(YourModels) }
 
-      it { should contain "class YourModelDecorator" }
+      it { is_expected.to contain "class YourModelDecorator" }
     end
   end
-end
+end

data/spec/generators/decorator/decorator_generator_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-require 'rails'
+require 'dummy/config/environment'
 require 'ammeter/init'
 require 'generators/rails/decorator_generator'
 
@@ -15,31 +15,32 @@ describe Rails::Generators::DecoratorGenerator do
     describe "naming" do
       before { run_generator %w(YourModel) }
 
-      it { should contain "class YourModelDecorator" }
+      it { is_expected.to contain "class YourModelDecorator" }
     end
 
     describe "namespacing" do
       subject { file("app/decorators/namespace/your_model_decorator.rb") }
       before { run_generator %w(Namespace::YourModel) }
 
-      it { should contain "class Namespace::YourModelDecorator" }
+      it { is_expected.to contain "class Namespace::YourModelDecorator" }
     end
 
     describe "inheritance" do
       context "by default" do
         before { run_generator %w(YourModel) }
 
-        it { should contain "class YourModelDecorator < Draper::Decorator" }
+        it { is_expected.to contain "class YourModelDecorator < Draper::Decorator" }
       end
 
       context "with the --parent option" do
         before { run_generator %w(YourModel --parent=FooDecorator) }
 
-        it { should contain "class YourModelDecorator < FooDecorator" }
+        it { is_expected.to contain "class YourModelDecorator < FooDecorator" }
       end
 
       context "with an ApplicationDecorator" do
         before do
+          allow_any_instance_of(Object).to receive(:require)
           allow_any_instance_of(Object).to receive(:require).with("application_decorator").and_return(
             stub_const "ApplicationDecorator", Class.new
           )
@@ -47,7 +48,7 @@ describe Rails::Generators::DecoratorGenerator do
 
         before { run_generator %w(YourModel) }
 
-        it { should contain "class YourModelDecorator < ApplicationDecorator" }
+        it { is_expected.to contain "class YourModelDecorator < ApplicationDecorator" }
       end
     end
   end
@@ -59,14 +60,14 @@ describe Rails::Generators::DecoratorGenerator do
       describe "naming" do
         before { run_generator %w(YourModel -t=rspec) }
 
-        it { should contain "describe YourModelDecorator" }
+        it { is_expected.to contain "describe YourModelDecorator" }
       end
 
       describe "namespacing" do
         subject { file("spec/decorators/namespace/your_model_decorator_spec.rb") }
         before { run_generator %w(Namespace::YourModel -t=rspec) }
 
-        it { should contain "describe Namespace::YourModelDecorator" }
+        it { is_expected.to contain "describe Namespace::YourModelDecorator" }
       end
     end
   end
@@ -78,14 +79,14 @@ describe Rails::Generators::DecoratorGenerator do
       describe "naming" do
         before { run_generator %w(YourModel -t=test_unit) }
 
-        it { should contain "class YourModelDecoratorTest < Draper::TestCase" }
+        it { is_expected.to contain "class YourModelDecoratorTest < Draper::TestCase" }
       end
 
       describe "namespacing" do
         subject { file("test/decorators/namespace/your_model_decorator_test.rb") }
         before { run_generator %w(Namespace::YourModel -t=test_unit) }
 
-        it { should contain "class Namespace::YourModelDecoratorTest < Draper::TestCase" }
+        it { is_expected.to contain "class Namespace::YourModelDecoratorTest < Draper::TestCase" }
       end
     end
   end

data/spec/generators/install/install_generator_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+require 'dummy/config/environment'
+require 'ammeter/init'
+require 'generators/draper/install_generator'
+
+describe Draper::Generators::InstallGenerator do
+  destination File.expand_path('../tmp', __FILE__)
+
+  before { prepare_destination }
+  after(:all) { FileUtils.rm_rf destination_root }
+
+  describe 'the application decorator' do
+    subject { file('app/decorators/application_decorator.rb') }
+
+    before { run_generator }
+
+    it { is_expected.to contain 'class ApplicationDecorator' }
+  end
+end

data/spec/spec_helper.rb

@@ -19,17 +19,18 @@ class Other < Model; end
 class ProductDecorator < Draper::Decorator; end
 class ProductsDecorator < Draper::CollectionDecorator; end
 
-class ProductPresenter < Draper::Decorator; end
-
 class OtherDecorator < Draper::Decorator; end
 
 module Namespaced
   class Product < Model; end
   class ProductDecorator < Draper::Decorator; end
-
+  ProductsDecorator = Class.new(Draper::CollectionDecorator)
   class OtherDecorator < Draper::Decorator; end
 end
 
+ApplicationController = Class.new(ActionController::Base)
+CustomController = Class.new(ActionController::Base)
+
 # After each example, revert changes made to the class
 def protect_class(klass)
   before { stub_const klass.name, Class.new(klass) }

data/spec/support/shared_examples/view_helpers.rb

@@ -1,38 +1,38 @@
 shared_examples_for "view helpers" do |subject|
   describe "#helpers" do
     it "returns the current view context" do
-      Draper::ViewContext.stub current: :current_view_context
+      allow(Draper::ViewContext).to receive_messages current: :current_view_context
       expect(subject.helpers).to be :current_view_context
     end
 
     it "is aliased to #h" do
-      Draper::ViewContext.stub current: :current_view_context
+      allow(Draper::ViewContext).to receive_messages current: :current_view_context
       expect(subject.h).to be :current_view_context
     end
   end
 
   describe "#localize" do
     it "delegates to #helpers" do
-      subject.stub helpers: double
-      subject.helpers.should_receive(:localize).with(:an_object, some: "parameter")
+      allow(subject).to receive(:helpers).and_return(double)
+      expect(subject.helpers).to receive(:localize).with(:an_object, some: "parameter")
       subject.localize(:an_object, some: "parameter")
     end
 
     it "is aliased to #l" do
-      subject.stub helpers: double
-      subject.helpers.should_receive(:localize).with(:an_object, some: "parameter")
+      allow(subject).to receive_messages helpers: double
+      expect(subject.helpers).to receive(:localize).with(:an_object, some: "parameter")
       subject.l(:an_object, some: "parameter")
     end
   end
 
   describe ".helpers" do
     it "returns the current view context" do
-      Draper::ViewContext.stub current: :current_view_context
+      allow(Draper::ViewContext).to receive_messages current: :current_view_context
       expect(subject.class.helpers).to be :current_view_context
     end
 
     it "is aliased to .h" do
-      Draper::ViewContext.stub current: :current_view_context
+      allow(Draper::ViewContext).to receive(:current).and_return(:current_view_context)
       expect(subject.class.h).to be :current_view_context
     end
   end