roar 0.8.3 → 0.9.0

data/CHANGES.markdown

@@ -1,3 +1,10 @@
+h2. 0.9.0
+
+* Using representable-0.12.x.
+* `Representer::Base` is now simply `Representer`.
+* Removed all the class methods from `HttpVerbs` except for `get`.
+
+
 h2. 0.8.3
 
 * Maintenance release for representable compat.

data/README.textile

@@ -175,7 +175,7 @@ To create a new order, the frontend needs to POST to the REST backend. Here's ho
 
 <pre>
   order = Order.new(:client_id => current_user.id)
-  order.post!("http://orders/")
+  order.post("http://orders/")
 </pre>
 
 A couple of noteworthy steps happen here.
@@ -184,7 +184,7 @@ A couple of noteworthy steps happen here.
 # Initial values like the client's id are passed as arguments and placed in the document.
 # The filled-out document is POSTed to the given URL.
 # The backend service creates an actual order record and sends back the representation.
-# In the @#post!@ call, the returned document is parsed and attributes in the representer instance are updated accordingly,
+# In the @#post@ call, the returned document is parsed and attributes in the representer instance are updated accordingly,
 
 After the HTTP roundtrip, the order instance keeps all the information we need for proceeding the ordering workflow.
 
@@ -267,7 +267,7 @@ Here's what could happen in the frontend.
 <pre>
 beer = Article.new(:title => "Lonestar Beer")
 order.items << beer
-order.post!(order.links[:self])
+order.post(order.links[:self])
 </pre>
 
 This was dead simple since representations can be composed of different documents in Roar.

data/lib/roar/rails/representer_methods.rb

@@ -43,7 +43,7 @@ module Roar
           singular_name = name.to_s.singularize
           
           super name, options.reverse_merge(
-            :as => "representer/#{namespace}/#{singular_name}".classify.constantize,
+            :class => "representer/#{namespace}/#{singular_name}".classify.constantize,
             #:tag => singular_name  # FIXME: how/where to decide if singular TAG or not?
             )
         end

data/lib/roar/representer.rb

@@ -0,0 +1,46 @@
+require 'representable'
+
+module Roar
+  module Representer
+    def self.included(base)
+      base.class_eval do
+        include Representable
+        extend ClassMethods
+      end
+    end
+    
+      
+    module ClassMethods
+      # Creates a representer instance and fills it with +attributes+.
+      # DISCUSS: remove.
+      def from_attributes(attributes) # DISCUSS: better move to #new? how do we handle the original #new then?
+        new.tap do |representer|
+          yield representer if block_given?
+          attributes.each { |p,v| representer.public_send("#{p}=", v) }
+        end
+      end
+    end
+    
+    
+    # Convert representer's attributes to a nested attributes hash.
+    def to_attributes
+      {}.tap do |attributes|
+        self.class.representable_attrs.each do |definition|
+          value = public_send(definition.getter)
+          
+          if definition.typed?
+            value = definition.apply(value) do |v|
+              v.to_attributes  # applied to each typed attribute (even in collections).
+            end
+          end
+          
+          attributes[definition.name] = value
+        end
+      end
+    end
+  
+  private
+    def before_serialize(*)
+    end
+  end
+end

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

@@ -1,60 +1,54 @@
 require 'roar/representer/feature/transport'
 
 module Roar
-  # Gives HTTP-power to representers where those can automatically serialize, send, process and deserialize HTTP-requests.
+  # 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
         end
-        # TODO: read format and base url defaults from Roar::Config.
+        
         
         module ClassMethods
-          include Transport
-          
+          # GETs +url+ with +format+ and returns deserialized representer.
           def get(url, format)
-            document = get_uri(url, format).body
+            document = http.get_uri(url, format).body
             deserialize(document)
           end
           
-          def post(url, body, format)
-            representation = post_uri(url, body, format).body
-            deserialize(representation)
-          end
-          
-          
-          def put(url, body, format)
-            representation = put_uri(url, body, format).body
-            deserialize(representation)
+          def http
+            Transport
           end
         end
         
+        
+        # Serializes the object, POSTs it to +url+ with +format+, deserializes the returned document
+        # and updates properties accordingly.
         def post(url, format)
-          self.class.post(url, serialize, format)
-        end
-        def post!(*args)
-          rep = post(*args) # TODO: make this better.
-          
-          self.class.representable_attrs.each do |definition|
-
-            send(definition.setter, rep.public_send(definition.getter))
-          end # TODO: this sucks. do this with #properties and #replace_properties.
+          # DISCUSS: what if a redirect happens here?
+          document = http.post_uri(url, serialize, format).body
+          deserialize(document)
         end
         
-        def get!(url, format) # FIXME: abstract to #replace_properties
-          rep = self.class.get(url, format) # TODO: where's the format? why do we need class here?
-          
-          self.class.representable_attrs.each do |definition|
-            send(definition.setter, rep.public_send(definition.getter))
-          end # TODO: this sucks. do this with #properties and #replace_properties.
+        # 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)
         end
         
+        # Serializes the object, PUTs it to +url+ with +format+, deserializes the returned document
+        # and updates properties accordingly.
         def put(url, format)
-          self.class.put(url, serialize, format)
+          document = http.put_uri(url, serialize, format).body
+          deserialize(document)
         end
         
         # TODO: implement delete, patch.
+      private
+        def http
+          Transport  # DISCUSS: might be refering to separate http object soon.
+        end
       end
     end
   end

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

@@ -6,36 +6,38 @@ module Roar
     module Feature
       # Implements the HTTP verbs with Net::HTTP.
       module Transport
-        # 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
+        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
         
-        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)
+        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

data/lib/roar/representer/json.rb

@@ -1,4 +1,4 @@
-require 'roar/representer/base'
+require 'roar/representer'
 require 'representable/json'
 
 module Roar
@@ -6,7 +6,7 @@ module Roar
     module JSON
       def self.included(base)
         base.class_eval do
-          include Base
+          include Representer
           include Representable::JSON
           
           extend ClassMethods
@@ -23,10 +23,6 @@ module Roar
         def from_json(document, options={})
           document ||= "{}" # DISCUSS: provide this for convenience, or better not?
           
-          if block = deserialize_block_for_options(options) and 
-            return super(document, &block)
-          end
-          
           super
         end
         
@@ -34,6 +30,10 @@ module Roar
         def serialize(*args)
           to_json(*args)
         end
+        
+        def deserialize(*args)
+          from_json(*args)
+        end
       end
       
       
@@ -44,7 +44,7 @@ module Roar
         
         # TODO: move to instance method, or remove?
         def links_definition_options
-          {:as => Hyperlink , :collection => true}
+          {:class => Hyperlink , :collection => true}
         end
       end
       

data/lib/roar/representer/xml.rb

@@ -1,4 +1,4 @@
-require 'roar/representer/base'
+require 'roar/representer'
 require 'representable/xml'
 
 module Roar
@@ -8,7 +8,7 @@ module Roar
     module XML
       def self.included(base)
         base.class_eval do
-          include Base
+          include Representer
           include Representable::XML
 
           extend ClassMethods
@@ -17,14 +17,6 @@ module Roar
       end
       
       module InstanceMethods
-        def from_xml(document, options={})
-          if block = deserialize_block_for_options(options)
-            return super(document, &block)
-          end
-          
-          super
-        end
-        
         def to_xml(*args)
           before_serialize(*args)
           super
@@ -34,6 +26,10 @@ module Roar
         def serialize(*args)
           to_xml(*args)
         end
+        
+        def deserialize(*args)
+          from_xml(*args)
+        end
       end
       
       
@@ -41,7 +37,7 @@ module Roar
         include Representable::XML::ClassMethods
         
         def links_definition_options
-          {:from => :link, :as => Hyperlink, :collection => true}
+          {:from => :link, :class => Hyperlink, :collection => true}
         end
         
         # Generic entry-point for parsing.

data/lib/roar/version.rb

@@ -1,3 +1,3 @@
 module Roar
-  VERSION = "0.8.3"
+  VERSION = "0.9.0"
 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.10.3"
+  s.add_runtime_dependency "representable", "~> 0.12"
   s.add_runtime_dependency "hooks",         "~> 0.1.4"
   
   s.add_development_dependency "test_xml"

data/test/dummy/config/routes.rb

@@ -3,5 +3,5 @@ Dummy::Application.routes.draw do
   root :to => 'musician#index'
   resources :albums
   resources :songs
-  get "articles/starts_with/{query}", :to => "albums#search",:as => :album_search
+  get "articles/starts_with/{query}", :to => "albums#search",:class => :album_search
 end

data/test/fake_server.rb

@@ -1,30 +1,9 @@
 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
-  BANDS = {"belvedere" => Band.new("Belvedere", "canadian maple")}
-  
-  get "/bands/:id" do
-    BANDS[params[:id]].to_xml
-  end
-  
-  
+class FakeServer < Sinatra::Base
   get "/method" do
     "<method>get</method>"
   end
@@ -45,21 +24,18 @@ class FakeServer < Sinatra::Base
   #  "<method>patch</method>"
   #end
   
-  post "/band" do
-    if request.content_type =~ /xml/
-      %{<band><label>n/a</label><name>Strung Out</name>
-        <link href="http://search" rel="search" />
-        <link href="http://band/strungout" rel="self" />
-      </band>}
-    else
-      '{"band": {"label": "n/a", "name": "Strung Out", "links": [{"href":"http://search", "rel": "search"}, {"href":"http://band/strungout", "rel": "self"}]}}'
-    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"}]}'
   end
   
-  put "/band/strungout" do
-    %{<band><label>Fat Wreck</label><name>Strung Out</name></band>}
+  put "/bands/strungout" do
+    {:name => "Strung Out", :label => "Fat Wreck"}.to_json
   end
   
+  get "/bands/slayer" do
+    {:name => "Slayer", :label => "Canadian Maple"}.to_json
+  end
   
   
   require Dir.pwd + '/order_representers'

data/test/http_verbs_feature_test.rb

@@ -1,67 +1,70 @@
 require 'test_helper'
 require 'roar/representer/feature/http_verbs'
+require 'roar/representer/json'
 
 class HttpVerbsTest < MiniTest::Spec
-  class Band
-    include Roar::Representer::XML
+  module BandRepresenter
+    include Roar::Representer::JSON
     
     property :name
     property :label
-    
-    include Roar::Representer::Feature::HttpVerbs
   end
   
   describe "HttpVerbs" do
     before do
-      @r = @band = Band.new
+      @band = Object.new
+      @band.extend(BandRepresenter)
+      @band.extend(Roar::Representer::Feature::HttpVerbs)
     end
     
-    # TODO: assert that Restfulie#post receives the correct document.
-    
-    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
+    describe "HttpVerbs.get" do
+      it "returns instance from incoming representation" do
+        @Band = Class.new do
+          include Roar::Representer::JSON
+          include BandRepresenter
+          include Roar::Representer::Feature::HttpVerbs
+        end
+        @band = @Band.get("http://localhost:9999/bands/slayer", "application/json")
+        assert_equal "Slayer", @band.name
+        assert_equal "Canadian Maple", @band.label
       end
     end
     
-    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
+    describe "#get" do
+      it "updates instance with incoming representation" do
+        @band.get("http://localhost:9999/bands/slayer", "application/json")
+        assert_equal "Slayer", @band.name
+        assert_equal "Canadian Maple", @band.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
+    describe "#post" do
+      it "updates instance with incoming representation" do
+        @band.name = "Strung Out"
+        assert_equal nil, @band.label
+        
+        @band.post("http://localhost:9999/bands", "application/xml")
+        assert_equal "Strung Out", @band.name
+        assert_equal "n/a", @band.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
+    describe "#put" do
+      it "updates instance with incoming representation" do
+        @band.name   = "Strung Out"
+        @band.label  = "Fat Wreck"
+        @band.put("http://localhost:9999/bands/strungout", "application/xml")
+        assert_equal "Strung Out", @band.name
+        assert_equal "Fat Wreck", @band.label
       end
     end
     
-    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
+    describe "#delete" do
+      
     end
     
+    describe "#patch" do
+      
+    end
   end
 end

data/test/hypermedia_feature_test.rb

@@ -59,7 +59,7 @@ class HypermediaTest
       it "sets up links even when nested" do
         class Page
           include Roar::Representer::JSON
-          property :note, :as => Note
+          property :note, :class => Note
         end
         
         assert_equal "{\"note\":{\"links\":[{\"rel\":\"self\",\"href\":\"http://me\"}]}}", Page.from_attributes(note: Note.new).to_json

data/test/integration_test.rb

@@ -18,7 +18,7 @@ class IntegrationTest < MiniTest::Spec
     include Roar::Representer::JSON
     include Roar::Representer::Feature::Hypermedia
     
-    collection :items, :as => Beer
+    collection :items, :class => Beer
   end
   
   describe "Beer service" do
@@ -45,7 +45,7 @@ class IntegrationTest < MiniTest::Spec
         
         attr_accessor :per_page, :current_page, :all_items
         
-        collection :beers, :as => Beer
+        collection :beers, :class => Beer
         property :total
         
         def total
@@ -79,7 +79,7 @@ class IntegrationTest < MiniTest::Spec
       
       
       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)
+      assert_equal "{\"beer_collection\":{\"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
     end
   end
 end

data/test/json_representer_test.rb

@@ -13,36 +13,44 @@ class JsonRepresenterTest < MiniTest::Spec
   
   describe "JsonRepresenter" do
     before do
-      @r = Order.new
+      @order = Order.new
     end
     
+    
     describe "#to_json" do
-      it "#serialize returns the serialized model" do
-        @r.id = 1
-        assert_equal '{"id":1}', @r.to_json
+      before do
+        @order.id = 1
+      end
+      
+      it "returns the serialized model" do
+        assert_equal '{"id":1}', @order.to_json
+      end
+      
+      it "is aliased by #serialize" do
+        assert_equal '{"id":1}', @order.serialize
       end
     end
     
-    describe ".from_json" do
+    describe "#from_json" do
       it "returns the deserialized model" do
-        @m = Order.from_json('{"id":1}')
-        assert_equal 1, @m.id
+        @order.from_json('{"id":1}')
+        assert_equal 1, @order.id
       end
       
-      it "accepts :except option" do
-        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({id: 1, pending: 1}.to_json, :include => [:id])
-        assert_equal 1, order.id
-        assert_equal nil, order.pending
+      it "is aliased by #deserialize" do
+        @order.deserialize('{"id":1}')
+        assert_equal 1, @order.id
       end
       
       it "works with a nil document" do
-        assert Order.from_json(nil)
+        assert @order.from_json(nil)
+      end
+    end
+    
+    describe "JSON.from_json" do
+      it "is aliased by #deserialize" do
+        @order = Order.deserialize('{"id":1}')
+        assert_equal 1, @order.id
       end
     end
   end

data/test/model_representing_test.rb

@@ -15,7 +15,7 @@ class ModelRepresentingTest < MiniTest::Spec
       include Roar::Representer::Feature::ModelRepresenting
       self.representation_wrap= :position
       property :id
-      property :item, :as => ItemRepresenter
+      property :item, :class => ItemRepresenter
     end
     
     class OrderRepresenter
@@ -23,7 +23,7 @@ class ModelRepresentingTest < MiniTest::Spec
       include Roar::Representer::Feature::ModelRepresenting
       self.representation_wrap= :order
       property :id
-      collection :items, :as => ItemRepresenter
+      collection :items, :class => ItemRepresenter
     end
     
     describe "#definition_class" do

data/test/order_representers.rb

@@ -18,7 +18,7 @@ module JSON
   class Order
     include Roar::Representer::JSON
     property :client_id
-    collection :items, :as => Item
+    collection :items, :class => Item
     
     
     include Roar::Representer::Feature::HttpVerbs

data/test/representer_test.rb

@@ -1,10 +1,10 @@
 require 'test_helper'
 
 class RepresenterTest < MiniTest::Spec
-  describe "Representer::Base" do
+  describe "Representer" do
     before do
       @c = Class.new do
-        include Roar::Representer::Base
+        include Roar::Representer
       end
     end
     

data/test/test_helper.rb

@@ -4,7 +4,7 @@ Bundler.setup
 require 'test/unit'
 require 'minitest/spec'
 
-require 'roar/representer/base'
+require 'roar/representer'
 require 'roar/representer/feature/hypermedia'
 require 'roar/representer/feature/http_verbs'
 

data/test/transport_test.rb

@@ -4,26 +4,23 @@ require 'roar/representer/feature/transport'
 class TransportTest < MiniTest::Spec
   describe "Transport" do
     before do
-      @klass = Class.new(Object) do
-        include Roar::Representer::Feature::Transport
-      end
-      @o = @klass.new
+      @transport = Roar::Representer::Feature::Transport
     end
     
     it "#get_uri returns response" do
-      assert_equal "<method>get</method>",  @o.get_uri("http://localhost:9999/method", "application/xml").body
+      assert_equal "<method>get</method>",  @transport.get_uri("http://localhost:9999/method", "application/xml").body
     end
     
     it "#post_uri returns response" do
-      assert_equal "<method>post</method>",  @o.post_uri("http://localhost:9999/method", "booty", "application/xml").body
+      assert_equal "<method>post</method>",  @transport.post_uri("http://localhost:9999/method", "booty", "application/xml").body
     end
     
     it "#put_uri returns response" do
-      assert_equal "<method>put</method>",  @o.put_uri("http://localhost:9999/method", "booty", "application/xml").body
+      assert_equal "<method>put</method>",  @transport.put_uri("http://localhost:9999/method", "booty", "application/xml").body
     end
     
     it "#delete_uri returns response" do
-      assert_equal "<method>delete</method>",  @o.delete_uri("http://localhost:9999/method", "application/xml").body
+      assert_equal "<method>delete</method>",  @transport.delete_uri("http://localhost:9999/method", "application/xml").body
     end
     
     # TODO: how to get PATCH into Sinatra?

data/test/xml_representer_test.rb

@@ -10,7 +10,7 @@ class PositionRepresenter
   include Roar::Representer::XML
   self.representation_wrap= :position
   property :id
-  property :item, :as => ItemRepresenter
+  property :item, :class => ItemRepresenter
 end
 
 
@@ -48,7 +48,7 @@ class XMLRepresenterFunctionalTest < MiniTest::Spec
   
   class TestXmlRepresenter
     include Roar::Representer::XML
-    self.representation_wrap= :order  # FIXME: get from represented?
+    self.representation_wrap= :order
     property :id
   end
   
@@ -71,19 +71,35 @@ class XMLRepresenterFunctionalTest < MiniTest::Spec
     
     
     describe "#to_xml" do
-      it "serializes the current model" do
+      it "serializes the model" do
         assert_xml_equal "<order/>", @r.to_xml
         
+        @r.id = 1
+        assert_xml_equal "<order><id>1</id></order>", @r.to_xml
+        
         @r.id = 2
-        assert_xml_equal "<rap><id>2</id></rap>", @r.to_xml(:name => :rap)
+        assert_xml_equal "<rap><id>2</id></rap>", @r.to_xml(:wrap => :rap)
       end
       
-      it "is aliased to #serialize" do
+      it "is aliased by #serialize" do
         assert_equal @r.to_xml, @r.serialize
       end
     end
     
     describe "#from_xml" do
+      it "deserializes object" do
+        @order = Order.new.from_xml("<order><id>1</id></order>")
+        assert_equal "1", @order.id
+      end
+      
+      it "is aliased by #deserialize" do
+        @order = Order.new.deserialize("<order><id>1</id></order>")
+        assert_equal "1", @order.id
+      end
+    end
+    
+    
+    describe "XML.from_xml" do
       class Order
         include Roar::Representer::XML
         property :id
@@ -109,12 +125,6 @@ class XMLRepresenterFunctionalTest < MiniTest::Spec
     
     
     describe "without options" do
-      it "#to_xml returns the serialized model" do
-        @r.id = 1
-        assert_xml_equal "<order><id>1</id></order>", @r.to_xml
-      end
-      
-      
       it ".from_xml returns the deserialized model" do
         @m = TestXmlRepresenter.from_xml("<order><id>1</id></order>")
         assert_equal "1", @m.id
@@ -157,7 +167,7 @@ class XMLRepresenterFunctionalTest < MiniTest::Spec
           
           self.representation_wrap= :order
           property :id
-          collection :items, :as => ItemRepresenter, :from => :item
+          collection :items, :class => ItemRepresenter, :from => :item
         end
         
         @r = @c.from_attributes("id" => 1)
@@ -192,8 +202,8 @@ class XmlHyperlinkRepresenterTest < MiniTest::Spec
       @l = Roar::Representer::XML::Hyperlink.from_xml(%{<link rel="self" href="http://roar.apotomo.de"/>})
     end
     
-    it "responds to #representation_name" do
-      assert_equal :link, @l.class.representation_wrap
+    it "responds to #to_xml" do
+      assert_xml_equal %{<link rel=\"self\" href=\"http://roar.apotomo.de\"/>}, @l.to_xml
     end
     
     

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 8
-  - 3
-  version: 0.8.3
+  - 9
+  - 0
+  version: 0.9.0
 platform: ruby
 authors: 
 - Nick Sutterer
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-08 00:00:00 +01:00
+date: 2011-12-20 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,9 +27,8 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 10
-        - 3
-        version: 0.10.3
+        - 12
+        version: "0.12"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -111,7 +110,7 @@ files:
 - lib/roar/rails/controller_methods.rb
 - lib/roar/rails/representer_methods.rb
 - lib/roar/rails/test_case.rb
-- lib/roar/representer/base.rb
+- lib/roar/representer.rb
 - lib/roar/representer/feature/http_verbs.rb
 - lib/roar/representer/feature/hypermedia.rb
 - lib/roar/representer/feature/model_representing.rb

data/lib/roar/representer/base.rb

@@ -1,64 +0,0 @@
-require 'representable'
-
-module Roar
-  module Representer
-    module Base
-      def self.included(base)
-        base.class_eval do
-          include Representable
-          extend ClassMethods
-          
-          class << self
-            alias_method :property, :representable_property
-            alias_method :collection, :representable_collection
-          end
-        end
-      end
-      
-        
-      module ClassMethods
-        # Creates a representer instance and fills it with +attributes+.
-        def from_attributes(attributes) # DISCUSS: better move to #new? how do we handle the original #new then?
-          new.tap do |representer|
-            yield representer if block_given?
-            attributes.each { |p,v| representer.public_send("#{p}=", v) }
-          end
-        end
-      end
-      
-      
-      # Convert representer's attributes to a nested attributes hash.
-      def to_attributes
-        {}.tap do |attributes|
-          self.class.representable_attrs.each do |definition|
-            value = public_send(definition.getter)
-            
-            if definition.typed?
-              value = definition.apply(value) do |v|
-                v.to_attributes  # applied to each typed attribute (even in collections).
-              end
-            end
-            
-            attributes[definition.name] = value
-          end
-        end
-      end
-    
-    private
-      def before_serialize(*)
-      end
-      
-      # Returns block used in #from_json and #from_xml to filter incoming arguments.
-      # This method is subject to change and might be removed, soon.
-      def deserialize_block_for_options(options)
-        return unless props = options[:except] || options[:include]
-        
-        lambda do |name| 
-          res = props.include?(name)
-          options[:include] ? res : !res
-        end
-      end
-      
-    end
-  end
-end