active_decorator 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a855bb5a5b2a7810e08850debb930d60b7675a3
-  data.tar.gz: 11d92465273c6867f71c92027c9866465169b4ea
+  metadata.gz: 32cc540a94d0c4151aa9ccc05f8ecdd075643b1d
+  data.tar.gz: ae85f4549a24440613e4dca88f9f770e8e6b2f1f
 SHA512:
-  metadata.gz: 40b0e9630767955088a50dd9c705431ea5dbfa0765fbfd9d363503737cfb52730bc4ce8f5a2dc2cc8992a6dc3a044aec74270ff4f730d7e6746d50f080e2747f
-  data.tar.gz: f8a888c5d6474ceb8d629ba0abc8c48dd87f6f3db6cca473b339a42e3cf66b20c14ca2c3fa3bbc4a55aae89a8385d281c3688c7174035bd5c7080fb6158198ef
+  metadata.gz: c035b1cb9156d73057f019fdc1a6c1f0ded63563570333f212a7d47719cc40d827f099eda3759fe5656fdcfc19ba1739b8f8f1f329bfe79a51a159ed2d5263c2
+  data.tar.gz: bffdaf8dd9ffb4fe61944266f735292a6dec5e8d008e7d6825acec4d2c5033bae2eecdf70db51da3e7ec209db7ddbe2a8dc987df6af59092039290dbdb04d526

data/.travis.yml

@@ -4,16 +4,16 @@ script: bundle exec rake test
 
 rvm:
   - 2.0.0
-  - 2.1.8
+  - 2.1.10
   - 2.2.4
-  - 2.3.0
+  - 2.3.1
   - 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
+  - gemfiles/Gemfile-rails.5.0.0.rc1
 
 sudo: false
 
@@ -22,8 +22,8 @@ matrix:
     - 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
+      gemfile: gemfiles/Gemfile-rails.5.0.0.rc1
+    - rvm: 2.1.10
+      gemfile: gemfiles/Gemfile-rails.5.0.0.rc1
   allow_failures:
     - rvm: ruby-head

data/active_decorator.gemspec

@@ -11,8 +11,6 @@ Gem::Specification.new do |s|
   s.summary     = %q{A simple and Rubyish view helper for Rails}
   s.description = %q{A simple and Rubyish view helper for Rails}
 
-  s.rubyforge_project = "active_decorator"
-
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

data/gemfiles/Gemfile-rails.4.0.x

@@ -7,4 +7,3 @@ gem 'test-unit-rails'
 gem 'capybara'
 gem 'sqlite3'
 gem 'jbuilder'
-gem 'test-unit'

data/gemfiles/{Gemfile-rails.5.0.0.beta1 → Gemfile-rails.5.0.0.rc1}

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gem 'active_decorator', path: '..'
 
-gem 'rails', '~> 5.0.0.beta1'
+gem 'rails', '~> 5.0.0.beta4'
 gem 'test-unit-rails'
 gem 'capybara'
 gem 'sqlite3'

data/lib/active_decorator/decorator.rb

@@ -19,7 +19,13 @@ module ActiveDecorator
         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
+        if obj.respond_to?(:records)
+          # Rails 5.0
+          obj.extend ActiveDecorator::RelationDecorator
+        else
+          # Rails 3.x and 4.x
+          obj.extend ActiveDecorator::RelationDecoratorLegacy
+        end
       else
         d = decorator_for obj.class
         return obj unless d
@@ -50,11 +56,19 @@ module ActiveDecorator
     end
   end
 
-  module RelationDecorator
+  module RelationDecoratorLegacy
     def to_a
       super.tap do |arr|
         ActiveDecorator::Decorator.instance.decorate arr
       end
     end
   end
+
+  module RelationDecorator
+    def records
+      super.tap do |arr|
+        ActiveDecorator::Decorator.instance.decorate arr
+      end
+    end
+  end
 end

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

@@ -2,6 +2,8 @@ module ActiveDecorator
   module Monkey
     module ActionView
       module PartialRenderer
+        private
+
         def setup(*)
           super
 

data/lib/active_decorator/version.rb

@@ -1,3 +1,3 @@
 module ActiveDecorator
-  VERSION = '0.7.0'
+  VERSION = '0.7.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_decorator
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Akira Matsuda
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-22 00:00:00.000000000 Z
+date: 2016-05-07 00:00:00.000000000 Z
 dependencies: []
 description: A simple and Rubyish view helper for Rails
 email:
@@ -28,7 +28,7 @@ files:
 - 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
+- gemfiles/Gemfile-rails.5.0.0.rc1
 - lib/active_decorator.rb
 - lib/active_decorator/config.rb
 - lib/active_decorator/decorator.rb
@@ -83,8 +83,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: active_decorator
-rubygems_version: 2.5.1
+rubyforge_project: 
+rubygems_version: 2.6.3
 signing_key: 
 specification_version: 4
 summary: A simple and Rubyish view helper for Rails