roar 0.10.0 → 0.10.1

data/CHANGES.markdown

@@ -1,3 +1,7 @@
+## 0.10.1
+
+* Adding the Coercion feature.
+
 ## 0.10.0
 
 * Requiring representable-0.1.3.

data/Gemfile

@@ -4,3 +4,9 @@ source "http://rubygems.org"
 gemspec
 
 #gem "representable", :path => "../representable"
+
+gem 'faraday'
+
+group :test do
+  gem 'turn'
+end

data/README.textile

@@ -134,7 +134,7 @@ module OrderRepresenter
   property :id
   property :client_id
   
-  collection :articles, :as => Article
+  collection :articles, :class => Article
   
   link :self do
     order_url(represented)
@@ -279,11 +279,11 @@ order.post(order.links[:self])
 
 This was dead simple since representations can be composed of different documents in Roar.
 
+h2. More Features
 
-h2. Current Status
+Be sure to check out the bundled features.
 
-Please note that Roar is still in conception, the API might change as well as concepts do.
- 
+# *Coercion* transforms values to typed objects when parsing a document. Uses virtus. 
 
 h2. What is REST about?
 
@@ -296,3 +296,4 @@ Making that system RESTful basically means
 h2. Support
 
 Questions? Need help? Free 1st Level Support on irc.freenode.org#roar !
+We also have a "mailing list":https://groups.google.com/forum/?fromgroups#!forum/roar-talk, yiha!

data/lib/roar/representer/feature/coercion.rb

@@ -0,0 +1,20 @@
+require 'virtus'
+require 'representable/coercion'
+
+module Roar::Representer::Feature
+  # Use the +:type+ option to specify the conversion type.
+  # class ImmigrantSong
+  #   include Roar::Representer::JSON
+  #   include Roar::Representer::Feature::Coercion
+  #   
+  #   property :composed_at, :type => DateTime, :default => "May 12th, 2012"
+  # end
+  module Coercion
+    def self.included(base)
+      base.class_eval do
+        include Virtus
+        extend Representable::Coercion::ClassMethods
+      end
+    end
+  end
+end

data/lib/roar/representer/feature/http_verbs.rb

@@ -1,53 +1,75 @@
-require 'roar/representer/feature/transport'
+require 'roar/representer/transport/net_http'
+require 'roar/representer/transport/faraday'  # Do not require here
 
 module Roar
   # Gives HTTP-power to representers. They can serialize, send, process and deserialize HTTP-requests.
   module Representer
     module Feature
       module HttpVerbs
-        def self.included(base)
-          base.extend ClassMethods
+
+        class << self
+          attr_accessor :transport_engine
+          
+          def included(base)
+            base.extend ClassMethods
+          end
         end
+        self.transport_engine = ::Roar::Representer::Transport::NetHTTP
         
-        
+
         module ClassMethods
-          # GETs +url+ with +format+ and returns deserialized representer.
-          def get(url, format)
-            document = http.get_uri(url, format).body
-            deserialize(document)
-          end
-          
-          def http
-            Transport
+          # GETs +url+ with +format+ and returns deserialized represented object.
+          def get(*args)
+            new.get(*args)
           end
         end
         
         
+        attr_writer :transport_engine
+        def transport_engine
+          @transport_engine || HttpVerbs.transport_engine
+        end
+        
         # Serializes the object, POSTs it to +url+ with +format+, deserializes the returned document
         # and updates properties accordingly.
         def post(url, format)
-          # DISCUSS: what if a redirect happens here?
-          document = http.post_uri(url, serialize, format).body
-          deserialize(document)
+          response = http.post_uri(url, serialize, format)
+          handle_response(response)
         end
         
         # GETs +url+ with +format+, deserializes the returned document and updates properties accordingly.
         def get(url, format)
-          document = http.get_uri(url, format).body
-          deserialize(document)
+          response = http.get_uri(url, format)
+          handle_response(response)
         end
         
         # Serializes the object, PUTs it to +url+ with +format+, deserializes the returned document
         # and updates properties accordingly.
         def put(url, format)
-          document = http.put_uri(url, serialize, format).body
-          deserialize(document)
+          response = http.put_uri(url, serialize, format)
+          handle_response(response)
+          self
         end
         
-        # TODO: implement delete, patch.
+        def patch(url, format)
+          response = http.patch_uri(url, serialize, format)
+          handle_response(response)
+          self
+        end
+
+        def delete(url, format)
+          http.delete_uri(url, format)
+          self
+        end
+
       private
+        def handle_response(response)
+          document = response.body
+          deserialize(document)
+        end
+
         def http
-          Transport  # DISCUSS: might be refering to separate http object soon.
+          transport_engine.new
         end
       end
     end

data/lib/roar/representer/feature/hypermedia.rb

@@ -108,9 +108,15 @@ module Roar
         
         class LinksDefinition < Representable::Definition
           # TODO: hide rel2block in interface.
+          attr_writer :rel2block
+          
           def rel2block
             @rel2block ||= []
           end
+          
+          def clone
+            super.tap { |d| d.rel2block = rel2block.clone }
+          end
         end
         
         

data/lib/roar/representer/json/hal.rb

@@ -42,7 +42,7 @@ module Roar::Representer
         
         def uncompile_fragment(bin, doc)
           return super unless bin.definition.options[:embedded]
-          super(bin, doc["_embedded"])
+          super(bin, doc["_embedded"] || {})
         end
       end
       
@@ -90,6 +90,7 @@ module Roar::Representer
           end
           
           def from_hash(json, *)
+            json ||= {} # since we override #from_hash we're responsible for this.
             json.each do |k, v|
               self << Feature::Hypermedia::Hyperlink.new(v.merge :rel => k)
             end

data/lib/roar/representer/transport/faraday.rb

@@ -0,0 +1,56 @@
+begin
+  require 'faraday'
+rescue LoadError
+  puts 'You must add faraday as a dependency to use the FaradayTransport'
+end
+require 'logger'
+
+module Roar
+  module Representer
+    module Transport
+      # Advanced implementation of the HTTP verbs with the Faraday HTTP library
+      # (which can, in turn, use adapters based on Net::HTTP or libcurl)
+      #
+      # Depending on how the Faraday middleware stack is configured, this
+      # Transport can support features such as HTTP error code handling,
+      # redirects, etc.
+      #
+      # @see http://rubydoc.info/gems/faraday/file/README.md Faraday README
+      class Faraday
+
+        def get_uri(uri, as)
+          build_connection(uri, as).get
+        end
+
+        def post_uri(uri, body, as)
+          build_connection(uri, as).post
+        end
+
+        def put_uri(uri, body, as)
+          build_connection(uri, as).put
+        end
+
+        def patch_uri(uri, body, as)
+          build_connection(uri, as).patch
+        end
+
+        def delete_uri(uri, as)
+          build_connection(uri, as).delete
+        end
+
+        private
+
+        def build_connection(uri, as)
+          ::Faraday::Connection.new(
+            :url => uri,
+            :headers => { :accept => as }
+          ) do |builder|
+            # builder.use Faraday::Response::Logger, Logger.new('faraday.log')
+            builder.use ::Faraday::Response::RaiseError
+            builder.adapter ::Faraday.default_adapter
+          end
+        end
+      end
+    end
+  end
+end

data/lib/roar/representer/transport/net_http.rb

@@ -0,0 +1,44 @@
+require "net/http"
+require "uri"
+
+module Roar
+  module Representer
+    # Implements the (HTTP) transport interface with Net::HTTP.
+    module Transport
+      # Definitions: every call returns a Response object responding to #body.
+      class NetHTTP
+        # TODO: generically handle return codes.
+        def get_uri(uri, as)
+          do_request(Net::HTTP::Get, uri, as)
+        end
+        
+        def post_uri(uri, body, as)
+          do_request(Net::HTTP::Post, uri, as)
+        end
+        
+        def put_uri(uri, body, as)
+          do_request(Net::HTTP::Put, uri, as)
+        end
+        
+        def patch_uri(uri, body, as)
+          do_request(Net::HTTP::Patch, uri, as)
+        end
+        
+        def delete_uri(uri, as)
+          do_request(Net::HTTP::Delete, uri, as)
+        end
+      
+      private
+        def do_request(what, uri, as, body="")
+          # DISCUSS: can this be made easier?
+          uri   = URI.parse(uri)
+          http  = Net::HTTP.new(uri.host, uri.port)
+          req   = what.new(uri.request_uri)
+          req.content_type  = as
+          req.body          = body if body
+          http.request(req)
+        end
+      end
+    end
+  end
+end

data/lib/roar/version.rb

@@ -1,3 +1,3 @@
 module Roar
-  VERSION = "0.10.0"
+  VERSION = "0.10.1"
 end

data/roar.gemspec

@@ -19,11 +19,13 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   
-  s.add_runtime_dependency "representable", ">= 1.1.3"
+  s.add_runtime_dependency "representable", ">= 1.1.7"
   
   s.add_development_dependency "rake"
   s.add_development_dependency "test_xml"
   s.add_development_dependency "minitest",	">= 2.8.1"
-  s.add_development_dependency "sinatra",   "~> 1.2.6"
+  s.add_development_dependency "sinatra",   "~> 1.3.2"
   s.add_development_dependency "sham_rack", "~> 1.3.0"
+  s.add_development_dependency "turn"
+  s.add_development_dependency "virtus"
 end

data/test/coercion_feature_test.rb

@@ -0,0 +1,18 @@
+require 'test_helper'
+require 'roar/representer/feature/coercion'
+
+class CoercionFeatureTest < MiniTest::Spec
+  describe "Coercion" do
+    class ImmigrantSong
+      include Roar::Representer::JSON
+      include Roar::Representer::Feature::Coercion
+      
+      property :composed_at, :type => DateTime, :default => "May 12th, 2012"
+    end
+    
+    it "coerces into the provided type" do
+      song = ImmigrantSong.new.from_json("{\"composed_at\":\"November 18th, 1983\"}")
+      assert_equal DateTime.parse("Fri, 18 Nov 1983 00:00:00 +0000"), song.composed_at
+    end
+  end
+end

data/test/fake_server.rb

@@ -1,41 +1,60 @@
 require "bundler/setup"
 require 'sinatra/base'
-
-class FakeServer < Sinatra::Base
-  get "/method" do
-    "<method>get</method>"
+
+class FakeServer < Sinatra::Base
+
+  set :raise_errors, false
+
+  get "/method" do
+    "<method>get</method>"
   end
-  
-  post "/method" do
-    "<method>post</method>"
+
+  post "/method" do
+    "<method>post</method>"
   end
   
-  put "/method" do
-    "<method>put</method>"
+  put "/method" do
+    "<method>put</method>"
   end
   
-  delete "/method" do
-    "<method>delete</method>"
+  delete "/method" do
+    "<method>delete</method>"
   end
   
-  #patch "/method" do
-  #  "<method>patch</method>"
-  #end
-  
+  patch "/method" do
+    "<method>patch</method>"
+  end
+
+  get '/deliberate-error' do
+    raise 'this error was deliberate'
+  end
+
   post "/bands" do
     #if request.content_type =~ /xml/
-      '{"label": "n/a", "name": "Strung Out", "links": [{"href":"http://search", "rel": "search"}, {"href":"http://band/strungout", "rel": "self"}]}'
+    body  '{"label": "n/a", "name": "Strung Out", "links": [{"href":"http://search", "rel": "search"}, {"href":"http://band/strungout", "rel": "self"}]}'
+    status 201
   end
   
   put "/bands/strungout" do
+    # DISCUSS: as long as we don't agree on what to return in PUT/PATCH, let's return an updated document.
     {:name => "Strung Out", :label => "Fat Wreck"}.to_json
+    #status 204
   end
-  
+
+  patch '/bands/strungout' do
+    # DISCUSS: as long as we don't agree on what to return in PUT/PATCH, let's return an updated document.
+    {:name => 'Strung Out', :label => 'Fat Mike'}.to_json
+    #status 204
+  end
+
   get "/bands/slayer" do
     {:name => "Slayer", :label => "Canadian Maple"}.to_json
   end
-  
-  
+
+  delete '/banks/metallica' do
+    status 204
+  end
+
   require './test/order_representers'
   JSON::Order.class_eval do
     def items_url
@@ -69,6 +88,6 @@ class FakeServer < Sinatra::Base
   get "/orders/1" do
     JSON::Order.new(:client_id => 1, :items => [JSON::Item.new(:article_id => "666-S", :amount => 1)]).serialize
   end
-  
-end
-
+  
+end
+

data/test/faraday_http_transport_test.rb

@@ -0,0 +1,69 @@
+require 'test_helper'
+require 'roar/representer/transport/faraday'
+
+class FaradayHttpTransportTest < MiniTest::Spec
+  describe 'FaradayHttpTransport' do
+    before do
+      @transport = Roar::Representer::Transport::Faraday.new
+    end
+
+    it "#get_uri returns response" do
+      assert_equal "<method>get</method>",  @transport.get_uri("http://roar.example.com/method", "application/xml").body
+    end
+
+    it "#post_uri returns response" do
+      assert_equal "<method>post</method>",  @transport.post_uri("http://roar.example.com/method", "booty", "application/xml").body
+    end
+
+    it "#put_uri returns response" do
+      assert_equal "<method>put</method>",  @transport.put_uri("http://roar.example.com/method", "booty", "application/xml").body
+    end
+
+    it "#delete_uri returns response" do
+      assert_equal "<method>delete</method>",  @transport.delete_uri("http://roar.example.com/method", "application/xml").body
+    end
+
+    it "#patch_uri returns response" do
+      assert_equal "<method>patch</method>",  @transport.patch_uri("http://roar.example.com/method", "booty", "application/xml").body
+    end
+
+    describe 'non-existent resource' do
+      before do
+        @not_found_url = 'http://roar.example.com/missing-resource'
+      end
+
+      it '#get_uri raises a ResourceNotFound error' do
+        assert_raises(Faraday::Error::ResourceNotFound) do
+          @transport.get_uri(@not_found_url, "application/xml").body
+        end
+      end
+
+      it '#post_uri raises a ResourceNotFound error' do
+        assert_raises(Faraday::Error::ResourceNotFound) do
+          @transport.post_uri(@not_found_url, 'crisis', "application/xml").body
+        end
+      end
+
+      it '#post_uri raises a ResourceNotFound error' do
+        assert_raises(Faraday::Error::ResourceNotFound) do
+          @transport.post_uri(@not_found_url, 'crisis', "application/xml").body
+        end
+      end
+
+      it '#delete_uri raises a ResourceNotFound error' do
+        assert_raises(Faraday::Error::ResourceNotFound) do
+          @transport.delete_uri(@not_found_url, "application/xml").body
+        end
+      end
+    end
+
+    describe 'server errors (500 Internal Server Error)' do
+      it '#get_uri raises a ClientError' do
+        assert_raises(Faraday::Error::ClientError) do
+          @transport.get_uri('http://roar.example.com/deliberate-error', "application/xml").body
+        end
+      end
+    end
+
+  end
+end

data/test/hal_json_test.rb

@@ -65,5 +65,12 @@ class HalJsonTest < MiniTest::Spec
       assert_equal "http://items/Coffee", @order.items.first.links[:self].href
       assert_equal "http://orders/2", @order.links[:self].href
     end
+    
+    it "doesn't require _links and _embedded to be present" do
+      @order.from_json("{\"id\":2}")
+      assert_equal 2, @order.id
+      assert_equal [], @order.items
+      assert_equal [], @order.links
+    end
   end
 end

data/test/http_verbs_feature_test.rb

@@ -23,21 +23,49 @@ class HttpVerbsTest < MiniTest::Spec
       @band.extend(Roar::Representer::Feature::HttpVerbs)
     end
     
+    describe "transport_engine" do
+      before do
+        @http_verbs = Roar::Representer::Feature::HttpVerbs
+        @net_http   = Roar::Representer::Transport::NetHTTP
+      end
+      
+      it "has a default set in the transport module level" do
+        assert_equal @net_http, @band.transport_engine
+      end
+      
+      it "allows changing on instance level" do
+        @band.transport_engine = :soap
+        assert_equal @net_http, @http_verbs.transport_engine
+        assert_equal :soap, @band.transport_engine
+      end
+    end
+    
+    
     describe "HttpVerbs.get" do
       it "returns instance from incoming representation" do
-        # let's pretend the user wants Roar class methods.
-        @Band = Class.new do
-          include Roar::Representer::JSON
-          include BandRepresenter
-          include Roar::Representer::Feature::HttpVerbs
-          attr_accessor :name, :label
+        band = @band.get("http://roar.example.com/bands/slayer", "application/json")
+        assert_equal "Slayer", band.name
+        assert_equal "Canadian Maple", band.label
+      end
+
+      # FIXME: move to faraday test.
+      describe 'a non-existent resource' do
+        it 'handles HTTP errors and raises a ResourceNotFound error with FaradayHttpTransport' do
+          @band.transport_engine = Roar::Representer::Transport::Faraday
+          assert_raises(::Faraday::Error::ResourceNotFound) do
+            @band.get('http://roar.example.com/bands/anthrax', "application/json")
+          end
+        end
+
+        it 'performs no HTTP error handling with NetHttpTransport' do
+          @band.transport_engine = Roar::Representer::Transport::NetHTTP
+          assert_raises(JSON::ParserError) do
+            @band.get('http://roar.example.com/bands/anthrax', "application/json")
+          end
         end
-        @band = @Band.get("http://roar.example.com/bands/slayer", "application/json")
-        assert_equal "Slayer", @band.name
-        assert_equal "Canadian Maple", @band.label
       end
     end
-    
+
     describe "#get" do
       it "updates instance with incoming representation" do
         @band.get("http://roar.example.com/bands/slayer", "application/json")
@@ -67,12 +95,21 @@ class HttpVerbsTest < MiniTest::Spec
       end
     end
     
-    describe "#delete" do
-      
-    end
-    
     describe "#patch" do
-      
+      it 'does something' do
+        @band.label  = 'Fat Mike'
+        @band.patch("http://roar.example.com/bands/strungout", "application/xml")
+        assert_equal 'Fat Mike', @band.label
+      end
     end
+
+    describe "#delete" do
+      it 'does something' do
+        @band.delete("http://roar.example.com/bands/metallica", "application/xml")
+      end
+    end
+
+    # HEAD, OPTIONs?
+
   end
 end

data/test/hypermedia_feature_test.rb

@@ -11,51 +11,51 @@ class HypermediaTest
           include Roar::Representer::Feature::Hypermedia
         end
       end
-      
+
       it "accepts rel symbol, only" do
         @mod.class_eval do
           link :self do
             "http://self"
           end
         end
-        
+
         assert_equal "{\"links\":[{\"rel\":\"self\",\"href\":\"http://self\"}]}", Object.new.extend(@mod).to_json
       end
-      
+
       it "accepts any options" do
         @mod.class_eval do
           link :rel => :self, :title => "Hey, @myabc" do
             "http://self"
           end
         end
-        
+
         assert_equal "{\"links\":[{\"rel\":\"self\",\"href\":\"http://self\",\"title\":\"Hey, @myabc\"}]}", Object.new.extend(@mod).to_json
       end
     end
-    
-    
+
+
     before do
       @bookmarks = Class.new do
         include AttributesContructor
         include Roar::Representer::XML
         include Roar::Representer::Feature::Hypermedia
-        
+
         self.representation_wrap = "bookmarks"
       end
-      
+
       @bookmarks_with_links = Class.new(@bookmarks)
       @bookmarks_with_links.class_eval do
         self.representation_wrap = "bookmarks"
-        
+
         property :id
         link :self do "http://bookmarks" end
         link :all do "http://bookmarks/all" end
-        
+
         attr_accessor :id, :self, :all
       end
     end
-    
-    
+
+
     describe "#to_xml" do
       it "sets up links and renders <link> correctly in XML" do
         assert_xml_equal '<bookmarks>
@@ -64,31 +64,31 @@ class HypermediaTest
                             <link rel="all" href="http://bookmarks/all"/>
                           </bookmarks>', @bookmarks_with_links.new(:id => 1).to_xml
       end
-      
+
       it "still works even if there are no links defined" do
         assert_xml_equal '<bookmarks/>', @bookmarks.new.to_xml
       end
-      
+
       it "doesn't render links with :links => false" do
         assert_xml_equal '<bookmarks>
                             <id>1</id>
-                          </bookmarks>', 
+                          </bookmarks>',
           @bookmarks_with_links.new(:id => 1).to_xml(:links => false)
       end
     end
-    
+
     describe "#to_json" do
       class Note
         include Roar::Representer::JSON
         include Roar::Representer::Feature::Hypermedia
         link(:self) { "http://me" }
       end
-        
+
       it "works twice" do
         note = Note.new
         assert_equal note.to_json, note.to_json
       end
-      
+
       it "sets up links even when nested" do
         class Page
           include AttributesContructor
@@ -96,13 +96,13 @@ class HypermediaTest
           property :note, :class => Note
           attr_accessor :note
         end
-        
+
         assert_equal "{\"note\":{\"links\":[{\"rel\":\"self\",\"href\":\"http://me\"}]}}", Page.new(:note => Note.new).to_json
       end
     end
-    
-    
-    
+
+
+
     describe "#from_xml" do
       it "extracts links from document" do
         doc = @bookmarks_with_links.from_xml(%{
@@ -110,25 +110,25 @@ class HypermediaTest
           <link rel="self" href="http://bookmarks">
         </bookmarks>
         })
-        
+
         assert_kind_of Roar::Representer::Feature::Hypermedia::LinkCollection, doc.links
         assert_equal 1, doc.links.size
-        assert_equal(["self", "http://bookmarks"], [doc.links.first.rel, doc.links.first.href]) 
+        assert_equal(["self", "http://bookmarks"], [doc.links.first.rel, doc.links.first.href])
       end
-      
+
       it "sets up an empty link list if no links found in the document" do
         assert_equal [], @bookmarks_with_links.from_xml(%{<bookmarks/>}).links
       end
     end
-    
-    
+
+
     describe "#links" do
       before do
         @set  = @bookmarks.new
         hyper = Roar::Representer::Feature::Hypermedia::Hyperlink
-        
+
         @set.links = [
-          {:rel => "self", :href => "http://self"}, 
+          {:rel => "self", :href => "http://self"},
           {:rel => "next", :href => "http://next"}].collect do |config|
             link = hyper.new
             link.rel  = config[:rel]
@@ -136,14 +136,14 @@ class HypermediaTest
             link
           end
       end
-      
+
       describe "#links=" do
         it "wraps links in a LinkCollection" do
           assert_kind_of Roar::Representer::Feature::Hypermedia::LinkCollection, @set.links
           assert_equal 2, @set.links.size
         end
       end
-      
+
       describe "#link[]" do
         it "returns link object" do
           assert_equal "http://self", @set.links["self"].href
@@ -152,23 +152,23 @@ class HypermediaTest
           assert_equal nil, @set.links[:prev]
         end
       end
-      
+
       it "returns an empty list when no links present" do
         assert_equal Roar::Representer::Feature::Hypermedia::LinkCollection.new, @bookmarks.new.links
       end
     end
-    
-    
+
+
     describe "#find_links_definition" do
       it "returns Definition if links are present" do
         @bookmarks.class_eval do
           property :id
           link :self
         end
-        
+
         assert_equal "links", @bookmarks.find_links_definition.name
       end
-      
+
       it "returns nil if no links defined" do
         assert_equal nil, @bookmarks.find_links_definition
       end
@@ -181,19 +181,25 @@ class LinksDefinitionTest < MiniTest::Spec
     before do
       @d = Roar::Representer::Feature::Hypermedia::LinksDefinition.new(:links)
     end
-    
+
     it "accepts options in constructor" do
       assert_equal [], @d.rel2block
     end
-    
+
     it "accepts configuration" do
       @d.rel2block << {:rel => :self}
       assert_equal [{:rel=>:self}], @d.rel2block
     end
     
-    it "responds to #each to iterate rel2block" do
+    it "responds to #clone" do
+      @d.rel2block << {:rel => :self}
+      assert @d.clone.rel2block.object_id != @d.rel2block.object_id
     end
     
+    
+    it "responds to #each to iterate rel2block" do
+    end
+
   end
 end
 
@@ -204,10 +210,10 @@ class LinkCollectionTest < MiniTest::Spec
       link        = Roar::Representer::Feature::Hypermedia::Hyperlink.new
       link.rel  = "self"
       link.href = "http://self"
-      
+
       collection.update_link(link)
       assert_equal 1, collection.size
-      
+
       collection.update_link(link)
       assert_equal 1, collection.size
     end
@@ -220,21 +226,57 @@ class HyperlinkTest < MiniTest::Spec
     before do
       @link = Hyperlink.new(:rel => "self", :href => "http://self")
     end
-    
+
     it "accepts string keys in constructor" do
       assert_equal "Hey, @myabc", Hyperlink.new("title" => "Hey, @myabc").title
     end
-    
+
     it "responds to #media" do
       assert_equal nil, @link.media
     end
-    
+
     it "responds to #rel" do
       assert_equal "self", @link.rel
     end
-    
+
     it "responds to #href" do
       assert_equal "http://self", @link.href
     end
   end
 end
+
+class HyperlinkInheritanceTest < MiniTest::Spec
+  describe "when the base representer has a link" do
+    before do
+      module BaseRepresenter
+        include Roar::Representer::JSON
+        include Roar::Representer::Feature::Hypermedia
+
+        link(:base) { "http://base" }
+      end
+
+       module Foo
+        include Roar::Representer::JSON
+        include Roar::Representer::Feature::Hypermedia
+        include BaseRepresenter
+
+        link(:foo) { "http://foo" }
+      end
+
+       module Bar
+        include Roar::Representer::JSON
+        include Roar::Representer::Feature::Hypermedia
+        include BaseRepresenter
+
+        link(:bar) { "http://bar" }
+      end
+    end
+
+    it "should inherit parent links" do
+      foo = Object.new.extend(Foo)
+      
+      assert_equal "{\"links\":[{\"rel\":\"base\",\"href\":\"http://base\"},{\"rel\":\"foo\",\"href\":\"http://foo\"}]}", foo.to_json
+    end
+
+  end
+end

data/test/{transport_test.rb → net_http_transport_test.rb}

@@ -1,10 +1,10 @@
 require 'test_helper'
-require 'roar/representer/feature/transport'
+require 'roar/representer/transport/net_http'
 
-class TransportTest < MiniTest::Spec
+class NetHTTPTransportTest < MiniTest::Spec
   describe "Transport" do
     before do
-      @transport = Roar::Representer::Feature::Transport
+      @transport = Roar::Representer::Transport::NetHTTP.new
     end
     
     it "#get_uri returns response" do
@@ -23,9 +23,8 @@ class TransportTest < MiniTest::Spec
       assert_equal "<method>delete</method>",  @transport.delete_uri("http://roar.example.com/method", "application/xml").body
     end
     
-    # TODO: how to get PATCH into Sinatra?
-    #it "#patch_uri returns Restfulie response" do
-    #  assert_equal "<method>patch</method>",  @o.patch_uri("http://roar.example.com/method", "booty", "application/xml").body
-    #end
+    it "#patch_uri returns response" do
+      assert_equal "<method>patch</method>",  @transport.patch_uri("http://roar.example.com/method", "booty", "application/xml").body
+    end
   end
 end

data/test/representer_test.rb

@@ -35,6 +35,5 @@ class RepresenterTest < MiniTest::Spec
       
       assert_equal "{\"name\":\"Paulo\"}", Person.new(:name => "Paulo").to_json
     end
-    
   end
 end

data/test/test_helper.rb

@@ -7,6 +7,15 @@ require 'minitest/spec'
 require 'roar/representer'
 require 'roar/representer/feature/http_verbs'
 
+begin
+  require 'turn'
+
+  Turn.config do |config|
+    config.format  = :dotted
+    # config.trace   = true
+  end
+rescue LoadError
+end
 
 module AttributesContructor
   def initialize(attrs={})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roar
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-22 00:00:00.000000000 Z
+date: 2012-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: representable
-  requirement: &82244490 !ruby/object:Gem::Requirement
+  requirement: &75807040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 1.1.7
   type: :runtime
   prerelease: false
-  version_requirements: *82244490
+  version_requirements: *75807040
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &82244190 !ruby/object:Gem::Requirement
+  requirement: &75805090 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *82244190
+  version_requirements: *75805090
 - !ruby/object:Gem::Dependency
   name: test_xml
-  requirement: &82243710 !ruby/object:Gem::Requirement
+  requirement: &75802000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *82243710
+  version_requirements: *75802000
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &82243040 !ruby/object:Gem::Requirement
+  requirement: &75801380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,21 +54,21 @@ dependencies:
         version: 2.8.1
   type: :development
   prerelease: false
-  version_requirements: *82243040
+  version_requirements: *75801380
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &82242340 !ruby/object:Gem::Requirement
+  requirement: &75799950 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.6
+        version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *82242340
+  version_requirements: *75799950
 - !ruby/object:Gem::Dependency
   name: sham_rack
-  requirement: &82241770 !ruby/object:Gem::Requirement
+  requirement: &75799310 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,29 @@ dependencies:
         version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *82241770
+  version_requirements: *75799310
+- !ruby/object:Gem::Dependency
+  name: turn
+  requirement: &75798790 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *75798790
+- !ruby/object:Gem::Dependency
+  name: virtus
+  requirement: &75797000 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *75797000
 description: Streamlines the development of RESTful, resource-oriented architectures
   in Ruby.
 email:
@@ -96,16 +118,19 @@ files:
 - lib/roar/rails.rb
 - lib/roar/representer.rb
 - lib/roar/representer/feature/client.rb
+- lib/roar/representer/feature/coercion.rb
 - lib/roar/representer/feature/http_verbs.rb
 - lib/roar/representer/feature/hypermedia.rb
-- lib/roar/representer/feature/transport.rb
 - lib/roar/representer/json.rb
 - lib/roar/representer/json/hal.rb
+- lib/roar/representer/transport/faraday.rb
+- lib/roar/representer/transport/net_http.rb
 - lib/roar/representer/xml.rb
 - lib/roar/version.rb
 - roar.gemspec
 - test/Gemfile
 - test/client_test.rb
+- test/coercion_feature_test.rb
 - test/dummy/Rakefile
 - test/dummy/app/controllers/albums_controller.rb
 - test/dummy/app/controllers/application_controller.rb
@@ -142,17 +167,18 @@ files:
 - test/dummy/tmp/app/cells/blog/post/latest.html.erb
 - test/dummy/tmp/app/cells/blog/post_cell.rb
 - test/fake_server.rb
+- test/faraday_http_transport_test.rb
 - test/hal_json_test.rb
 - test/http_verbs_feature_test.rb
 - test/hypermedia_feature_test.rb
 - test/integration_test.rb
 - test/json_representer_test.rb
+- test/net_http_transport_test.rb
 - test/order_representers.rb
 - test/rails/controller_methods_test.rb
 - test/rails/rails_representer_methods_test.rb
 - test/representer_test.rb
 - test/test_helper.rb
-- test/transport_test.rb
 - test/xml_representer_test.rb
 homepage: http://rubygems.org/gems/roar
 licenses: []

data/lib/roar/representer/feature/transport.rb

@@ -1,45 +0,0 @@
-require "net/http"
-require "uri"
-
-module Roar
-  module Representer
-    module Feature
-      # Implements the HTTP verbs with Net::HTTP.
-      module Transport
-        class << self
-          # TODO: generically handle return codes/let Restfulie do it.
-          def get_uri(uri, as)
-            do_request(Net::HTTP::Get, uri, as)
-          end
-          
-          def post_uri(uri, body, as)
-            do_request(Net::HTTP::Post, uri, as)
-          end
-          
-          def put_uri(uri, body, as)
-            do_request(Net::HTTP::Put, uri, as)
-          end
-          
-          def patch_uri(uri, body, as)
-            do_request(Net::HTTP::Patch, uri, as)
-          end
-          
-          def delete_uri(uri, as)
-            do_request(Net::HTTP::Delete, uri, as)
-          end
-        
-        private
-          def do_request(what, uri, as, body="")
-            # DISCUSS: can this be made easier?
-            uri   = URI.parse(uri)
-            http  = Net::HTTP.new(uri.host, uri.port)
-            req   = what.new(uri.request_uri)
-            req.content_type  = as
-            req.body          = body if body
-            http.request(req)
-          end
-        end
-      end
-    end
-  end
-end