draper 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e75f0dd1ba7ae0030d13480aff3ff107d0d4b4c
-  data.tar.gz: 65a8625646622e1028e5a39cc7211cae6149fd5e
+  metadata.gz: 1f81b7399dc00d41ae63b326f39168c4eee62fd2
+  data.tar.gz: e7551c20a72398d534bbf9b172f126e0f6d2f992
 SHA512:
-  metadata.gz: e59d96cc6a143e504f2382de22aeeb2d577f062353464cd31d25f161305fdf92609438f77c5b4fb3490cbd23f970286d4de4566729c39db04da47397b80a21a1
-  data.tar.gz: e8c846f71bdbcee910f1307d915780da808098303dcba43e7a2dfc3944b791640b866bc20d01d55366585be6a015a82d07fdb23c8b092e83ec5d622461212a12
+  metadata.gz: 5e77c1b9609806a7cd011978203dac1d8554898f65787e403e866c704ac1ccd7e383c512e0134b1151ad290abaca0b0d286ef88457104f282b68812b1ff7ef8a
+  data.tar.gz: 6bb88ce4a64ea56510a76e45211f79faab6e4fc464ec836b181b8c35970ed4b2abc162ff705dd61f2cc3042bff4a5790166f727dcffb8cf41690ceb289c0728b

data/.travis.yml

@@ -5,9 +5,11 @@ services:
 
 rvm:
   - 1.9.3
-  - 2.0.0
-  - rbx-19mode
+  - 2.1.0
   - jruby-19mode
+  - rbx-2
+  - ruby-head
+  - jruby-head
 
 env:
   - "RAILS_VERSION=4.0"
@@ -19,3 +21,5 @@ env:
 matrix:
   allow_failures:
     - env: "RAILS_VERSION=4.1"
+    - rvm: ruby-head
+    - rvm: jruby-head

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Draper Changelog
 
