conglomerate 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39ff3bd7063846051708c677ab9f8c3c0ebe0d5d
-  data.tar.gz: 24433fc68163aebbbf567868edc05e807a07cf88
+  metadata.gz: 79cf2a21f974567cdf55b0a1e273292306c96140
+  data.tar.gz: 882941211d941acbd16c88eefb0e51c0fad474bc
 SHA512:
-  metadata.gz: 2bf22794559d3319db96ffe11989ef093eed2f3402dcc435c645220663dabbb140c980e9eb938163baa4ab0f0cf695bcf3c3d7dc019e9c562c95c9a98c5ae8f6
-  data.tar.gz: a82de2fe1c7dd8e60cf911b32eb914a07ba258508af060407d86e1372183a583240b192cd66cc6379a16edcaaef026085e335a783e4f0396fd858bebe50da651
+  metadata.gz: 57d389ee559e86c32166f58fc6efbcc9a23d57a5c3dbadca1318ef0735ae366f46cea65ddc2f62bbf97014ee5bc363c21b6a107a6118e8e25d30a12676d4903f
+  data.tar.gz: 568b17ac4a3c9bb36ec93aa8133926d6d42f39c0407351692eaa5b3a458682067fd7d5e514f337e74f350ec501a09c3db0fca35293ded8bf99a670ab2fe73226

data/lib/conglomerate/serializer.rb

@@ -30,10 +30,14 @@ module Conglomerate
     end
 
     def apply_href(collection, proc: self.class._href, object: nil)
-      if object
-        collection.merge({"href" => context.instance_exec(object, &proc)})
+      if proc
+        if object
+          collection.merge({"href" => context.instance_exec(object, &proc)})
+        else
+          collection.merge({"href" => context.instance_eval(&proc)})
+        end
       else
-        collection.merge({"href" => context.instance_eval(&proc)})
+        collection
       end
     end
 
@@ -189,7 +193,7 @@ module Conglomerate
       attr_writer :_href, :_item_href, :_queries, :_attributes, :_links
 
       def _href
-        @_href || Proc.new { raise ArgumentError, "You must include an href" }
+        @_href || nil
       end
 
       def _item_href

data/lib/conglomerate/version.rb

@@ -1,3 +1,3 @@
 module Conglomerate
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/conglomerate_spec.rb

@@ -34,18 +34,11 @@ end
 class ConglomerateExtraTestSerializer
   include Conglomerate.serializer
 
-  href { "" }
   attribute :id
 end
 
 class ConglomerateNullSerializer
   include Conglomerate.serializer
-
-  href { "" }
-end
-
-class ConglomerateInvalidSerializer
-  include Conglomerate.serializer
 end
 
 describe Conglomerate do
@@ -96,18 +89,12 @@ describe Conglomerate do
     ConglomerateNullSerializer.new(object, :context => context).serialize
   end
 
-  let(:invalid_serializer) do
-    ConglomerateInvalidSerializer.new(object, :context => context).serialize
-  end
-
   let(:test_collection) { test_serializer["collection"] }
 
   let(:extra_test_collection) { extra_test_serializer["collection"] }
 
   let(:null_collection) { null_serializer["collection"] }
 
-  let(:invalid_collection) { invalid_serializer["collection"] }
-
   describe "#version" do
     it "sets version to 1.0" do
       expect(null_collection["version"]).to eq("1.0")
@@ -120,8 +107,8 @@ describe Conglomerate do
       expect(test_collection["href"]).to eq("abc")
     end
 
-    it "errors if no href given" do
-      expect { invalid_collection["href"] }.to raise_error
+    it "isn't included if the href is nil" do
+      expect(null_collection["href"]).to be_nil
     end
   end
 

metadata

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