representable 0.9.1 → 0.9.2

data/CHANGES.textile

@@ -1,3 +1,7 @@
+h2. 0.9.2
+
+* Arguments and block now successfully forwarded in @#from_*@.
+
 h2. 0.9.1
 
 * Extracted common serialization into @Representable#create_representation_with@ and deserialization into @#update_properties_from@.

data/lib/representable/json.rb

@@ -25,9 +25,9 @@ module Representable
       # Example:
       #  book = Book.from_xml("<book><name>Beyond Java</name></book>")
       # DISCUSS: assumes shitty wrapping like :article => {:name => ...}
-      def from_json(data, options={}, &block)
+      def from_json(data, *args, &block)
         create_from_json.tap do |object|
-          object.from_json(data, &block)
+          object.from_json(data, *args, &block)
         end
       end
       

data/lib/representable/version.rb

@@ -1,3 +1,3 @@
 module Representable
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

data/lib/representable/xml.rb

@@ -12,7 +12,6 @@ module Representable
       base.class_eval do
         include Representable
         extend ClassMethods
-        alias_method :from_xml, :update_properties_from
       end
     end
     
@@ -38,11 +37,9 @@ module Representable
       #
       # Example:
       #   band.from_xml("<band><name>Nofx</name></band>")
-      def from_xml(data, *args)
-        xml = Nokogiri::XML::Node.from(data)
-
+      def from_xml(doc, *args, &block)
         create_from_xml(*args).tap do |object|
-          object.update_properties_from(xml)
+          object.from_xml(doc, *args, &block)
         end
       end
       
@@ -52,6 +49,12 @@ module Representable
       end
     end
     
+    def from_xml(doc, *args, &block)
+      xml = Nokogiri::XML::Node.from(doc)
+      update_properties_from(xml, &block)
+    end
+    
+    
     # Returns a Nokogiri::XML object representing this object.
     def to_xml(params={})
       root_tag = params[:name] || self.class.representation_name

data/representable.gemspec

@@ -26,4 +26,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rake"
   s.add_development_dependency "test_xml"
   s.add_development_dependency "minitest", "~>2.8"
+  s.add_development_dependency "mocha"
 end

data/test/json_test.rb

@@ -74,6 +74,12 @@ module JsonTest
           assert_equal ["Nofx", nil], [band.name, band.label]
         end
         
+        it "passes all args to #from_json" do
+          block = lambda {|a,b|}
+          @Band.any_instance.expects(:from_json).with("{}", "yo") # FIXME: how to expect block?
+          @Band.from_json("{}", "yo", &block)
+        end
+        
         # TODO: move following tests to #from_json test.
         it "raises error with emtpy string" do
           assert_raises JSON::ParserError do

data/test/test_helper.rb

@@ -5,4 +5,4 @@ require 'representable'
 require 'test/unit'
 require 'minitest/spec'
 require 'test_xml/mini_test'
-
+require 'mocha'

data/test/xml_test.rb

@@ -73,6 +73,15 @@ class XmlTest < MiniTest::Spec
         assert_equal ["Nofx", nil], [@band.name, @band.label]
       end
     end
+    
+    describe ".from_xml" do
+      it "passes all args to #from_xml" do
+        block = lambda {|bind|}
+        @Band.any_instance.expects(:from_xml).with("{}", "yo") # FIXME: how to expect block?
+        @Band.from_xml("{}", "yo", &block)
+      end
+    end
+    
   end
 end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 1
-  version: 0.9.1
+  - 2
+  version: 0.9.2
 platform: ruby
 authors: 
 - Nick Sutterer
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-22 00:00:00 -02:00
+date: 2011-11-25 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -96,6 +96,19 @@ dependencies:
         version: "2.8"
   type: :development
   version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id007
 description: Maps representation documents from and to Ruby objects. Includes XML and JSON support, plain properties and compositions.
 email: 
 - apotonick@gmail.com