+## 1.3.0
+
+[30 commits by 11 authors](https://github.com/drapergem/draper/compare/v1.2.1...v1.3.0)
+
+* [Add `decorator_class?` method](https://github.com/drapergem/draper/commit/53e1df5c3ee169144a2778c6d2ee13cc6af99429)
+
+* [Clear ViewContext before specs instead of after](https://github.com/drapergem/draper/pull/547)
+
+* [Add alias method `#{model_name}` to the decorated object ](https://github.com/drapergem/draper/commit/f5f27243c3f0c37bff4872e1e78521e570ff1e4f)
+
+* [Hook into `controller_generator` and `scaffold_controller_generator` instead of resource generator](https://github.com/drapergem/draper/commit/cd4f298987c3b4ad8046563ad4a087055fc7efe2)
+
+* [Delegate `to_s` method to the object](https://github.com/drapergem/draper/commit/58b8181050c2a9a86f54660e7bb6bfefa5fd0b64)
+
 ## 1.2.1
 
 [28 commits by 4 authors](https://github.com/drapergem/draper/compare/v1.2.0...v1.2.1)

data/draper.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec', '~> 2.12'
   s.add_development_dependency 'rspec-mocks', '>= 2.12.1'
   s.add_development_dependency 'rspec-rails', '~> 2.12'
-  s.add_development_dependency 'minitest-rails', '~> 0.2'
+  s.add_development_dependency 'minitest-rails', '>= 1.0'
   s.add_development_dependency 'capybara'
   s.add_development_dependency 'active_model_serializers'
 end

data/lib/draper.rb

@@ -22,6 +22,7 @@ require 'draper/decorated_association'
 require 'draper/helper_support'
 require 'draper/view_context'
 require 'draper/collection_decorator'
+require 'draper/undecorate'
 require 'draper/decorates_assigned'
 require 'draper/railtie' if defined?(Rails)
 
@@ -32,10 +33,7 @@ module Draper
       extend  Draper::HelperSupport
       extend  Draper::DecoratesAssigned
 
-      before_filter do |controller|
-        Draper::ViewContext.clear!
-        Draper::ViewContext.controller = controller
-      end
+      before_filter :activate_draper
     end
   end
 

data/lib/draper/decoratable.rb

@@ -75,8 +75,12 @@ module Draper
         decorator_name = "#{prefix}Decorator"
         decorator_name.constantize
       rescue NameError => error
-        raise unless error.missing_name?(decorator_name)
-        raise Draper::UninferrableDecoratorError.new(self)
+        if superclass.respond_to?(:decorator_class)
+          superclass.decorator_class
+        else
+          raise unless error.missing_name?(decorator_name)
+          raise Draper::UninferrableDecoratorError.new(self)
+        end
       end
 
       # Compares with possibly-decorated objects.

data/lib/draper/railtie.rb

@@ -20,7 +20,6 @@ module Draper
       if Rails.env.test?
         require 'draper/test_case'
         require 'draper/test/rspec_integration' if defined?(RSpec) and RSpec.respond_to?(:configure)
-        require 'draper/test/minitest_integration' if defined?(MiniTest::Rails)
       end
     end
 
@@ -50,6 +49,12 @@ module Draper
       end
     end
 
+    initializer "draper.minitest-rails_integration" do |app|
+      ActiveSupport.on_load :minitest do
+        require "draper/test/minitest_integration"
+      end
+    end
+
     console do
       require 'action_controller/test_case'
       ApplicationController.new.view_context

data/lib/draper/test/rspec_integration.rb

@@ -7,7 +7,11 @@ module Draper
   end
 
   RSpec.configure do |config|
-    config.include DecoratorExampleGroup, example_group: {file_path: %r{spec/decorators}}, type: :decorator
+    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
 
     [:decorator, :controller, :mailer].each do |type|
       config.before(:each, type: type) { Draper::ViewContext.clear! }

data/lib/draper/test_case.rb

@@ -1,18 +1,7 @@
 module Draper
-  begin
-    require 'minitest/rails'
-  rescue LoadError
-  end
-
-  active_support_test_case = begin
-    require 'minitest/rails/active_support' # minitest-rails < 0.5
-    ::MiniTest::Rails::ActiveSupport::TestCase
-  rescue LoadError
-    require 'active_support/test_case'
-    ::ActiveSupport::TestCase
-  end
+  require 'active_support/test_case'
 
-  class TestCase < active_support_test_case
+  class TestCase < ::ActiveSupport::TestCase
     module ViewContextTeardown
       def teardown
         super

data/lib/draper/undecorate.rb

@@ -0,0 +1,9 @@
+module Draper
+  def self.undecorate(object)
+    if object.respond_to?(:decorated?) && object.decorated?
+      object.object
+    else
+      object
+    end
+  end
+end

data/lib/draper/version.rb

@@ -1,3 +1,3 @@
 module Draper
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

data/lib/draper/view_context.rb

@@ -10,6 +10,11 @@ module Draper
       end
     end
 
+    # Set the current controller
+    def activate_draper
+      Draper::ViewContext.controller = self
+    end
+
     # Returns the current controller.
     def self.controller
       RequestStore.store[:current_controller]

data/lib/generators/controller_override.rb

@@ -5,7 +5,9 @@ require "rails/generators/rails/scaffold_controller/scaffold_controller_generato
 module Rails
   module Generators
     class ControllerGenerator
-      hook_for :decorator, default: true
+      hook_for :decorator, default: true do |generator|
+        invoke generator, [name.singularize]
+      end
     end
 
     class ScaffoldControllerGenerator

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

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

data/lib/generators/mini_test/templates/decorator_test.rb

@@ -1,4 +1,4 @@
-require 'minitest_helper'
+require 'test_helper'
 
 class <%= class_name %>DecoratorTest < Draper::TestCase
 end

data/spec/draper/decoratable_spec.rb

@@ -152,6 +152,12 @@ module Draper
         it "infers the decorator from the class" do
           expect(Product.decorator_class).to be ProductDecorator
         end
+
+        context "without a decorator on its own" do
+          it "infers the decorator from a superclass" do
+            expect(SpecialProduct.decorator_class).to be ProductDecorator
+          end
+        end
       end
 
       context "for ActiveModel classes" do

data/spec/draper/undecorate_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe Draper, '.undecorate' do
+  it 'undecorates a decorated object' do
+    object = Model.new
+    decorator = Draper::Decorator.new(object)
+    expect(Draper.undecorate(decorator)).to equal object
+  end
+
+  it 'passes a non-decorated object through' do
+    object = Model.new
+    expect(Draper.undecorate(object)).to equal object
+  end
+
+  it 'passes a non-decorator object through' do
+    object = Object.new
+    expect(Draper.undecorate(object)).to equal object
+  end
+end

data/spec/dummy/config/mongoid.yml

@@ -73,7 +73,6 @@ test:
       hosts:
         - localhost:27017
       options:
-        consistency: :strong
         # In the test environment we lower the retries and retry interval to
         # low amounts for fast failures.
         max_retries: 1

data/spec/generators/controller/controller_generator_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+require 'rails'
+require 'ammeter/init'
+require 'generators/controller_override'
+require 'generators/rails/decorator_generator'
+
+describe Rails::Generators::ControllerGenerator do
+  destination File.expand_path("../tmp", __FILE__)
+
+  before { prepare_destination }
+  after(:all) { FileUtils.rm_rf destination_root }
+
+  describe "the generated decorator" do
+    subject { file("app/decorators/your_model_decorator.rb") }
+
+    describe "naming" do
+      before { run_generator %w(YourModels) }
+
+      it { should contain "class YourModelDecorator" }
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -13,6 +13,7 @@ end
 class Model; include Draper::Decoratable; end
 
 class Product < Model; end
+class SpecialProduct < Product; end
 class ProductDecorator < Draper::Decorator; end
 class ProductsDecorator < Draper::CollectionDecorator; end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: draper
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Jeff Casimir
@@ -9,174 +9,174 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-26 00:00:00.000000000 Z
+date: 2014-06-17 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'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: request_store
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: ammeter
   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'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.12'
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.12.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.12.1
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.12'
 - !ruby/object:Gem::Dependency
   name: minitest-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: capybara
   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'
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
   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
@@ -188,10 +188,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
-- .yardopts
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
+- ".yardopts"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -225,6 +225,7 @@ files:
 - lib/draper/test/minitest_integration.rb
 - lib/draper/test/rspec_integration.rb
 - lib/draper/test_case.rb
+- lib/draper/undecorate.rb
 - lib/draper/version.rb
 - lib/draper/view_context.rb
 - lib/draper/view_context/build_strategy.rb
@@ -249,6 +250,7 @@ files:
 - spec/draper/finders_spec.rb
 - spec/draper/helper_proxy_spec.rb
 - spec/draper/lazy_helpers_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
@@ -318,6 +320,7 @@ files:
 - spec/dummy/test/decorators/test_unit/view_context_test.rb
 - spec/dummy/test/minitest_helper.rb
 - spec/dummy/test/test_helper.rb
+- spec/generators/controller/controller_generator_spec.rb
 - spec/generators/decorator/decorator_generator_spec.rb
 - spec/integration/integration_spec.rb
 - spec/performance/active_record.rb
@@ -339,108 +342,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 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/decorates_assigned_spec.rb
-- spec/draper/decorator_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/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/localized_urls.rb
-- spec/dummy/app/controllers/posts_controller.rb
-- spec/dummy/app/decorators/mongoid_post_decorator.rb
-- spec/dummy/app/decorators/post_decorator.rb
-- 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
-- spec/dummy/config/database.yml
-- spec/dummy/config/environment.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/production.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config/initializers/mime_types.rb
-- 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/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/active_model_serializers_spec.rb
-- 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/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/shared_examples/decoratable.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
-- spec/performance/benchmark.rb
-- spec/performance/decorators.rb
-- spec/performance/models.rb
-- spec/spec_helper.rb
-- spec/support/dummy_app.rb
-- spec/support/matchers/have_text.rb
-- spec/support/shared_examples/decoratable_equality.rb
-- spec/support/shared_examples/view_helpers.rb
+test_files: []