roar 0.11.4 → 0.11.5

data/test/rails/controller_methods_test.rb

@@ -8,25 +8,25 @@ module Representer
     class Album; end
   end
 end
-    
+
 class ControllerMethodsTest < ActionController::TestCase
   tests AlbumsController
-  
+
   test "responds to #responder" do
     assert_equal Roar::Rails::ControllerMethods::Responder, @controller.class.responder
   end
-  
+
   test "responds to #represents" do
     @controller = Class.new(AlbumsController)
     assert_equal Album, @controller.represented_class
     @controller.represents Song
     assert_equal Song, @controller.represented_class
   end
-  
+
   test "responds to #representer_class_for" do
     assert_equal Representer::BMP::Album, @controller.representer_class_for(Album, :bmp)
   end
-  
+
   test "responds to #representation" do
     post :create, %{<album>
       <year>2011</year>
@@ -34,12 +34,12 @@ class ControllerMethodsTest < ActionController::TestCase
         <title>Walking In Your Footsteps</title>
       </song>
     </album>}, :format => :xml
-    
-     
+
+
     assert_equal({"id"=>"", "year"=>"2011",
       "songs_attributes"=>[{"title"=>"Walking In Your Footsteps"}]}, @controller.representation)
   end
-  
+
   test "responds to #incoming" do
     post :create, %{<album>
       <year>2011</year>
@@ -47,8 +47,8 @@ class ControllerMethodsTest < ActionController::TestCase
         <title>Walking In Your Footsteps</title>
       </song>
     </album>}, :format => :xml
-    
-     
+
+
     assert_equal({"id"=>"", "year"=>"2011",
       "songs"=>[{"title"=>"Walking In Your Footsteps"}], "links"=>[]}, @controller.incoming.to_attributes)
   end
@@ -57,14 +57,14 @@ end
 
 class ControllerFunctionalTest < ActionController::TestCase
   tests AlbumsController
-  
+
   test "GET: returns a xml representation" do
     get :show, :id => 1, :format => :xml
-    
+
     assert_response 200
     assert_body %{
     <album>
-      <id>1</id>  
+      <id>1</id>
       <year>2011</year>
       <song>
         <title>Alltax</title>
@@ -72,12 +72,12 @@ class ControllerFunctionalTest < ActionController::TestCase
       <song>
         <title>Bali</title>
       </song>
-      
+
       <link rel="self"      href="http://test.host/albums/1" />
       <link rel="album-search"  href="http://test.host/articles/starts_with/{query}" />
     </album>}, :format => :xml
   end
-  
+
   test "POST: creates a new album and returns the xml representation" do
     post :create, %{<album>
       <year>1997</year>
@@ -85,31 +85,31 @@ class ControllerFunctionalTest < ActionController::TestCase
         <title>Cooler Than You</title>
       </song>
     </album>}, :format => :xml
-    
+
     assert @album = Album.find(:last)
     assert_equal "1997", @album.year
     assert_equal "Cooler Than You", @album.songs.first.title
-    
+
     assert_response 201, "Location" => album_url(@album) # Created
     assert_body %{
     <album>
-      <id>2</id>  
+      <id>2</id>
       <year>1997</year>
       <song>
         <title>Cooler Than You</title>
       </song>
-      
+
       <link rel="self"      href="http://test.host/albums/2" />
       <link rel="album-search"  href="http://test.host/articles/starts_with/{query}" />
     </album>}, :format => :xml
   end
-  
+
   test "POST: invalid incoming representations yields to 422" do
     post :create, :format => :xml
-    
+
     assert_response 422  # Unprocessable Entity
   end
-  
+
   test "PUT: updates album and returns the xml representation" do
     put :update, %{
     <album>
@@ -121,13 +121,13 @@ class ControllerFunctionalTest < ActionController::TestCase
         <title>Rubbing The Elf</title>
       </song>
     </album>}, :id => 1, :format => :xml
-    
+
     assert @album = Album.find(1)
     assert_equal "1997", @album.year
     assert_equal 2, @album.songs.size
     assert_equal "Cooler Than You", @album.songs.first.title
     assert_equal "Rubbing The Elf", @album.songs.last.title
-    
+
     assert_response 200
     assert_body %{
     <album>
@@ -139,7 +139,7 @@ class ControllerFunctionalTest < ActionController::TestCase
       <song>
         <title>Rubbing The Elf</title>
       </song>
-      
+
       <link rel="self"      href="http://test.host/albums/1" />
       <link rel="album-search"  href="http://test.host/articles/starts_with/{query}" />
     </album>}, :format => :xml

data/test/rails/rails_representer_methods_test.rb

@@ -16,15 +16,15 @@ class RailsRepresenterMethodsTest < MiniTest::Spec
     before do
       @c = Representer::JPG::Album  # TODO: mix Rails into Base, not XML only.
     end
-    
+
     it "provides conventions for #collection" do
       @c.collection :songs
-      
+
       @d = @c.representable_attrs.first
       assert_equal Representer::JPG::Song, @d.sought_type
       assert @d.array?
     end
-    
+
     it "provides conventions for #representation_name" do
       assert_equal "album", @c.representation_name
     end

data/test/representer_test.rb

@@ -7,32 +7,32 @@ class RepresenterTest < MiniTest::Spec
         include Roar::Representer
       end
     end
-    
+
     it "aliases #representable_property to #property" do
       @c.property :title
       assert_equal "title", @c.representable_attrs.first.name
     end
-    
+
     it "aliases #representable_collection to #collection" do
       @c.collection :songs
       assert_equal "songs", @c.representable_attrs.first.name
     end
   end
-  
+
   describe "Inheritance" do
     it "properly inherits properties from modules" do
       module PersonRepresentation
         include Roar::Representer::JSON
         property :name
       end
-      
+
       class Person
-        include AttributesContructor
+        include AttributesConstructor
         include Roar::Representer::JSON
         include PersonRepresentation
         attr_accessor :name
       end
-      
+
       assert_equal "{\"name\":\"Paulo\"}", Person.new(:name => "Paulo").to_json
     end
   end

data/test/test_helper.rb

@@ -17,7 +17,7 @@ begin
 rescue LoadError
 end
 
-module AttributesContructor
+module AttributesConstructor
   def initialize(attrs={})
     attrs.each do |k,v|
       instance_variable_set("@#{k}", v)
@@ -26,17 +26,17 @@ module AttributesContructor
 end
 
 class Item
-  include AttributesContructor
+  include AttributesConstructor
   attr_accessor :value
 end
 
 class Position
-  include AttributesContructor
+  include AttributesConstructor
   attr_accessor :id, :item
 end
 
 class Order
-  include AttributesContructor
+  include AttributesConstructor
   attr_accessor :id, :items
 end
 
@@ -49,3 +49,32 @@ require './test/fake_server'
 ShamRack.at('roar.example.com').rackup do
   run FakeServer
 end
+
+MiniTest::Spec.class_eval do
+  def link(options)
+    Roar::Representer::Feature::Hypermedia::Hyperlink.new(options)
+  end
+
+  def self.representer_for(&block) # FIXME: move to test_helper.
+    let (:rpr) do
+      Module.new do
+        include Roar::Representer::JSON
+        include Roar::Representer::Feature::Hypermedia
+
+        instance_exec(&block)
+      end
+    end
+  end
+end
+
+Roar::Representer::Feature::Hypermedia::Hyperlink.class_eval do
+  def ==(other)
+    stringify_hash(table) == stringify_hash(other.table)
+  end
+
+  def stringify_hash(hash)
+    hash.collect do |k,v|
+      [k.to_s, v.to_s]
+    end.sort
+  end
+end

data/test/xml_representer_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 class ItemRepresenter
-  include AttributesContructor
+  include AttributesConstructor
   include Roar::Representer::XML
   self.representation_wrap= :item
   property :value
@@ -9,7 +9,7 @@ class ItemRepresenter
 end
 
 class PositionRepresenter
-  include AttributesContructor
+  include AttributesConstructor
   include Roar::Representer::XML
   self.representation_wrap= :position
   property :id
@@ -20,69 +20,69 @@ end
 
 class XMLRepresenterFunctionalTest < MiniTest::Spec
   class Order
-    include AttributesContructor
+    include AttributesConstructor
     attr_accessor :id, :items
   end
-  
+
   class GreedyOrder < Order
   end
-  
+
   class TestXmlRepresenter
     include Roar::Representer::XML
     self.representation_wrap= :order
     property :id
     attr_accessor :id
   end
-  
-  
+
+
   describe "XMLRepresenter" do
     before do
       @m = {"id" => "1"}
       @o = Order.new(@m)
-      
+
       @r = TestXmlRepresenter.new
       @i = ItemRepresenter.new
       @i.value = "Beer"
     end
-    
+
     describe "#to_xml" 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(:wrap => :rap)
       end
-      
+
       it "is aliased by #serialize" do
         assert_equal @r.to_xml, @r.serialize
       end
-      
+
       it "accepts :include and :exclude" do
         assert_equal '<order/>', @r.to_xml(:exclude => [:id])
       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
-      
+
       it "accepts :include and :exclude" do
         @order = Order.new.deserialize("<order><id>1</id></order>", :exclude => [:id])
         assert_equal nil, @order.id
       end
     end
-    
-    
+
+
     describe "XML.from_xml" do
       class Order
         include Roar::Representer::XML
@@ -90,96 +90,96 @@ class XMLRepresenterFunctionalTest < MiniTest::Spec
         property :pending
         attr_accessor :id, :pending
       end
-    
+
       it "is aliased to #deserialize" do
         assert_equal TestXmlRepresenter.from_xml("<order/>").id, TestXmlRepresenter.deserialize("<order/>").id
       end
-      
+
       it "accepts :exclude option" do
         order = Order.from_xml(%{<order><id>1</id><pending>1</pending></order>}, :exclude => [:id])
         assert_equal nil, order.id
         assert_equal "1", order.pending
       end
-      
+
       it "accepts :include option" do
         order = Order.from_xml(%{<order><id>1</id><pending>1</pending></order>}, :include => [:id])
         assert_equal "1", order.id
         assert_equal nil, order.pending
       end
     end
-    
-    
+
+
     describe "without options" do
       it ".from_xml returns the deserialized model" do
         @m = TestXmlRepresenter.from_xml("<order><id>1</id></order>")
         assert_equal "1", @m.id
       end
-      
+
       #it ".from_xml still works with nil" do
       #  assert TestXmlRepresenter.from_xml(nil)
       #end
-      
+
     end
-    
-    
+
+
     describe "with a typed attribute" do
       before do
         @r = PositionRepresenter.new("id" => "1")
       end
-      
+
       it "#serialize skips empty :item" do
         assert_xml_equal "<position><id>1</id></position>", @r.to_xml
       end
-      
+
       it "#to_xml delegates to ItemRepresenter#to_xml" do
         @r.item = @i
         assert_xml_equal "<position><id>1</id><item><value>Beer</value></item></position>", @r.to_xml
       end
-      
+
       it ".from_xml typecasts :item" do
         @m = PositionRepresenter.from_xml("<position><id>1</id><item><value>beer</value></item>\n</position>")
-        
+
         assert_equal "1",     @m.id
         assert_equal "beer",  @m.item.value
       end
     end
-    
-    
+
+
     describe "with a typed list" do
       before do
         @c = Class.new do
-          include AttributesContructor
+          include AttributesConstructor
           include Roar::Representer::XML
-          
+
           self.representation_wrap= :order
           property :id
           collection :items, :class => ItemRepresenter, :from => :item
           attr_accessor :id, :items
         end
-        
+
         @r = @c.new("id" => 1)
       end
-      
+
       it "#serialize_model skips empty :item" do
         assert_xml_equal "<order><id>1</id></order>", @r.to_xml
       end
-      
+
       it "#serialize delegates to ItemXmlRepresenter#to_xml in list" do
         @r.items = [ItemRepresenter.new("value" => "Bier")]
-        
-        assert_xml_equal "<order><id>1</id><item><value>Bier</value></item></order>", 
+
+        assert_xml_equal "<order><id>1</id><item><value>Bier</value></item></order>",
           @r.to_xml
       end
-      
+
       it ".from_xml typecasts list" do
         @m = @c.from_xml("<order><id>1</id><item><value>beer</value></item>\n</order>")
-        
+
         assert_equal "1",     @m.id
         assert_equal 1,       @m.items.size
         assert_equal "beer",  @m.items.first.value
       end
     end
-    
+
   end
 end
 
@@ -188,19 +188,19 @@ class XmlHyperlinkRepresenterTest < MiniTest::Spec
     before do
       @link = Roar::Representer::Feature::Hypermedia::Hyperlink.new.extend(Roar::Representer::XML::HyperlinkRepresenter).from_xml(%{<link rel="self" href="http://roar.apotomo.de" media="web"/>})
     end
-    
+
     it "responds to #rel" do
       assert_equal "self", @link.rel
     end
-    
+
     it "responds to #href" do
       assert_equal "http://roar.apotomo.de", @link.href
     end
-    
+
     it "responds to #media" do
       assert_equal "web", @link.media
     end
-    
+
     it "responds to #to_xml" do
       assert_xml_equal %{<link rel=\"self\" href=\"http://roar.apotomo.de\" media="web"/>}, @link.to_xml
     end