representable 0.13.0 → 0.13.1

data/CHANGES.textile

@@ -1,3 +1,7 @@
+h2. 0.13.1
+
+* Removed property :@name from @XML@ in favor of @:attribute => true@.
+
 h2. 0.13.0
 
 * We no longer create accessors in @Representable.property@ - you have to do this yourself using @attr_accessors@.

data/lib/representable.rb

@@ -22,8 +22,8 @@ module Representable
   end
   
   # Reads values from +doc+ and sets properties accordingly.
-  def update_properties_from(doc, options, &block)
-    representable_bindings.each do |bin|
+  def update_properties_from(doc, options, format, &block)
+    representable_bindings_for(format).each do |bin|
       next if skip_property?(bin, options)
       
       value = bin.read(doc) || bin.definition.default
@@ -34,8 +34,8 @@ module Representable
   
 private
   # Compiles the document going through all properties.
-  def create_representation_with(doc, options, &block)
-    representable_bindings.each do |bin|
+  def create_representation_with(doc, options, format, &block)
+    representable_bindings_for(format).each do |bin|
       next if skip_property?(bin, options)
       
       value = send(bin.definition.getter) || bin.definition.default # DISCUSS: eventually move back to Ref.
@@ -55,8 +55,8 @@ private
     @representable_attrs ||= self.class.representable_attrs # DISCUSS: copy, or better not?
   end
   
-  def representable_bindings
-    representable_attrs.map {|attr| binding_for_definition(attr) }
+  def representable_bindings_for(format)
+    representable_attrs.map {|attr| format.binding_for_definition(attr) }
   end
   
   # Returns the wrapper for the representation. Mostly used in XML.

data/lib/representable/definition.rb

@@ -1,23 +1,18 @@
 module Representable
   # Created at class compile time. Keeps configuration options for one property.
   class Definition
-    attr_reader :name, :sought_type, :from, :default, :representer_module
+    attr_reader :name, :sought_type, :from, :default, :representer_module, :attribute
     alias_method :getter, :name
     
     def initialize(sym, options={})
       @name               = sym.to_s
       @array              = options[:collection]
       @from               = (options[:from] || name).to_s
-      @sought_type        = options[:class] || options[:as] || :text  # TODO: deprecate :as in 1.0.
+      @sought_type        = options[:class]
       @default            = options[:default]
       @default            ||= [] if array?
       @representer_module = options[:extend]  # DISCUSS: move to Representable::DCI?
-      
-      # FIXME: move me to xml.
-      if options[:from].to_s =~ /^@/
-        @sought_type = :attr
-        options[:from].sub!('@', '')
-      end
+      @attribute          = options[:attribute] 
     end
 
     def instance_variable_name

data/lib/representable/json.rb

@@ -8,9 +8,10 @@ module Representable
   # Note: The authorative methods are #to_hash and #from_hash, if you override #to_json instead,
   # things might work as expected.
   module JSON
-    BINDING_FOR_TYPE = {  # TODO: refactor #representable_accessor for better extendability.
-      :text     => TextBinding,
-    }
+    def self.binding_for_definition(definition)
+      return ObjectBinding.new(definition) if definition.typed?
+      TextBinding.new(definition)
+    end
     
     def self.included(base)
       base.class_eval do
@@ -43,11 +44,11 @@ module Representable
         data = data[wrap.to_s]
       end
       
-      update_properties_from(data, options)
+      update_properties_from(data, options, JSON)
     end
     
     def to_hash(options={})
-      hash = create_representation_with({}, options)
+      hash = create_representation_with({}, options, JSON)
       
       return hash unless wrap = options[:wrap] || representation_wrap
       
@@ -58,9 +59,5 @@ module Representable
     def to_json(*args)
       to_hash(*args).to_json
     end
-    
-    def binding_for_definition(definition)
-      (BINDING_FOR_TYPE[definition.sought_type] or ObjectBinding).new(definition)
-    end
   end
 end

data/lib/representable/version.rb

@@ -1,3 +1,3 @@
 module Representable
-  VERSION = "0.13.0"
+  VERSION = "0.13.1"
 end

data/lib/representable/xml.rb

@@ -4,10 +4,11 @@ require 'nokogiri'
 
 module Representable
   module XML
-    BINDING_FOR_TYPE = {
-      :attr     => AttributeBinding,
-      :text     => TextBinding,
-    }
+    def self.binding_for_definition(definition)
+      return ObjectBinding.new(definition) if definition.typed?
+      return AttributeBinding.new(definition) if definition.attribute
+      TextBinding.new(definition)
+    end
     
     def self.included(base)
       base.class_eval do
@@ -42,22 +43,18 @@ module Representable
     end
     
     def from_node(node, options={})
-      update_properties_from(node, options)
+      update_properties_from(node, options, XML)
     end
     
     # Returns a Nokogiri::XML object representing this object.
     def to_node(options={})
       root_tag = options[:wrap] || representation_wrap
       
-      create_representation_with(Nokogiri::XML::Node.new(root_tag.to_s, Nokogiri::XML::Document.new), options)
+      create_representation_with(Nokogiri::XML::Node.new(root_tag.to_s, Nokogiri::XML::Document.new), options, XML)
     end
     
     def to_xml(*args)
       to_node(*args).to_s
     end
-    
-    def binding_for_definition(definition)
-      (BINDING_FOR_TYPE[definition.sought_type] or ObjectBinding).new(definition)
-    end
   end
 end

data/test/definition_test.rb

@@ -35,7 +35,7 @@ class DefinitionTest < MiniTest::Spec
     end
     
     it "responds to #sought_type" do
-      assert_equal :text, @def.sought_type
+      assert_equal nil, @def.sought_type
     end
   end
   
@@ -67,7 +67,7 @@ class DefinitionTest < MiniTest::Spec
     end
     
     it "responds to #sought_type" do
-      assert_equal :text, @def.sought_type
+      assert_equal nil, @def.sought_type
     end
     
     it "responds to #default" do

data/test/json_test.rb

@@ -129,18 +129,18 @@ module JsonTest
         
       describe "#binding_for_definition" do
         it "returns ObjectBinding" do
-          assert_kind_of Json::ObjectBinding, @band.binding_for_definition(Def.new(:band, :class => Hash))
+          assert_kind_of Json::ObjectBinding, Json.binding_for_definition(Def.new(:band, :class => Hash))
         end
         
         it "returns TextBinding" do
-          assert_kind_of Json::TextBinding, @band.binding_for_definition(Def.new(:band))
+          assert_kind_of Json::TextBinding, Json.binding_for_definition(Def.new(:band))
         end
       end
       
       describe "#representable_bindings" do
         it "returns bindings for each property" do
-          assert_equal 2, @band.send(:representable_bindings).size
-          assert_equal "name", @band.send(:representable_bindings).first.definition.name
+          assert_equal 2, @band.send(:representable_bindings_for, Json).size
+          assert_equal "name", @band.send(:representable_bindings_for, Json).first.definition.name
         end
       end
     end

data/test/representable_test.rb

@@ -100,13 +100,13 @@ class RepresentableTest < MiniTest::Spec
       band.name = "Bodyjar"
       
       assert_equal "{\"band\":{\"name\":\"Bodyjar\"}}", band.to_json
-      #assert_equal "{\"name\":\"Bodyjar\"}", band.to_xml # FIXME: now, #binding_for_definition returns wrong binding.
+      assert_xml_equal "<band><name>Bodyjar</name></band>", band.to_xml
     end
     
     it "allows extending with different representers subsequentially" do
       module SongXmlRepresenter
         include Representable::XML
-        property :name, :from => "@name"
+        property :name, :from => "name", :attribute => true
       end
       
       module SongJsonRepresenter
@@ -214,25 +214,25 @@ class RepresentableTest < MiniTest::Spec
     end
     
     it "copies values from document to object" do
