draper 2.1.0 → 3.0.0

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

@@ -54,13 +54,11 @@ describe PostDecorator do
   end
 
   it "serializes to XML" do
-    pending("Rails < 3.2 does not use `serializable_hash` in `to_xml`") if Rails.version.to_f < 3.2
-
     xml = Capybara.string(decorator.to_xml)
     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/spec/mailers/post_mailer_spec.rb

@@ -10,14 +10,6 @@ describe PostMailer do
       expect(email_body).to have_content "Today"
     end
 
-    it "can use path helpers with a model" do
-      expect(email_body).to have_css "#path_with_model", text: "/en/posts/#{post.id}"
-    end
-
-    it "can use path helpers with an id" do
-      expect(email_body).to have_css "#path_with_id", text: "/en/posts/#{post.id}"
-    end
-
     it "can use url helpers with a model" do
       expect(email_body).to have_css "#url_with_model", text: "http://www.example.com:12345/en/posts/#{post.id}"
     end

data/spec/dummy/spec/shared_examples/decoratable.rb

@@ -11,8 +11,6 @@ shared_examples_for "a decoratable model" do
 
   describe "#==" do
     it "is true for other instances' decorators" do
-      pending "Mongoid < 3.1 overrides `#==`" if defined?(Mongoid) && Mongoid::VERSION.to_f < 3.1 && described_class < Mongoid::Document
-
       described_class.create
       one = described_class.first
       other = described_class.first

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
-  tests 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/dummy/test/decorators/test_unit/view_context_test.rb

@@ -14,7 +14,7 @@ class DecoratorTest < Draper::TestCase
 end
 
 class ControllerTest < ActionController::TestCase
-  tests Class.new(ActionController::Base)
+  subject{ Class.new(ActionController::Base) }
 
   it_does_not_leak_view_context
 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,38 +15,40 @@ 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
-          Object.any_instance.stub(:require).with("application_decorator").and_return (
-            stub_const "ApplicationDecorator", Class.new)
+          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
+          )
         end
 
         before { run_generator %w(YourModel) }
 
-        it { should contain "class YourModelDecorator < ApplicationDecorator" }
+        it { is_expected.to contain "class YourModelDecorator < ApplicationDecorator" }
       end
     end
   end
@@ -58,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
@@ -77,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/integration/integration_spec.rb

@@ -38,16 +38,19 @@ app.start_server do
         expect(page).to have_text("Goodnight, moon!").in("#goodnight_moon")
       end
 
-      it "can be passed to path helpers" do
-        expect(page).to have_text("/en/posts/1").in("#path_with_decorator")
-      end
+      # _path helpers aren't available in mailers
+      if type == :view
+        it "can be passed to path helpers" do
+          expect(page).to have_text("/en/posts/1").in("#path_with_decorator")
+        end
 
-      it "can use path helpers with a model" do
-        expect(page).to have_text("/en/posts/1").in("#path_with_model")
-      end
+        it "can use path helpers with a model" do
+          expect(page).to have_text("/en/posts/1").in("#path_with_model")
+        end
 
-      it "can use path helpers with an id" do
-        expect(page).to have_text("/en/posts/1").in("#path_with_id")
+        it "can use path helpers with an id" do
+          expect(page).to have_text("/en/posts/1").in("#path_with_id")
+        end
       end
 
       it "can be passed to url helpers" do

data/spec/performance/benchmark.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
-Bundler.require(:default) if defined?(Bundler)
+Bundler.require :default
 
 require "benchmark"
 require "draper"

data/spec/spec_helper.rb

@@ -1,6 +1,5 @@
 require 'bundler/setup'
 require 'draper'
-require 'rails/version'
 require 'action_controller'
 require 'action_controller/test_case'
 
@@ -20,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/matchers/have_text.rb

@@ -21,11 +21,11 @@ module HaveTextMatcher
       @subject.has_css?(@css || "*", text: @text)
     end
 
-    def failure_message_for_should
+    def failure_message
       "expected to find #{@text.inspect} #{within}"
     end
 
-    def failure_message_for_should_not
+    def failure_message_when_negated
       "expected not to find #{@text.inspect} #{within}"
     end
 

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: draper
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Jeff Casimir
@@ -9,36 +9,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-27 00:00:00.000000000 Z
+date: 2017-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: request_store
   requirement: !ruby/object:Gem::Requirement
@@ -57,16 +57,30 @@ dependencies:
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: activemodel-serializers-xml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: ammeter
   requirement: !ruby/object:Gem::Requirement
