conglomerate 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e38daf11ae81750e9556260e06001b9c8510a7d5
-  data.tar.gz: 0c7edf5b484cbd0d4c3d3953fef6ab1cbffda34f
+  metadata.gz: 39ff3bd7063846051708c677ab9f8c3c0ebe0d5d
+  data.tar.gz: 24433fc68163aebbbf567868edc05e807a07cf88
 SHA512:
-  metadata.gz: 97da55cdc7a6e5128d2317779d3e44a4339a7fc11e7d09c1e2d34cf56449778062adec8dc8ed5a1cfa838e78803ce3669626ab73efb705a3f55b74f5770c669c
-  data.tar.gz: 3a7d31e8647b1d367b8cebc6039dd1547d1fe03dad3fca2fd32f04e8521b10947eefc1db46310fa8a8b6d60f4ae62804418faba9755c4db284fd15a63b2fe879
+  metadata.gz: 2bf22794559d3319db96ffe11989ef093eed2f3402dcc435c645220663dabbb140c980e9eb938163baa4ab0f0cf695bcf3c3d7dc019e9c562c95c9a98c5ae8f6
+  data.tar.gz: a82de2fe1c7dd8e60cf911b32eb914a07ba258508af060407d86e1372183a583240b192cd66cc6379a16edcaaef026085e335a783e4f0396fd858bebe50da651

data/lib/conglomerate/serializer.rb

@@ -189,7 +189,7 @@ module Conglomerate
       attr_writer :_href, :_item_href, :_queries, :_attributes, :_links
 
       def _href
-        @_href || Proc.new { request.original_url }
+        @_href || Proc.new { raise ArgumentError, "You must include an href" }
       end
 
       def _item_href

data/lib/conglomerate/version.rb

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

data/spec/conglomerate_spec.rb

@@ -34,11 +34,18 @@ 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
@@ -89,12 +96,18 @@ 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")
@@ -107,8 +120,8 @@ describe Conglomerate do
       expect(test_collection["href"]).to eq("abc")
     end
 
-    it "uses 'request.original_url' if preset 'rails_current_url' used" do
-      expect(extra_test_collection["href"]).to eq("https://example.com/items")
+    it "errors if no href given" do
+      expect { invalid_collection["href"] }.to raise_error
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conglomerate
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Shane Emmons
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-31 00:00:00.000000000 Z
+date: 2014-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler