roar 0.8.0 → 0.8.1

data/test/representer_test.rb

@@ -1,9 +1,11 @@
 require 'test_helper'
 
 class RepresenterTest < MiniTest::Spec
-  describe "Representer" do
+  describe "Representer::Base" do
     before do
-      @c = Class.new(Roar::Representer::Base)
+      @c = Class.new do
+        include Roar::Representer::Base
+      end
     end
     
     it "aliases #representable_property to #property" do
@@ -16,9 +18,37 @@ class RepresenterTest < MiniTest::Spec
       assert_equal "songs", @c.representable_attrs.first.name
     end
     
-    it "accepts property hash in #new" do
-      @c.property :title
-      assert_equal "Counting Down", @c.new(:title => "Counting Down").title
+    
+    describe "#from_attributes" do
+      it "accepts a block yielding the created representer instance" do
+        @c.class_eval { attr_accessor :name }
+        
+        assert_equal("Conan", @c.from_attributes({}) { |rep| rep.name = "Conan" }.name)
+      end
+      
+      it "copies known properties, only, but doesn't complain" do
+        @c.class_eval { property :id }
+        
+        assert_equal 1, @c.from_attributes("id" => 1, "unknown" => "don't use me").id
+      end
+      
+      it "accepts symbols and strings as property name" do
+        @c.class_eval { property :id }
+        
+        assert_equal @c.from_attributes(:id => 1).id, @c.from_attributes("id" => 1).id
+      end
+    end
+  end
+  
+  describe "Inheritance" do
+    it "properly inherits properties" do
+      base = Class.new do
+        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
     end
     
   end

data/test/test_helper.rb

@@ -4,18 +4,39 @@ Bundler.setup
 require 'test/unit'
 require 'minitest/spec'
 
-require 'active_model'
-#require 'roar/client/entity_proxy'
-require 'roar/representer'
-require 'roar/model'
+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
+    end
+    
+    
+    module ClassMethods
+      def accessors(*names)
+        names.each do |name|
+          attr_accessor name
+        end
+      end
+    end
+    
+    attr_accessor :attributes
+    
+    def initialize(attributes={})
+      attributes.each do |k,v|
+        send("#{k}=", v)
+      end
+    end
+  end
+
 
 class Item
-  include Roar::Model
+  include TestModel
   accessors :value
   
   def self.model_name
@@ -24,7 +45,7 @@ class Item
 end
 
 class Position
-  include Roar::Model
+  include TestModel
   accessors :id, :item
   
   def self.model_name
@@ -33,7 +54,7 @@ class Position
 end
 
 class Order
-  include Roar::Model
+  include TestModel
   accessors :id, :items
   
   def self.model_name

data/test/xml_representer_test.rb

@@ -1,24 +1,16 @@
 require 'test_helper'
 
-class Order
-  include Roar::Model
-  accessors :id, :item
-  
-  def self.model_name
-    :order
-  end
-end
-
-
-class ItemRepresenter < Roar::Representer::XML
+class ItemRepresenter
+  include Roar::Representer::XML
   self.representation_name= :item
-  representable_property :value
+  property :value
 end
 
-class PositionRepresenter < Roar::Representer::XML
+class PositionRepresenter
+  include Roar::Representer::XML
   self.representation_name= :position
-  representable_property :id
-  representable_property :item, :as => ItemRepresenter
+  property :id
+  property :item, :as => ItemRepresenter
 end
 
 
@@ -27,7 +19,10 @@ end
 class XMLRepresenterUnitTest < MiniTest::Spec
   describe "XmlRepresenter" do
     describe "#link" do
-      class Rapper < Roar::Representer::XML
+      class Rapper
+        include Roar::Representer::XML
+        include Roar::Representer::Feature::Hypermedia
+        
         link :self
         link :next
       end
@@ -37,57 +32,13 @@ class XMLRepresenterUnitTest < MiniTest::Spec
         assert_equal [{:rel=>:self, :block=>nil}, {:rel=>:next, :block=>nil}], Rapper.representable_attrs.first.rel2block
       end
     end
-    
-    describe "#from_attributes" do
-      it "accepts a block" do
-        @c = Class.new(Roar::Representer::XML) do
-          attr_accessor :name
-        end
-        
-        assert_equal("Conan", @c.from_attributes({}) { |rep| rep.name = "Conan" }.name)
-      end
-    end
   end
 end
 
-class LinksDefinitionTest < MiniTest::Spec
-  describe "LinksDefinition" do
-    before do
-      @d = Roar::Representer::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
-  end
-end
-
-class XMLDefinitionTest < MiniTest::Spec
-  class Rapper
-    attr_accessor :name
-  end
-  
-  describe "ROXML::Definition" do
-    it "responds to #populate" do
-      @r = Rapper.new
-      Representable::Definition.new(:name).populate(@r, "name" => "Eugen")
-      assert_equal "Eugen", @r.name
-    end
-  end
-end
-
-
-
-
 
 class XMLRepresenterFunctionalTest < MiniTest::Spec
   class GreedyOrder
-    include Roar::Model
+    include TestModel
     accessors :id, :items
     
     def self.model_name
@@ -95,9 +46,10 @@ class XMLRepresenterFunctionalTest < MiniTest::Spec
     end
   end
   
-  class TestXmlRepresenter < Roar::Representer::XML
+  class TestXmlRepresenter
+    include Roar::Representer::XML
     self.representation_name= :order  # FIXME: get from represented?
-    representable_property :id
+    property :id
   end
   
   
@@ -110,18 +62,6 @@ class XMLRepresenterFunctionalTest < MiniTest::Spec
       @i.value = "Beer"
     end
     
