hal_presenter 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10e6de4d852aa101cc4318eb88d152996adeb2e288359a0c9a53f6efcc5e9cc6
-  data.tar.gz: 89080e06a6c5a756bc00d9620663fb8e6eb97906059285666d13f007a4e6b4fa
+  metadata.gz: e0dc504f92084015f773cf97fb82e35f1e969cce9d994190ea193b9966d7fade
+  data.tar.gz: e7dc11b0623948a02dd51e5f9fccfd912c49d26c5616ce4d61da2a656e6cc330
 SHA512:
-  metadata.gz: ab43657fea638457294930e648d5a33b2a6055ff02e511ba239d55b0b38bb8bad9ea6a3816b2c01674efa38c816876681af075dc5fc6ccb67ad1ebe44a891ae6
-  data.tar.gz: 84f44aa7ef856dbec2e23c56a1aceef04b35b253ebc1dd574c7379aa574f72b57d6b8e969e4a53eff8b7be5da54ecc23ca8d0411d87dbdb2f52a694bb7dcd8a7
+  metadata.gz: 13dc22af8b63f4bb7c369ebcbecfcbe81df0cd88e534cd4b95bf57f337a19a359dc8a41f8df80377e8cd24e01e02b66803f209959ed304e4cdfdfd4e8cd2cbab
+  data.tar.gz: fe8e9d146fd80980fadd22856b38467e2f2f428cd6ad00837a4bc945fe12de00e22920959a2e353ede236bd8681fb3d8ad304b4bf49e0a7cd45b0163ad10a6b7

data/lib/hal_presenter/lazy_evaluator.rb

@@ -7,7 +7,7 @@ module HALPresenter
 
     def initialize(block, context)
       @context = context
-      define_singleton_method(:evaluate_block, &block)
+      define_singleton_method(:call, &block)
     end
 
     def update_context(context)
@@ -16,17 +16,21 @@ module HALPresenter
 
     def evaluate(resource, options)
       @resource = resource
-      @options = options || {}
-      evaluate_block
+      @options = (options || {}).dup
+      call
     ensure
-      @resource = nil
-      @options = nil
+      clear_state
     end
 
     private
 
     attr_reader :context
 
+    def clear_state
+      @resource = nil
+      @options = nil
+    end
+
     def method_missing(method, *args, &block)
       return super unless context.respond_to?(method)
 

data/lib/hal_presenter/policy/dsl.rb

@@ -1,19 +1,19 @@
 module HALPresenter
   module Policy
     module DSL
-
       class Rules
+        DEFAULT_PROC = Proc.new { false }
 
         def attributes
-          @attributes ||= Hash.new(Proc.new { false })
+          @attributes ||= Hash.new(DEFAULT_PROC)
         end
 
         def links
-          @links ||= Hash.new(Proc.new { false })
+          @links ||= Hash.new(DEFAULT_PROC)
         end
 
         def embedded
-          @embedded ||= Hash.new(Proc.new { false })
+          @embedded ||= Hash.new(DEFAULT_PROC)
         end
 
         private :attributes, :links, :embedded
@@ -53,34 +53,31 @@ module HALPresenter
         def strip_curie(rel)
           rel.to_s.split(':', 2)[1]&.to_sym
         end
-
       end
 
       module ClassMethods
-
         def allow_by_default(*types)
           rules.defaults(*types, value: true)
         end
 
-        def attribute(*names)
-          b = block_given? ? Proc.new : Proc.new { true }
-          names.each { |name| rules.add_attribute(name, b) }
+        def attribute(*names, &block)
+          block ||= Proc.new { true }
+          names.each { |name| rules.add_attribute(name, block) }
         end
 
-        def link(*rels)
-          b = block_given? ? Proc.new : Proc.new { true }
-          rels.each { |rel| rules.add_link(rel, b) }
+        def link(*rels, &block)
+          block ||= Proc.new { true }
+          rels.each { |rel| rules.add_link(rel, block) }
         end
 
