draper 3.1.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c323d66ea5eafcb8aac1d70bdbf02335a7460939bf6dc24a801a37a7c75f6691
-  data.tar.gz: ebd93feddfba45e9c1596b320278bc3ae0886579dbfc6637f7025a6df6e3994c
+  metadata.gz: 39d1efc5af48e806f378bbd92b0d3dcf9e2811175b631e02e2aadd011d1cbf7c
+  data.tar.gz: d758263643cfccb3f4b1c2e1635f40aa540e194647e53e47792e735d433b6d88
 SHA512:
-  metadata.gz: 5977d38ab1436a7dd00cb9e6e8854abdd78d2d21e2a15c00d1b40dade4490909a5d66c73fe64cbea610074096d7ece893fc70b16403fa9090b5de62a2eed2ff6
-  data.tar.gz: b1d4f7faf5afafc5b4820b30bb8f2650fe8c8f936fdde22aedc3198d6b6c21d3299f067da23d96f23a835081bdbef2d71263725f72dce843723f14be3e7216f8
+  metadata.gz: 97b2c778d94f3ffa05a4cd232668f64e1646a7a47b582e9e09eaadaa0ae912f2edb3f5f91e9f8c698832be4990f751dc1359d2bf9bbffb034cffc26145e473ec
+  data.tar.gz: bbd454fb0379f0e7411680139a4fb3cafe5499ad6719bef19040fa93d595019dc8377820f546c8a38408ad0be81abdfd79457a446a9ded0faee04fb30bcb06e8

data/.travis.yml

@@ -1,17 +1,28 @@
+env:
+  global:
+    - CC_TEST_REPORTER_ID=b7ba588af2a540fa96c267b3655a2afe31ea29976dc25905a668dd28d5e88915
+
 language: ruby
-sudo: false
 cache: bundler
 
 services:
   - mongodb
 
 rvm:
-  - 2.3.5
-  - 2.4.3
-  - 2.5.4
-  - 2.6.2
+  - 2.4.9
+  - 2.5.7
+  - 2.6.5
+  - 2.7.0
   - ruby-head
 
 matrix:
   allow_failures:
     - rvm: ruby-head
+
+before_script:
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+  - ./cc-test-reporter before-build
+
+after_script:
+  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Draper Changelog
 
+## 4.0.0 - 2020-02-05
+
+### Breaking Changes
+* Drop support for Ruby < 2.4 [#852](https://github.com/drapergem/draper/pull/852), [#872](https://github.com/drapergem/draper/pull/872)
+* Don't delegate public methods overridden by a private method in the decorator [#849](https://github.com/drapergem/draper/pull/849)
+
+### Fixes
+* Add preservation of decorator options on QueryMethods [#868](https://github.com/drapergem/draper/pull/868)
+* Add `#respond_to_missing?` to `CollectionDecorator` so it correctly responds to ORM methods [#850](https://github.com/drapergem/draper/pull/850)
+* Fix deprecation warning with the new Rails 6 `ActionView::Base` constructor [#866](https://github.com/drapergem/draper/pull/866)
+* Fix deprecation warning with Ruby 2.7 [#870](https://github.com/drapergem/draper/pull/870)
+
+### Other Changes
+* Add SimpleCov for code coverage analysis [#851](https://github.com/drapergem/draper/pull/851)
+* Update RSpec syntax in the README [#855](https://github.com/drapergem/draper/pull/855)
+* Update continuous integration configuration [#861](https://github.com/drapergem/draper/pull/861), [#862](https://github.com/drapergem/draper/pull/862), [#863](https://github.com/drapergem/draper/pull/863), [#872](https://github.com/drapergem/draper/pull/872)
+
 ## 3.1.0
 * Rails 6 support [#841](https://github.com/drapergem/draper/pull/841)
 * Include ORM query methods in `CollectionDecorator` (e.g. `includes`) [#845](https://github.com/drapergem/draper/pull/845)

data/Gemfile

@@ -3,7 +3,11 @@ source "https://rubygems.org"
 gemspec
 
 platforms :ruby do
-  gem 'sqlite3', '~> 1.3.6'
+  if RUBY_VERSION >= "2.5.0"
+    gem 'sqlite3'
+  else
+    gem 'sqlite3', '~> 1.3.6'
+  end
 end
 
 platforms :jruby do
@@ -11,5 +15,9 @@ platforms :jruby do
   gem "activerecord-jdbcsqlite3-adapter"
 end
 
-gem "rails", "~> 5.0"
+if RUBY_VERSION >= "2.5.0"
+  gem "rails", "~> 6.0"
+else
+  gem "rails", "~> 5.0"
+end
 gem "mongoid", github: "mongodb/mongoid"

data/README.md

@@ -2,6 +2,7 @@
 
 [![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.svg)](https://codeclimate.com/github/drapergem/draper)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/0d40c43951d516bf6985/test_coverage)](https://codeclimate.com/github/drapergem/draper/test_coverage)
 [![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
@@ -107,7 +108,7 @@ Decorators are the ideal place to:
 
 ## Installation
 
-As of version 3.0.0, Draper is only compatible with Rails 5 / Ruby 2.2 and later. Add Draper to your Gemfile.
+As of version 4.0.0, Draper only officially supports Rails 5.2 / Ruby 2.4 and later. Add Draper to your Gemfile.
 
 ```ruby
   gem 'draper'
@@ -379,7 +380,7 @@ can continue to use the `@article` instance variable to manipulate the model -
 for example, `@article.comments.build` to add a new blank comment for a form.
 
 ## Configuration
-Draper works out the box well, but also provides a hook for you to configure its 
+Draper works out the box well, but also provides a hook for you to configure its
 default functionality. For example, Draper assumes you have a base `ApplicationController`.
 If your base controller is named something different (e.g. `BaseController`),
 you can tell Draper to use it by adding the following to an initializer:
@@ -468,10 +469,13 @@ end
 ```
 
 Then you can stub the specific route helper functions you need using your
-preferred stubbing technique (this example uses RSpec's `stub` method):
+preferred stubbing technique. This examples uses Rspec currently recommended API
+available in RSpec 3.6+
 
 ```ruby
-helpers.stub(users_path: '/users')
+without_partial_double_verification do
+  allow(helpers).to receive(:users_path).and_return('/users')
+end
 ```
 
 ### View context leakage
@@ -645,7 +649,7 @@ you can include this module manually.
 
 ### Active Job Integration
 
-[Active Job](http://edgeguides.rubyonrails.org/active_job_basics.html) allows you to pass ActiveRecord 
+[Active Job](http://edgeguides.rubyonrails.org/active_job_basics.html) allows you to pass ActiveRecord
 objects to background tasks directly and performs the necessary serialization and deserialization. In
 order to do this, arguments to a background job must implement [Global ID](https://github.com/rails/globalid).
 Decorated objects implement Global ID by delegating to the object they are decorating. This means

data/draper.gemspec

@@ -30,4 +30,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'capybara'
   s.add_development_dependency 'active_model_serializers', '>= 0.10'
   s.add_development_dependency 'rubocop'
+  s.add_development_dependency 'simplecov'
 end

data/lib/draper/automatic_delegation.rb

@@ -20,6 +20,8 @@ module Draper
 
     # @private
     def delegatable?(method)
+      return if private_methods.include?(method)
+
       object.respond_to?(method)
     end
 

data/lib/draper/collection_decorator.rb

@@ -35,7 +35,7 @@ module Draper
     end
 
     class << self
-      alias_method :decorate, :new
+      alias :decorate :new
     end
 
     # @return [Array] the decorated items.
@@ -59,11 +59,12 @@ module Draper
       true
     end
 
-    alias_method :decorated_with?, :instance_of?
+    alias :decorated_with? :instance_of?
 
     def kind_of?(klass)
       decorated_collection.kind_of?(klass) || super
     end
+
     alias_method :is_a?, :kind_of?
 
     def replace(other)

data/lib/draper/compatibility/api_only.rb

@@ -14,9 +14,9 @@ module Draper
       extend ActiveSupport::Concern
 
       included do
-        alias :previous_render_to_body :render_to_body
+        alias_method :previous_render_to_body, :render_to_body
         include ActionView::Rendering
-        alias :render_to_body :previous_render_to_body
+        alias_method :render_to_body, :previous_render_to_body
       end
     end
   end

data/lib/draper/decorator.rb

@@ -12,7 +12,8 @@ module Draper
 
     # @return the object being decorated.
     attr_reader :object
-    alias_method :model, :object
+
+    alias :model :object
 
     # @return [Hash] extra data to be used in user-defined methods.
     attr_accessor :context
@@ -36,7 +37,7 @@ module Draper
     end
 
     class << self
-      alias_method :decorate, :new
+      alias :decorate :new
     end
 
     # Automatically delegates instance methods to the source object. Class
@@ -190,7 +191,8 @@ module Draper
     def kind_of?(klass)
       super || object.kind_of?(klass)
     end
-    alias_method :is_a?, :kind_of?
+
+    alias :is_a? :kind_of?
 
     # Checks if `self.instance_of?(klass)` or `object.instance_of?(klass)`
     #
@@ -225,7 +227,7 @@ module Draper
     # @return [Class] the class created by {decorate_collection}.
     def self.collection_decorator_class
       name = collection_decorator_name
-      name_constant = name && name.safe_constantize
+      name_constant = name&.safe_constantize
 
       name_constant || Draper::CollectionDecorator
     end
@@ -248,7 +250,7 @@ module Draper
 
     def self.inferred_object_class
       name = object_class_name
-      name_constant = name && name.safe_constantize
+      name_constant = name&.safe_constantize
       return name_constant unless name_constant.nil?
 
       raise Draper::UninferrableObjectError.new(self)
@@ -256,7 +258,7 @@ module Draper
 
     def self.collection_decorator_name
       singular = object_class_name
-      plural = singular && singular.pluralize
+      plural = singular&.pluralize
 
       "#{plural}Decorator" unless plural == singular
     end

data/lib/draper/delegation.rb

@@ -7,7 +7,7 @@ module Draper
     #   @return [void]
     def delegate(*methods)
       options = methods.extract_options!
-      super *methods, options.reverse_merge(to: :object)
+      super(*methods, **options.reverse_merge(to: :object))
     end
   end
 end

data/lib/draper/query_methods.rb

@@ -6,7 +6,11 @@ module Draper
     def method_missing(method, *args, &block)
       return super unless strategy.allowed? method
 
-      object.send(method, *args, &block).decorate
+      object.send(method, *args, &block).decorate(with: decorator_class, context: context)
+    end
+
+    def respond_to_missing?(method, include_private = false)
+      strategy.allowed?(method) || super
     end
 
     private

data/lib/draper/test_case.rb

@@ -21,7 +21,7 @@ module Draper
       end
 
       include Draper::ViewHelpers::ClassMethods
-      alias_method :helper, :helpers
+      alias :helper :helpers
     end
 
     include Behavior

data/lib/draper/version.rb

@@ -1,3 +1,3 @@
 module Draper
-  VERSION = '3.1.0'
+  VERSION = '4.0.0'
 end

data/lib/draper/view_context/build_strategy.rb

@@ -12,7 +12,7 @@ module Draper
         end
 
         def call
-          view_context_class.new
+          view_context_class.respond_to?(:empty) ? view_context_class.empty : view_context_class.new
         end
 
         private

data/lib/draper/view_helpers.rb

@@ -12,7 +12,8 @@ module Draper
       def helpers
         Draper::ViewContext.current
       end
-      alias_method :h, :helpers
+
+      alias :h :helpers
     end
 
     # Access the helpers proxy to call built-in and user-defined
@@ -22,13 +23,15 @@ module Draper
     def helpers
       Draper::ViewContext.current
     end
-    alias_method :h, :helpers
+
+    alias :h :helpers
 
     # Alias for `helpers.localize`, since localize is something that's used
     # quite often. Further aliased to `l` for convenience.
     def localize(*args)
       helpers.localize(*args)
     end
-    alias_method :l, :localize
+
+    alias :l :localize
   end
 end

data/spec/draper/decorator_spec.rb

@@ -664,6 +664,26 @@ module Draper
           expect{decorator.hello_world}.to raise_error NoMethodError
           expect(decorator.methods).not_to include :hello_world
         end
+
+        context 'when decorator overrides a public method defined on the object with a private' do
+          let(:decorator_class) do
+            Class.new(Decorator) do
+              private
+
+              def hello_world
+                'hello world'
+              end
+            end
+          end
+
+          let(:object) { Class.new { def hello_world; end }.new }
+
+          it 'does not delegate the public method defined on the object' do
+            decorator = decorator_class.new(object)
+
+            expect{ decorator.hello_world }.to raise_error NoMethodError
+          end
+        end
       end
 
       context ".method_missing" do

data/spec/draper/draper_spec.rb

@@ -1,5 +1,6 @@
 require 'spec_helper'
 require 'support/shared_examples/view_helpers'
+SimpleCov.command_name 'test:unit'
 
 module Draper
   describe Draper do

data/spec/draper/query_methods_spec.rb

@@ -5,12 +5,14 @@ Post = Struct.new(:id) { }
 
 module Draper
   describe QueryMethods do
+    let(:fake_strategy) { instance_double(QueryMethods::LoadStrategy::ActiveRecord) }
+
+    before { allow(QueryMethods::LoadStrategy).to receive(:new).and_return(fake_strategy) }
+
     describe '#method_missing' do
       let(:collection) { [ Post.new, Post.new ] }
-      let(:collection_decorator) { PostDecorator.decorate_collection(collection) }
-      let(:fake_strategy) { instance_double(QueryMethods::LoadStrategy::ActiveRecord) }
-
-      before { allow(QueryMethods::LoadStrategy).to receive(:new).and_return(fake_strategy) }
+      let(:collection_context) { { user: 'foo' } }
+      let(:collection_decorator) { PostDecorator.decorate_collection(collection, context: collection_context) }
 
       context 'when strategy allows collection to call the method' do
         let(:results) { spy(:results) }
@@ -25,6 +27,12 @@ module Draper
 
           expect(results).to have_received(:decorate)
         end
+
+        it 'calls the method on the collection and keeps the decoration options' do
+          collection_decorator.some_query_method
+
+          expect(results).to have_received(:decorate).with({ context: collection_context, with: PostDecorator })
+        end
       end
 
       context 'when strategy does not allow collection to call the method' do
@@ -35,5 +43,28 @@ module Draper
         end
       end
     end
+
+    describe "#respond_to?" do
+      let(:collection) { [ Post.new, Post.new ] }
+      let(:collection_decorator) { PostDecorator.decorate_collection(collection) }
+
+      subject { collection_decorator.respond_to?(:some_query_method) }
+
+      context 'when strategy allows collection to call the method' do
+        before do
+          allow(fake_strategy).to receive(:allowed?).with(:some_query_method).and_return(true)
+        end
+
+        it { is_expected.to eq(true) }
+      end
+
+      context 'when strategy does not allow collection to call the method' do
+        before do
+          allow(fake_strategy).to receive(:allowed?).with(:some_query_method).and_return(false)
+        end
+
+        it { is_expected.to eq(false) }
+      end
+    end
   end
 end

data/spec/dummy/app/assets/config/manifest.js

@@ -0,0 +1,3 @@
+//= link_tree ../images
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css

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

@@ -0,0 +1,2 @@
+class ApplicationController < ActionController::Base
+end

data/spec/generators/controller/controller_generator_spec.rb

@@ -3,6 +3,7 @@ require 'dummy/config/environment'
 require 'ammeter/init'
 require 'generators/controller_override'
 require 'generators/rails/decorator_generator'
+SimpleCov.command_name 'test:generator'
 
 describe Rails::Generators::ControllerGenerator do
   destination File.expand_path("../tmp", __FILE__)

data/spec/integration/integration_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 require 'support/dummy_app'
 require 'support/matchers/have_text'
+SimpleCov.command_name 'test:integration'
 
 app = DummyApp.new(ENV["RAILS_ENV"])
 spec_types = {

data/spec/spec_helper.rb

@@ -1,3 +1,10 @@
+require 'simplecov'
+SimpleCov.start do
+  add_filter 'spec'
+  add_group 'Draper', 'lib/draper'
+  add_group 'Generators', 'lib/generators'
+end
+
 require 'bundler/setup'
 require 'draper'
 require 'action_controller'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: draper
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Jeff Casimir
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-14 00:00:00.000000000 Z
+date: 2020-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -179,6 +179,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Draper adds an object-oriented layer of presentation logic to your Rails
   apps.
 email:
@@ -266,6 +280,8 @@ files:
 - spec/draper/view_helpers_spec.rb
 - spec/dummy/.rspec
 - spec/dummy/Rakefile
+- spec/dummy/app/assets/config/manifest.js
+- 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
@@ -394,6 +410,8 @@ test_files:
 - spec/draper/view_helpers_spec.rb
 - spec/dummy/.rspec
 - spec/dummy/Rakefile
+- spec/dummy/app/assets/config/manifest.js
+- 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