draper 1.0.0 → 1.1.0

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

@@ -0,0 +1,64 @@
+require 'test_helper'
+
+if defined?(Devise)
+  class DeviseTest < Draper::TestCase
+    def test_sign_in_a_real_user
+      user = User.new
+      sign_in user
+
+      assert_same user, helper.current_user
+    end
+
+    def test_sign_in_a_mock_user
+      user = Object.new
+      sign_in :user, user
+
+      assert_same user, helper.current_user
+    end
+
+    def test_sign_in_a_real_admin
+      admin = Admin.new
+      sign_in admin
+
+      assert_same admin, helper.current_admin
+    end
+
+    def test_sign_in_a_mock_admin
+      admin = Object.new
+      sign_in :admin, admin
+
+      assert_same admin, helper.current_admin
+    end
+
+    def test_sign_out_a_real_user
+      user = User.new
+      sign_in user
+      sign_out user
+
+      assert helper.current_user.nil?
+    end
+
+    def test_sign_out_a_mock_user
+      user = Object.new
+      sign_in :user, user
+      sign_out :user
+
+      assert helper.current_user.nil?
+    end
+
+    def test_sign_out_without_a_user
+      sign_out :user
+
+      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/dummy/test/decorators/test_unit/helpers_test.rb

@@ -0,0 +1,21 @@
+require 'test_helper'
+
+class HelpersTest < Draper::TestCase
+  def test_access_helpers_through_helper
+    assert_equal "<p>Help!</p>", helper.content_tag(:p, "Help!")
+  end
+
+  def test_access_helpers_through_helpers
+    assert_equal "<p>Help!</p>", helpers.content_tag(:p, "Help!")
+  end
+
+  def test_access_helpers_through_h
+    assert_equal "<p>Help!</p>", h.content_tag(:p, "Help!")
+  end
+
+  def test_same_helper_object_as_decorators
+    decorator = Draper::Decorator.new(Object.new)
+
+    assert_same decorator.helpers, helpers
+  end
+end

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

@@ -0,0 +1,24 @@
+require 'test_helper'
+
+def it_does_not_leak_view_context
+  2.times do |n|
+    define_method("test_has_independent_view_context_#{n}") do
+      refute_equal :leaked, Draper::ViewContext.current
+      Draper::ViewContext.current = :leaked
+    end
+  end
+end
+
+class DecoratorTest < Draper::TestCase
+  it_does_not_leak_view_context
+end
+
+class ControllerTest < ActionController::TestCase
+  tests Class.new(ActionController::Base)
+
+  it_does_not_leak_view_context
+end
+
+class MailerTest < ActionMailer::TestCase
+  it_does_not_leak_view_context
+end

data/spec/dummy/test/minitest_helper.rb

@@ -0,0 +1,4 @@
+ENV['RAILS_ENV'] ||= 'test'
+require File.expand_path('../../config/environment', __FILE__)
+require 'minitest/autorun'
+require 'minitest/rails'

data/spec/dummy/test/test_helper.rb

@@ -0,0 +1,3 @@
+ENV['RAILS_ENV'] ||= 'test'
+require File.expand_path('../../config/environment', __FILE__)
+require 'rails/test_help'

data/spec/generators/decorator/decorator_generator_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'ammeter/init'
 
 # Generators are not automatically loaded by Rails
 require 'generators/decorator/decorator_generator'

data/spec/integration/integration_spec.rb

@@ -3,30 +3,55 @@ require 'support/dummy_app'
 require 'support/matchers/have_text'
 
 app = DummyApp.new(ENV["RAILS_ENV"])
+spec_types = {
+  view: ["/posts/1", "PostsController"],
+  mailer: ["/posts/1/mail", "PostMailer"]
+}
 
 app.start_server do
-  {view: "/posts/1", mailer: "/posts/1/mail"}.each do |type, path|
+  spec_types.each do |type, (path, controller)|
     page = app.get(path)
 
     describe "in a #{type}" do
       it "runs in the correct environment" do
-        page.should have_text(app.environment).in("#environment")
+        expect(page).to have_text(app.environment).in("#environment")
+      end
+
+      it "uses the correct view context controller" do
+        expect(page).to have_text(controller).in("#controller")
+      end
+
+      it "can use built-in helpers" do
+        expect(page).to have_text("Once upon a...").in("#truncated")
+      end
+
+      it "can use built-in private helpers" do
+        # Nokogiri unescapes text!
+        expect(page).to have_text("<script>danger</script>").in("#html_escaped")
+      end
+
+      it "can use user-defined helpers from app/helpers" do
+        expect(page).to have_text("Hello, world!").in("#hello_world")
+      end
+
+      it "can use user-defined helpers from the controller" do
+        expect(page).to have_text("Goodnight, moon!").in("#goodnight_moon")
       end
 
       it "can use path helpers with a model" do
