roar 0.8.2 → 0.8.3

data/CHANGES.markdown

@@ -1,8 +1,11 @@
+h2. 0.8.3
+
+* Maintenance release for representable compat.
+
 h2. 0.8.2
 
 * Removing `restfulie` dependency - we now use `Net::HTTP`.
 
-
 h2. 0.8.1
 
 * Added the :except and :include options to `#from_*`.

data/README.textile

@@ -64,8 +64,12 @@ h2. Representers
 To render a representational document, the backend service has to define a representer.
 
 <pre>
+require 'roar/representer/json'
+require 'roar/representer/feature/hypermedia'
+
 class Article
   include Roar::Representer::JSON
+  include Roar::Representer::Feature::Hypermedia
   
   property :title
   property :id
@@ -121,7 +125,8 @@ Since orders may contain a composition of articles, how would the order service
 <pre>
 class Order 
   include Roar::Representer::JSON
-  
+  include Roar::Representer::Feature::Hypermedia
+
   property :id
   property :client_id
   
@@ -150,6 +155,7 @@ If we were to implement an endpoint for creating new orders, we'd allow POST to
   post "/orders" do
     incoming = Order.deserialize(request.body.string)
     puts incoming.to_attributes #=> {:client_id => 815}
+  end
 </pre>
  
 Look how the @#to_attributes@ method helps extracting data from the incoming document and, again, @#to_json@ returns the freshly created order's representation. Roar's representers are truely working in both directions, rendering and parsing and thus prevent you from redundant knowledge sharing.

data/Rakefile

@@ -7,7 +7,7 @@ task :default => [:test, :testrails]
 
 Rake::TestTask.new(:test) do |test|
   test.libs << 'test'
-  test.test_files = FileList['test/*_test.rb'] - ['test/integration_test.rb']
+  test.test_files = FileList['test/*_test.rb'] - ['test/integration_test.rb', 'test/active_record_integration_test.rb']
   test.verbose = true
 end
 

data/lib/roar/representer/base.rb

@@ -52,10 +52,9 @@ module Roar
       # This method is subject to change and might be removed, soon.
       def deserialize_block_for_options(options)
         return unless props = options[:except] || options[:include]
-        props.collect!{ |name| name.to_s }
         
-        lambda do |bind| 
-          res = props.include?(bind.definition.name)
+        lambda do |name| 
+          res = props.include?(name)
           options[:include] ? res : !res
         end
       end

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

@@ -8,15 +8,14 @@ module Roar
         def self.included(base)
           base.extend ClassMethods
         end
-        
+        # TODO: read format and base url defaults from Roar::Config.
         
         module ClassMethods
           include Transport
           
-          def get(url, format)  # TODO: test me!
-            #url = resource_base + variable_path.to_s
-            representation = get_uri(url, format).body
-            deserialize(representation)
+          def get(url, format)
+            document = get_uri(url, format).body
+            deserialize(document)
           end
           
           def post(url, body, format)

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

@@ -34,11 +34,14 @@ module Roar
       protected
         # Setup hypermedia links by invoking their blocks. Usually called by #serialize.
         def prepare_links!
-          links_def = self.class.find_links_definition or return
+          links_def       = find_links_definition or return
+          hyperlink_class = links_def.sought_type
+          
           links_def.rel2block.each do |link|
-            links << links_def.sought_type.from_attributes({  # create Hyperlink representer.
-            "rel"   => link[:rel],
-            "href"  => run_link_block(link[:block])})
+            links.update_link(hyperlink_class.from_attributes( # create Hyperlink representer.
+              :rel  => link[:rel],
+              :href => run_link_block(link[:block]))
+            )
           end
         end
         
@@ -46,16 +49,38 @@ module Roar
           instance_exec(&block)
         end
         
+        def find_links_definition
+          representable_attrs.find { |d| d.is_a?(LinksDefinition) }
+        end
+        
         
         class LinkCollection < Array
           def [](rel)
             link = find { |l| l.rel.to_s == rel.to_s } and return link.href
           end
+          
+          # Checks if the link is already contained by querying for its +rel+.
+          # If so, it gets replaced. Otherwise, the new link gets appended.
+          def update_link(link)
+            if i = find_index { |l| l.rel.to_s == link.rel.to_s }
+              return self[i] = link
+            end
+            self << link
+          end
         end
         
         
         module ClassMethods
-          # Defines a hypermedia link to be embedded in the document.
+          # Declares a hypermedia link in the document.
+          #
+          # Example:
+          #
+          #   link :self do
+          #     "http://orders/#{id}"
+          #   end
+          #
+          # The block is executed in instance context, so you may call properties or other accessors.
+          # Note that you're free to put decider logic into #link blocks, too.
           def link(rel, &block)
             unless links = find_links_definition
               links = LinksDefinition.new(:links, links_definition_options)
@@ -66,7 +91,7 @@ module Roar
           end
           
           def find_links_definition
-            representable_attrs.find do |d| d.is_a?(LinksDefinition) end
+            representable_attrs.find { |d| d.is_a?(LinksDefinition) }
           end
         end
         

data/lib/roar/representer/json.rb

@@ -15,7 +15,7 @@ module Roar
       end
       
       module InstanceMethods
-        def to_json(*args)
+        def to_hash(*args)
           before_serialize(*args)
           super
         end
@@ -44,7 +44,7 @@ module Roar
         
         # TODO: move to instance method, or remove?
         def links_definition_options
-          {:as => [Hyperlink]}
+          {:as => Hyperlink , :collection => true}
         end
       end
       
@@ -52,7 +52,6 @@ module Roar
       # Encapsulates a hypermedia link.
       class Hyperlink
         include JSON
-        self.representation_name = :link
         
         property :rel
         property :href

data/lib/roar/representer/xml.rb

@@ -27,7 +27,7 @@ module Roar
         
         def to_xml(*args)
           before_serialize(*args)
-          super.serialize
+          super
         end
         
         # Generic entry-point for rendering.
@@ -41,7 +41,7 @@ module Roar
         include Representable::XML::ClassMethods
         
         def links_definition_options
-          {:from => :link, :as => [Hyperlink]}
+          {:from => :link, :as => Hyperlink, :collection => true}
         end
         
         # Generic entry-point for parsing.
@@ -56,7 +56,7 @@ module Roar
         # TODO: make XML a module to include in Hyperlink < Base.
         include XML
         
-        self.representation_name = :link
+        self.representation_wrap = :link
         
         property :rel,  :from => "@rel"
         property :href, :from => "@href"

data/lib/roar/version.rb

@@ -1,3 +1,3 @@
 module Roar
-  VERSION = "0.8.2"
+  VERSION = "0.8.3"
 end

data/roar.gemspec

@@ -19,7 +19,7 @@ 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", "~> 0.9.2"
+  s.add_runtime_dependency "representable", "~> 0.10.3"
   s.add_runtime_dependency "hooks",         "~> 0.1.4"
   
   s.add_development_dependency "test_xml"

data/test/Gemfile

@@ -4,3 +4,4 @@ gem "sinatra"
 gem "sinatra-contrib", :path => "./sinatra-contrib"
 gem "sinatra-activerecord"
 gem "roar", :path => ".."
+gem "representable", :path => "../../representable"

data/test/fake_server.rb

@@ -1,9 +1,30 @@
 require "bundler/setup"
 require 'sinatra/base'
 require 'sinatra/reloader'
+require 'roar/representer/xml'
+
+# Usually shared in a gem between service and clients.
+module BandRepresenter
+  include Roar::Representer::XML
+  property :name
+  property :label
+end
+
+Band = Struct.new(:name, :label)
+Band.class_eval do
+  include Roar::Representer::XML
+  include BandRepresenter
+end
 
 
-class FakeServer < Sinatra::Base
+class FakeServer < Sinatra::Base
+  BANDS = {"belvedere" => Band.new("Belvedere", "canadian maple")}
+  
+  get "/bands/:id" do
+    BANDS[params[:id]].to_xml
+  end
+  
+  
   get "/method" do
     "<method>get</method>"
   end

data/test/http_verbs_feature_test.rb

@@ -13,34 +13,55 @@ class HttpVerbsTest < MiniTest::Spec
   
   describe "HttpVerbs" do
     before do
-      @r = Band.new
+      @r = @band = Band.new
     end
     
     # TODO: assert that Restfulie#post receives the correct document.
     
-    it "#post deserializes the incoming representation and returns it" do
-      @r.name = "Strung Out"
-      rep = @r.post("http://localhost:9999/band", "application/xml")
-      assert_equal "Strung Out", rep.name
-      assert_equal "n/a", rep.label
+    describe "#post" do
+      it "#deserializes the incoming representation and returns it" do
+        @r.name = "Strung Out"
+        rep = @r.post("http://localhost:9999/band", "application/xml")
+        assert_equal "Strung Out", rep.name
+        assert_equal "n/a", rep.label
+      end
     end
     
-    it "#post! deserializes the incoming representation and replaces attributes" do
-      @r.name = "Strung Out"
-      assert_equal nil, @r.label
-      @r.post!("http://localhost:9999/band", "application/xml")
-      assert_equal "Strung Out", @r.name
-      assert_equal "n/a", @r.label
+    describe "#post!" do
+      it "#post! deserializes the incoming representation and replaces attributes" do
+        @r.name = "Strung Out"
+        assert_equal nil, @r.label
+        @r.post!("http://localhost:9999/band", "application/xml")
+        assert_equal "Strung Out", @r.name
+        assert_equal "n/a", @r.label
+      end
     end
     
+    describe "#put!" do
+      it "deserializes the incoming representation and returns it" do
+        @r.name   = "Strung Out"
+        @r.label  = "Fat Wreck"
+        rep = @r.put("http://localhost:9999/band/strungout", "application/xml")
+        assert_equal "Strung Out", rep.name
+        assert_equal "Fat Wreck", rep.label
+      end
+    end
     
+    describe ".get" do
+      it "returns the deserialized retrieved doc" do
+        band = Band.get("http://localhost:9999/bands/belvedere", "application/xml")
+        assert_equal "Belvedere", band.name
+        assert_equal "canadian maple", band.label
+      end
+    end
     
-    it "#put deserializes the incoming representation and returns it" do
-      @r.name   = "Strung Out"
-      @r.label  = "Fat Wreck"
-      rep = @r.put("http://localhost:9999/band/strungout", "application/xml")
-      assert_equal "Strung Out", rep.name
-      assert_equal "Fat Wreck", rep.label
+    describe "#get!" do
+      it "retrieves, deserializes and updates properties" do
+        band = @band.get!("http://localhost:9999/bands/belvedere", "application/xml")
+        assert_equal "Belvedere", band.name
+        assert_equal "canadian maple", band.label
+      end
     end
+    
   end
 end

data/test/hypermedia_feature_test.rb

@@ -1,5 +1,6 @@
 require 'test_helper'
 require 'roar/representer/feature/hypermedia'
+require 'roar/representer/json'
 
 class HypermediaTest
   describe "Hypermedia Feature" do
@@ -8,11 +9,13 @@ class HypermediaTest
         include Roar::Representer::XML
         include Roar::Representer::Feature::Hypermedia
         
