hal_presenter 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0dc504f92084015f773cf97fb82e35f1e969cce9d994190ea193b9966d7fade
-  data.tar.gz: e7dc11b0623948a02dd51e5f9fccfd912c49d26c5616ce4d61da2a656e6cc330
+  metadata.gz: 306b8de363e5da5cb14c573bf44e7c6cceefd0d0a050dba2a859da94429722aa
+  data.tar.gz: 42d74e04e03c0b4705023385e3bd9ddff1d3d70f638536f40143a3ab47c30e56
 SHA512:
-  metadata.gz: 13dc22af8b63f4bb7c369ebcbecfcbe81df0cd88e534cd4b95bf57f337a19a359dc8a41f8df80377e8cd24e01e02b66803f209959ed304e4cdfdfd4e8cd2cbab
-  data.tar.gz: fe8e9d146fd80980fadd22856b38467e2f2f428cd6ad00837a4bc945fe12de00e22920959a2e353ede236bd8681fb3d8ad304b4bf49e0a7cd45b0163ad10a6b7
+  metadata.gz: 44aa0f45829620c8d2b26283503b0906df6201d0d9ec7f38b692c02aabb4a3418c953d0ca4385f112650bd88fa7b654a8f11a7731feab332f45e35fd71042515
+  data.tar.gz: 82d4afdb641c4299cb9e7c56c18b3ef6b3c7e01234e10f230e0a77d0ae15966c855460774ffd3d2754de763dae00cfd10215842086d6ee7c6b7127dc91e09cbc

data/lib/hal_presenter/links.rb

@@ -46,15 +46,13 @@ 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
 
@@ -68,7 +66,6 @@ module HALPresenter
       end
 
       kwargs[:context] ||= self
-      links.delete_if { |link| link.rel == rel }
       Link.new(rel, value, **kwargs, &block).tap do |link|
         links << link
       end

data/lib/hal_presenter/serializer.rb

@@ -6,21 +6,24 @@ 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)
+      presenter!(resource, options).to_hal(resource, options)
     end
 
     def to_collection(resources, options = {})
-      raise Serializer::Error, "resources is nil" if resources.nil?
       options = options.dup
+      presenter!(resources, options).to_collection(resources, options)
+    end
+
+    private
+
+    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.to_collection(resources, options)
+
+      presenter
     end
   end
 
@@ -37,6 +40,8 @@ module HALPresenter
       options[:_depth] ||= 0
       hash = to_hash(resource, options)
       move_curies_to_root! hash
+      return hash if options[:as_hash]
+
       JSON.generate(hash)
     end
 
@@ -51,6 +56,8 @@ module HALPresenter
       options[:_depth] ||= 0
       hash = to_collection_hash(resources, options)
       move_curies_to_root! hash
+      return hash if options[:as_hash]
+
       JSON.generate(hash)
     end
 
@@ -133,9 +140,19 @@ module HALPresenter
 
     def _serialize_links(links, curies, resource, policy, options)
       serialized = links.each_with_object({}) do |link, hash|
+        rel = link.rel
         next unless link.nested_depth_ok? options[:_depth]
-        next if policy && !policy.link?(link.rel)
-        hash.merge! link.to_h(resource, options)
+        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?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hal_presenter
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Sammy Henningsson
@@ -30,7 +30,7 @@ cert_chain:
   ZMhjYR7sRczGJx+GxGU2EaR0bjRsPVlC4ywtFxoOfRG3WaJcpWGEoAoMJX6Z0bRv
   M40=
   -----END CERTIFICATE-----
-date: 2019-12-18 00:00:00.000000000 Z
+date: 2020-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake

metadata.gz.sig

@@ -1,2 +1 @@
-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�;�~
+L�oHk�O��_�Jƹ�Ȟ���1U�X��j9Q��lrı6z��eX&���UF���lR��}Am5��@����`!0n�9O_���/}l"Y��>+��a;���v��	˂���f��S���7�<��r���p��4�n�3�"쵺
�a�K��]��u�G&���n���5��:�Q#l�"���,>e�HTކHX@%g�F�Jt�>��N�M٩��*_)���M8P�dlQ�}߉�Pa�"%�v