-        page.should have_text("/en/posts/1").in("#path_with_model")
+        expect(page).to have_text("/en/posts/1").in("#path_with_model")
       end
 
       it "can use path helpers with an id" do
-        page.should have_text("/en/posts/1").in("#path_with_id")
+        expect(page).to have_text("/en/posts/1").in("#path_with_id")
       end
 
       it "can use url helpers with a model" do
-        page.should have_text("http://www.example.com:12345/en/posts/1").in("#url_with_model")
+        expect(page).to have_text("http://www.example.com:12345/en/posts/1").in("#url_with_model")
       end
 
       it "can use url helpers with an id" do
-        page.should have_text("http://www.example.com:12345/en/posts/1").in("#url_with_id")
+        expect(page).to have_text("http://www.example.com:12345/en/posts/1").in("#url_with_id")
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,29 +1,36 @@
 require 'bundler/setup'
-require 'ammeter/init'
-require 'rails'
-
-require 'action_view'
+require 'draper'
 require 'action_controller'
 require 'action_controller/test_case'
 
-Bundler.require
-
-require 'support/active_model'
-require 'support/active_record'
-require 'support/action_controller'
-
-require 'support/models/product'
-require 'support/models/namespaced_product'
-require 'support/models/non_active_model_product'
-require 'support/models/widget'
-require 'support/models/some_thing'
-require 'support/models/uninferrable_decorator_model'
-
-require 'support/decorators/product_decorator'
-require 'support/decorators/namespaced_product_decorator'
-require 'support/decorators/non_active_model_product_decorator'
-require 'support/decorators/widget_decorator'
-require 'support/decorators/specific_product_decorator'
-require 'support/decorators/products_decorator'
-require 'support/decorators/some_thing_decorator'
-require 'support/decorators/decorator_with_application_helper'
+RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.expect_with(:rspec) {|c| c.syntax = :expect}
+  config.order = :random
+end
+
+class Model; include Draper::Decoratable; end
+
+class Product < 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
+
+  class OtherDecorator < Draper::Decorator; end
+end
+
+# After each example, revert changes made to the class
+def protect_class(klass)
+  before { stub_const klass.name, Class.new(klass) }
+end
+
+def protect_module(mod)
+  before { stub_const mod.name, mod.dup }
+end

data/spec/support/shared_examples/decoratable_equality.rb

@@ -0,0 +1,40 @@
+shared_examples_for "decoration-aware #==" do |subject|
+  it "is true for itself" do
+    expect(subject == subject).to be_true
+  end
+
+  it "is false for another object" do
+    expect(subject == Object.new).to be_false
+  end
+
+  it "is true for a decorated version of itself" do
+    decorated = double(source: subject, decorated?: true)
+
+    expect(subject == decorated).to be_true
+  end
+
+  it "is false for a decorated other object" do
+    decorated = double(source: Object.new, decorated?: true)
+
+    expect(subject == decorated).to be_false
+  end
+
+  it "is false for a decoratable object with a `source` association" do
+    decoratable = double(source: subject, decorated?: false)
+
+    expect(subject == decoratable).to be_false
+  end
+
+  it "is false for an undecoratable object with a `source` association" do
+    undecoratable = double(source: subject)
+
+    expect(subject == undecoratable).to be_false
+  end
+
+  it "is true for a multiply-decorated version of itself" do
+    decorated = double(source: subject, decorated?: true)
+    redecorated = double(source: decorated, decorated?: true)
+
+    expect(subject == redecorated).to be_true
+  end
+end

data/spec/support/shared_examples/view_helpers.rb

@@ -0,0 +1,39 @@
+shared_examples_for "view helpers" do |subject|
+  describe "#helpers" do
+    it "returns the current view context" do
+      Draper::ViewContext.stub 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
+      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")
+      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")
+      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
+      expect(subject.class.helpers).to be :current_view_context
+    end
+
+    it "is aliased to .h" do
+      Draper::ViewContext.stub current: :current_view_context
+      expect(subject.class.h).to be :current_view_context
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: draper
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-14 00:00:00.000000000 Z
+date: 2013-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -172,8 +172,8 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Draper adds a nicely-separated object-oriented layer of presentation
-  logic to your Rails apps.
+description: Draper adds an object-oriented layer of presentation logic to your Rails
+  apps.
 email:
 - jeff@casimircreative.com
 - steve@steveklabnik.com
@@ -197,6 +197,7 @@ files:
 - lib/draper/automatic_delegation.rb
 - lib/draper/collection_decorator.rb
 - lib/draper/decoratable.rb
+- lib/draper/decoratable/equality.rb
 - lib/draper/decorated_association.rb
 - lib/draper/decorator.rb
 - lib/draper/delegation.rb
@@ -212,6 +213,7 @@ files:
 - lib/draper/test_case.rb
 - lib/draper/version.rb
 - lib/draper/view_context.rb
+- lib/draper/view_context/build_strategy.rb
 - lib/draper/view_helpers.rb
 - lib/generators/decorator/decorator_generator.rb
 - lib/generators/decorator/templates/decorator.rb
@@ -224,14 +226,16 @@ files:
 - lib/generators/test_unit/decorator_generator.rb
 - lib/generators/test_unit/templates/decorator_test.rb
 - spec/draper/collection_decorator_spec.rb
+- spec/draper/decoratable/equality_spec.rb
 - spec/draper/decoratable_spec.rb
 - spec/draper/decorated_association_spec.rb
 - spec/draper/decorator_spec.rb
 - spec/draper/finders_spec.rb
 - spec/draper/helper_proxy_spec.rb
+- spec/draper/view_context/build_strategy_spec.rb
+- spec/draper/view_context_spec.rb
 - spec/draper/view_helpers_spec.rb
 - spec/dummy/.rspec
-- spec/dummy/README.rdoc
 - spec/dummy/Rakefile
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/localized_urls.rb
@@ -240,11 +244,15 @@ files:
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/application_mailer.rb
 - spec/dummy/app/mailers/post_mailer.rb
+- spec/dummy/app/models/admin.rb
+- spec/dummy/app/models/mongoid_post.rb
 - spec/dummy/app/models/post.rb
+- spec/dummy/app/models/user.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/views/post_mailer/decorated_email.html.erb
 - spec/dummy/app/views/posts/_post.html.erb
 - spec/dummy/app/views/posts/show.html.erb
+- spec/dummy/bin/rails
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
@@ -259,23 +267,37 @@ files:
 - spec/dummy/config/initializers/secret_token.rb
 - spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/locales/en.yml
+- spec/dummy/config/mongoid.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/db/migrate/20121019115657_create_posts.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/seeds.rb
+- spec/dummy/fast_spec/post_decorator_spec.rb
 - spec/dummy/lib/tasks/test.rake
 - spec/dummy/log/.gitkeep
-- spec/dummy/mini_test/mini_test_integration_test.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/dummy/script/rails
+- spec/dummy/spec/decorators/devise_spec.rb
+- spec/dummy/spec/decorators/helpers_spec.rb
 - spec/dummy/spec/decorators/post_decorator_spec.rb
-- spec/dummy/spec/decorators/rspec_integration_spec.rb
+- spec/dummy/spec/decorators/spec_type_spec.rb
+- spec/dummy/spec/decorators/view_context_spec.rb
 - spec/dummy/spec/mailers/post_mailer_spec.rb
+- spec/dummy/spec/models/mongoid_post_spec.rb
 - spec/dummy/spec/models/post_spec.rb
 - spec/dummy/spec/spec_helper.rb
+- spec/dummy/test/decorators/minitest/devise_test.rb
+- spec/dummy/test/decorators/minitest/helpers_test.rb
+- spec/dummy/test/decorators/minitest/spec_type_test.rb
+- spec/dummy/test/decorators/minitest/view_context_test.rb
+- spec/dummy/test/decorators/test_unit/devise_test.rb
+- spec/dummy/test/decorators/test_unit/helpers_test.rb
+- spec/dummy/test/decorators/test_unit/view_context_test.rb
+- spec/dummy/test/minitest_helper.rb
+- spec/dummy/test/test_helper.rb
 - spec/generators/decorator/decorator_generator_spec.rb
 - spec/integration/integration_spec.rb
 - spec/performance/active_record.rb
@@ -283,25 +305,10 @@ files:
 - spec/performance/decorators.rb
 - spec/performance/models.rb
 - spec/spec_helper.rb
-- spec/support/action_controller.rb
-- spec/support/active_model.rb
-- spec/support/active_record.rb
-- spec/support/decorators/decorator_with_application_helper.rb
-- spec/support/decorators/namespaced_product_decorator.rb
-- spec/support/decorators/non_active_model_product_decorator.rb
-- spec/support/decorators/product_decorator.rb
-- spec/support/decorators/products_decorator.rb
-- spec/support/decorators/some_thing_decorator.rb
-- spec/support/decorators/specific_product_decorator.rb
-- spec/support/decorators/widget_decorator.rb
 - spec/support/dummy_app.rb
 - spec/support/matchers/have_text.rb
-- spec/support/models/namespaced_product.rb
-- spec/support/models/non_active_model_product.rb
-- spec/support/models/product.rb
-- spec/support/models/some_thing.rb
-- spec/support/models/uninferrable_decorator_model.rb
-- spec/support/models/widget.rb
+- spec/support/shared_examples/decoratable_equality.rb
+- spec/support/shared_examples/view_helpers.rb
 homepage: http://github.com/drapergem/draper
 licenses: []
 post_install_message: 
@@ -328,14 +335,16 @@ specification_version: 3
 summary: View Models for Rails
 test_files:
 - spec/draper/collection_decorator_spec.rb
+- spec/draper/decoratable/equality_spec.rb
 - spec/draper/decoratable_spec.rb
 - spec/draper/decorated_association_spec.rb
 - spec/draper/decorator_spec.rb
 - spec/draper/finders_spec.rb
 - spec/draper/helper_proxy_spec.rb
+- spec/draper/view_context/build_strategy_spec.rb
+- spec/draper/view_context_spec.rb
 - spec/draper/view_helpers_spec.rb
 - spec/dummy/.rspec
-- spec/dummy/README.rdoc
 - spec/dummy/Rakefile
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/localized_urls.rb
@@ -344,11 +353,15 @@ test_files:
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/application_mailer.rb
 - spec/dummy/app/mailers/post_mailer.rb
+- spec/dummy/app/models/admin.rb
+- spec/dummy/app/models/mongoid_post.rb
 - spec/dummy/app/models/post.rb
+- spec/dummy/app/models/user.rb
 - spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/app/views/post_mailer/decorated_email.html.erb
 - spec/dummy/app/views/posts/_post.html.erb
 - spec/dummy/app/views/posts/show.html.erb
+- spec/dummy/bin/rails
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
@@ -363,23 +376,37 @@ test_files:
 - spec/dummy/config/initializers/secret_token.rb
 - spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/locales/en.yml
+- spec/dummy/config/mongoid.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/db/migrate/20121019115657_create_posts.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/seeds.rb
+- spec/dummy/fast_spec/post_decorator_spec.rb
 - spec/dummy/lib/tasks/test.rake
 - spec/dummy/log/.gitkeep
-- spec/dummy/mini_test/mini_test_integration_test.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/dummy/script/rails
+- spec/dummy/spec/decorators/devise_spec.rb
+- spec/dummy/spec/decorators/helpers_spec.rb
 - spec/dummy/spec/decorators/post_decorator_spec.rb
-- spec/dummy/spec/decorators/rspec_integration_spec.rb
+- spec/dummy/spec/decorators/spec_type_spec.rb
+- spec/dummy/spec/decorators/view_context_spec.rb
 - spec/dummy/spec/mailers/post_mailer_spec.rb
+- spec/dummy/spec/models/mongoid_post_spec.rb
 - spec/dummy/spec/models/post_spec.rb
 - spec/dummy/spec/spec_helper.rb
+- spec/dummy/test/decorators/minitest/devise_test.rb
+- spec/dummy/test/decorators/minitest/helpers_test.rb
+- spec/dummy/test/decorators/minitest/spec_type_test.rb
+- spec/dummy/test/decorators/minitest/view_context_test.rb
+- spec/dummy/test/decorators/test_unit/devise_test.rb
+- spec/dummy/test/decorators/test_unit/helpers_test.rb
+- spec/dummy/test/decorators/test_unit/view_context_test.rb
+- spec/dummy/test/minitest_helper.rb
+- spec/dummy/test/test_helper.rb
 - spec/generators/decorator/decorator_generator_spec.rb
 - spec/integration/integration_spec.rb
 - spec/performance/active_record.rb
@@ -387,23 +414,8 @@ test_files:
 - spec/performance/decorators.rb
 - spec/performance/models.rb
 - spec/spec_helper.rb
-- spec/support/action_controller.rb
-- spec/support/active_model.rb
-- spec/support/active_record.rb
-- spec/support/decorators/decorator_with_application_helper.rb
-- spec/support/decorators/namespaced_product_decorator.rb
-- spec/support/decorators/non_active_model_product_decorator.rb
-- spec/support/decorators/product_decorator.rb
-- spec/support/decorators/products_decorator.rb
-- spec/support/decorators/some_thing_decorator.rb
-- spec/support/decorators/specific_product_decorator.rb
-- spec/support/decorators/widget_decorator.rb
 - spec/support/dummy_app.rb
 - spec/support/matchers/have_text.rb
-- spec/support/models/namespaced_product.rb
-- spec/support/models/non_active_model_product.rb
-- spec/support/models/product.rb
-- spec/support/models/some_thing.rb
-- spec/support/models/uninferrable_decorator_model.rb
-- spec/support/models/widget.rb
+- spec/support/shared_examples/decoratable_equality.rb
+- spec/support/shared_examples/view_helpers.rb
 has_rdoc: