conglomerate 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 299095559c8ba18987524ef7e2702c2f2ad341b6
-  data.tar.gz: 65a914ac9c9c2a31086c39d1577685347339b568
+  metadata.gz: 62beba0ffa576fd7850b3956e291803ab65df121
+  data.tar.gz: e23e631bacf3d357ad45e3e883a9418560a273ae
 SHA512:
-  metadata.gz: 2374f028927ee394aabeb148a0513c9dd2b1a59e9cd3c68a926c98c9bd1b12391ad13d19c39eccabdc7cf9e56dd446c9c0f1a31dbe2451bd2d430a348f0efa1d
-  data.tar.gz: 9a7c73782ab8de2f30131cc60f5449941159b3168b5c228e1af4810f12a49372cd18265e7a3170712c592bd0b288f6324bb0eb45c8fb3d76cdb180f482c57a18
+  metadata.gz: fbd8143ba303ec112d94cdd5a108f9a066b6d869677e1516bea0ba308a43f82c6b68398252163c61bc34091a25526974f1b0dec833e38067872cbb67a32059e4
+  data.tar.gz: 0fe8a51f3556c1c865825c3f575a2a0506e991b66d6fd3de889b60181469a08c5775a0472471e971a8a9cda9e4a2f42a9ae88702ab874e80e106a89f9f028018

data/README.md

@@ -1,7 +1,8 @@
 # Conglomerate
 
-[![Gem Version](https://badge.fury.io/rb/conglomerate.png)](http://badge.fury.io/rb/conglomerate)
 [ ![Codeship Status for teamsnap/conglomerate](https://www.codeship.io/projects/7210a3f0-de00-0131-af05-5236ebb52643/status)](https://www.codeship.io/projects/24758)
+
+[![Gem Version](https://badge.fury.io/rb/conglomerate.png)](http://badge.fury.io/rb/conglomerate)
 [![Code Climate](https://codeclimate.com/github/teamsnap/conglomerate.png)](https://codeclimate.com/github/teamsnap/conglomerate)
 [![Coverage Status](https://coveralls.io/repos/teamsnap/conglomerate/badge.png?branch=master)](https://coveralls.io/r/teamsnap/conglomerate?branch=master)
 [![Dependency Status](https://gemnasium.com/teamsnap/conglomerate.png)](https://gemnasium.com/teamsnap/conglomerate)
@@ -35,28 +36,30 @@ Or install it yourself as:
 ```ruby
 # Step 1: Create a serializer
 class TeamSerializer
-  include Conglomerate::RootBuilder
+  include Conglomerate::RootBuilder.serializer
 
-  href { teams_url }
+  collection do
+    href { teams_url }
 
-  item "Team" do |item|
-    href { team_url(item.id) }
+    item "Team" do |item|
+      href { team_url(item.id) }
 
-    datum :id
-    datum :name
-    datum :event_ids
+      datum :id
+      datum :name
+      datum :event_ids
 
-    link :events, :href => Proc.new { event_url(item.event_ids.join(",")) }
-  end
+      link :events, :href => Proc.new { event_url(item.event_ids.join(",")) }
+    end
 
-  link :root, :href => Proc.new { root_url }
+    link :root, :href => Proc.new { root_url }
 
-  query :search, :href => Proc.new { search_items_url } do
-    datum :id
-  end
+    query :search, :href => Proc.new { search_items_url } do
+      datum :id
+    end
 
-  template do
-    datum :name
+    template do
+      datum :name
+    end
   end
 end
 

data/lib/conglomerate/serializer.rb

@@ -193,17 +193,13 @@ module Conglomerate
     end
 
     def sanitize_value(object, name:, type: :value, default_value: nil)
-      if blank?(object) || blank?(object.send(name))
+      if object.nil? || object.send(name).nil?
         if type == :array
           []
         elsif type == :object
           {}
         else
-          if present?(object) && object.send(name) == false
-            false
-          else
-            default_value
-          end
+          default_value
         end
       else
         object.send(name)

data/lib/conglomerate/version.rb

@@ -1,3 +1,3 @@
 module Conglomerate
-  VERSION = "0.11.0"
+  VERSION = "0.11.1"
 end

data/spec/particle_builder_spec.rb

@@ -58,7 +58,7 @@ class ConglomerateNullParticleSerializer
 end
 
 describe Conglomerate do
-  let(:object) do
+  let(:object1) do
     double(
       "Object",
       :id => 1,
@@ -74,6 +74,22 @@ describe Conglomerate do
     )
   end
 
+  let(:object2) do
+    double(
+      "Object",
+      :id => 2,
+      :description => "Tasty Pizza",
+      :event_date_time => DateTime.parse("1982-01-22T10:00:00+00:00"),
+      :event_date => Date.parse("1981-01-22"),
+      :event_time => Time.parse("1981-01-22T10:00:00+00:00"),
+      :event_id => 3,
+      :roster_id => nil,
+      :team_ids => [3,4],
+      :user_ids => [],
+      :is_available => true
+    )
+  end
+
   let(:context) do
     request = double("Request", :original_url => "https://example.com/items")
     double(
@@ -85,32 +101,48 @@ describe Conglomerate do
       allow(context).to receive(:item_url).with(1) {
         "https://example.com/items/1"
       }
+      allow(context).to receive(:item_url).with(2) {
+        "https://example.com/items/2"
+      }
       allow(context).to receive(:event_url).with(2) {
         "https://example.com/events/2"
       }
+      allow(context).to receive(:event_url).with(3) {
+        "https://example.com/events/3"
+      }
       allow(context).to receive(:events_url) {
         "https://example.com/events"
       }
       allow(context).to receive(:team_url).with("1,2") {
         "https://example.com/teams/1,2"
       }
+      allow(context).to receive(:team_url).with("3,4") {
+        "https://example.com/teams/3,4"
+      }
       allow(context).to receive(:test_url) { "abc" }
       allow(context).to receive(:users_search_url).with(:object_id => 1) {
         "def"
       }
+      allow(context).to receive(:users_search_url).with(:object_id => 2) {
+        "ghi"
+      }
     end
   end
 
   let(:test_serializer) do
-    ConglomerateTestParticleSerializer.new(object, :context => context).serialize
+    ConglomerateTestParticleSerializer.new(object1, :context => context).serialize
   end
 
   let(:extra_test_serializer) do
-    ConglomerateExtraTestParticleSerializer.new(object, :context => context).serialize
+    ConglomerateExtraTestParticleSerializer.new(object1, :context => context).serialize
   end
 
   let(:null_serializer) do
-    ConglomerateNullParticleSerializer.new(object, :context => context).serialize
+    ConglomerateNullParticleSerializer.new(object1, :context => context).serialize
+  end
+
+  let(:multi_test_serializer) do
+    ConglomerateTestParticleSerializer.new([object1, object2], :context => context).serialize
   end
 
   let(:test_collection) { test_serializer["collection"] }
@@ -119,6 +151,8 @@ describe Conglomerate do
 
   let(:null_collection) { null_serializer["collection"] }
 
+  let(:multi_test_collection) { multi_test_serializer["collection"] }
+
   describe "#version" do
     it "sets version to 1.0" do
       expect(null_collection["version"]).to eq("1.0")
@@ -164,8 +198,8 @@ describe Conglomerate do
 
       it "doesn't have an items array if items is empty" do
         test_serializer = ConglomerateTestParticleSerializer
-        .new(nil, :context => context)
-        .serialize
+          .new(nil, :context => context)
+          .serialize
         test_collection = test_serializer["collection"]
         expect(test_collection.keys).to_not include("items")
       end
@@ -207,6 +241,51 @@ describe Conglomerate do
           ]
         )
       end
+
+      it "correctly handles multiple items" do
+        expect(multi_test_collection["items"]).to eq(
+          [
+            {
+              "href" => "https://example.com/items/1",
+              "data" => [
+                {"name" => "description", "value" => "Tasty Burgers", "prompt" => "awesome"},
+                {"name" => "id", "value" => 1},
+                {"name" => "event_id", "value" => 2},
+                {"name" => "roster_id", "value" => nil},
+                {"name" => "team_ids", "value" => [1,2]},
+                {"name" => "event_date_time", "value" => "1981-11-28T10:00:00Z"},
+                {"name" => "event_date", "value" => "1981-11-28"},
+                {"name" => "event_time", "value" => "1981-11-28T10:00:00Z"},
+                {"name" => "is_available", "value" => false}
+              ],
+              "links" => [
+                {"href" => "https://example.com/events/2", "rel" => "event"},
+                {"href" => "https://example.com/teams/1,2", "rel" => "teams"},
+                {"href" => "def", "rel" => "users"}
+              ]
+            },
+            {
+              "href" => "https://example.com/items/2",
+              "data" => [
+                {"name" => "description", "value" => "Tasty Pizza", "prompt" => "awesome"},
+                {"name" => "id", "value" => 2},
+                {"name" => "event_id", "value" => 3},
+                {"name" => "roster_id", "value" => nil},
+                {"name" => "team_ids", "value" => [3,4]},
+                {"name" => "event_date_time", "value" => "1981-01-22T10:00:00Z"},
+                {"name" => "event_date", "value" => "1981-01-22"},
+                {"name" => "event_time", "value" => "1981-01-22T10:00:00Z"},
+                {"name" => "is_available", "value" => true}
+              ],
+              "links" => [
+                {"href" => "https://example.com/events/3", "rel" => "event"},
+                {"href" => "https://example.com/teams/3,4", "rel" => "teams"},
+                {"href" => "ghi", "rel" => "users"}
+              ]
+            }
+          ]
+        )
+      end
     end
 
     context "template" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conglomerate
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Shane Emmons
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-28 00:00:00.000000000 Z
+date: 2014-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler