hal_decorator 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fdb9a14bc7ef54528db8017406dd28708f6543b
-  data.tar.gz: 3daea7984ca3962708d013f493c5f913a6308551
+  metadata.gz: 2897e8bc0d974babfc03d1461b90ae41c9e082a7
+  data.tar.gz: d2205bd5adc36fb326f2e90571e5f7b5ea02fd2b
 SHA512:
-  metadata.gz: e572bb50f4e82435f9760cb19cfcece75f68810ae2d517c83a6e8876751918d822cae1d90f9e5b0371ca9ab12c89ea9f2f6b3b687a59112763b02a2459a0cebb
-  data.tar.gz: d891bc22668258cc50a0e0863338245ed9d24c4e9e73dd4948a9752e31b972731043e22c9b4f5eeba9282d586f1d4061c4eaf1fb84fd9a53227b0a479be2c2c2
+  metadata.gz: 78f1ff66a8dee4282b2286cb7fdb96d56d48a498eb43f00d1606b8362d7d5597d58ce6eddf82fd8f2d513865fc1a969c01588cced3855c962c764ec3e97c76e9
+  data.tar.gz: 22b1031407abe3fc434add985e476c1d7281f56884e22162325694b052f8e7d48184e879fac68654da845c1c405f212d8c4bfd5e7b3ac591587e74dddf2f21c7

data/lib/hal_decorator/attributes.rb

@@ -7,6 +7,8 @@ module HALDecorator
       @_attributes << Property.new(*args, &block)
     end
 
+    protected
+
     def attributes
       @_attributes ||= []
       @_attributes.dup

data/lib/hal_decorator/collection.rb

@@ -14,7 +14,7 @@ module HALDecorator
 
       def initialize(name, &block)
         @name = name
-        instance_exec(&block)
+        instance_exec(&block) if block_given?
       end
     end
 
@@ -22,6 +22,8 @@ module HALDecorator
       @_parameters = CollectionParameters.new(of, &block)
     end
 
+    protected
+
     def collection_parameters
       @_parameters ||= nil
     end

data/lib/hal_decorator/curies.rb

@@ -10,6 +10,8 @@ module HALDecorator
       @_curies << Property.new(rel, value, &block)
     end
 
+    protected
+
     def curies
       @_curies ||= []
       @_curies.dup

data/lib/hal_decorator/deserializer.rb

@@ -7,6 +7,7 @@ module HALDecorator
     class Error < StandardError; end
 
     def from_hal(payload, resource = nil)
+      return if payload.nil? || payload.empty?
       hash = JSON.parse(payload)
       from_hash(hash, resource)
     end
@@ -37,7 +38,7 @@ module HALDecorator
       attributes.each do |attribute|
         setter_method = setter_method_name(attribute.name)
         next unless resource.respond_to? setter_method
-        resource.send(setter_method, hash[attribute.name.to_s])
+        resource.public_send(setter_method, hash[attribute.name.to_s])
       end
     end
 
@@ -50,14 +51,14 @@ module HALDecorator
         embedded_hash = hash.dig('_embedded', embed.name.to_s)
         next unless embedded_hash&.any?
 
-        embedded_resource = resource.send(embed.name)
+        embedded_resource = resource.public_send(embed.name)
         embedded_resource = 
           if embedded_hash.is_a? Array
             embedded_hash.map { |h| decorator.from_hash(h, embedded_resource) }
           else
             decorator.from_hash(embedded_hash, embedded_resource)
           end
-        resource.send(setter_method, embedded_resource)
+        resource.public_send(setter_method, embedded_resource)
       end
     end
 

data/lib/hal_decorator/embedded.rb

@@ -16,6 +16,8 @@ module HALDecorator
       @_embedded << Embed.new(*args, &block)
     end
 
+    protected
+
     def embedded
       @_embedded ||= []
       @_embedded.dup

data/lib/hal_decorator/links.rb

@@ -19,6 +19,8 @@ module HALDecorator
       @_links << Link.new(rel, value, http_method: method || methods, &block)
     end
 
+    protected
+
     def links
       @_links ||= []
       @_links.dup

data/lib/hal_decorator/property.rb

@@ -29,8 +29,8 @@ module HALDecorator
 
     def method_missing(method, *args, &block)
       if @scope&.respond_to? method
-        define_singleton_method(method) { |*a, &b| @scope.send method, *a, &b }
-        return send(method, *args, &block)
+        define_singleton_method(method) { |*a, &b| @scope.public_send method, *a, &b }
+        return public_send(method, *args, &block)
       end
       super
     end

data/lib/hal_decorator/serializer.rb

@@ -6,20 +6,12 @@ module HALDecorator
 
     class Error < StandardError; end
 
-    def to_hal(resource, options = {})
+    def to_hal(resource = nil, options = {})
       hash = to_hash(resource, options)
       JSON.generate(hash)
     end
 
-    def to_hash(object, options, embed: true)
-      {}.tap do |serialized|
-        serialized.merge! serialize_attributes(object, options)
-        serialized.merge! serialize_links(object, options)
-        serialized.merge! serialize_embedded(object, options) if embed
-      end
-    end
-
-    def to_collection(resources, options = {})
+    def to_collection(resources = [], options = {})
       parameters = collection_parameters
       if parameters.nil?
         raise Error,
@@ -31,15 +23,21 @@ module HALDecorator
       serialized = _serialize_attributes(parameters.attributes, resources, options)
       serialized.merge! _serialize_links(links, curies, resources, options)
 
-      serialized_resources = resources.map do |resource|
-        to_hash(resource, embed: false)
-      end
+      serialized_resources = resources.map { |resource| to_hash(resource, options) }
       serialized[:_embedded] = { parameters.name => serialized_resources }
       JSON.generate(serialized)
     end
 
     protected
 
+    def to_hash(object, options)
+      {}.tap do |serialized|
+        serialized.merge! serialize_attributes(object, options)
+        serialized.merge! serialize_links(object, options)
+        serialized.merge! serialize_embedded(object, options)
+      end
+    end
+
     def serialize_attributes(object, options)
       _serialize_attributes(attributes, object, options)
     end
@@ -95,11 +93,11 @@ module HALDecorator
           if resource.respond_to? :each
             decorator ||= HALDecorator.lookup_decorator(resource.first).first
             resource.map do |resrc|
-              decorator.to_hash(resrc, options, embed: false)
+              decorator.to_hash(resrc, options)
             end
           else
             decorator ||= HALDecorator.lookup_decorator(resource).first
-            decorator.to_hash(resource, options, embed: false)
+            decorator.to_hash(resource, options)
           end
       end
       return {} if serialized.empty?

data.tar.gz.sig

@@ -1 +1,2 @@
-���Ts��
��A����V�����pH*.�\n��)�]�c������6԰̾H��z��5yהcEp@�HN*أ�n�;_x��?A����?y(:"�֦��c�c��ŗ��4�C��>FJ� �*ɝk�m)F�.ӌw(B�ӯ �v���PK
+����wB�I8�������"t^�uc�=,���������Z�F�#�$L��*���%�e��k�†�X������ƥŪ��	�3���N�. V7�\���	F��ӏ�����P��jv#.n1H��l2@p��Y��$)4�I3��G��Q�d��>�|��*���$8h�}&5oO�Z��K������	*�ɐ�a?�*��=�P�[�:[�o
+���܊���̜�Ш������MVj#�TA�

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hal_decorator
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Sammy Henningsson