composable_decorator 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0fa65ef7eb8fc9f424b8995c47aaeec25cbff91
-  data.tar.gz: a7d9cd5bb1aec8857c5e93b69a990ad309e10a0a
+  metadata.gz: 2135a3c4a581123c60cddd695143272d269214a3
+  data.tar.gz: 19fdc6f5d95b0a2ecc601edd12020a533c7b21e4
 SHA512:
-  metadata.gz: b521e76e756b291fa352c617c72ff51ac3073c8fad20ad9c88fe41137c9377bc793f132ab817ed57282b0d789c6fa87f20827885c4fc041ac7eec750ba1df9b3
-  data.tar.gz: 0d3bedc34f1419b4c338041ef7a962fea86a85c56ce63262224313d8ecb6aa32b9b665a108fa0b40be0c457915be7d98c3dafd86ec140e9a2f4e0602057aae2c
+  metadata.gz: 3964c582e98ba1a5b2a233369580c2f0102b3b12f7d7cbd4afa57bfc5f087bd94b9ecd3bc374fe1cb9aeaa907154949d01486b7593a1591551d62430e4c1d981
+  data.tar.gz: 70e9f2e657000046f24523c3ff68fc93bd4bc6ab4fad230159628a68152ef2bcd452eaab2ddad5cc06d6d5f8d5af1f0f51c8c0698f88150f39de9508234d0b9e

data/lib/composable_decorator/active_record/base.rb

@@ -7,6 +7,7 @@ module ComposableDecorator
         mod.extend DSL
 
         mod.__define_delegation
+        mod.__initialize_decorators
       end
 
       def decorate
@@ -45,6 +46,10 @@ module ComposableDecorator
         self.class.__decorators
       end
 
+      private def __associations
+        self.class.__associations
+      end
+
       private def __decorator_methods(assoc)
         __association_class(assoc).__decorators.map(&:instance_methods).flatten
       end

data/lib/composable_decorator/active_record/dsl.rb

@@ -12,11 +12,15 @@ module ComposableDecorator
       #
       # @Param +decorators+ is an <Array> of classes
       def decorate_with(*decorators)
-        existing_decorators = defined?(__decorators) ? __decorators : []
+        existing_decorators = __decorators
 
         define_singleton_method(:__decorators) { decorators + existing_decorators }
       end
 
+      def __initialize_decorators
+        define_singleton_method(:__decorators) { [] }
+      end
+
       # # delegates all of the decorated methods for each has_one or belongs_to association.
       #
       # module PostDecorator
@@ -39,18 +43,19 @@ module ComposableDecorator
       #
       # @Param +associations+ is an <Array> of symbols
       def delegate_decorated_to(*associations, prefix: true, allow_nil: true, handle_nil_with: '')
+        existing_associations = __associations
+
         __define_delegation(
-          associations: associations,
+          associations: associations + existing_associations,
           prefix: prefix,
           allow_nil: allow_nil,
           handle_nil_with: handle_nil_with)
       end
 
       def __define_delegation(associations: [], prefix: true, allow_nil: true, handle_nil_with: '')
-        define_method(:__associations) { associations }
+        define_singleton_method(:__associations) { associations }
         define_method(:__prefix) { prefix }
         define_method(:__allow_nil) { allow_nil }
-        define_method(:__handle_nil_with) { handle_nil_with }
       end
     end
   end

data/lib/composable_decorator/version.rb

@@ -1,3 +1,3 @@
 module ComposableDecorator
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: composable_decorator
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Adam Steel