halva 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7540c00f3cbdde45eb5601db5fa7b21fd37da8c6f9f32a12d0f7b351a01c578
-  data.tar.gz: 858f12ed050776011ca688739717efe5ec31afc2a40940b256dfd52f0f7c15dd
+  metadata.gz: 80195ba0344ba27a745702df037112a4a99dd5dcf8b5a6efead8239695e45d65
+  data.tar.gz: a9ecef55da2bc12c3c3c87f81e866b598bfcc3c721c39951f44a9a13e753245b
 SHA512:
-  metadata.gz: a887b14fff4b717594cb14b43371f797ddbe2650753261a578f8eab78dd372f78b2cc9618aaed2c3214d69eda63d19b39acb60590a6c8a6353746c4dd2559028
-  data.tar.gz: 329b6db4147b2646d7f613bacce0202cf1211af44376e7479ff8f917600a8a29c36dfb3bf7ae66a887858b300e4dd16c2d78499457ba184aaed09e8f80167ea7
+  metadata.gz: 6a23c6fb22884252b2184fd5b2caef1e9f59fbdbae3066230586b72782b018868a5d19c8de049b4a1751fed301f6350871f0765b6cbbae9b3e236b087a452daa
+  data.tar.gz: 8662e1c3887fe0c23061fb33a21a8e059e7e39764be9282ec219bc53064db34a565394cdd04d461a11fe3e4eba8f0442924989a788ced5ebdca07278884459a6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    halva (0.2.0)
+    halva (0.3.0)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -33,10 +33,10 @@ require 'halva'
 
 order = Order.find(1)
 Halva::Resource.from_model(order)
-               .embed(Halva::Resource.from_model(order.customer).build, :customer)
+               .embed(Halva::Resource.from_model(order.customer), :customer)
                .link(Halva::Link.new('/orders/1', :self))
                .link(Halva::Link.new('/orders/1/customer', :customer))
-               .build
+               .to_h
 
 ```
 
@@ -47,11 +47,14 @@ require 'halva'
 
 orders = Order.find
 Halva::Resource.from_empty_model
-               .embed(orders.map { |order| Halva::Resource.from_model(order).build })
+               .embed(orders.map do |order|
+                 Halva::Resource.from_model(order)
+                                .link(Halva::Link.new("/orders/#{order.id}", :self))
+               end)
                .link(Halva::Link.new('/orders?page=3', :next))
                .link(Halva::Link.new('/orders?page=2', :self))
                .link(Halva::Link.new('/orders?page=1', :prev))
-               .build
+               .to_h
 
 ```
 

data/lib/halva/resource.rb

@@ -16,7 +16,7 @@ module Halva
     end
 
     def initialize(model)
-      @model = model
+      @model = model.freeze
       @embedded = []
       @links = []
     end
@@ -31,22 +31,28 @@ module Halva
       self
     end
 
-    def build
+    def to_h
+      document = @model.dup
       unless @embedded.empty?
-        @model[EMBEDDED_KEY] = {} unless @model.key?(EMBEDDED_KEY)
+        document[EMBEDDED_KEY] = {} unless document.key?(EMBEDDED_KEY)
         @embedded.each do |emb|
-          @model[EMBEDDED_KEY][emb[:relation]] = emb[:resource]
+          is_collection = emb[:resource].is_a?(Enumerable)
+          document[EMBEDDED_KEY][emb[:relation]] = if is_collection
+                                                     emb[:resource].map(&:to_h)
+                                                   else
+                                                     emb[:resource].to_h
+                                                   end
         end
       end
 
       unless @links.empty?
-        @model[LINKS_KEY] = {} unless @model.key?(LINKS_KEY)
+        document[LINKS_KEY] = {} unless document.key?(LINKS_KEY)
         @links.each do |link|
-          @model[LINKS_KEY][link.relation] = link.to_h
+          document[LINKS_KEY][link.relation] = link.to_h
         end
       end
 
-      @model.to_h
+      document
     end
   end
 end

data/lib/halva/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Halva
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: halva
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Denis Semenenko