-    describe "#from_attributes" do
-      it "copies represented attributes, only" do
-        @r = PositionRepresenter.from_attributes("id" => 1, "item" => @i, "unknown" => 1)
-        assert_kind_of PositionRepresenter, @r
-        assert_equal 1, @r.id
-        
-        assert_kind_of ItemRepresenter, @r.item
-        assert_equal @r.item.value, "Beer"
-      end
-    end
-    
-    
     describe "#to_attributes" do
       it "returns a nested attributes hash" do
         @r = PositionRepresenter.from_attributes("id" => 1, "item" => @i)
@@ -132,28 +72,56 @@ class XMLRepresenterFunctionalTest < MiniTest::Spec
     
     describe "#to_xml" do
       it "serializes the current model" do
-        assert_xml_equal "<order/>", @r.to_xml.serialize
+        assert_xml_equal "<order/>", @r.to_xml
         
         @r.id = 2
-        assert_xml_equal "<rap><id>2</id></rap>", @r.to_xml(:name => :rap).serialize
+        assert_xml_equal "<rap><id>2</id></rap>", @r.to_xml(:name => :rap)
+      end
+      
+      it "is aliased to #serialize" do
+        assert_equal @r.to_xml, @r.serialize
+      end
+    end
+    
+    describe "#from_xml" do
+      class Order
+        include Roar::Representer::XML
+        property :id
+        property :pending
+      end
+    
+      it "is aliased to #deserialize" do
+        assert_equal TestXmlRepresenter.from_xml("<order/>").to_attributes, TestXmlRepresenter.deserialize("<order/>").to_attributes
+      end
+      
+      it "accepts :except option" do
+        order = Order.from_xml(%{<order><id>1</id><pending>1</pending></order>}, :except => [: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 "#serialize returns the serialized model" do
+      it "#to_xml returns the serialized model" do
         @r.id = 1
-        assert_xml_equal "<order><id>1</id></order>", @r.serialize
+        assert_xml_equal "<order><id>1</id></order>", @r.to_xml
       end
       
       
       it ".from_xml returns the deserialized model" do
-        @m = TestXmlRepresenter.deserialize("<order><id>1</id></order>")
+        @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.deserialize(nil)
+        assert TestXmlRepresenter.from_xml(nil)
       end
       
     end
@@ -165,16 +133,16 @@ class XMLRepresenterFunctionalTest < MiniTest::Spec
       end
       
       it "#serialize skips empty :item" do
-        assert_xml_equal "<position><id>1</id></position>", @r.serialize
+        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.serialize
+        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.deserialize("<position><id>1</id><item><value>beer</value></item>\n</position>")
+        @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
@@ -184,28 +152,30 @@ class XMLRepresenterFunctionalTest < MiniTest::Spec
     
     describe "with a typed list" do
       before do
-        @c = Class.new(Roar::Representer::XML) do
+        @c = Class.new do
+          include Roar::Representer::XML
+          
           self.representation_name= :order
-          representable_property :id
-          representable_collection :items, :as => ItemRepresenter, :tag => :item
+          property :id
+          collection :items, :as => ItemRepresenter, :from => :item
         end
         
         @r = @c.from_attributes("id" => 1)
       end
       
       it "#serialize_model skips empty :item" do
-        assert_xml_equal "<order><id>1</id></order>", @r.serialize
+        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.from_attributes("value" => "Bier")]
         
         assert_xml_equal "<order><id>1</id><item><value>Bier</value></item></order>", 
-          @r.serialize
+          @r.to_xml
       end
       
       it ".from_xml typecasts list" do
-        @m = @c.deserialize("<order><id>1</id><item><value>beer</value></item>\n</order>")
+        @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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 8
-  - 0
-  version: 0.8.0
+  - 1
+  version: 0.8.1
 platform: ruby
 authors: 
 - Nick Sutterer
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-13 00:00:00 -05:00
+date: 2011-11-25 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,11 +23,13 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        version: "0"
+        - 9
+        - 2
+        version: 0.9.2
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -71,7 +73,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: minitest
@@ -136,13 +138,11 @@ files:
 - lib/roar/client/entity_proxy.rb
 - lib/roar/client/proxy.rb
 - lib/roar/client/transport.rb
-- lib/roar/model.rb
-- lib/roar/model/representable.rb
 - lib/roar/rails.rb
 - lib/roar/rails/controller_methods.rb
 - lib/roar/rails/representer_methods.rb
 - lib/roar/rails/test_case.rb
-- lib/roar/representer.rb
+- lib/roar/representer/base.rb
 - lib/roar/representer/feature/http_verbs.rb
 - lib/roar/representer/feature/hypermedia.rb
 - lib/roar/representer/feature/model_representing.rb
@@ -187,23 +187,17 @@ 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/http_verbs_test.rb
-- test/hypermedia_test.rb
+- test/http_verbs_feature_test.rb
+- test/hypermedia_feature_test.rb
 - test/integration_test.rb
 - test/json_representer_test.rb
 - test/model_representing_test.rb
-- test/model_test.rb
 - test/order_representers.rb
-- test/proxy_test.rb
 - test/rails/controller_methods_test.rb
 - test/rails/rails_representer_methods_test.rb
-- test/representable_test.rb
 - test/representer_test.rb
-- test/ruby_representation_test.rb
 - test/test_helper.rb
-- test/test_helper_test.rb
 - test/transport_test.rb
-- test/xml_hypermedia_test.rb
 - test/xml_representer_test.rb
 has_rdoc: true
 homepage: http://rubygems.org/gems/roar