draper 2.1.0 → 3.0.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b85cf531330b6947bd3bd6970e527ca62149975a
-  data.tar.gz: e063ca4cd9757a4bfc7ad5eb3970b852fa62f1f8
+  metadata.gz: 016c0c7b5f38f0560c5629e83abcc175401cdcb4
+  data.tar.gz: eb23dac2cdc58bf4a2eedccd0f468b25f2df49b8
 SHA512:
-  metadata.gz: d51ffa67dbb810f7d093bf2bf7c7b0c216cc03231150dbec62b0915fc098ac7bd28b8975541ac99abe3fcdae541d98133d3e7fc176335f16615c6cd6169111bb
-  data.tar.gz: 0006c748a474980dcc613530ed51fa1b9b469e3bbf63eb5ed3eb72d06ab2d5c692c439d5cc43cc139c00ce0032329ac77518600efc351c10b0b1c5b6fa81af51
+  metadata.gz: 4fc57f67ed9b7f7779f93c7393c4a91a883ed5a5393dffa6be88da26171bfa6ae463db4d73c5d8831dc4c8f5f4fa3d6e61e3a38c8fec02e9d481c7c3e88ab85d
+  data.tar.gz: 972827d365bf4d02bc8bb9f817c6fab065a9de81bf9f80c3de67b2be8fc12b1216d5e459fa561997afe9debad1456d704da2d2f8d108aef8fdcccbc6139da317

data/.gitignore

@@ -1,5 +1,7 @@
 *.gem
-*.rvmrc
+.rvmrc
+.ruby-version
+.ruby-gemset
 .bundle
 Gemfile.lock
 pkg/*

data/.travis.yml

@@ -4,10 +4,5 @@ services:
   - mongodb
 
 rvm:
-  - 2.1.5
-  - 2.2.1
-
-env:
-  - "RAILS_VERSION=4.0"
-  - "RAILS_VERSION=4.1"
-  - "RAILS_VERSION=4.2"
+  - 2.2.5
+  - 2.3.1

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Draper Changelog
 
+## 3.0.0.pre1 - 2016-07-10
+
+* Added support for Rails 5, dropped 4.0 - 4.2
+  * Ruby >= 2.2 is required, matching Rails 5
+* Dropped support for ActiveModelSerializers 0.8
+
 ## 2.1.0 - 2015-03-26
 
 * Cleared most issues and merged a few PRs

data/Gemfile

@@ -7,10 +7,9 @@ platforms :ruby do
 end
 
 platforms :jruby do
-  gem "minitest", ">= 3.0"
-  gem "activerecord-jdbcsqlite3-adapter", ">= 1.3.0.beta2"
+  gem "minitest"
+  gem "activerecord-jdbcsqlite3-adapter"
 end
 
-version = ENV["RAILS_VERSION"] || "4.1"
-
-eval_gemfile File.expand_path("../gemfiles/#{version}.gemfile", __FILE__)
+gem "rails", "~> 5.0"
+gem "mongoid", github: "mongodb/mongoid"

data/README.md

@@ -1,8 +1,8 @@
 # Draper: View Models for Rails
 
 [![TravisCI Build Status](https://travis-ci.org/drapergem/draper.svg?branch=master)](http://travis-ci.org/drapergem/draper)
-[![Code Climate](https://codeclimate.com/github/drapergem/draper.png)](https://codeclimate.com/github/drapergem/draper)
-[![Inline docs](http://inch-ci.org/github/drapergem/draper.png?branch=master)](http://inch-ci.org/github/drapergem/draper)
+[![Code Climate](https://codeclimate.com/github/drapergem/draper.svg)](https://codeclimate.com/github/drapergem/draper)
+[![Inline docs](http://inch-ci.org/github/drapergem/draper.svg?branch=master)](http://inch-ci.org/github/drapergem/draper)
 
 Draper adds an object-oriented layer of presentation logic to your Rails
 application.
@@ -48,7 +48,7 @@ end
 But it makes you a little uncomfortable. `publication_status` lives in a
 nebulous namespace spread across all controllers and view. Down the road, you
 might want to display the publication status of a `Book`. And, of course, your
-design calls for a slighly different formatting to the date for a `Book`.
+design calls for a slightly different formatting to the date for a `Book`.
 
 Now your helper method can either switch based on the input class type (poor
 Ruby style), or you break it out into two methods, `book_publication_status` and
@@ -110,7 +110,7 @@ Decorators are the ideal place to:
 Add Draper to your Gemfile:
 
 ```ruby
-gem 'draper', '~> 1.3'
+gem 'draper'
 ```
 
 And run `bundle install` within your app's directory.
@@ -276,6 +276,19 @@ omitted.
 delegate :current_page, :per_page, :offset, :total_entries, :total_pages
 ```
 
+If needed, you can then set the collection_decorator_class of your CustomDecorator as follows:
+```ruby
+class ArticleDecorator < Draper::Decorator
+  def self.collection_decorator_class
+    PaginatingDecorator
+  end
+end
+
+ArticleDecorator.decorate_collection(@articles.paginate)
+# => Collection decorated by PaginatingDecorator
+# => Members decorated by ArticleDecorator
+```
+
 ### Decorating Associated Objects
 
 You can automatically decorate associated models when the primary model is
@@ -379,6 +392,15 @@ In your `Spork.prefork` block of `spec_helper.rb`, add this:
 require 'draper/test/rspec_integration'
 ```
 
+#### Custom Draper Controller ViewContext
+If running tests in an engine setting with a controller other than "ApplicationController," set a custom controller in `spec_helper.rb`
+
+```ruby
+config.before(:each, type: :decorator) do |example|
+  Draper::ViewContext.controller = ExampleEngine::CustomRootController.new
+end
+```
+
 ### Isolated Tests
 
 In tests, Draper needs to build a view context to access helper methods. By
@@ -564,13 +586,15 @@ end
 
 This is only necessary when proxying class methods.
 
+Once this association between the decorator and the model is set up, you can call
+`SomeModel.decorator_class` to access class methods defined in the decorator.
+If necessary, you can check if your model is decorated with `SomeModel.decorator_class?`.
+
 ### Making Models Decoratable
 
 Models get their `decorate` method from the `Draper::Decoratable` module, which
 is included in `ActiveRecord::Base` and `Mongoid::Document` by default. If
-you're [using another
-ORM](https://github.com/drapergem/draper/wiki/Using-other-ORMs) (including
-versions of Mongoid prior to 3.0), or want to decorate plain old Ruby objects,
+you're using another ORM, or want to decorate plain old Ruby objects,
 you can include this module manually.
 
 ## Contributors
@@ -579,7 +603,11 @@ Draper was conceived by Jeff Casimir and heavily refined by Steve Klabnik and a
 great community of open source
 [contributors](https://github.com/drapergem/draper/contributors).
 
-### Core Team
+### Current maintainers
+
+* Sean Linsley
+
+### Historical maintainers
 
 * Jeff Casimir (jeff@jumpstartlab.com)
 * Steve Klabnik (steve@jumpstartlab.com)

data/Rakefile

@@ -16,7 +16,8 @@ desc "Run all specs"
 task "spec" => "spec:all"
 
 namespace "spec" do
-  task "all" => ["draper", "generators", "integration"]
+  # TODOD: add back "generators"
+  task "all" => ["draper", "integration"]
 
   def spec_task(name)
     desc "Run #{name} specs"
@@ -64,6 +65,6 @@ namespace "db" do
     run_in_dummy_app "rm -f db/*.sqlite3"
     run_in_dummy_app "RAILS_ENV=development rake db:schema:load db:seed"
     run_in_dummy_app "RAILS_ENV=production rake db:schema:load db:seed"
-    run_in_dummy_app "RAILS_ENV=test rake db:schema:load"
+    run_in_dummy_app "RAILS_ENV=test rake db:environment:set db:schema:load"
   end
 end

data/draper.gemspec

@@ -1,6 +1,4 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "draper/version"
+require File.join(__dir__, "lib", "draper", "version")
 
 Gem::Specification.new do |s|
   s.name        = "draper"
@@ -17,15 +15,18 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'activesupport', '>= 3.0'
-  s.add_dependency 'actionpack', '>= 3.0'
+  s.required_ruby_version = '>= 2.2.2'
+
+  s.add_dependency 'activesupport', '~> 5.0'
+  s.add_dependency 'actionpack', '~> 5.0'
   s.add_dependency 'request_store', '~> 1.0'
-  s.add_dependency 'activemodel', '>= 3.0'
+  s.add_dependency 'activemodel', '~> 5.0'
+  s.add_dependency 'activemodel-serializers-xml', '~> 1.0'
 
   s.add_development_dependency 'ammeter'
-  s.add_development_dependency 'rake', '>= 0.9.2'
-  s.add_development_dependency 'rspec-rails', '~> 3.2'
-  s.add_development_dependency 'minitest-rails', '>= 1.0'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rspec-rails'
+  s.add_development_dependency 'minitest-rails'
   s.add_development_dependency 'capybara'
-  s.add_development_dependency 'active_model_serializers'
+  s.add_development_dependency 'active_model_serializers', '~> 0.10'
 end

data/lib/draper.rb

@@ -33,7 +33,7 @@ module Draper
       extend  Draper::HelperSupport
       extend  Draper::DecoratesAssigned
 
-      before_filter :activate_draper
+      before_action :activate_draper
     end
   end
 

data/lib/draper/automatic_delegation.rb

@@ -6,7 +6,7 @@ module Draper
     def method_missing(method, *args, &block)
       return super unless delegatable?(method)
 
-      self.class.delegate method
+      self.singleton_class.delegate method
       send(method, *args, &block)
     end
 

data/lib/draper/decoratable.rb

@@ -56,8 +56,7 @@ module Draper
       # @param [Hash] options
       #   see {Decorator.decorate_collection}.
       def decorate(options = {})
-        collection = Rails::VERSION::MAJOR >= 4 ? all : scoped
-        decorator_class.decorate_collection(collection, options.reverse_merge(with: nil))
+        decorator_class.decorate_collection(all, options.reverse_merge(with: nil))
       end
 
       def decorator_class?

data/lib/draper/decorator.rb

@@ -203,18 +203,6 @@ module Draper
       super || object.instance_of?(klass)
     end
 
-    if RUBY_VERSION < "2.0"
-      # nasty hack to stop 1.9.x using the delegated `to_s` in `inspect`
-      alias_method :_to_s, :to_s
-
-      def inspect
-        ivars = instance_variables.map do |name|
-          "#{name}=#{instance_variable_get(name).inspect}"
-        end
-        _to_s.insert(-2, " #{ivars.join(", ")}")
-      end
-    end
-
     delegate :to_s
 
     # In case object is nil

data/lib/draper/railtie.rb

@@ -43,14 +43,6 @@ module Draper
       end
     end
 
-    initializer "draper.setup_active_model_serializers" do |app|
-      ActiveSupport.on_load :active_model_serializers do
-        if defined?(ActiveModel::ArraySerializerSupport)
-          Draper::CollectionDecorator.send :include, ActiveModel::ArraySerializerSupport
-        end
-      end
-    end
-
     initializer "draper.minitest-rails_integration" do |app|
       ActiveSupport.on_load :minitest do
         require "draper/test/minitest_integration"

data/lib/draper/tasks/test.rake

@@ -1,22 +1,9 @@
 require 'rake/testtask'
-
-test_task = if Rails.version.to_f < 3.2
-  require 'rails/test_unit/railtie'
-  Rake::TestTask
-else
-  require 'rails/test_unit/sub_test_task'
-  Rails::SubTestTask
-end
+require 'rails/test_unit/railtie'
 
 namespace :test do
-  test_task.new(:decorators => "test:prepare") do |t|
+  Rake::TestTask.new(:decorators => "test:prepare") do |t|
     t.libs << "test"
     t.pattern = "test/decorators/**/*_test.rb"
   end
 end
-
-if Rails.version.to_f < 4.2 && Rake::Task.task_defined?('test:run')
-  Rake::Task['test:run'].enhance do
-    Rake::Task['test:decorators'].invoke
-  end
-end

data/lib/draper/test/rspec_integration.rb

@@ -7,11 +7,7 @@ module Draper
   end
 
   RSpec.configure do |config|
-    if RSpec::Core::Version::STRING.starts_with?("3")
-      config.include DecoratorExampleGroup, file_path: %r{spec/decorators}, type: :decorator
-    else
-      config.include DecoratorExampleGroup, example_group: {file_path: %r{spec/decorators}}, type: :decorator
-    end
+    config.include DecoratorExampleGroup, file_path: %r{spec/decorators}, type: :decorator
 
     [:decorator, :controller, :mailer].each do |type|
       config.before(:each, type: type) { Draper::ViewContext.clear! }

data/lib/draper/test_case.rb

@@ -29,14 +29,10 @@ module Draper
   end
 end
 
-if defined?(ActionController::TestCase)
-  class ActionController::TestCase
-    include Draper::TestCase::ViewContextTeardown
-  end
+if defined? ActionController::TestCase
+  ActionController::TestCase.include Draper::TestCase::ViewContextTeardown
 end
 
-if defined?(ActionMailer::TestCase)
-  class ActionMailer::TestCase
-    include Draper::TestCase::ViewContextTeardown
-  end
+if defined? ActionMailer::TestCase
+  ActionMailer::TestCase.include Draper::TestCase::ViewContextTeardown
 end

data/lib/draper/version.rb

@@ -1,3 +1,3 @@
 module Draper
-  VERSION = "2.1.0"
+  VERSION = "3.0.0.pre1"
 end

data/lib/draper/view_context/build_strategy.rb

@@ -38,7 +38,7 @@ module Draper
 
         def controller
           (Draper::ViewContext.controller || ApplicationController.new).tap do |controller|
-            controller.request ||= ActionController::TestRequest.new if defined?(ActionController::TestRequest)
+            controller.request ||= ActionController::TestRequest.create
           end
         end
       end

data/lib/generators/rspec/templates/decorator_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe <%= class_name %>Decorator do
 end

data/spec/draper/decoratable_spec.rb

@@ -128,11 +128,9 @@ module Draper
     end
 
     describe ".decorate" do
-      let(:scoping_method) { Rails::VERSION::MAJOR >= 4 ? :all : :scoped }
-
       it "calls #decorate_collection on .decorator_class" do
         scoped = [Product.new]
-        Product.stub scoping_method => scoped
+        Product.stub all: scoped
 
         Product.decorator_class.should_receive(:decorate_collection).with(scoped, with: nil).and_return(:decorated_collection)
         expect(Product.decorate).to be :decorated_collection
@@ -140,7 +138,7 @@ module Draper
 
       it "accepts options" do
         options = {with: ProductDecorator, context: {some: "context"}}
-        Product.stub scoping_method => []
+        Product.stub all: []
 
         Product.decorator_class.should_receive(:decorate_collection).with([], options)
         Product.decorate(options)
@@ -162,7 +160,7 @@ module Draper
 
       context "for ActiveModel classes" do
         it "infers the decorator from the model name" do
-          Product.stub(:model_name).and_return("Other")
+          allow(Product).to receive(:model_name){"Other"}
 
           expect(Product.decorator_class).to be OtherDecorator
         end

data/spec/draper/decorator_spec.rb

@@ -604,6 +604,14 @@ module Draper
           expect(decorator.methods).to include :hello_world
         end
 
+        it "allows decorator to decorate different classes of objects" do
+          decorator_1 = Decorator.new(double)
+          decorator_2 = Decorator.new(double(hello_world: :delegated))
+
+          decorator_2.hello_world
+          expect(decorator_1.methods).not_to include :hello_world
+        end
+
         it "passes blocks to delegated methods" do
           object = Model.new
           object.stub(:hello_world) { |*args, &block| block.call }

data/spec/draper/factory_spec.rb

@@ -99,7 +99,7 @@ module Draper
         options = {foo: "bar"}
         worker = Factory::Worker.new(double, object)
         decorator = ->(*){}
-        worker.stub decorator: decorator
+        allow(worker).to receive(:decorator){ decorator }        
 
         decorator.should_receive(:call).with(object, options).and_return(:decorated)
         expect(worker.call(options)).to be :decorated
@@ -227,8 +227,8 @@ module Draper
             it "returns the .decorate_collection method from the object's decorator" do
               object = []
               decorator_class = Class.new(Decorator)
-              object.stub decorator_class: decorator_class
-              object.stub decorate: nil
+              allow(object).to receive(:decorator_class){ decorator_class }
+              allow(object).to receive(:decorate){ nil }
               worker = Factory::Worker.new(nil, object)
 
               decorator_class.should_receive(:decorate_collection).with(object, foo: "bar", with: nil).and_return(:decorated)

data/spec/draper/helper_proxy_spec.rb

@@ -52,7 +52,7 @@ module Draper
         view_context = double
         helper_proxy = HelperProxy.new(view_context)
 
-        view_context.stub(:capture) { |*args, &block| [*args, block.call] }
+        allow(view_context).to receive(:capture) { |*args, &block| [*args, block.call] }
         expect(helper_proxy.capture(:first_arg, :second_arg){:yielded}).to \
           be_eql [:first_arg, :second_arg, :yielded]
       end

data/spec/dummy/app/views/posts/_post.html.erb

@@ -20,14 +20,16 @@
   <dt>Helpers from the controller:</dt>
   <dd id="goodnight_moon"><%= post.goodnight_moon %></dd>
 
-  <dt>Path with decorator:</dt>
-  <dd id="path_with_decorator"><%= post_path(post) %></dd>
+  <% unless defined? mailer %>
+    <dt>Path with decorator:</dt>
+    <dd id="path_with_decorator"><%= post_url(post) %></dd>
 
-  <dt>Path with model:</dt>
-  <dd id="path_with_model"><%= post.path_with_model %></dd>
+    <dt>Path with model:</dt>
+    <dd id="path_with_model"><%= post.path_with_model %></dd>
 
-  <dt>Path with id:</dt>
-  <dd id="path_with_id"><%= post.path_with_id %></dd>
+    <dt>Path with id:</dt>
+    <dd id="path_with_id"><%= post.path_with_id %></dd>
+  <% end %>
 
   <dt>URL with decorator:</dt>
   <dd id="url_with_decorator"><%= post_url(post) %></dd>

data/spec/dummy/config/mongoid.yml

@@ -1,54 +1,117 @@
 development:
-  # Configure available database sessions. (required)
-  sessions:
-    # Defines the default session. (required)
+  # Configure available database clients. (required)
+  clients:
+    # Defines the default client. (required)
     default:
       # Defines the name of the default database that Mongoid can connect to.
       # (required).
       database: dummy_development
-      # Provides the hosts the default session can connect to. Must be an array
+      # Provides the hosts the default client can connect to. Must be an array
       # of host:port pairs. (required)
       hosts:
         - localhost:27017
       options:
-        # Change whether the session persists in safe mode by default.
-        # (default: false)
-        # safe: false
-
-        # Change the default consistency model to :eventual or :strong.
-        # :eventual will send reads to secondaries, :strong sends everything
-        # to master. (default: :eventual)
-        # consistency: :eventual
-
-        # How many times Moped should attempt to retry an operation after
-        # failure. (default: 30)
-        # max_retries: 30
-
-        # The time in seconds that Moped should wait before retrying an
-        # operation on failure. (default: 1)
-        # retry_interval: 1
-  # Configure Mongoid specific options. (optional)
-  options:
-    # Configuration for whether or not to allow access to fields that do
-    # not have a field definition on the model. (default: true)
-    # allow_dynamic_fields: true
+        # Change the default write concern. (default = { w: 1 })
+        # write:
+        #   w: 1
+
+        # Change the default read preference. Valid options for mode are: :secondary,
+        # :secondary_preferred, :primary, :primary_preferred, :nearest
+        # (default: primary)
+        # read:
+        #   mode: :secondary_preferred
+        #   tag_sets:
+        #     - use: web
+
+        # The name of the user for authentication.
+        # user: 'user'
+
+        # The password of the user for authentication.
+        # password: 'password'
+
+        # The user's database roles.
+        # roles:
+        #   - 'dbOwner'
+
+        # Change the default authentication mechanism. Valid options are: :scram,
+        # :mongodb_cr, :mongodb_x509, and :plain. (default on 3.0 is :scram, default
+        # on 2.4 and 2.6 is :plain)
+        # auth_mech: :scram
+
+        # The database or source to authenticate the user against. (default: admin)
+        # auth_source: admin
+
+        # Force a the driver cluster to behave in a certain manner instead of auto-
+        # discovering. Can be one of: :direct, :replica_set, :sharded. Set to :direct
+        # when connecting to hidden members of a replica set.
+        # connect: :direct
+
+        # Changes the default time in seconds the server monitors refresh their status
+        # via ismaster commands. (default: 10)
+        # heartbeat_frequency: 10
+
+        # The time in seconds for selecting servers for a near read preference. (default: 5)
+        # local_threshold: 5
+
+        # The timeout in seconds for selecting a server for an operation. (default: 30)
+        # server_selection_timeout: 30
+
+        # The maximum number of connections in the connection pool. (default: 5)
+        # max_pool_size: 5
+
+        # The minimum number of connections in the connection pool. (default: 1)
+        # min_pool_size: 1
+
+        # The time to wait, in seconds, in the connection pool for a connection
+        # to be checked in before timing out. (default: 5)
+        # wait_queue_timeout: 5
 
-    # Enable the identity map, needed for eager loading. (default: false)
-    # identity_map_enabled: false
+        # The time to wait to establish a connection before timing out, in seconds.
+        # (default: 5)
+        # connect_timeout: 5
 
+        # The timeout to wait to execute operations on a socket before raising an error.
+        # (default: 5)
+        # socket_timeout: 5
+
+        # The name of the replica set to connect to. Servers provided as seeds that do
+        # not belong to this replica set will be ignored.
+        # replica_set: name
+
+        # Whether to connect to the servers via ssl. (default: false)
+        # ssl: true
+
+        # The certificate file used to identify the connection against MongoDB.
+        # ssl_cert: /path/to/my.cert
+
+        # The private keyfile used to identify the connection against MongoDB.
+        # Note that even if the key is stored in the same file as the certificate,
+        # both need to be explicitly specified.
+        # ssl_key: /path/to/my.key
+
+        # A passphrase for the private key.
+        # ssl_key_pass_phrase: password
+
+        # Whether or not to do peer certification validation. (default: true)
+        # ssl_verify: true
+
+        # The file containing a set of concatenated certification authority certifications
+        # used to validate certs passed from the other end of the connection.
+        # ssl_ca_cert: /path/to/ca.cert
+
+
+  # Configure Mongoid specific options. (optional)
+  options:
     # Includes the root model name in json serialization. (default: false)
     # include_root_in_json: false
 
-    # Include the _type field in serializaion. (default: false)
+    # Include the _type field in serialization. (default: false)
     # include_type_for_serialization: false
 
     # Preload all models in development, needed when models use
     # inheritance. (default: false)
     # preload_models: false
 
-    # Protect id and type from mass assignment. (default: true)
-    # protect_sensitive_fields: true
-
     # Raise an error when performing a #find and the document is not found.
     # (default: true)
     # raise_not_found_error: true
@@ -57,23 +120,23 @@ development:
     # existing method. (default: false)
     # scope_overwrite_exception: false
 
-    # Skip the database version check, used when connecting to a db without
-    # admin access. (default: false)
-    # skip_version_check: false
-
-    # User Active Support's time zone in conversions. (default: true)
+    # Use Active Support's time zone in conversions. (default: true)
     # use_activesupport_time_zone: true
 
     # Ensure all times are UTC in the app side. (default: false)
     # use_utc: false
+
+    # Set the Mongoid and Ruby driver log levels when not in a Rails
+    # environment. The Mongoid logger will be set to the Rails logger
+    # otherwise.(default: :info)
+    # log_level: :info
 test:
-  sessions:
+  clients:
     default:
       database: dummy_test
       hosts:
         - localhost:27017
       options:
-        # In the test environment we lower the retries and retry interval to
-        # low amounts for fast failures.
-        max_retries: 1
-        retry_interval: 0
+        read:
+          mode: :primary
+        max_pool_size: 1

data/spec/dummy/spec/decorators/active_model_serializers_spec.rb

@@ -2,15 +2,11 @@ require 'spec_helper'
 
 describe Draper::CollectionDecorator do
   describe "#active_model_serializer" do
-    it "returns ActiveModel::ArraySerializer" do
-      collection_decorator = Draper::CollectionDecorator.new([])
-      if defined?(ActiveModel::ArraySerializerSupport)
-        collection_serializer = collection_decorator.active_model_serializer
-      else
-        collection_serializer = ActiveModel::Serializer.serializer_for(collection_decorator)
-      end
+    it "returns ActiveModel::Serializer::CollectionSerializer" do
+      collection_decorator  = Draper::CollectionDecorator.new([])
+      collection_serializer = ActiveModel::Serializer.serializer_for(collection_decorator)
 
-      expect(collection_serializer).to be ActiveModel::ArraySerializer
+      expect(collection_serializer).to be ActiveModel::Serializer::CollectionSerializer
     end
   end
 end

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

@@ -54,8 +54,6 @@ 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

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/view_context_test.rb

@@ -14,7 +14,7 @@ describe "A decorator test" do
 end
 
 describe "A controller test" do
-  tests Class.new(ActionController::Base)
+  subject{ Class.new(ActionController::Base) }
 
   it_does_not_leak_view_context
 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/decorator/decorator_generator_spec.rb

@@ -40,8 +40,9 @@ describe Rails::Generators::DecoratorGenerator do
 
       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).with("application_decorator").and_return(
+            stub_const "ApplicationDecorator", Class.new
+          )
         end
 
         before { run_generator %w(YourModel) }

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'
 

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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: draper
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.0.0.pre1
 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: 2016-07-10 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: '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: '3.0'
+        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
@@ -141,16 +155,16 @@ dependencies:
   name: active_model_serializers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
 description: Draper adds an object-oriented layer of presentation logic to your Rails
   apps.
 email:
@@ -172,9 +186,6 @@ 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
@@ -314,15 +325,15 @@ 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:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: View Models for Rails

data/gemfiles/4.0.gemfile

@@ -1,3 +0,0 @@
-gem "rails", "~> 4.0.0"
-gem "mongoid", "~> 4.0"
-gem "devise", "~> 3.0.0"

data/gemfiles/4.1.gemfile

@@ -1,3 +0,0 @@
-gem "rails", "~> 4.1.0"
-gem "mongoid", "~> 4.0"
-gem "devise", "~> 3.2"

data/gemfiles/4.2.gemfile

@@ -1,3 +0,0 @@
-gem "rails", "~> 4.2.0"
-gem "mongoid", "~> 4.0"
-gem "devise", "~> 3.4"