@@ -87,42 +101,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -139,6 +153,20 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+- !ruby/object:Gem::Dependency
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -160,8 +188,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".codeclimate.yml"
+- ".github/PULL_REQUEST_TEMPLATE.md"
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - ".yardopts"
 - CHANGELOG.md
@@ -172,12 +203,11 @@ files:
 - README.md
 - Rakefile
 - draper.gemspec
-- gemfiles/4.0.gemfile
-- gemfiles/4.1.gemfile
-- gemfiles/4.2.gemfile
 - lib/draper.rb
 - lib/draper/automatic_delegation.rb
 - lib/draper/collection_decorator.rb
+- lib/draper/compatibility/api_only.rb
+- lib/draper/configuration.rb
 - lib/draper/decoratable.rb
 - lib/draper/decoratable/equality.rb
 - lib/draper/decorated_association.rb
@@ -201,6 +231,8 @@ files:
 - lib/draper/view_context/build_strategy.rb
 - lib/draper/view_helpers.rb
 - lib/generators/controller_override.rb
+- lib/generators/draper/install_generator.rb
+- lib/generators/draper/templates/application_decorator.rb
 - lib/generators/mini_test/decorator_generator.rb
 - lib/generators/mini_test/templates/decorator_spec.rb
 - lib/generators/mini_test/templates/decorator_test.rb
@@ -211,22 +243,25 @@ files:
 - lib/generators/test_unit/decorator_generator.rb
 - lib/generators/test_unit/templates/decorator_test.rb
 - spec/draper/collection_decorator_spec.rb
+- spec/draper/configuration_spec.rb
 - spec/draper/decoratable/equality_spec.rb
 - spec/draper/decoratable_spec.rb
 - spec/draper/decorated_association_spec.rb
 - spec/draper/decorates_assigned_spec.rb
 - spec/draper/decorator_spec.rb
+- spec/draper/draper_spec.rb
 - spec/draper/factory_spec.rb
 - spec/draper/finders_spec.rb
 - spec/draper/helper_proxy_spec.rb
 - spec/draper/lazy_helpers_spec.rb
+- spec/draper/undecorate_chain_spec.rb
 - spec/draper/undecorate_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/Rakefile
-- spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/controllers/base_controller.rb
 - spec/dummy/app/controllers/localized_urls.rb
 - spec/dummy/app/controllers/posts_controller.rb
 - spec/dummy/app/decorators/mongoid_post_decorator.rb
@@ -252,6 +287,7 @@ files:
 - spec/dummy/config/environments/production.rb
 - spec/dummy/config/environments/test.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
+- spec/dummy/config/initializers/draper.rb
 - spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/secret_token.rb
@@ -292,6 +328,7 @@ files:
 - spec/dummy/test/test_helper.rb
 - spec/generators/controller/controller_generator_spec.rb
 - spec/generators/decorator/decorator_generator_spec.rb
+- spec/generators/install/install_generator_spec.rb
 - spec/integration/integration_spec.rb
 - spec/performance/active_record.rb
 - spec/performance/benchmark.rb
@@ -314,7 +351,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -322,28 +359,31 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: View Models for Rails
 test_files:
 - spec/draper/collection_decorator_spec.rb
+- spec/draper/configuration_spec.rb
 - spec/draper/decoratable/equality_spec.rb
 - spec/draper/decoratable_spec.rb
 - spec/draper/decorated_association_spec.rb
 - spec/draper/decorates_assigned_spec.rb
 - spec/draper/decorator_spec.rb
+- spec/draper/draper_spec.rb
 - spec/draper/factory_spec.rb
 - spec/draper/finders_spec.rb
 - spec/draper/helper_proxy_spec.rb
 - spec/draper/lazy_helpers_spec.rb
+- spec/draper/undecorate_chain_spec.rb
 - spec/draper/undecorate_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/Rakefile
-- spec/dummy/app/controllers/application_controller.rb
+- spec/dummy/app/controllers/base_controller.rb
 - spec/dummy/app/controllers/localized_urls.rb
 - spec/dummy/app/controllers/posts_controller.rb
 - spec/dummy/app/decorators/mongoid_post_decorator.rb
@@ -369,6 +409,7 @@ test_files:
 - spec/dummy/config/environments/production.rb
 - spec/dummy/config/environments/test.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
+- spec/dummy/config/initializers/draper.rb
 - spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/secret_token.rb
@@ -409,6 +450,7 @@ test_files:
 - spec/dummy/test/test_helper.rb
 - spec/generators/controller/controller_generator_spec.rb
 - spec/generators/decorator/decorator_generator_spec.rb
+- spec/generators/install/install_generator_spec.rb
 - spec/integration/integration_spec.rb
 - spec/performance/active_record.rb
 - spec/performance/benchmark.rb