active_decorator 0.5.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b629e8976c74e87685b7bb1fbf2e147e98b28d0
-  data.tar.gz: 39f23f27bf3a043b71dce4e6d819d1108090ba81
+  metadata.gz: 42f46de551b9463436f22f02b446cc587c69d7f4
+  data.tar.gz: bc4bcb100cb17417f34c18e919adce05e18ee02e
 SHA512:
-  metadata.gz: 5bd056ada07410daf3273da2227d1a486d16676cba88cf7ed6297fa6647feccd97d1219c5e86cee571c790a368f6ad2c5a8a6c1e556ded5c64167971f5cdfb0b
-  data.tar.gz: b7e46eac597123a5ae5d9741c76101341684d3e0ca93b6ae1792eb152c8b4f7691faf82c695ad3c7e926744b2b2ce27d602219eb58a9d820b0a027dc5df58b4c
+  metadata.gz: 7e7775bd6e2b67fbbd60b968926eb8d50b0e048729a976e7cd247a9c1a942fc3edbaa6624734dde9d8599cd536dccf15db9b3334da96eb6214ddba5266abd2ba
+  data.tar.gz: c13028fd5ac9ebf59e8e699423aa1179b2816edbaddd70c2e82fce43ccfdb37a8ba9d82fff1a239b1207c49b82fd408d3b561df74d5959499d7c5ec3f5637b5e

data/.rspec

@@ -1 +1,2 @@
 --color
+--require spec_helper

data/.travis.yml

@@ -3,33 +3,27 @@ language: ruby
 script: bundle exec rake spec
 
 rvm:
-  - 1.9.3
   - 2.0.0
-  - 2.1
-  - 2.2
+  - 2.1.8
+  - 2.2.4
+  - 2.3.0
   - ruby-head
 gemfile:
   - gemfiles/Gemfile-rails.3.2.x
   - gemfiles/Gemfile-rails.4.0.x
   - gemfiles/Gemfile-rails.4.1.x
   - gemfiles/Gemfile-rails.4.2.x
+  - gemfiles/Gemfile-rails.5.0.0.beta1
 
 sudo: false
 
 matrix:
-  include:
-    - rvm: 1.8.7
-      gemfile: gemfiles/Gemfile-rails.3.0.x
-    - rvm: 1.8.7
-      gemfile: gemfiles/Gemfile-rails.3.1.x
-    - rvm: 1.8.7
-      gemfile: gemfiles/Gemfile-rails.3.2.x
-    - rvm: 1.9.3
-      gemfile: gemfiles/Gemfile-rails.3.0.x
-    - rvm: 1.9.3
-      gemfile: gemfiles/Gemfile-rails.3.1.x
   exclude:
     - rvm: ruby-head
       gemfile: gemfiles/Gemfile-rails.3.2.x
+    - rvm: 2.0.0
+      gemfile: gemfiles/Gemfile-rails.5.0.0.beta1
+    - rvm: 2.1.8
+      gemfile: gemfiles/Gemfile-rails.5.0.0.beta1
   allow_failures:
     - rvm: ruby-head

data/README.md

@@ -14,7 +14,9 @@ A simple and Rubyish view helper for Rails 3 and Rails 4. Keep your helpers and
 
 ## Supported versions ##
 
-Rails 3.0.x, 3.1.x, 3.2.x, 4.0.x, 4.1.x, 4.2.x, and 5.0 (edge)
+* Ruby 2.0.0, 2.1.x, 2.2.x, 2.3.x, and 2.4 (trunk)
+
+* Rails 3.2.x, 4.0.x, 4.1.x, 4.2.x, and 5.0 (edge)
 
 
 ## Supported ORMs ##
@@ -63,6 +65,48 @@ end
 <% end %>
 ```
 
+## Decorating associated objects ##
+
+ActiveDecorator *does not* automatically decorate associated objects. We recommend that you pass associated objects to `render` when decorated associated objects are needed.
+
+```ruby
+# app/models/blog_post.rb
+class BlogPost < ActiveRecord::Base
+  # published_at:datetime
+end
+
+# app/models/user.rb
+class User < ActiveRecord::Base
+  has_many :blog_posts
+end
+
+# app/decorators/blog_post_decorator.rb
+module BlogPostDecorator
+  def published_date
+    published_at.strftime("%Y.%m.%d")
+  end
+end
+
+# app/controllers/users_controller.rb
+class UsersController < ApplicationController
+  def index
+    @users = User.all
+  end
+end
+```
+
+```erb
+# app/views/users/index.html.erb
+<% @users.each do |user| %>
+  <%= render partial: "blog_post", locals: { blog_posts: user.blog_posts } %><br>
+<% end %>
+
+# app/views/users/_blog_post.html.erb
+<% blog_posts.each do |blog_post| %>
+  <%= blog_post.published_date %>
+<% end %>
+```
+
 ## Configuring the decorator suffix
 
 By default, ActiveDecorator searches a decorator module named `target_class.name + "Decorator"`

data/gemfiles/Gemfile-rails.5.0.0.beta1

@@ -0,0 +1,9 @@
+source 'https://rubygems.org'
+
+gem 'active_decorator', :path => '..'
+
+gem 'rails', '~> 5.0.0.beta1'
+gem 'rspec-rails'
+gem 'capybara'
+gem 'sqlite3'
+gem 'jbuilder'

data/lib/active_decorator/config.rb

@@ -1,20 +1,5 @@
 module ActiveDecorator
-  def self.configure(&block)
-    yield @config ||= ActiveDecorator::Configuration.new
-  end
+  include ActiveSupport::Configurable
 
-  def self.config
-    @config
-  end
-
-  # need a Class for 3.0
-  class Configuration #:nodoc:
-    include ActiveSupport::Configurable
-
-    config_accessor :decorator_suffix
-  end
-
-  configure do |config|
-    config.decorator_suffix = 'Decorator'
-  end
+  config.decorator_suffix = 'Decorator'
 end

data/lib/active_decorator/decorator.rb

@@ -17,15 +17,9 @@ module ActiveDecorator
         obj.each do |r|
           decorate r
         end
-      elsif defined?(ActiveRecord) && obj.is_a?(ActiveRecord::Relation) && !obj.respond_to?(:to_a_with_decorator)
-        obj.class.class_eval do
-          def to_a_with_decorator
-            to_a_without_decorator.tap do |arr|
-              ActiveDecorator::Decorator.instance.decorate arr
-            end
-          end
-          alias_method_chain :to_a, :decorator
-        end
+      elsif defined?(ActiveRecord) && obj.is_a?(ActiveRecord::Relation) && !obj.is_a?(ActiveDecorator::RelationDecorator)
+        # don't call each nor to_a immediately
+        obj.extend ActiveDecorator::RelationDecorator
       else
         d = decorator_for obj.class
         return obj unless d
@@ -43,10 +37,20 @@ module ActiveDecorator
         d.send :include, ActiveDecorator::Helpers
         @@decorators[model_class] = d
       else
+        # Cache nil results
         @@decorators[model_class] = nil
       end
     rescue NameError
+      # Cache nil results
       @@decorators[model_class] = nil
     end
   end
+
+  module RelationDecorator
+    def to_a
+      super.tap do |arr|
+        ActiveDecorator::Decorator.instance.decorate arr
+      end
+    end
+  end
 end

data/lib/active_decorator/monkey/abstract_controller/rendering.rb

@@ -1,13 +1,15 @@
-module AbstractController
-  module Rendering
-    def view_assigns_with_decorator
-      hash = view_assigns_without_decorator
-      hash.values.each do |v|
-        ActiveDecorator::Decorator.instance.decorate v
+module ActiveDecorator
+  module Monkey
+    module AbstractController
+      module Rendering
+        def view_assigns
+          hash = super
+          hash.values.each do |v|
+            ActiveDecorator::Decorator.instance.decorate v
+          end
+          hash
+        end
       end
-      hash
     end
-
-    alias_method_chain :view_assigns, :decorator
   end
 end

data/lib/active_decorator/monkey/action_controller/base/rescue_from.rb

@@ -1,11 +1,14 @@
-module ActionController
-  class Base
-    def rescue_with_handler_with_decorator_view_context(exception)
-      ActiveDecorator::ViewContext.push(view_context)
-      rescue_with_handler_without_decorator_view_context(exception)
-    ensure
-      ActiveDecorator::ViewContext.pop
+module ActiveDecorator
+  module Monkey
+    module ActionController
+      module Base
+        def rescue_with_handler(*)
+          ActiveDecorator::ViewContext.push(view_context)
+          super
+        ensure
+          ActiveDecorator::ViewContext.pop
+        end
+      end
     end
-    alias_method_chain :rescue_with_handler, :decorator_view_context
   end
 end

data/lib/active_decorator/monkey/action_view/partial_renderer.rb

@@ -1,37 +1,19 @@
 module ActiveDecorator
-  module ActionViewExtension
-    def setup_decorator
-      @locals.values.each do |v|
-        ActiveDecorator::Decorator.instance.decorate v
-      end unless @locals.blank?
-      ActiveDecorator::Decorator.instance.decorate @object unless @object.blank?
-      ActiveDecorator::Decorator.instance.decorate @collection unless @collection.blank?
+  module Monkey
+    module ActionView
+      module PartialRenderer
+        def setup(*)
+          super
 
-      self
-    end
-  end
-end
+          @locals.values.each do |v|
+            ActiveDecorator::Decorator.instance.decorate v
+          end unless @locals.blank?
+          ActiveDecorator::Decorator.instance.decorate @object unless @object.blank?
+          ActiveDecorator::Decorator.instance.decorate @collection unless @collection.blank?
 
-if ActionPack::VERSION::STRING >= '3.1'
-  class ActionView::PartialRenderer
-    include ActiveDecorator::ActionViewExtension
-
-    def setup_with_decorator(context, options, block) #:nodoc:
-      setup_without_decorator context, options, block
-      setup_decorator
+          self
+        end
+      end
     end
-
-    alias_method_chain :setup, :decorator
-  end
-else
-  class ActionView::Partials::PartialRenderer
-    include ActiveDecorator::ActionViewExtension
-
-    def setup_with_decorator(options, block) #:nodoc:
-      setup_without_decorator options, block
-      setup_decorator
-    end
-
-    alias_method_chain :setup, :decorator
   end
 end

data/lib/active_decorator/railtie.rb

@@ -4,17 +4,26 @@ require 'rails'
 module ActiveDecorator
   class Railtie < ::Rails::Railtie
     initializer 'active_decorator' do
-      ActiveSupport.on_load(:action_view) do
+      ActiveSupport.on_load :action_view do
         require 'active_decorator/monkey/action_view/partial_renderer'
+        ActionView::PartialRenderer.send :prepend, ActiveDecorator::Monkey::ActionView::PartialRenderer
       end
-      ActiveSupport.on_load(:action_controller) do
+
+      ActiveSupport.on_load :action_controller do
         require 'active_decorator/monkey/abstract_controller/rendering'
+        ::ActionController::Base.send :prepend, ActiveDecorator::Monkey::AbstractController::Rendering
+
         require 'active_decorator/monkey/action_controller/base/rescue_from'
+        ActionController::Base.send :prepend, ActiveDecorator::Monkey::ActionController::Base
+
         ActionController::Base.send :include, ActiveDecorator::ViewContext::Filter
       end
-      ActiveSupport.on_load(:action_mailer) do
+
+      ActiveSupport.on_load :action_mailer do
+        require 'active_decorator/monkey/abstract_controller/rendering'
+        ActionMailer::Base.send :prepend, ActiveDecorator::Monkey::AbstractController::Rendering
+
         if ActionMailer::Base.respond_to? :before_action
-          require 'active_decorator/monkey/abstract_controller/rendering'
           ActionMailer::Base.send :include, ActiveDecorator::ViewContext::Filter
         end
       end

data/lib/active_decorator/version.rb

@@ -1,3 +1,3 @@
 module ActiveDecorator
-  VERSION = '0.5.3'
+  VERSION = '0.6.0'
 end

data/lib/generators/rails/templates/decorator.rb

@@ -1,3 +1,2 @@
-# coding: utf-8
 module <%= class_name %>Decorator
 end

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

@@ -1,4 +1,3 @@
-# coding: utf-8
 require '<%= File.exists?('spec/rails_helper.rb') ? 'rails_helper' : 'spec_helper' %>'
 
 describe <%= singular_name.camelize %>Decorator do

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

@@ -1,4 +1,3 @@
-# coding: utf-8
 require 'test_helper'
 
 class <%= singular_name.camelize %>DecoratorTest < ActiveSupport::TestCase

data/spec/configuration_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 Comic = Struct.new(:title, :price)
 
 module ComicPresenter

data/spec/controllers/fake_detection_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 describe MoviesController, :type => :controller do
   let(:movie){ Movie.create }
 

data/spec/fake_app/fake_app.rb

@@ -167,28 +167,14 @@ class CreateAllTables < ActiveRecord::Migration
 end
 
 # Proxy for ActiveRecord::Relation
-if RUBY_VERSION >= '1.9.0'
-  class RelationProxy < BasicObject
-    attr_accessor :ar_relation
+class RelationProxy < BasicObject
+  attr_accessor :ar_relation
 
-    def initialize(ar_relation)
-      @ar_relation = ar_relation
-    end
-
-    def method_missing(method, *args, &block)
-      @ar_relation.public_send(method, *args, &block)
-    end
+  def initialize(ar_relation)
+    @ar_relation = ar_relation
   end
-else
-  class RelationProxy < Object
-    attr_accessor :ar_relation
 
-    def initialize(ar_relation)
-      @ar_relation = ar_relation
-    end
-
-    def method_missing(method, *args, &block)
-      @ar_relation.send(method, *args, &block)
-    end
+  def method_missing(method, *args, &block)
+    @ar_relation.public_send(method, *args, &block)
   end
 end

data/spec/features/action_view_helpers_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 feature 'fallback to helpers' do
   background do
     aamine = Author.create! :name => 'aamine'

data/spec/features/controller_ivar_spec.rb

@@ -1,5 +1,3 @@
-require 'spec_helper'
-
 feature 'decorating controller ivar' do
   background do
     @matz = Author.create! :name => 'matz'
@@ -7,11 +5,6 @@ feature 'decorating controller ivar' do
     Author.create! :name => 'takahashim'
   end
 
-  after do
-    Author.delete_all
-    Book.delete_all
-  end
-
   scenario 'decorating a model object in ivar' do
     visit "/authors/#{@matz.id}"
     page.should have_content 'matz'

data/spec/features/jbuilder_spec.rb

@@ -1,15 +1,9 @@
-require 'spec_helper'
-
 feature 'decorating partial object in Jbuilder' do
   background do
     Author.create! :name => 'aamine'
     nari = Author.create! :name => 'nari'
     nari.books.create! :title => 'the gc book'
   end
-  after do
-    Book.delete_all
-    Author.delete_all
-  end
 
   scenario 'decorating objects in Jbuilder partials' do
     visit "/authors/#{Author.last.id}.json"

data/spec/features/partial_spec.rb

@@ -1,15 +1,9 @@
-require 'spec_helper'
-
 feature 'decorating partial object' do
   background do
     Author.create! :name => 'aamine'
     nari = Author.create! :name => 'nari'
     nari.books.create! :title => 'the gc book'
   end
-  after do
-    Book.delete_all
-    Author.delete_all
-  end
 
   scenario 'decorating implicit @object' do
     visit '/authors'

data/spec/spec_helper.rb

@@ -18,6 +18,7 @@ RSpec.configure do |config|
   config.before :all do
     CreateAllTables.up unless ActiveRecord::Base.connection.table_exists? 'authors'
   end
+
   config.before :each do
     Book.delete_all
     Author.delete_all

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_decorator
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-28 00:00:00.000000000 Z
+date: 2016-01-04 00:00:00.000000000 Z
 dependencies: []
 description: A simple and Rubyish view helper for Rails
 email:
@@ -25,12 +25,11 @@ files:
 - README.md
 - Rakefile
 - active_decorator.gemspec
-- gemfiles/Gemfile-rails.3.0.x
-- gemfiles/Gemfile-rails.3.1.x
 - gemfiles/Gemfile-rails.3.2.x
 - gemfiles/Gemfile-rails.4.0.x
 - gemfiles/Gemfile-rails.4.1.x
 - gemfiles/Gemfile-rails.4.2.x
+- gemfiles/Gemfile-rails.5.0.0.beta1
 - lib/active_decorator.rb
 - lib/active_decorator/config.rb
 - lib/active_decorator/decorator.rb
@@ -86,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: active_decorator
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A simple and Rubyish view helper for Rails

data/gemfiles/Gemfile-rails.3.0.x

@@ -1,16 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'active_decorator', :path => '..'
-
-gem 'rails', '~> 3.0.0'
-gem 'rspec-rails', '~> 2.14.0'
-gem 'capybara', '~> 2.0.0'
-# rubyzip >=1 doesn't support ruby 1.8
-gem 'rubyzip', '< 1.0.0'
-gem 'sqlite3'
-gem 'nokogiri', '~> 1.5.0'
-if RUBY_VERSION <= '1.8.7'
-  gem 'jbuilder', '< 2'
-else
-  gem 'jbuilder'
-end

data/gemfiles/Gemfile-rails.3.1.x

@@ -1,19 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'active_decorator', :path => '..'
-
-gem 'rails', '~> 3.1.0'
-gem 'rspec-rails', '~> 2.14.0'
-if RUBY_VERSION <= '1.8.7'
-  gem 'i18n', '~> 0.6.11'
-end
-gem 'capybara', '~> 2.0.0'
-# rubyzip >=1 doesn't support ruby 1.8
-gem 'rubyzip', '< 1.0.0'
-gem 'sqlite3'
-gem 'nokogiri', '~> 1.5.0'
-if RUBY_VERSION <= '1.8.7'
-  gem 'jbuilder', '< 2'
-else
-  gem 'jbuilder'
-end