hal_presenter 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 306b8de363e5da5cb14c573bf44e7c6cceefd0d0a050dba2a859da94429722aa
-  data.tar.gz: 42d74e04e03c0b4705023385e3bd9ddff1d3d70f638536f40143a3ab47c30e56
+  metadata.gz: 403e79978e056d4f350ac5ec339bb1db0c3b080ff5a1cc53767c807ecddea490
+  data.tar.gz: c1910ed9afb1976f13f988a0732ce785343bd1b12ccc3ca3ea164402a09420c5
 SHA512:
-  metadata.gz: 44aa0f45829620c8d2b26283503b0906df6201d0d9ec7f38b692c02aabb4a3418c953d0ca4385f112650bd88fa7b654a8f11a7731feab332f45e35fd71042515
-  data.tar.gz: 82d4afdb641c4299cb9e7c56c18b3ef6b3c7e01234e10f230e0a77d0ae15966c855460774ffd3d2754de763dae00cfd10215842086d6ee7c6b7127dc91e09cbc
+  metadata.gz: 0da13bd2e8c5c6809ddd5e61f0774473ff556ef9b8ab58890d5609d808717ef458b01e85a93af1f964789800496d0e6aab119c8b355a262c32ad2485f691f34a
+  data.tar.gz: af582f322a79eb338153e2ddf914b22f33304aea63e93cc53d603f6da0e2391acaeb1ab71708f1c77e7dc5ca9f3703787f054b55a8c5c46a3a3545c4424c768f

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

@@ -24,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
@@ -66,6 +66,12 @@ module HALPresenter
       end
 
       kwargs[:context] ||= self
+      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/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
 

data/lib/hal_presenter/serializer.rb

@@ -5,19 +5,19 @@ require 'hal_presenter/curie_collection'
 module HALPresenter
 
   module ClassMethods
-    def to_hal(resource, options = {})
+    def to_hal(resource, **options)
       options = options.dup
       presenter!(resource, options).to_hal(resource, options)
     end
 
-    def to_collection(resources, options = {})
+    def to_collection(resources, **options)
       options = options.dup
       presenter!(resources, options).to_collection(resources, options)
     end
 
     private
 
-    def presenter!(resources, options = {})
+    def presenter!(resources, **options)
       raise Serializer::Error, "resources is nil" if resources.nil?
       presenter = options.delete(:presenter)
       presenter ||= HALPresenter.lookup_presenter(resources)
@@ -35,7 +35,7 @@ module HALPresenter
       base.extend(ClassMethods)
     end
 
-    def to_hal(resource = nil, options = {})
+    def to_hal(resource = nil, **options)
       options = options.dup
       options[:_depth] ||= 0
       hash = to_hash(resource, options)
@@ -45,7 +45,7 @@ module HALPresenter
       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. " \

metadata

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

metadata.gz.sig

@@ -1 +1,2 @@
-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
+-�$����aH����%�d?%�ӏ�Q���_��u�"��s�8��b�1�c�+:=�[v�8x��Ӏ�[#W�Q�^Od_MUS�`���j�{x�˙��Jܺj>�X�qP�`��ۄ�Nu�r�'_�x �/�=��A��օ�D�Ô�y>嫳�"Aܨ���@���W�������0���
+�AӲ���<(�d�����.��~��Q@��ؘC9���T�TI)�s�ҩ���F�\