hal_presenter 1.2.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12895524e08462462b15f197216f20f3fd24a53e7e6a60e7c5876639cd72dba5
-  data.tar.gz: b74e9c2084b7652447ee5bf90a56212fd5fc3829ee0e7a842187889b71ded750
+  metadata.gz: af641721e6b137d280c31c60efc6b76e7e1a22dd441a9b65aee3b929954290ec
+  data.tar.gz: 784293b830aeed98f2f1ac1157b0526a8febe8ccbbe40a54dcee85acb8111294
 SHA512:
-  metadata.gz: c6f920f2d359fba3dd088f217dd94b7ecce8a5023a2f59ddf5daf3be012f81205663f6be10263ba7d67435a6c220f6904aa121fc13381eeda1d890444ada3ee2
-  data.tar.gz: '08041d1884286f31bfd1e2b14014b518ec2979081c222703f435b0b26c83d13c53f630cd9da4593c4e6be5b14af60289e0e66d7ac8e50e40a0783ad9aee664be'
+  metadata.gz: 829846a3e6a6d86e537817585ccfdc929efc758cf9a748b73c4a9c5d54d0760f8735301a7606a90d6279c2dba9efd1b3b9998a646c336a1656628f42ba779c56
+  data.tar.gz: fd10fbc76409d2b1738b2e5abdd75ba68e6a34592ae6b7ed56f2fcac0f83079eba33b524704de4c29ff168040147e89d82fc0466746049c84b4f1df87bafaaeb

data/lib/hal_presenter/attributes.rb

@@ -5,10 +5,10 @@ module HALPresenter
   module Attributes
     include SuperInit
 
-    def attribute(*args, **kwargs, &block)
+    def attribute(name, value = Property::NO_VALUE, **kwargs, &block)
       kwargs[:context] ||= self
-      attributes.delete_if { |attr| attr.name == args.first }
-      Property.new(*args, **kwargs, &block).tap do |attr|
+      attributes.delete_if { |attr| attr.name == name }
+      Property.new(name, value, **kwargs, &block).tap do |attr|
         attributes << attr
       end
     end

data/lib/hal_presenter/curie_collection.rb

@@ -0,0 +1,158 @@
+require 'set'
+
+module HALPresenter
+  class CurieCollection
+    class CurieWithReferences
+      attr_reader :name, :href, :templated, :rels, :references
+
+      def initialize(curie)
+        @name = curie.fetch(:name)
+        @href = curie.fetch(:href)
+        @templated = curie.fetch(:templated, true)
+        @rels = Hash.new { |hash, key| hash[key] = Set.new }
+        @references = Hash.new do |hash, key|
+          hash[key] = Set.new.compare_by_identity
+        end
+      end
+
+      def add_reference(rel, reference, type)
+        rels[type] << rel
+        references[type] << reference
+      end
+
+      def <<(other)
+        other.rels.each do |type, rels|
+          self.rels[type] += rels
+        end
+        other.references.each do |type, references|
+          self.references[type] += references
+        end
+      end
+
+      def rename(name)
+        self.name = name
+
+        rels.each do |type, rels|
+          rels.each do |rel|
+            new_rel = replace_curie(name, rel)
+            references[type].each do |reference|
+              reference[new_rel] = reference.delete(rel)
+            end
+          end
+        end
+      end
+
+      def to_h
+        {
+          name: name,
+          href: href,
+          templated: templated
+        }
+      end
+
+      private
+
+      attr_writer :name
+
+      def replace_curie(name, rel)
+        _, rest = rel.to_s.split(':', 2)
+        :"#{name}:#{rest}"
+      end
+    end
+
+    attr_reader :collection
+
+    def self.extract_from!(hash, resolve_collisions: true)
+      new.tap do |curies|
+        curies.add_curies(hash[:_links]&.delete(:curies))
+        curies.send(:add_references, hash[:_links], :links)
+        curies.send(:add_references, hash[:_embedded], :embedded)
+        curies.resolve_collisions! if resolve_collisions
+      end
+    end
+
+    def initialize
+      @collection = []
+    end
+
+    def add_curies(curies)
+      return unless curies
+
+      curies.each do |curie|
+        next if find(curie[:name])
+        collection << CurieWithReferences.new(curie)
+      end
+    end
+
+    def generate_curie_name(base)
+      name = "#{base}0"
+      name = name.next while find(name.to_sym)
+      name.to_sym
+    end
+
+    def resolve_collisions!
+      collection.reverse_each do |curie|
+        next if collection.none? { |c| c.name == curie.name && c.href != curie.href }
+        new_name = generate_curie_name(curie.name)
+        curie.rename new_name
+      end
+
+      self
+    end
+
+    def to_a
+      collection.map(&:to_h)
+    end
+
+    def empty?
+      collection.empty?
+    end
+
+    def each
+      return collection.each unless block_given?
+      collection.each { |c| yield c }
+    end
+
+    private
+
+    def find(name, href = nil)
+      return unless name
+
+      collection.find do |c|
+        next unless c.name.to_sym == name.to_sym
+        href.nil? || c.href == href
+      end
+    end
+
+    def curie_from(rel)
+      parts = rel.to_s.split(':')
+      parts.first if parts.size > 1
+    end
+
+    def concat(other)
+      other.each do |curie|
+        if existing = find(curie.name, curie.href)
+          existing << curie
+        else
+          collection << curie
+        end
+      end
+    end
+
+    def add_references(reference, type)
+      return unless reference
+
+      reference.each do |rel, values|
+        curie_name = curie_from(rel)
+        curie = find(curie_name)
+        curie&.add_reference(rel, reference, type)
+
+        values = [values] if values.is_a? Hash
+        values.each do |value|
+          nested = self.class.extract_from!(value, resolve_collisions: false)
+          concat nested.collection
+        end
+      end
+    end
+  end
+end

