halva 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 900e5a47a7c2ffcb2528799f258b4de9245358315dfb0c7cf5c211844bfe872b
-  data.tar.gz: 798b4bb53e9121a805f8e0acb963609c8626b2281e80c54098e76b037c6574b9
+  metadata.gz: 80195ba0344ba27a745702df037112a4a99dd5dcf8b5a6efead8239695e45d65
+  data.tar.gz: a9ecef55da2bc12c3c3c87f81e866b598bfcc3c721c39951f44a9a13e753245b
 SHA512:
-  metadata.gz: 447cd2a234cc0edc69b2404207731add3093e91527ffe2ce9ab34416e78fd7415f344d03cebfff9289411cc6af8f502d55bdef7dc95dd20773469f719ac0ecde
-  data.tar.gz: 6dde2bcef96c82921f98af028a0c6c78c47453e904f6dc9ad891cacaf001ab03100e8a43a28820c8deef92a00caa84872688526661899665005d873c6ff5f05f
+  metadata.gz: 6a23c6fb22884252b2184fd5b2caef1e9f59fbdbae3066230586b72782b018868a5d19c8de049b4a1751fed301f6350871f0765b6cbbae9b3e236b087a452daa
+  data.tar.gz: 8662e1c3887fe0c23061fb33a21a8e059e7e39764be9282ec219bc53064db34a565394cdd04d461a11fe3e4eba8f0442924989a788ced5ebdca07278884459a6

data/Gemfile.lock

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

data/README.md

@@ -29,25 +29,32 @@ Or install it yourself as:
 ### Representing an object
 
 ```ruby
+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
 
 ```
 
 ### Representing a collection
 
 ```ruby
+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.1.0'
+  VERSION = '0.3.0'
 end

data/lib/halva.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'halva/link'
+require 'halva/resource'
 require 'halva/version'
 
 module Halva

metadata

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