-        def embed(*names)
-          b = block_given? ? Proc.new : Proc.new { true }
-          names.each { |name| rules.add_embed(name, b) }
+        def embed(*names, &block)
+          block ||= Proc.new { true }
+          names.each { |name| rules.add_embed(name, block) }
         end
 
         def rules
           @rules ||= Rules.new
         end
-
       end
 
       def self.included(mod)
@@ -94,24 +91,49 @@ module HALPresenter
       end
 
       def attribute?(name)
-        run self.class.rules.attribute_rule_for(name)
+        __check __rules.attribute_rule_for(name)
       end
 
       def link?(rel)
         return true if rel == :self
-        run self.class.rules.link_rule_for(rel)
+        __check __rules.link_rule_for(rel)
       end
 
       def embed?(name)
-        run self.class.rules.embed_rule_for(name)
+        __check __rules.embed_rule_for(name)
       end
 
       private
 
       attr_reader :current_user, :resource, :options
 
-      def run(block)
-        instance_eval(&block) && true || false
+      def delegate_attribute(policy_class, attr, **opts)
+        delegate_to(policy_class, :attribute?, args: attr, **opts)
+      end
+
+      def delegate_link(policy_class, rel, **opts)
+        delegate_to(policy_class, :link?, args: rel, **opts)
+      end
+
+      def delegate_embed(policy_class, rel, **opts)
+        delegate_to(policy_class, :embed?, args: rel, **opts)
+      end
+
+      def delegate_to(policy_class, method, resource: nil, args: nil, **opts)
+        resource ||= send(:resource)
+        opts = options.merge(opts)
+        policy = policy_class.new(current_user, resource, opts)
+        args = Array(args)
+        args.unshift(method)
+        policy.send(*args)
+      end
+
+      def __rules
+        self.class.rules
+      end
+
+      def __check(block)
+        !!instance_eval(&block)
       end
 
     end

data/lib/hal_presenter/property.rb

@@ -28,6 +28,11 @@ module HALPresenter
       self
     end
 
+    def nested_depth_ok?(level)
+      return true unless embed_depth
+      level <= embed_depth
+    end
+
     private
 
     def initialize_copy(source)

data/lib/hal_presenter/serializer.rb

@@ -5,23 +5,23 @@ require 'hal_presenter/curie_collection'
 module HALPresenter
 
   module ClassMethods
-	def to_hal(resource, options = {})
-	  raise Serializer::Error, "Resource is nil" if resource.nil?
-	  options = options.dup
-	  presenter = options.delete(:presenter)
-	  presenter ||= HALPresenter.lookup_presenter(resource)
-	  raise Serializer::Error, "No presenter for #{resource.class}" unless presenter
-	  presenter.to_hal(resource, options)
-	end
-
-	def to_collection(resources, options = {})
-	  raise Serializer::Error, "resources is nil" if resources.nil?
-	  options = options.dup
-	  presenter = options.delete(:presenter)
-	  presenter ||= HALPresenter.lookup_presenter(resources)
-	  raise Serializer::Error, "No presenter for #{resources.first.class}" unless presenter
-	  presenter.to_collection(resources, options)
-	end
+    def to_hal(resource, options = {})
+      raise Serializer::Error, "Resource is nil" if resource.nil?
+      options = options.dup
+      presenter = options.delete(:presenter)
+      presenter ||= HALPresenter.lookup_presenter(resource)
+      raise Serializer::Error, "No presenter for #{resource.class}" unless presenter
+      presenter.to_hal(resource, options)
+    end
+
+    def to_collection(resources, options = {})
+      raise Serializer::Error, "resources is nil" if resources.nil?
+      options = options.dup
+      presenter = options.delete(:presenter)
+      presenter ||= HALPresenter.lookup_presenter(resources)
+      raise Serializer::Error, "No presenter for #{resources.first.class}" unless presenter
+      presenter.to_collection(resources, options)
+    end
   end
 
   module Serializer
@@ -83,9 +83,7 @@ module HALPresenter
         serialized.merge! _serialize_embedded(embedded, resources, policy, options)
 
         # Embedded resources
-        embed_options = options.dup
-        embed_options[:_depth] += 1
-        serialized_resources = resources.map { |resource| to_hash(resource, embed_options) }
+        serialized_resources = resources.map { |resource| to_hash(resource, options.dup) }
         serialized[:_embedded] ||= {}
         serialized[:_embedded].merge!(properties.name => serialized_resources)
       end
@@ -127,7 +125,7 @@ module HALPresenter
 
     def _serialize_attributes(attributes, resource, policy, options)
       attributes.each_with_object({}) do |attribute, hash|
-        next unless nested_depth_ok?(attribute, options[:_depth])
+        next unless attribute.nested_depth_ok? options[:_depth]
         next if policy && !policy.attribute?(attribute.name)
         hash[attribute.name] = attribute.value(resource, options)
       end
@@ -135,7 +133,7 @@ module HALPresenter
 
     def _serialize_links(links, curies, resource, policy, options)
       serialized = links.each_with_object({}) do |link, hash|
-        next unless nested_depth_ok?(link, options[:_depth])
+        next unless link.nested_depth_ok? options[:_depth]
         next if policy && !policy.link?(link.rel)
         hash.merge! link.to_h(resource, options)
       end
@@ -147,7 +145,7 @@ module HALPresenter
 
     def _serialize_curies(curies, resource, options)
       curies.each_with_object([]) do |curie, array|
-        next unless nested_depth_ok?(curie, options[:_depth])
+        next unless curie.nested_depth_ok? options[:_depth]
         hash = curie.to_h(resource, options)
         array << hash unless hash.empty?
       end
@@ -155,7 +153,7 @@ module HALPresenter
 
     def _serialize_embedded(embedded, object, policy, options)
       serialized = embedded.each_with_object({}) do |embed, hash|
-        next unless nested_depth_ok?(embed, options[:_depth])
+        next unless embed.nested_depth_ok? options[:_depth]
         next if policy && !policy.embed?(embed.name)
         resource = embed.value(object, options) or next
         presenter = embed.presenter_class
@@ -192,10 +190,5 @@ module HALPresenter
     def policy_for(resource, options)
       policy_class&.new(options[:current_user], resource, options)
     end
-
-    def nested_depth_ok?(property, level)
-      return true unless embed_depth = property.embed_depth
-      level <= embed_depth
-    end
   end
 end

data/lib/hal_presenter/super_init.rb

@@ -7,7 +7,7 @@ module HALPresenter
       return default unless superclass.respond_to?(method, true)
 
       if default.respond_to? :each
-        superclass.send(method).map do |prop|
+        Array(superclass.send(method)).map do |prop|
           prop.clone.change_context(self)
         end
       else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hal_presenter
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Sammy Henningsson
@@ -30,7 +30,7 @@ cert_chain:
   ZMhjYR7sRczGJx+GxGU2EaR0bjRsPVlC4ywtFxoOfRG3WaJcpWGEoAoMJX6Z0bRv
   M40=
   -----END CERTIFICATE-----
-date: 2019-10-29 00:00:00.000000000 Z
+date: 2019-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -198,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: JSON HAL serializer

metadata.gz.sig

@@ -1,2 +1,2 @@
-�8Я�Y�J4��#G����޽/�|�uu�(|*���J����a��^�8|F�-$��y�=�`ݑ^��u]�^�C�.��Wc�t�A1����]5��w
-�W+���A�3���k��AhL�Y�G��b�Թ@����t�؉鳃]Q9����$(}����3���L�ӻh�M��c]1���3<XM0�n�~�?�v����"���j�,P�̙�ls0c����¦u���v_S��#�iPЭ��XP��
+K�s����� ����Iv]����?/\��j
+ĬEig����F�Z��}(�uVUڠ�z�uz�6p(-Jz��n��5d�͚���<�T�������- /�E�)#�Xy���x8�4*+)&W�&Q��T(.H��B�#�V�g����M�`$�2m�;�~