collection-json 0.1.0 → 0.1.1

data/README.md

@@ -18,20 +18,20 @@ collection = CollectionJSON.generate_for('/friends/') do |builder|
   builder.add_link '/friends/rss', 'feed'
   user.friends.each do |friend|
     builder.add_item("/friends/#{friend.id}") do |item|
-      item.add_data "full-name", {"value" => friend.full_name}
-      item.add_data "email", {"value" => friend.email}
-      item.add_link "/blogs/#{friend.id}", "blog", {"prompt" => "Blog"}
-      item.add_link "/blogs/#{friend.id}", "avatar", {"prompt" => "Avatar", "render" => "image"}
+      item.add_data "full-name", value: friend.full_name
+      item.add_data "email", value: friend.email
+      item.add_link "/blogs/#{friend.id}", "blog", prompt: "Blog"
+      item.add_link "/blogs/#{friend.id}", "avatar", prompt: "Avatar", render: "image"
     end
   end
-  builder.add_query("/friends/search", "search", {"prompt" => "Search"}) do |query|
+  builder.add_query("/friends/search", "search", prompt: "Search") do |query|
     query.add_data "search"
   end
   builder.set_template do |template|
-    template.add_data "full-name", {"prompt" => "Full Name"}
-    template.add_data "email", {"prompt" => "Email"}
-    template.add_data "blog", {"prompt" => "Blog"}
-    template.add_data "avatar", {"prompt" => "Avatar"}
+    template.add_data "full-name", prompt: "Full Name"
+    template.add_data "email", prompt: "Email"
+    template.add_data "blog", prompt: "Blog"
+    template.add_data "avatar", prompt: "Avatar"
   end
 end
 

data/lib/collection-json.rb

@@ -8,21 +8,12 @@ ROOT_NODE = 'collection'
 
 module CollectionJSON
   def self.generate_for(href, &block)
-    response = Collection.new
-    response.href href
-    if block_given?
-      builder = Builder.new(response)
-      yield(builder)
-    end
-
-    response
-  end
-
-  def self.add_host(href)
-    if ENV['COLLECTION_JSON_HOST'] && !href[/^http/]
-      ENV['COLLECTION_JSON_HOST'] + href
-    else
-      href
+    Collection.new.tap do |response|
+      response.href href
+      if block_given?
+        builder = Builder.new(response)
+        yield(builder)
+      end
     end
   end
 

data/lib/collection-json/attribute.rb

@@ -20,10 +20,10 @@ module CollectionJSON
             instance_variable_set(:"@#{name}", arg)
           end
         else
-          unless instance_variable_get(:"@#{name}").nil?
-             instance_variable_get(:"@#{name}")
+          if instance_variable_get(:"@#{name}").nil? && opts[:default]
+            instance_variable_set(:"@#{name}", opts[:default].dup)
            else
-            opts[:default]
+            instance_variable_get(:"@#{name}")
           end
         end
       end

data/lib/collection-json/attributes/collection.rb

@@ -20,6 +20,6 @@ module CollectionJSON
               transform:  lambda { |queries| queries.each.map { |q| Query.from_hash(q) }},
               default:    []
     attribute :template, transform: lambda { |template| Template.from_hash(template) }
-    attribute :error, transform: lambda { |template| Error.from_hash(template) }
+    attribute :error, transform: lambda { |error| Error.from_hash(error) }
   end
 end

data/lib/collection-json/builder.rb

@@ -1,23 +1,21 @@
 module CollectionJSON
   class Builder
-    attr_reader :collection
-
     def initialize(collection)
       @collection = collection
     end
 
     def set_error(params = {})
-      collection.error = params
+      @collection.error = params
     end
 
     def add_link(href, rel, params = {})
       params.merge!({'rel' => rel, 'href' => href})
-      collection.links << Link.from_hash(params)
+      @collection.links << Link.from_hash(params)
     end
 
     def add_item(href, params = {}, &block)
       params.merge!({'href' => href})
-      collection.items << Item.from_hash(params).tap do |item|
+      @collection.items << Item.from_hash(params).tap do |item|
         if block_given?
           data = []
           links = []
@@ -31,7 +29,7 @@ module CollectionJSON
 
     def add_query(href, rel, params = {}, &block)
       params.merge!({'href' => href, 'rel' => rel})
-      collection.queries << Query.from_hash(params).tap do |query|
+      @collection.queries << Query.from_hash(params).tap do |query|
         data = []
         query_builder = QueryBuilder.new(data)
         yield(query_builder) if block_given?
@@ -46,7 +44,7 @@ module CollectionJSON
         yield(template_builder) 
         params.merge!({'data' => data})
       end
-      collection.template params
+      @collection.template params
     end
   end
 

data/lib/collection-json/version.rb

@@ -1,3 +1,3 @@
 module CollectionJSON
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/collection-json/transformers/uri_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+require 'collection-json/transformers/uri'
+
+describe CollectionJSON::URI do
+  before :each do
+    @href = '/friends'
+  end
+
+  context 'with COLLECTION_JSON_HOST set' do
+    it 'returns full uri' do
+      ENV['COLLECTION_JSON_HOST'] = EXAMPLE_HOST
+      uri = CollectionJSON::URI.call(@href)
+      uri.should eq("http://localhost/friends")
+    end
+  end
+
+  context 'without COLLECTION_JSON_HOST set' do
+    it 'returns partial uri' do
+      ENV['COLLECTION_JSON_HOST'] = nil
+      uri = CollectionJSON::URI.call(@href)
+      uri.should eq("/friends")
+    end
+  end
+end

data/spec/collection-json_spec.rb

@@ -2,28 +2,6 @@ require 'spec_helper'
 require 'collection-json'
 
 describe CollectionJSON do
-  describe :add_host do
-    before :each do
-      @href = '/friends'
-    end
-
-    context 'with COLLECTION_JSON_HOST set' do
-      it 'returns full uri' do
-        ENV['COLLECTION_JSON_HOST'] = EXAMPLE_HOST
-        uri = CollectionJSON.add_host(@href)
-        uri.should eq("http://localhost/friends")
-      end
-    end
-
-    context 'without COLLECTION_JSON_HOST set' do
-      it 'returns partial uri' do
-        ENV['COLLECTION_JSON_HOST'] = nil
-        uri = CollectionJSON.add_host(@href)
-        uri.should eq("/friends")
-      end
-    end
-  end
-
   describe :generate_for do
     before :each do
       @friends = [
@@ -50,20 +28,20 @@ describe CollectionJSON do
         builder.add_link '/friends/rss', 'feed'
         @friends.each do |friend|
           builder.add_item("/friends/#{friend['id']}") do |item|
-            item.add_data "full-name", {'value' => friend["full-name"]}
-            item.add_data "email", {'value' => friend["email"]}
-            item.add_link "/blogs/#{friend['id']}", "blog", {'prompt' => "Blog"}
-            item.add_link "/blogs/#{friend['id']}", "avatar", {'prompt' => "Avatar", 'render' => 'image'}
+            item.add_data "full-name", value: friend["full-name"]
+            item.add_data "email", value: friend["email"]
+            item.add_link "/blogs/#{friend['id']}", "blog", prompt: "Blog"
+            item.add_link "/blogs/#{friend['id']}", "avatar", prompt: "Avatar", render: 'image'
           end
         end
-        builder.add_query("/friends/search", "search", {'prompt' => "Search"}) do |query|
+        builder.add_query("/friends/search", "search", prompt: "Search") do |query|
           query.add_data "search"
         end
         builder.set_template do |template|
-          template.add_data "full-name", {'prompt' => "Full Name"}
-          template.add_data "email", {'prompt' => "Email"}
-          template.add_data "blog", {'prompt' => "Blog"}
-          template.add_data "avatar", {'prompt' => "Avatar"}
+          template.add_data "full-name", prompt: "Full Name"
+          template.add_data "email", prompt: "Email"
+          template.add_data "blog", prompt: "Blog"
+          template.add_data "avatar", prompt: "Avatar"
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: collection-json
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70343263781380 !ruby/object:Gem::Requirement
+  requirement: &70137055564260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70343263781380
+  version_requirements: *70137055564260
 description: Lightweight gem for building Collection+JSON responses.
 email:
 - sebastian@uprise.co.nz
@@ -49,6 +49,7 @@ files:
 - spec/collection-json/attributes/collection_spec.rb
 - spec/collection-json/attributes/item_spec.rb
 - spec/collection-json/attributes/template_spec.rb
+- spec/collection-json/transformers/uri_spec.rb
 - spec/collection-json_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/sebastianedwards/collection-json
@@ -79,5 +80,6 @@ test_files:
 - spec/collection-json/attributes/collection_spec.rb
 - spec/collection-json/attributes/item_spec.rb
 - spec/collection-json/attributes/template_spec.rb
+- spec/collection-json/transformers/uri_spec.rb
 - spec/collection-json_spec.rb
 - spec/spec_helper.rb