active_decorator_with_decorate_associations 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00d55c76c85db0fbb13db08dc6896be8f695f667
-  data.tar.gz: 5bbdff17711628b08f133c2e9f697c30336596e0
+  metadata.gz: 1ce61e6f92676a60254a628b4b650408d787919c
+  data.tar.gz: 291311be7e2253161cb68d0d9eb10d1bc9eb529b
 SHA512:
-  metadata.gz: 83b9bf7e7e7d3519eba7b0aae4dba6173dfa8f765104dd57faf4cdaf29bb1a1cabc02ae54ae488a3ca4ae225e205da20778c8890290bc19a0d1e255928d456b8
-  data.tar.gz: 3e1512c9951172ff4f47084b51ca148ba0feb832e974d28516d61ff47829eff64c0d1977a2329b4caf84a8287146977b331f6617eeb9057bdd6eba6d6171a7f0
+  metadata.gz: 8f7299b4c67f0f0df6ed6e74e814f3a9758fcf2020d20745300d9dd7a6331d21caa367af084f7fe06a68f7bfafbe04474c13afb5987969d70fb3b3431d862c81
+  data.tar.gz: fae9cbc2a55fc689e53238823b3f974e7e80427ea6cf8a713e458e76d594b83cd1297297e59d25c35769769c235be85cc8bf97b04046b600d68850219cfcf1c8

data/lib/active_decorator_with_decorate_associations/active_decorator_extension.rb

@@ -0,0 +1,12 @@
+# TODO remove this class when merged either of these pull requests
+# https://github.com/amatsuda/active_decorator/pull/15
+# https://github.com/amatsuda/active_decorator/pull/59
+
+module ActiveDecoratorExtension
+  def decorate(obj)
+    return if defined?(Jbuilder) && Jbuilder === obj
+    return if obj.nil?
+    super
+    obj
+  end
+end

data/lib/active_decorator_with_decorate_associations/association_decorator.rb

@@ -2,6 +2,6 @@ require "active_decorator_with_decorate_associations/decorator"
 
 module AssociationDecorator
   def target
-    ActiveDecoratorWithDecorateAssociations::Decorator.instance.decorate(super)
+    ActiveDecoratorWithDecorateAssociations::Decorator.instance.decorate(owner, super)
   end
 end

data/lib/active_decorator_with_decorate_associations/collection_association_decorator.rb

@@ -5,13 +5,13 @@ module CollectionAssociationDecorator
   if Gem::Version.new(Rails.version) < Gem::Version.new("4.1")
 
     def first_or_last(*args)
-      ActiveDecoratorWithDecorateAssociations::Decorator.instance.decorate(super)
+      ActiveDecoratorWithDecorateAssociations::Decorator.instance.decorate(owner, super)
     end
 
   else
 
     def first_nth_or_last(*args)
-      ActiveDecoratorWithDecorateAssociations::Decorator.instance.decorate(super)
+      ActiveDecoratorWithDecorateAssociations::Decorator.instance.decorate(owner, super)
     end
 
   end

data/lib/active_decorator_with_decorate_associations/decorator.rb

@@ -4,9 +4,12 @@ module ActiveDecoratorWithDecorateAssociations
   class Decorator
     include Singleton
 
-    def decorate(target)
-      ActiveDecorator::Decorator.instance.decorate(target)
-      target
+    def decorate(owner, target)
+      if owner.is_a?(ActiveDecorator::Helpers)
+        ActiveDecorator::Decorator.instance.decorate(target)
+      else
+        target
+      end
     end
   end
 end

data/lib/active_decorator_with_decorate_associations/railtie.rb

@@ -1,10 +1,14 @@
 require "rails"
+require "active_decorator"
 require "active_decorator_with_decorate_associations/collection_association_decorator"
 require "active_decorator_with_decorate_associations/association_decorator"
+require "active_decorator_with_decorate_associations/active_decorator_extension"
 
 module ActiveDecoratorWithDecorateAssociations
   class Railtie < ::Rails::Railtie
     initializer 'active_decorator_with_decorate_associations' do
+      ActiveDecorator::Decorator.send :prepend, ActiveDecoratorExtension
+
       ActiveRecord::Associations::CollectionAssociation.send :prepend, CollectionAssociationDecorator
       ActiveRecord::Associations::BelongsToAssociation.send  :prepend, AssociationDecorator
       ActiveRecord::Associations::HasOneAssociation.send     :prepend, AssociationDecorator

data/lib/active_decorator_with_decorate_associations/version.rb

@@ -1,3 +1,3 @@
 module ActiveDecoratorWithDecorateAssociations
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_decorator_with_decorate_associations
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Tatsuya Itakura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-30 00:00:00.000000000 Z
+date: 2016-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_decorator
@@ -96,6 +96,7 @@ files:
 - bin/console
 - bin/setup
 - lib/active_decorator_with_decorate_associations.rb
+- lib/active_decorator_with_decorate_associations/active_decorator_extension.rb
 - lib/active_decorator_with_decorate_associations/association_decorator.rb
 - lib/active_decorator_with_decorate_associations/collection_association_decorator.rb
 - lib/active_decorator_with_decorate_associations/decorator.rb