data/lib/hal_presenter/deserializer.rb

@@ -1,15 +1,20 @@
 require 'json'
 
 module HALPresenter
-
-  def self.from_hal(presenter, payload, resource = nil)
-    presenter.from_hal(payload, resource)
+  module ClassMethods
+    def from_hal(presenter, payload, resource = nil)
+      presenter.from_hal(payload, resource)
+    end
   end
 
   module Deserializer
 
     class Error < StandardError; end
 
+    def self.included(base)
+      base.extend ClassMethods
+    end
+
     def from_hal(payload, resource = nil)
       return if payload.nil? || payload.empty?
       hash = JSON.parse(payload)

data/lib/hal_presenter/embedded.rb

@@ -8,16 +8,16 @@ module HALPresenter
     class Embed < HALPresenter::Property
       attr_reader :presenter_class
 
-      def initialize(name, value = nil, **kwargs, &block)
+      def initialize(name, value = NO_VALUE, **kwargs, &block)
         @presenter_class = kwargs.delete(:presenter_class)
         super(name, value, **kwargs, &block)
       end
     end
 
-    def embed(*args, **kwargs, &block)
+    def embed(name, value = Property::NO_VALUE, **kwargs, &block)
       kwargs[:context] ||= self
-      embedded.delete_if { |embed| embed.name == args.first }
-      Embed.new(*args, **kwargs, &block).tap do |embed|
+      embedded.delete_if { |embed| embed.name == name }
+      Embed.new(name, value, **kwargs, &block).tap do |embed|
         embedded << embed
       end
     end

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/links.rb

@@ -3,14 +3,16 @@ require 'hal_presenter/super_init'
 
 module HALPresenter
 
-  def self.base_href=(base)
-    @base_href = base&.sub(%r(/*$), '')
-  end
+  module ClassMethods
+    def base_href=(base)
+      @base_href = base&.sub(%r(/*$), '')
+    end
 
-  def self.href(href)
-    return href if (@base_href ||= '').empty?
-    return href if href =~ %r(\A(\w+://)?[^/])
-    @base_href + href
+    def href(href)
+      return href if (@base_href ||= '').empty?
+      return href if href =~ %r(\A(\w+://)?[^/])
+      @base_href + href
+    end
   end
 
   module Links
@@ -22,7 +24,7 @@ module HALPresenter
 
       alias rel name
 
-      def initialize(rel, value = nil, **kwargs, &block)
+      def initialize(rel, value = NO_VALUE, **kwargs, &block)
         @type =         kwargs[:type].freeze
         @deprecation =  kwargs[:deprecation].freeze
         @profile =      kwargs[:profile].freeze
@@ -44,25 +46,32 @@ module HALPresenter
         href = value(resource, options)
         return {} unless href
 
-        hash = {href: HALPresenter.href(href)}.tap do |h|
-          h[:type] = type if type
-          h[:deprecation] = deprecation if deprecation
-          h[:profile] = profile if profile
-          h[:title] = title if title
-          h[:templated] = templated if templated
+        {href: HALPresenter.href(href)}.tap do |hash|
+          hash[:type]        = type        if type
+          hash[:deprecation] = deprecation if deprecation
+          hash[:profile]     = profile     if profile
+          hash[:title]       = title       if title
+          hash[:templated]   = templated   if templated
         end
-
-        {rel => hash}
       end
     end
 
+    def self.included(base)
+      base.extend ClassMethods
+    end
+
     def link(rel, value = nil, **kwargs, &block)
       if value.nil? && !block_given?
         raise 'link must be called with non nil value or be given a block'
       end
 
       kwargs[:context] ||= self
-      links.delete_if { |link| link.rel == rel }
+      rel = rel.to_sym
+
+      if rel == :self || kwargs[:replace_parent]
+        links.delete_if { |link| link.rel == rel }
+      end
+
       Link.new(rel, value, **kwargs, &block).tap do |link|
         links << link
       end

data/lib/hal_presenter/model.rb

@@ -1,34 +1,40 @@
 module HALPresenter
   @presenters = {}
 
-  def self.register(model:, presenter:)
-    return unless presenter && model
-    @presenters[presenter] = model
-  end
+  module ClassMethods
+    def register(model:, presenter:)
+      return unless presenter && model
+      @presenters[presenter] = model
+    end
 
-  def self.unregister(presenter)
-    @presenters.delete_if { |d,_| d == presenter }
-  end
+    def unregister(presenter)
+      @presenters.delete_if { |d,_| d == presenter }
+    end
 
-  def self.lookup_model(presenter)
-    @presenters[presenter]
-  end
+    def lookup_model(presenter)
+      @presenters[presenter]
+    end
 
-  def self.lookup_presenter(model)
-    presenters = lookup_presenters(model)
-    return presenters.last unless presenters.empty?
-    lookup_presenters(model.first).last if model.respond_to? :first
-  end
+    def lookup_presenter(model)
+      presenters = lookup_presenters(model)
+      return presenters.last unless presenters.empty?
+      lookup_presenters(model.first).last if model.respond_to? :first
+    end
 
-  def self.lookup_presenters(model)
-    clazz = model.is_a?(Class) ? model : model.class
-    presenters = @presenters.select { |_d, m| m == clazz }.keys
-    return presenters unless presenters.empty?
-    return [] unless clazz < BasicObject
-    lookup_presenters(clazz.superclass)
+    def lookup_presenters(model)
+      clazz = model.is_a?(Class) ? model : model.class
+      presenters = @presenters.select { |_d, m| m == clazz }.keys
+      return presenters unless presenters.empty?
+      return [] unless clazz < BasicObject
+      lookup_presenters(clazz.superclass)
+    end
   end
 
   module Model
+    def self.included(base)
+      base.extend ClassMethods
+    end
+
     def model(clazz)
       HALPresenter.register(model: clazz, presenter: self)
     end

data/lib/hal_presenter/pagination.rb

@@ -1,11 +1,12 @@
 module HALPresenter
-  class << self
+  module ClassMethods
     attr_accessor :paginate
   end
 
-  # TODO: Support Kaminari and Will_paginate
- 
   class Pagination
+    def self.included(base)
+      base.extend ClassMethods
+    end
 
     class Uri
       def self.parse(str)

data/lib/hal_presenter/policy/dsl.rb

@@ -1,86 +1,43 @@
+require 'hal_presenter/policy/rules'
+
 module HALPresenter
   module Policy
     module DSL
-
-      class Rules
-
-        def attributes
-          @attributes ||= Hash.new(Proc.new { false })
-        end
-
-        def links
-          @links ||= Hash.new(Proc.new { false })
-        end
-
-        def embedded
-          @embedded ||= Hash.new(Proc.new { false })
-        end
-
-        private :attributes, :links, :embedded
-
-        def defaults(*types, value: false)
-          types.each do |t|
-            send(t).default= Proc.new { value }
-          end
-        end
-
-        def attribute_rule_for(name)
-          attributes[name]
-        end
-
-        def add_attribute(name, block)
-          attributes[name] = block
-        end
-
-        def link_rule_for(rel)
-          return links[rel] if links.key? rel
-          links[strip_curie(rel)]
-        end
-
-        def add_link(rel, block)
-          links[rel] = block
-        end
-
-        def embed_rule_for(name)
-          return embedded[name] if embedded.key? name
-          embedded[strip_curie(name)]
-        end
-
-        def add_embed(name, block)
-          embedded[name] = block
-        end
-
-        def strip_curie(rel)
-          rel.to_s.split(':', 2)[1]&.to_sym
-        end
-
-      end
-
       module ClassMethods
+        def inherited(child)
+          child.instance_variable_set(:@rules, rules.dup)
+        end
 
         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
 
+        def no_transform_rels
+          rules.transform_rels = false
+        end
+
+        def transform_rels(value = true)
+          rules.transform_rels = !!value
+        end
       end
 
       def self.included(mod)
@@ -94,26 +51,50 @@ 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
   end
 end

data/lib/hal_presenter/policy/rules.rb

@@ -0,0 +1,87 @@
+module HALPresenter
+  module Policy
+    class Rules
+      DEFAULT_PROC = Proc.new { false }
+
+      attr_accessor :transform_rels
+
+      def initialize
+        @transform_rels = true
+      end
+
+      def dup
+        super.tap do |copy|
+          copy.instance_variable_set(:@attributes, attributes.dup)
+          copy.instance_variable_set(:@links, links.dup)
+          copy.instance_variable_set(:@embedded, embedded.dup)
+        end
+      end
+
+      def defaults(*types, value: false)
+        types.each do |t|
+          send(t).default= Proc.new { value }
+        end
+      end
+
+      def attribute_rule_for(name)
+        attributes[name]
+      end
+
+      def add_attribute(name, block)
+        attributes[name] = block
+      end
+
+      def link_rule_for(rel)
+        rel = transform(rel)
+        return links[rel] if links.key? rel
+
+        links[strip_curie(rel)]
+      end
+
+      def add_link(rel, block)
+        rel = transform(rel)
+        links[rel] = block
+      end
+
+      def embed_rule_for(name)
+        name = transform(name)
+        return embedded[name] if embedded.key? name
+
+        embedded[strip_curie(name)]
+      end
+
+      def add_embed(name, block)
+        name = transform(name)
+        embedded[name] = block
+      end
+
+      private
+
+      def attributes
+        @attributes ||= Hash.new(DEFAULT_PROC)
+      end
+
+      def links
+        @links ||= Hash.new(DEFAULT_PROC)
+      end
+
+      def embedded
+        @embedded ||= Hash.new(DEFAULT_PROC)
+      end
+
+      def strip_curie(rel)
+        rel.to_s.split(':', 2)[1]&.to_sym
+      end
+
+      def transform_rels?
+        @transform_rels
+      end
+
+      def transform(rel)
+        return rel unless transform_rels?
+
+        rel.to_s.tr('-', '_').to_sym
+      end
+    end
+  end
+end

data/lib/hal_presenter/profile.rb

@@ -4,7 +4,7 @@ module HALPresenter
   module Profile
     include SuperInit
 
-    def profile(value = nil, **kwargs, &block)
+    def profile(value = Property::NO_VALUE, **kwargs, &block)
       if value.nil? && !block_given?
         raise 'profile must be called with non nil value or be given a block'
       end

data/lib/hal_presenter/property.rb

@@ -2,9 +2,11 @@ require 'hal_presenter/lazy_evaluator'
 
 module HALPresenter
   class Property
+    NO_VALUE = Object.new.freeze
+
     attr_reader :name, :embed_depth
 
-    def initialize(name, value = nil, **kwargs, &block)
+    def initialize(name, value = NO_VALUE, **kwargs, &block)
       @name = name.to_sym
       @value = value.freeze
       @embed_depth = kwargs[:embed_depth].freeze
@@ -15,10 +17,16 @@ module HALPresenter
     def value(resource = nil, options = {})
       if @lazy
         @lazy.evaluate(resource, options)
-      elsif @value
+      elsif @value != NO_VALUE
         @value
       elsif resource&.respond_to? name_without_curie
         resource.public_send(name_without_curie)
+      else
+        raise ArgumentError, <<~ERR
+          Cannot serialize #{name.inspect}.
+          No value given and resource does not respond to #{name_without_curie}. Resource:
+          #{resource.inspect}"
+          ERR
       end
     end
 
@@ -28,6 +36,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

@@ -1,45 +1,63 @@
 require 'json'
 require 'hal_presenter/pagination'
+require 'hal_presenter/curie_collection'
 
 module HALPresenter
 
-  def self.to_hal(resource, options = {})
-    raise Serializer::Error, "Resource is nil" if resource.nil?
-    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
+  module ClassMethods
+    def to_hal(resource, **options)
+      options = options.dup
+      presenter!(resource, options).to_hal(resource, options)
+    end
+
+    def to_collection(resources, **options)
+      options = options.dup
+      presenter!(resources, options).to_collection(resources, options)
+    end
+
+    private
 
-  def self.to_collection(resources, options = {})
-    raise Serializer::Error, "resources is nil" if resources.nil?
-    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)
+    def presenter!(resources, **options)
+      raise Serializer::Error, "resources is nil" if resources.nil?
+      presenter = options.delete(:presenter)
+      presenter ||= HALPresenter.lookup_presenter(resources)
+      raise Serializer::Error, "No presenter for #{resources.first.class}" unless presenter
+
+      presenter
+    end
   end
 
   module Serializer
 
     class Error < StandardError; end
 
-    def to_hal(resource = nil, options = {})
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    def to_hal(resource = nil, **options)
+      options = options.dup
       options[:_depth] ||= 0
       hash = to_hash(resource, options)
-      move_curies_to_top! hash
+      move_curies_to_root! hash
+      return hash if options[:as_hash]
+
       JSON.generate(hash)
     end
 
-    def to_collection(resources = [], options = {})
+    def to_collection(resources = [], **options)
       unless can_serialize_collection?
         raise Error,
           "Trying to serialize a collection using #{self} which has no collection info. " \
           "Add a 'collection' spec to the serializer or use another serializer"
       end
+      options = options.dup
       options[:paginate] = HALPresenter.paginate unless options.key? :paginate
       options[:_depth] ||= 0
       hash = to_collection_hash(resources, options)
-      move_curies_to_top! hash
+      move_curies_to_root! hash
+      return hash if options[:as_hash]
+
       JSON.generate(hash)
     end
 
@@ -72,8 +90,7 @@ module HALPresenter
         serialized.merge! _serialize_embedded(embedded, resources, policy, options)
 
         # Embedded resources
-        options[:_depth] += 1
-        serialized_resources = resources.map { |resource| to_hash(resource, options) }
+        serialized_resources = resources.map { |resource| to_hash(resource, options.dup) }
         serialized[:_embedded] ||= {}
         serialized[:_embedded].merge!(properties.name => serialized_resources)
       end
@@ -97,32 +114,16 @@ module HALPresenter
 
     private
 
-    def move_curies_to_top!(hash)
-      curies = {}
-      find_curies(hash).each do |curie|
-        name = curie[:name]
-        curies[name] = curie
-      end
+    def move_curies_to_root!(hash)
+      return if Hash(hash).empty?
 
-      return if curies.empty?
+      curie_collection = CurieCollection.extract_from!(hash)
+      return if curie_collection.empty?
 
       hash[:_links] ||= {}
-      hash[:_links][:curies] = curies.values
+      hash[:_links][:curies] = curie_collection.to_a
     end
 
-    def find_curies(hash)
-      return [] if Hash(hash).empty?
-
-      curies = hash[:_links].delete(:curies) if hash.key? :_links
-      curies ||= []
-
-      hash.fetch(:_embedded, {}).values.each do |embedded|
-        collection = embedded.is_a?(Array) ? embedded : [embedded]
-        collection.each { |resrc| curies += find_curies(resrc) }
-      end
-
-      curies
-    end
 
     def run_post_serialize_hook!(resource, options, serialized)
       hook = post_serialize_hook
@@ -131,7 +132,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
@@ -139,9 +140,19 @@ 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 if policy && !policy.link?(link.rel)
-        hash.merge! link.to_h(resource, options)
+        rel = link.rel
+        next unless link.nested_depth_ok? options[:_depth]
+        next if policy && !policy.link?(rel)
+
+        link_hash = link.to_h(resource, options)
+        next if link_hash.empty?
+
+        if hash.key? rel
+          hash[rel] = [hash[rel]] unless hash[rel].is_a? Array
+          hash[rel] << link_hash
+        else
+          hash.merge!(rel => link_hash)
+        end
       end
       curies = _serialize_curies(curies, resource, options)
       serialized[:curies] = curies if curies.any?
@@ -151,7 +162,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
@@ -159,17 +170,18 @@ 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
-        options[:_depth] += 1
+        embed_options = options.dup
+        embed_options[:_depth] += 1
         hash[embed.name] = 
           if resource.is_a? Array
-            _serialize_embedded_collection(resource, presenter, options)
+            _serialize_embedded_collection(resource, presenter, embed_options)
           else
             presenter ||= HALPresenter.lookup_presenter(resource)
-            presenter.to_hash(resource, options)
+            presenter.to_hash(resource, embed_options)
           end
       end
       return {} if serialized.empty?
@@ -195,10 +207,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.2.1
+  version: 1.6.0
 platform: ruby
 authors:
 - Sammy Henningsson
@@ -10,27 +10,26 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDXjCCAkagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFzYW1t
-  eS5oZW5uaW5nc3Nvbi9EQz1nbWFpbC9EQz1jb20wHhcNMTgwNzE2MTYzNTMzWhcN
-  MjAwNzE2MTYzNTMzWjAsMSowKAYDVQQDDCFzYW1teS5oZW5uaW5nc3Nvbi9EQz1n
-  bWFpbC9EQz1jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvkgwt
-  Zn8obnCelWttayB1BrHBLUK3b8gasRRtbNk4DzAL+EW6sHSVT2u5I7Wws7JQA5VB
-  NaK7tgvq3CbDLVRl9NrpDCDx09To08stPxDKi6kst1nkSPAD8g0sQlW3voeQTH98
-  2Z2H3XUegHhu5Z9PU9T/7V/vZUzHPiPg1tX1JUIGOPAjVGsr7SUetbL171zK4S4Y
-  tvUkIoNaph+maHttvyYB/ptiZLD53WORKd4Knw3OiJsLtrxr5hhKyQ+txQdF0P8G
-  +FlR+Je7B0Ek3yg6fEiJgrdcajYCMo8Oe/GRtoHhi6J3LsYA620P1BSCddZQ2XeL
-  y3rzIZyMU0iaT69nAgMBAAGjgYowgYcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
-  HQYDVR0OBBYEFLpI49QndnmuiDhwy2XtMps7No1pMCYGA1UdEQQfMB2BG3NhbW15
-  Lmhlbm5pbmdzc29uQGdtYWlsLmNvbTAmBgNVHRIEHzAdgRtzYW1teS5oZW5uaW5n
-  c3NvbkBnbWFpbC5jb20wDQYJKoZIhvcNAQELBQADggEBAFJZqH6sgeiTLvMLpxaK
-  K1GaYSCyZbMutf5C3tIAgkmU5UD6B8R0bw6gTM1deM5NJ60LjzqY7rlK3YKDIbTn
-  iXMCe9vd4yE/jb5Zi8Wk//9n8CMG68dQpBvmcQ58/M4gTtgsx+lIgXuI5dPQMmRi
-  bhWQqqWqxT9X6njjfXFk4xn3z6mfFQNPAYqRVeTHUpXBQZPt+bYXRwHPFZGWkx4l
-  BnuuhYKt3CR7YIgvnsQWlTAcU1Ipdayj6UfYqUtlc6cF3CL96NOx7mgZXV8URFiX
-  ZMhjYR7sRczGJx+GxGU2EaR0bjRsPVlC4ywtFxoOfRG3WaJcpWGEoAoMJX6Z0bRv
-  M40=
+  MIIDVjCCAj6gAwIBAgIBATANBgkqhkiG9w0BAQsFADAqMSgwJgYDVQQDDB9zYW1t
+  eS5oZW5uaW5nc3Nvbi9EQz1oZXkvREM9Y29tMB4XDTIwMDgwNDE4MTAyOVoXDTIx
+  MDgwNDE4MTAyOVowKjEoMCYGA1UEAwwfc2FtbXkuaGVubmluZ3Nzb24vREM9aGV5
+  L0RDPWNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK+SDC1mfyhu
+  cJ6Va21rIHUGscEtQrdvyBqxFG1s2TgPMAv4RbqwdJVPa7kjtbCzslADlUE1oru2
+  C+rcJsMtVGX02ukMIPHT1OjTyy0/EMqLqSy3WeRI8APyDSxCVbe+h5BMf3zZnYfd
+  dR6AeG7ln09T1P/tX+9lTMc+I+DW1fUlQgY48CNUayvtJR61svXvXMrhLhi29SQi
+  g1qmH6Zoe22/JgH+m2JksPndY5Ep3gqfDc6Imwu2vGvmGErJD63FB0XQ/wb4WVH4
+  l7sHQSTfKDp8SImCt1xqNgIyjw578ZG2geGLoncuxgDrbQ/UFIJ11lDZd4vLevMh
+  nIxTSJpPr2cCAwEAAaOBhjCBgzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNV
+  HQ4EFgQUukjj1Cd2ea6IOHDLZe0ymzs2jWkwJAYDVR0RBB0wG4EZc2FtbXkuaGVu
+  bmluZ3Nzb25AaGV5LmNvbTAkBgNVHRIEHTAbgRlzYW1teS5oZW5uaW5nc3NvbkBo
+  ZXkuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQAEtv48barHOksR+CEF+Nu5ZjzXksi0
+  rI2JMmuDTlQBw0/m79+Om1cPzBKKR7ODGytjQ7NAj9VWQcw8Oc/K4z63JbD13G3Y
+  45/GTTCCae5YyO/g8BpkFeFwZTvJBwD1HQvMBjBi8WMk+Yr00EUoiLExuL0VSjJ9
+  grmwk+vA+68PWAkYOAkNOonQ6nT3UgmbK9XGoINSxHwn1Njxyw0dXsuZeaznJzhy
+  D4OCgJwXzne+Jeqc60ISM5a6/eFZGVyfI15X2fnxXXVrGu3EMnrgKuHxTNUfjaBL
+  Xs+28o/7SxG1CNyMq1HAmDvUPP3bMyzXTtVr61Kd2uyS1StS5s9XFedR
   -----END CERTIFICATE-----
-date: 2019-08-31 00:00:00.000000000 Z
+date: 2020-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -155,7 +154,7 @@ dependencies:
 description: |
   A DSL for serializing resources according to
   HypertextApplicationLanguage.
-email: sammy.henningsson@gmail.com
+email: sammy.henningsson@hey.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -163,6 +162,7 @@ files:
 - lib/hal_presenter.rb
 - lib/hal_presenter/attributes.rb
 - lib/hal_presenter/collection.rb
+- lib/hal_presenter/curie_collection.rb
 - lib/hal_presenter/curies.rb
 - lib/hal_presenter/deserializer.rb
 - lib/hal_presenter/embedded.rb
@@ -173,6 +173,7 @@ files:
 - lib/hal_presenter/pagination.rb
 - lib/hal_presenter/policy.rb
 - lib/hal_presenter/policy/dsl.rb
+- lib/hal_presenter/policy/rules.rb
 - lib/hal_presenter/profile.rb
 - lib/hal_presenter/property.rb
 - lib/hal_presenter/serialize_hooks.rb
@@ -197,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: JSON HAL serializer