-      @band.update_properties_from({"name"=>"No One's Choice", "groupies"=>2}, {})
+      @band.update_properties_from({"name"=>"No One's Choice", "groupies"=>2}, {}, Representable::JSON)
       assert_equal "No One's Choice", @band.name
       assert_equal 2, @band.groupies
     end
     
     it "accepts :except option" do
-      @band.update_properties_from({"name"=>"No One's Choice", "groupies"=>2}, :except => [:groupies])
+      @band.update_properties_from({"name"=>"No One's Choice", "groupies"=>2}, {:except => [:groupies]}, Representable::JSON)
       assert_equal "No One's Choice", @band.name
       assert_equal nil, @band.groupies
     end
     
     it "accepts :include option" do
-      @band.update_properties_from({"name"=>"No One's Choice", "groupies"=>2}, :include => [:groupies])
+      @band.update_properties_from({"name"=>"No One's Choice", "groupies"=>2}, {:include => [:groupies]}, Representable::JSON)
       assert_equal 2, @band.groupies
       assert_equal nil, @band.name
     end
     
     it "always returns self" do
-      assert_equal @band, @band.update_properties_from({"name"=>"Nofx"}, {})
+      assert_equal @band, @band.update_properties_from({"name"=>"Nofx"}, {}, Representable::JSON)
     end
   end
   
@@ -244,16 +244,16 @@ class RepresentableTest < MiniTest::Spec
     end
     
     it "compiles document from properties in object" do
-      assert_equal({"name"=>"No One's Choice", "groupies"=>2}, @band.send(:create_representation_with, {}, {}))
+      assert_equal({"name"=>"No One's Choice", "groupies"=>2}, @band.send(:create_representation_with, {}, {}, Representable::JSON))
     end
     
     it "accepts :except option" do
-      hash = @band.send(:create_representation_with, {}, :except => [:groupies])
+      hash = @band.send(:create_representation_with, {}, {:except => [:groupies]}, Representable::JSON)
       assert_equal({"name"=>"No One's Choice"}, hash)
     end
     
     it "accepts :include option" do
-      hash = @band.send(:create_representation_with, {}, :include => [:groupies])
+      hash = @band.send(:create_representation_with, {}, {:include => [:groupies]}, Representable::JSON)
       assert_equal({"groupies"=>2}, hash)
     end
   end

data/test/xml_test.rb

@@ -122,17 +122,17 @@ class XmlTest < MiniTest::Spec
     end
     
     
-    describe "#binding_for_definition" do
+    describe "XML#binding_for_definition" do
       it "returns AttributeBinding" do
-        assert_kind_of XML::AttributeBinding, @band.binding_for_definition(Def.new(:band, :from => "@band"))
+        assert_kind_of XML::AttributeBinding, Representable::XML.binding_for_definition(Def.new(:band, :from => "band", :attribute => true))
       end
       
       it "returns ObjectBinding" do
-        assert_kind_of XML::ObjectBinding, @band.binding_for_definition(Def.new(:band, :class => Hash))
+        assert_kind_of XML::ObjectBinding, Representable::XML.binding_for_definition(Def.new(:band, :class => Hash))
       end
       
       it "returns TextBinding" do
-        assert_kind_of XML::TextBinding, @band.binding_for_definition(Def.new(:band, :from => :content))
+        assert_kind_of XML::TextBinding, Representable::XML.binding_for_definition(Def.new(:band, :from => :content))
       end
     end
     
@@ -194,11 +194,11 @@ end
 
 
 class AttributesTest < MiniTest::Spec
-  describe ":from => @rel" do
+  describe ":from => rel, :attribute => true" do
     class Link
       include Representable::XML
-      property :href,   :from => "@href"
-      property :title,  :from => "@title"
+      property :href,   :from => "href",  :attribute => true
+      property :title,  :from => "title", :attribute => true
       attr_accessor :href, :title
     end
     

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 13
-  - 0
-  version: 0.13.0
+  - 1
+  version: 0.13.1
 platform: ruby
 authors: 
 - Nick Sutterer
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-24 00:00:00 +01:00
+date: 2011-12-27 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency