conglomerate 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9da3788aca18b7373349738518eb060890f2bc0b
-  data.tar.gz: 13ce8616d35fa4e79621b924bc58d3444cbd0fcb
+  metadata.gz: f4fc3f553eb19fcaae033b0e4f282b90a02ebe76
+  data.tar.gz: d103df8833f9900ed1b563a83899b8986bd1ac22
 SHA512:
-  metadata.gz: b82efadf83f9b16cb46617c81995e7e5b1df6e9706c08406aa0c33e0a2d45b9a10cb5fe2bfca3d62606409743da4ce329b1869ccf53f4cb0dd2e35f12673832c
-  data.tar.gz: 2647c169ae848cc2a0bfdd319b35e1dd2db0c30a2929ee1107f0a7e9bb9dec3b480fb35a9f8c63a740bb584859bf14ccd5fd25fc320659b7dacf3dbaaf0c1d53
+  metadata.gz: b70a06cf3cf2d5c9ddcb0f7be710070999933c577a50e4d15b0b235bdfe1025d1cc55c0d6e8260af40e51d6667e94438386bf5bd91702ff13aebe04e3f4cbcf4
+  data.tar.gz: 6200528508229a70be96a79f75d93120ce349b3a209bf5129a2f238cc6a8e4b1ba7dfa6f1f744328ef485da73eddc23a832a7e9bac8f4277bebe830b049fbba2

data/lib/conglomerate/serializer.rb

@@ -41,12 +41,15 @@ module Conglomerate
       end
     end
 
-    def apply_data(collection, data: [], object: nil)
+    def apply_data(collection, data: [], object: nil, default_value: nil)
       data = data.map do |datum|
         name = datum[:name]
-        value = object.nil? ? "" : object.send(name)
+        type = datum.fetch(:type, :value)
+        value = sanitize_value(
+          object, :name => name, :type => type, :default_value => default_value
+        )
 
-        {"name" => name.to_s, datum.fetch(:type, "value").to_s => value}
+        {"name" => name.to_s, type.to_s => value}
       end
 
       if data.empty?
@@ -105,7 +108,9 @@ module Conglomerate
       if attrs.empty?
         collection
       else
-        collection.merge({"template" => apply_data({}, :data => attrs)})
+        collection.merge(
+          {"template" => apply_data({}, :data => attrs, :default_value => "")}
+        )
       end
     end
 
@@ -145,7 +150,7 @@ module Conglomerate
     def build_query(rel, data, block)
       query = {"rel" => rel.to_s}
       query = apply_href(query, :proc => block)
-      apply_data(query, :data => data)
+      apply_data(query, :data => data, :default_value => "")
     end
 
     def build_item_link(rel, proc: nil, object: nil)
@@ -153,6 +158,20 @@ module Conglomerate
       apply_href(link, :proc => proc, :object => object)
     end
 
+    def sanitize_value(object, name:, type: :value, default_value: nil)
+      if blank?(object) || blank?(object.send(name))
+        if type == :array
+          []
+        elsif type == :object
+          {}
+        else
+          default_value
+        end
+      else
+        object.send(name)
+      end
+    end
+
     def blank?(value)
       if value.is_a?(String)
         value !~ /[^[:space:]]/

data/lib/conglomerate/version.rb

@@ -1,3 +1,3 @@
 module Conglomerate
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/spec/conglomerate_spec.rb

@@ -18,7 +18,7 @@ class ConglomerateTestSerializer
   attribute :team_ids, :rel => :teams, :type => :array do |item|
     team_url(item.team_ids.join(","))
   end
-  attribute :user_ids, :rel => :users do |item|
+  attribute :user_ids, :rel => :users, :type => :array do |item|
     user_url(item.user_ids.join(","))
   end
 
@@ -157,7 +157,7 @@ describe Conglomerate do
                 {"name" => "event_id", "value" => 2},
                 {"name" => "roster_id", "value" => nil},
                 {"name" => "team_ids", "array" => [1,2]},
-                {"name" => "user_ids", "value" => []}
+                {"name" => "user_ids", "array" => []}
               ],
               "links" => [
                 {"rel" => "event", "href" => "https://example.com/events/2"},

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conglomerate
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Shane Emmons