pipa-xmlnuts 0.2.3 → 0.2.4

data/README.rdoc

@@ -1,30 +1,30 @@
-== Introduction
+=== Introduction
 XmlNuts is an library that allows for bidirectional mapping between Ruby objects and XML.
 
 Released under the MIT license.
 
-== Features
+=== Features
 - Type awareness (extensible).
 - XML namespaces support.
 - Pluggable backends to work with different XML APIs (REXML implemented so far).
 
-== Installation
+=== Installation
   gem install pipa-xmlnuts --source http://gems.github.com
 
-== Usage
+=== Usage
 Please see an example below.
 See also +XmlNuts::Nut+, +XmlNuts::Nut::ClassMethods+
 
-== TODO
+=== TODO
 - Inheritance
 - Mixins
 - More mappings?
 - More types?
 
-== Reporting bugs
-Please file bugs and feature requests at http://pipa.lighthouseapp.com/projects/21756-xmlnuts
+=== Bugs & such
+Please report via Github issue tracking.
 
-== Example
+=== Example
     class Cheezburger
       include XmlNuts::Nut
 

data/lib/xmlnuts/mappings.rb

@@ -62,53 +62,49 @@ module XmlNuts
       def froxml(text)
         @converter ? @converter.from_xml(text) : text
       end
-    end
 
-    module NestedMixin #:nodoc:
-      private
-      def parse(node)
-        backend.each_element_with_value(node, xmlname, xmlns) {|el, txt| return type.parse_node(type.new, el) }
+      def each_element(node, &block)
+        node && backend.each_element(node, xmlname, xmlns, &block)
         nil
       end
 
-      def build(node, nut)
-        nut && type.build_node(nut, backend.add_element(node, xmlname, xmlns, nil))
+      def add_element(node, value = nil)
+        backend.add_element(node, xmlname, xmlns, value)
       end
-    end
 
-    module ElementsMixin #:nodoc:
-      private
-      def getxml(node)
-        node && backend.enum_for(:each_element_with_value, node, xmlname, xmlns).map {|el, v| froxml(v) }
+      def value(node)
+        backend.value(node)
       end
 
-      def setxml(node, values)
-        values.each {|x| toxml(node, x) } if values
+      def parse(node)
+        type.parse_node(type.new, node)
       end
 
-      def toxml(value, node)
-        super(value)
+      def build(node, nut, dest_node)
+        nut && type.build_node(nut, dest_node)
       end
     end
 
     class ElementValue < MemberMapping
       private
       def getxml(node)
-        backend.each_element_with_value(node, xmlname, xmlns) {|e, v| return froxml(v) }
-        nil
+        each_element(node) {|e| return froxml(value(e)) }
       end
 
       def setxml(node, value)
-        backend.add_element(node, xmlname, xmlns, toxml(value))
+        add_element(node, toxml(value))
       end
     end
 
     class Element < MemberMapping
-      include NestedMixin
-
       private
-      alias getxml parse
-      alias setxml build
+      def getxml(node)
+        each_element(node) {|e| return parse(e) }
+      end
+
+      def setxml(node, value)
+        build(node, value, add_element(node))
+      end
     end
 
     class Attribute < MemberMapping
@@ -123,16 +119,36 @@ module XmlNuts
     end
 
     class ElementValues < MemberMapping
-      include ElementsMixin
+      private
+      def each_value(node)
+        each_element(node) {|x| yield froxml(value(x)) }
+      end
+
+      def getxml(node)
+        enum_for(:each_value, node).to_a
+      end
+
+      def setxml(node, values)
+        unless node
+          raise 'fuck'
+        end
+        values.each {|v| add_element(node, toxml(v)) } if values
+      end
     end
 
     class Elements < MemberMapping
-      include NestedMixin
-      include ElementsMixin
-
       private
-      alias froxml parse
-      alias toxml build
+      def each_object(node)
+        each_element(node) {|e| yield parse(e) }
+      end
+
+      def getxml(node)
+        enum_for(:each_object, node)
+      end
+
+      def setxml(node, elements)
+        elements.each {|e| build(node, e, add_element(node)) } if elements
+      end
     end
   end
 end

data/lib/xmlnuts/rexml.rb

@@ -13,7 +13,7 @@ class XmlNuts::XmlBackend::REXMLBackend #:nodoc:
     when String, IO
       node = REXML::Document.new(source).root
     else
-      raise ArgumentError, 'invalid destination'
+      raise ArgumentError, 'invalid source'
     end
     node && yield(node)
   end
@@ -57,9 +57,13 @@ class XmlNuts::XmlBackend::REXMLBackend #:nodoc:
     namespaces.each {|prefix, uri| context.add_namespace(prefix.to_s, uri) }
   end
 
-  def each_element_with_value(context, name, ns)
+  def each_element(context, name, ns, &block)
     ns = context.namespace unless ns
-    REXML::XPath.each(context, "ns:#{name}", 'ns' => ns) {|el| yield el, el.text }
+    REXML::XPath.each(context, "ns:#{name}", 'ns' => ns, &block)
+  end
+
+  def value(node)
+    node.text
   end
 
   def attribute(context, name, ns)

data/test/parsing_test.rb

@@ -1,5 +1,6 @@
 #$:.unshift File.join(File.dirname(__FILE__),'..','lib')
 
+require 'bigdecimal'
 require 'test/unit'
 require 'shoulda'
 require 'lib/xmlnuts'
@@ -31,6 +32,9 @@ class Cat
   end
 
   element :cheezburger, Cheezburger
+  element :moar_cheezburgers do
+    elements :cheezburger, Cheezburger
+  end
 end
 
 class ParsingTest < Test::Unit::TestCase
@@ -55,6 +59,10 @@ class ParsingTest < Test::Unit::TestCase
           <paw>three</paw>
           <paw>four</paw>
           <cheezburger price='2.05' weight='14.5547' />
+          <moar_cheezburgers>
+            <cheezburger price='19' weight='685.940' />
+            <cheezburger price='7.40' weight='9356.7' />
+          </moar_cheezburgers>
         </kitteh>
     EOS
     @cat = Cat.parse(@xml_fragment)
@@ -77,7 +85,7 @@ class ParsingTest < Test::Unit::TestCase
       assert_equal 2, @cat.ears
     end
 
-    should 'have tail' do
+    should 'have a tail' do
       assert @cat.has_tail
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pipa-xmlnuts
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Igor Gunko
@@ -9,10 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-06 00:00:00 -08:00
+date: 2009-04-23 00:00:00 -07:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: thoughtbot-shoulda
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.0.6
+    version: 
 description: XmlNuts is an XML to Ruby and back again mapping library.
 email: tekmon@gmail.com
 executables: []