-        self.representation_name = "bookmarks"
+        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
@@ -39,10 +42,32 @@ class HypermediaTest
                           </bookmarks>', 
           @bookmarks_with_links.from_attributes(: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 Roar::Representer::JSON
+          property :note, :as => Note
+        end
+        
+        assert_equal "{\"note\":{\"links\":[{\"rel\":\"self\",\"href\":\"http://me\"}]}}", Page.from_attributes(note: Note.new).to_json
+      end
     end
     
     
+    
     describe "#from_xml" do
       it "extracts links from document" do
         doc = @bookmarks_with_links.from_xml(%{
@@ -130,3 +155,19 @@ class LinksDefinitionTest < MiniTest::Spec
     
   end
 end
+
+class LinkCollectionTest < MiniTest::Spec
+  describe "LinkCollection" do
+    it "provides #update_link" do
+      collection  = Roar::Representer::Feature::Hypermedia::LinkCollection.new
+      link        = Roar::Representer::XML::Hyperlink.from_attributes(rel: "self", href: "http://self")
+      
+      collection.update_link(link)
+      assert_equal 1, collection.size
+      
+      collection.update_link(link)
+      assert_equal 1, collection.size
+    end
+  end
+end
+

data/test/integration_test.rb

@@ -1,122 +1,85 @@
 require 'test_helper'
-
-require 'roar/representer/xml'
 require 'roar/representer/json'
-
-require 'roar/representer/feature/http_verbs'
 require 'roar/representer/feature/hypermedia'
 
-class RepresenterIntegrationTest < MiniTest::Spec
-  module XML
-    class Band
-      include Roar::Representer::XML
-      
-      property :name
-      property :label
-      
-      include Roar::Representer::Feature::HttpVerbs
-      
-      
-      link :search do
-        search_url
-      end
-      
-      link :self do
-        order_url(represented)
-      end
+class IntegrationTest < MiniTest::Spec
+  class Beer
+    include Roar::Representer::JSON
+    include Roar::Representer::Feature::Hypermedia
+    
+    property :name
+    
+    link :self do
+      "http://beers/#{name.downcase}"
     end
   end
   
-  # TODO: inherit properly.
-  module JSON
-    class Band
-      include Roar::Representer::JSON
-      
-      property :name
-      property :label
-      
-      include Roar::Representer::Feature::HttpVerbs
-      include Roar::Representer::Feature::Hypermedia
-      
-      
-      link :search do
-        search_url
-      end
-      
-      link :self do
-        order_url(represented)
-      end
-    end
+  class Beers
+    include Roar::Representer::JSON
+    include Roar::Representer::Feature::Hypermedia
+    
+    collection :items, :as => Beer
   end
   
-  
-  require 'order_representers'
-  describe "Representer as client" do
-    describe "JSON" do
-      it "allows a POST workflow" do
-        # create representation with initial values:
-        @r = JSON::Band.from_attributes(:name => "Bigwig")
-        assert_equal "Bigwig", @r.name
-        
-        @r = @r.post("http://localhost:9999/band", "application/band+json")
-        assert_equal "n/a", @r.label
-        
-        # check HATEOAS:
-        #@r.extend Roar::Representer::Feature::Hypermedia
-        assert_equal "http://search",         @r.links[:search]
-        assert_equal "http://band/strungout", @r.links[:self]
+  describe "Beer service" do
+    it "provides a document for a particular beer" do
+      assert_equal "{\"beer\":{\"name\":\"Eisenbahn\",\"links\":[{\"rel\":\"self\",\"href\":\"http://beers/eisenbahn\"}]}}", Beer.from_attributes(name: "Eisenbahn").to_json
+    end
+    
+    it "provides a detailed beers list" do
+      beers = ["Jever", "Becks", "Eisenbahn", "Colorado"].collect do |name|
+        Beer.from_attributes(name: name)
       end
       
-      # TODO: implement me.
-      it "allows an ordering workflow" do
-        # create representation with initial values:
-        @o = ::JSON::Order.from_attributes(:client_id => 1)
-        assert_equal 1, @o.client_id
-        
-        @o.post!("http://localhost:9999/orders", "application/order+json")
-        # check HATEOAS:
-        #@r.extend Roar::Representer::Feature::Hypermedia
-        
-        assert_equal "http://localhost:9999/orders/1/items",     @o.links[:items]
-        assert_equal "http://localhost:9999/orders/1",           @o.links[:self]
-        
-        
-        # manually POST item:
-        @i = ::JSON::Item.from_attributes(:article_id => "666-S", :amount => 1)
-        @i.post!(@o.links[:items], "application/item+json")
-        @o.get!(@o.links[:self], "application/order+json")
+      
+      list = Beers.new
+      list.items = beers
+      
+      assert_equal "{\"beers\":{\"items\":[{\"name\":\"Jever\",\"links\":[{\"rel\":\"self\",\"href\":\"http://beers/jever\"}]},{\"name\":\"Becks\",\"links\":[{\"rel\":\"self\",\"href\":\"http://beers/becks\"}]},{\"name\":\"Eisenbahn\",\"links\":[{\"rel\":\"self\",\"href\":\"http://beers/eisenbahn\"}]},{\"name\":\"Colorado\",\"links\":[{\"rel\":\"self\",\"href\":\"http://beers/colorado\"}]}]}}", list.to_json
+    end
+    
+    it "provides a pageable beers list without details" do
+      class BeerCollection
+        include Roar::Representer::JSON
+        include Roar::Representer::Feature::Hypermedia
         
-        # check if item is included in order:
-        assert_equal 1, @o.items.size
-        assert_equal @i.to_attributes, @o.items.first.to_attributes
+        attr_accessor :per_page, :current_page, :all_items
         
+        collection :beers, :as => Beer
+        property :total
         
-        ###@@o.delete!(@o.links[:self])
+        def total
+          all_items.size
+        end
         
-        # use the DSL to add items:
-        #@o.links[:items].post(:article_id => "666-S", :amount => 1)
+        def beers
+          all_items[(current_page-1)*per_page..current_page*per_page-1]
+        end
         
-        #@o.items.post(:article_id => "666-S", :amount => 1)
+        link :next do
+          "http://beers/all?page=#{current_page+1}" if current_page < total / per_page
+        end
         
+        link :prev do
+          "http://beers/all?page=#{current_page-1}" if current_page > 1
+        end
       end
-    end
-    
-    describe "XML" do
-      it "allows a POST workflow" do
-        # create representation with initial values:
-        @r = XML::Band.from_attributes(:name => "Bigwig")
-        assert_equal "Bigwig", @r.name
-        
-        @r = @r.post("http://localhost:9999/band", "application/band+xml")
-        assert_equal "n/a", @r.label
-        
-        # check HATEOAS:
-        #@r.extend Roar::Representer::Feature::Hypermedia
-        assert_equal "http://search",         @r.links[:search]
-        assert_equal "http://band/strungout", @r.links[:self]
+  
+      beers = ["Jever", "Becks", "Eisenbahn", "Colorado"].collect do |name|
+        Beer.from_attributes(name: name)
       end
+      
+      
+      list = BeerCollection.new
+      list.all_items    = beers # this would be a AR collection from a #find.
+      list.current_page = 1
+      list.per_page     = 2
+      
+      assert_equal "{\"beer_collection\":{\"beers\":[{\"name\":\"Jever\",\"links\":[{\"rel\":\"self\",\"href\":\"http://beers/jever\"}]},{\"name\":\"Becks\",\"links\":[{\"rel\":\"self\",\"href\":\"http://beers/becks\"}]}],\"total\":4,\"links\":[{\"rel\":\"next\",\"href\":\"http://beers/all?page=2\"},{\"rel\":\"prev\"}]}}", list.to_json
+      
+      
+      list.current_page = 2
+      assert_equal "{\"beers\":[{\"name\":\"Eisenbahn\",\"links\":[{\"rel\":\"self\",\"href\":\"http://beers/eisenbahn\"}]},{\"name\":\"Colorado\",\"links\":[{\"rel\":\"self\",\"href\":\"http://beers/colorado\"}]}],\"total\":4,\"links\":[{\"rel\":\"next\"},{\"rel\":\"prev\",\"href\":\"http://beers/all?page=1\"}]}", list.to_json(wrap: false)
     end
-    
-    
   end
 end

data/test/json_representer_test.rb

@@ -19,24 +19,24 @@ class JsonRepresenterTest < MiniTest::Spec
     describe "#to_json" do
       it "#serialize returns the serialized model" do
         @r.id = 1
-        assert_equal '{"order":{"id":1}}', @r.to_json
+        assert_equal '{"id":1}', @r.to_json
       end
     end
     
     describe ".from_json" do
       it "returns the deserialized model" do
-        @m = Order.from_json('{"order": {"id":1}}')
+        @m = Order.from_json('{"id":1}')
         assert_equal 1, @m.id
       end
       
       it "accepts :except option" do
-        order = Order.from_json({order: {id: 1, pending: 1}}.to_json, :except => [:id])
+        order = Order.from_json({id: 1, pending: 1}.to_json, :except => [:id])
         assert_equal nil, order.id
         assert_equal 1, order.pending
       end
       
       it "accepts :include option" do
-        order = Order.from_json({order: {id: 1, pending: 1}}.to_json, :include => [:id])
+        order = Order.from_json({id: 1, pending: 1}.to_json, :include => [:id])
         assert_equal 1, order.id
         assert_equal nil, order.pending
       end
@@ -51,14 +51,9 @@ end
 class JsonHyperlinkRepresenterTest
   describe "API" do
     before do
-      @l = Roar::Representer::JSON::Hyperlink.from_json({:link => {:rel => :self, :href => "http://roar.apotomo.de"}}.to_json)
+      @l = Roar::Representer::JSON::Hyperlink.from_json({:rel => :self, :href => "http://roar.apotomo.de"}.to_json)
     end
     
-    it "responds to #representation_name" do
-      assert_equal :link, @l.class.representation_name
-    end
-    
-    
     it "responds to #rel" do
       assert_equal "self", @l.rel
     end
@@ -76,8 +71,6 @@ class JsonHypermediaTest
         include Roar::Representer::JSON
         include Roar::Representer::Feature::Hypermedia
         
-        self.representation_name= :order
-        
         property :id
         
         link :self do "http://self" end
@@ -92,14 +85,14 @@ class JsonHypermediaTest
     end
     
     it "extracts links from JSON" do
-      @r = @c.from_json({:order => {:links => [{:rel => "self", :href => "http://self"}]}}.to_json)
+      @r = @c.from_json({:links => [{:rel => "self", :href => "http://self"}]}.to_json)
       
       assert_equal 1, @r.links.size
       assert_equal({"rel"=>"self", "href"=>"http://self"}, @r.links.first.to_attributes) 
     end
     
     it "renders link: correctly in JSON" do
-      assert_equal "{\"order\":{\"id\":1,\"links\":[{\"rel\":\"self\",\"href\":\"http://self\"},{\"rel\":\"next\",\"href\":\"http://next/1\"}]}}", @c.from_attributes(:id => 1).to_json
+      assert_equal "{\"id\":1,\"links\":[{\"rel\":\"self\",\"href\":\"http://self\"},{\"rel\":\"next\",\"href\":\"http://next/1\"}]}", @c.from_attributes(:id => 1).to_json
     end
   end
 end

data/test/model_representing_test.rb

@@ -6,14 +6,14 @@ class ModelRepresentingTest < MiniTest::Spec
     class ItemRepresenter
       include Roar::Representer::XML
       include Roar::Representer::Feature::ModelRepresenting
-      self.representation_name= :item
+      self.representation_wrap= :item
       property :value
     end
     
     class PositionRepresenter
       include Roar::Representer::XML
       include Roar::Representer::Feature::ModelRepresenting
-      self.representation_name= :position
+      self.representation_wrap= :position
       property :id
       property :item, :as => ItemRepresenter
     end
@@ -21,7 +21,7 @@ class ModelRepresentingTest < MiniTest::Spec
     class OrderRepresenter
       include Roar::Representer::XML
       include Roar::Representer::Feature::ModelRepresenting
-      self.representation_name= :order
+      self.representation_wrap= :order
       property :id
       collection :items, :as => ItemRepresenter
     end

data/test/representer_test.rb

@@ -41,14 +41,18 @@ class RepresenterTest < MiniTest::Spec
   end
   
   describe "Inheritance" do
-    it "properly inherits properties" do
-      base = Class.new do
+    it "properly inherits properties from modules" do
+      module PersonRepresentation
         include Roar::Representer::JSON
-        self.representation_name= "collection"
         property :name
       end
       
-      assert_equal "{\"collection\":{\"name\":\"Paulo\"}}", Class.new(base).from_attributes(:name => "Paulo").to_json
+      class Person
+        include Roar::Representer::JSON
+        include PersonRepresentation
+      end
+      
+      assert_equal "{\"name\":\"Paulo\"}", Person.from_attributes(:name => "Paulo").to_json
     end
     
   end

data/test/test_helper.rb

@@ -8,9 +8,6 @@ require 'roar/representer/base'
 require 'roar/representer/feature/hypermedia'
 require 'roar/representer/feature/http_verbs'
 
-require 'stringio'  # FIXME. remove for 3.0.4.
-require 'builder'
-
   module TestModel
     def self.included(base)
       base.extend ClassMethods

data/test/xml_representer_test.rb

@@ -2,13 +2,13 @@ require 'test_helper'
 
 class ItemRepresenter
   include Roar::Representer::XML
-  self.representation_name= :item
+  self.representation_wrap= :item
   property :value
 end
 
 class PositionRepresenter
   include Roar::Representer::XML
-  self.representation_name= :position
+  self.representation_wrap= :position
   property :id
   property :item, :as => ItemRepresenter
 end
@@ -48,7 +48,7 @@ class XMLRepresenterFunctionalTest < MiniTest::Spec
   
   class TestXmlRepresenter
     include Roar::Representer::XML
-    self.representation_name= :order  # FIXME: get from represented?
+    self.representation_wrap= :order  # FIXME: get from represented?
     property :id
   end
   
@@ -120,9 +120,9 @@ class XMLRepresenterFunctionalTest < MiniTest::Spec
         assert_equal "1", @m.id
       end
       
-      it ".from_xml still works with nil" do
-        assert TestXmlRepresenter.from_xml(nil)
-      end
+      #it ".from_xml still works with nil" do
+      #  assert TestXmlRepresenter.from_xml(nil)
+      #end
       
     end
     
@@ -155,7 +155,7 @@ class XMLRepresenterFunctionalTest < MiniTest::Spec
         @c = Class.new do
           include Roar::Representer::XML
           
-          self.representation_name= :order
+          self.representation_wrap= :order
           property :id
           collection :items, :as => ItemRepresenter, :from => :item
         end
@@ -193,7 +193,7 @@ class XmlHyperlinkRepresenterTest < MiniTest::Spec
     end
     
     it "responds to #representation_name" do
-      assert_equal :link, @l.class.representation_name
+      assert_equal :link, @l.class.representation_wrap
     end
     
     

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 8
-  - 2
-  version: 0.8.2
+  - 3
+  version: 0.8.3
 platform: ruby
 authors: 
 - Nick Sutterer
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-27 00:00:00 +01:00
+date: 2011-12-08 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,9 +27,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 9
-        - 2
-        version: 0.9.2
+        - 10
+        - 3
+        version: 0.10.3
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency