pragma-decorator 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e305095eddad1a3fdb573ece93d351b61732bcd
-  data.tar.gz: bcc5c1edaa9d26b41b648ddccadd9c5fe78748b4
+  metadata.gz: 4ff5939aba8c33bfd6bce0dfe784392ec89b0905
+  data.tar.gz: 24b7825e2c07df12ef69089d7ee854a1bcbcc408
 SHA512:
-  metadata.gz: 8f05deb8a7a6b5142b11916d630b7a91471887f92528beaa742bf1dc408efbbdbef8ba8ddf0426f4ae50d6c95990b12a06b25f2b4a77a5cd7b4b7592ef3c430b
-  data.tar.gz: 1893e791b53c6f2ed32f8f652844a54f0336c19924d02c52d3036f2ea70383e308be45be19fd75bb3702d977cb6bcdb34c2f7bf2eeaf98abe65852c4175fca34
+  metadata.gz: cf9c5241c0107a425dbe86bd802f46ac25c698b219ace26187aa1b5a744ecf18fbbf230ea090f59799964e1c7c632980e2488f9c779a5bae25880f5f8d45ffb1
+  data.tar.gz: 3e6a9cfbfaca8868c8f2f39a9be3978f2e5319c4f7b2e5ac7357413bc2372d83ca6450e0bf800e98e98fe1ab66b71005784c54fe111ce159e041823f89fbb0be

data/.rubocop.yml

@@ -53,7 +53,7 @@ Style/BracesAroundHashParameters:
   EnforcedStyle: context_dependent
 
 Lint/EndAlignment:
-  AlignWith: variable
+  EnforcedStyleAlignWith: variable
   AutoCorrect: true
 
 Style/AndOr:
@@ -82,3 +82,6 @@ Metrics/PerceivedComplexity:
 
 Metrics/CyclomaticComplexity:
   Enabled: false
+
+Metrics/BlockLength:
+  Enabled: false

data/doc/03-associations.md

@@ -86,6 +86,6 @@ Here's a list of options accepted when defining an association:
 Name | Type | Default | Meaning
 ---- | ---- | ------- | -------
 `expandable` | Boolean | `false` | Whether this association is expandable by consumers. Attempting to expand a non-expandable association will raise a `UnexpandableError`.
-`decorator` | Class | - | If provided, decorates the expanded object with this decorator. Otherwise, simply calls `#to_hash` on the object to get a representable hash.
+`decorator` | Class|Proc | - | If provided, decorates the expanded object with this decorator. Otherwise, simply calls `#to_hash` on the object to get a representable hash. If the option is callable, will call it and pass the associated object - a decorator class should be returned, or `nil` to skip decoration.
 `render_nil` | Boolean | `false` | Whether the property should be rendered at all when it is `nil`.
 `exec_context` | Symbol | `:decorated` | Whether to call the getter on the decorator (`:decorator`) or the decorated object (`:decorated`).

data/lib/pragma/decorator/association/binding.rb

@@ -68,8 +68,10 @@ module Pragma
             }
           }
 
-          if reflection.options[:decorator]
-            reflection.options[:decorator].new(associated_object).to_hash(options)
+          decorator_klass = compute_decorator
+
+          if decorator_klass
+            decorator_klass.new(associated_object).to_hash(options)
           else
             associated_object.as_json(options)
           end
@@ -106,6 +108,14 @@ module Pragma
             end
           end
         end
+
+        def compute_decorator
+          if reflection.options[:decorator].respond_to?(:call)
+            reflection.options[:decorator].call(associated_object)
+          else
+            reflection.options[:decorator]
+          end
+        end
       end
     end
   end

data/lib/pragma/decorator/association/reflection.rb

@@ -23,7 +23,8 @@ module Pragma
         # @param options [Hash] additional options
         #
         # @option options [Boolean] :expandable (`false`) whether the association is expandable
-        # @option options [Class] :decorator the decorator to use for the associated object
+        # @option options [Class|Proc] :decorator the decorator to use for the associated object
+        #   or a callable that will return the decorator class (or +nil+ to skip decoration)
         # @option options [Boolean] :render_nil (`true`) whether to render a +nil+ association
         # @option options [Symbol] :exec_context (`decorated`) whether to call the getter on the
         #   decorator (+decorator+) or the decorated object (+decorated+)

data/lib/pragma/decorator/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Pragma
   module Decorator
-    VERSION = '1.0.1'
+    VERSION = '1.1.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pragma-decorator
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Alessandro Desantis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-16 00:00:00.000000000 Z
+date: 2017-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: roar