roxml 2.5.3 → 3.1.0

data/lib/roxml/xml/parsers/nokogiri.rb

@@ -0,0 +1,77 @@
+require 'nokogiri'
+
+module ROXML
+  module XML # :nodoc:all
+    Document = Nokogiri::XML::Document
+    Element = Nokogiri::XML::Element
+    Node = Nokogiri::XML::Node
+
+    module Error; end
+
+    class Parser
+      class << self
+        def parse(string)
+          Nokogiri::XML(string)
+        end
+
+        def parse_file(path) #:nodoc:
+          path = path.sub('file:', '') if path.starts_with?('file:')
+          parse(open(path))
+        end
+
+        def parse_io(stream) #:nodoc:
+          parse(stream)
+        end
+      end
+    end
+
+    class Document
+      def save(path)
+        open(path, 'w') do |file|
+          file << serialize
+        end
+      end
+
+      def default_namespace
+        'xmlns' if root.namespaces['xmlns']
+      end
+    end
+
+    module NodeExtensions
+      def search(xpath, roxml_namespaces = {})
+        xpath = "./#{xpath}"
+        (roxml_namespaces.present? ? super(xpath, roxml_namespaces) : super(xpath)).map {|i| i }
+      end
+
+      def attributes
+        self
+      end
+
+      def default_namespace
+        document.default_namespace
+      end
+    end
+
+    class Element
+      include NodeExtensions
+
+      def empty?
+        children.empty?
+      end
+    end
+
+    class Node
+      class << self
+        def new_cdata(content)
+          Nokogiri::XML::CDATA.new(Document.new, content)
+        end
+
+        def create(name)
+          new(name, Document.new)
+        end
+      end
+      include NodeExtensions
+      alias :remove! :remove
+    end
+  end
+end

data/lib/roxml/xml/references.rb

@@ -6,15 +6,15 @@ module ROXML
   # Internal base class that represents an XML - Class binding.
   #
   class XMLRef # :nodoc:
-    delegate :required?, :array?, :blocks, :accessor, :variable_name, :default, :to => :opts
+    delegate :required?, :array?, :blocks, :accessor, :default, :wrapper, :to => :opts
 
     def initialize(opts, instance)
       @opts = opts
       @instance = instance
     end
 
-    def to_xml
-      val = @instance.__send__(accessor)
+    def to_xml(instance)
+      val = instance.__send__(accessor)
       opts.to_xml.respond_to?(:call) ? opts.to_xml.call(val) : val
     end
 
@@ -29,11 +29,7 @@ module ROXML
     end
 
     def xpath_name
-      if !opts.name_explicit? && namespace = @instance.class.roxml_namespace
-        "#{namespace}:#{name}"
-      else
-        name
-      end
+      namespacify(name)
     end
 
     def value_in(xml)
@@ -56,13 +52,20 @@ module ROXML
       end
     end
 
-    def wrapper
-      conventionize(opts.wrapper)
+    def namespacify(what)
+      return "#{opts.namespace}:#{what}" if opts.namespace
+
+      namespace = @instance.class.roxml_namespace || @default_namespace
+      if namespace && what.present? && !what.include?(':') && (opts.namespace != false)
+        "#{namespace}:#{what}"
+      else
+        what
+      end
     end
 
     def apply_blocks(val)
       begin
-        blocks.apply_to(val)
+        blocks.inject(val) {|val, block| block.call(val) }
       rescue Exception => ex
         raise ex, "#{accessor}: #{ex.message}"
       end
@@ -78,11 +81,15 @@ module ROXML
     end
 
     def xpath
-      wrapper ? "#{wrapper}/#{xpath_name}" : xpath_name.to_s
+      opts.wrapper ? "#{namespacify(opts.wrapper)}/#{xpath_name}" : xpath_name.to_s
     end
 
     def auto_xpath
-      "#{conventionize(opts.name.pluralize)}/#{xpath_name}" if array?
+      "#{namespacify(conventionize(opts.name.pluralize))}/#{xpath_name}" if array?
+    end
+
+    def several?
+      array?
     end
 
     def wrap(xml)
@@ -90,22 +97,27 @@ module ROXML
       if child = xml.children.find {|c| c.name == wrapper }
        return child
       end
-      xml.add_child(XML::Node.new(wrapper.to_s))
+      xml.add_child(XML::Node.create(wrapper.to_s))
     end
 
     def nodes_in(xml)
-      vals = xml.search(xpath)
+      @default_namespace = xml.default_namespace
+      vals = xml.search(xpath, @instance.class.roxml_namespaces)
 
-      if (opts.hash? || opts.array?) && vals.empty? && !wrapper && auto_xpath
-        vals = xml.search(auto_xpath)
+      if several? && vals.empty? && !wrapper && auto_xpath
+        vals = xml.search(auto_xpath, @instance.class.roxml_namespaces)
         @auto_vals = !vals.empty?
       end
 
       if vals.empty?
         raise RequiredElementMissing, "#{name} from #{xml} for #{accessor}" if required?
         default
+      elsif several?
+        vals.map do |val|
+          yield val
+        end
       else
-        yield(vals)
+        yield(vals.first)
       end
     end
   end
@@ -121,12 +133,12 @@ module ROXML
     # Updates the attribute in the given XML block to
     # the value provided.
     def write_xml(xml, value)
-      xml.attributes[name] = value.to_s.to_utf_without_deprecation
+      xml.attributes[name] = value.to_s
     end
 
     def fetch_value(xml)
-      nodes_in(xml) do |nodes|
-        nodes.first.value
+      nodes_in(xml) do |node|
+        node.value
       end
     end
 
@@ -154,10 +166,10 @@ module ROXML
         xml.name = value
       elsif array?
         value.each do |v|
-          add(xml.add_child(XML::Node.new(name)), v)
+          add(xml.add_child(XML::Node.create(name)), v)
         end
       else
-        add(xml.add_child(XML::Node.new(name)), value)
+        add(xml.add_child(XML::Node.create(name)), value)
       end
     end
 
@@ -177,23 +189,17 @@ module ROXML
           value
         end
       else
-        nodes_in(xml) do |nodes|
-          if array?
-            nodes.collect do |e|
-              e.content.strip.to_latin_without_deprecation
-            end
-          else
-            nodes.first.content
-          end
+        nodes_in(xml) do |node|
+          node.content.strip
         end
       end
     end
 
     def add(dest, value)
       if cdata?
-        dest.child_add(XML::Node.new_cdata(value.to_s.to_utf_without_deprecation))
+        dest.add_child(XML::Node.new_cdata(value.to_s))
       else
-        dest.content = value.to_s.to_utf_without_deprecation
+        dest.content = value.to_s
       end
     end
   end
@@ -207,22 +213,24 @@ module ROXML
       @value = opts.hash.value.to_ref(inst)
     end
 
+    def several?
+      true
+    end
+
   private
     # Updates the composed XML object in the given XML block to
     # the value provided.
     def write_xml(xml, value)
       value.each_pair do |k, v|
-        node = xml.child_add(XML::Node.new(hash.wrapper))
+        node = xml.add_child(XML::Node.create(hash.wrapper))
         @key.update_xml(node, k)
         @value.update_xml(node, v)
       end
     end
 
     def fetch_value(xml)
-      nodes_in(xml) do |nodes|
-        nodes.collect do |e|
-          [@key.value_in(e), @value.value_in(e)]
-        end
+      nodes_in(xml) do |node|
+        [@key.value_in(node), @value.value_in(node)]
       end
     end
 
@@ -232,7 +240,7 @@ module ROXML
           super(kvp)
         end
       end
-      vals.to_hash if vals
+      to_hash(vals) if vals
     end
 
     def freeze(vals)
@@ -243,6 +251,17 @@ module ROXML
         vals
       end
     end
+
+    def to_hash(array)
+      hash = array.inject({}) do |result, (k, v)|
+        result[k] ||= []
+        result[k] << v
+        result
+      end
+      hash.each_pair do |k, v|
+        hash[k] = v.first if v.size == 1
+      end
+    end
   end
 
   class XMLObjectRef < XMLTextRef # :nodoc:
@@ -254,35 +273,25 @@ module ROXML
     def write_xml(xml, value)
       if array?
         value.each do |v|
-          xml.child_add(v.to_xml(name))
+          xml.add_child(v.to_xml(name))
         end
       elsif value.is_a?(ROXML)
-        xml.child_add(value.to_xml(name))
+        xml.add_child(value.to_xml(name))
       else
-        node = XML::Node.new(name)
+        node = XML::Node.create(name)
         node.content = value.to_xml
-        xml.child_add(node)
+        xml.add_child(node)
       end
     end
 
     def fetch_value(xml)
-      nodes_in(xml) do |nodes|
-        unless array?
-          instantiate(nodes.first)
+      nodes_in(xml) do |node|
+        if type.respond_to? :from_xml
+          type.from_xml(node)
         else
-          nodes.collect do |e|
-            instantiate(e)
-          end
+          type.new(node)
         end
       end
     end
-
-    def instantiate(elem)
-      if type.respond_to? :from_xml
-        type.from_xml(elem)
-      else
-        type.new(elem)
-      end
-    end
   end
 end

data/roxml.gemspec

@@ -1,50 +1,201 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{roxml}
-  s.version = "2.5.3"
+  s.version = "3.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Woosley", "Zak Mandhro", "Anders Engstrom", "Russ Olsen"]
-  s.date = %q{2009-03-22}
-  s.description = %q{ROXML is a Ruby library designed to make it easier for Ruby developers to work with XML. Using simple annotations, it enables Ruby classes to be mapped to XML. ROXML takes care of the marshalling and unmarshalling of mapped attributes so that developers can focus on building first-class Ruby classes. As a result, ROXML simplifies the development of RESTful applications, Web Services, and XML-RPC.}
+  s.date = %q{2009-10-16}
+  s.description = %q{ROXML is a Ruby library designed to make it easier for Ruby developers to work with XML.
+Using simple annotations, it enables Ruby classes to be mapped to XML. ROXML takes care
+of the marshalling and unmarshalling of mapped attributes so that developers can focus on
+building first-class Ruby classes. As a result, ROXML simplifies the development of
+RESTful applications, Web Services, and XML-RPC.
+}
   s.email = %q{ben.woosley@gmail.com}
-  s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.rdoc"]
-  s.files = ["History.txt", "MIT-LICENSE", "Manifest.txt", "README.rdoc", "Rakefile", "TODO", "config/website.yml", "examples/active_record.rb", "examples/amazon.rb", "examples/current_weather.rb", "examples/dashed_elements.rb", "examples/library.rb", "examples/posts.rb", "examples/twitter.rb", "examples/xml/active_record.xml", "examples/xml/amazon.xml", "examples/xml/current_weather.xml", "examples/xml/dashed_elements.xml", "examples/xml/posts.xml", "examples/xml/twitter.xml", "lib/roxml.rb", "lib/roxml/definition.rb", "lib/roxml/extensions.rb", "lib/roxml/extensions/array.rb", "lib/roxml/extensions/array/conversions.rb", "lib/roxml/extensions/deprecation.rb", "lib/roxml/extensions/string.rb", "lib/roxml/extensions/string/conversions.rb", "lib/roxml/extensions/string/iterators.rb", "lib/roxml/hash_definition.rb", "lib/roxml/xml.rb", "lib/roxml/xml/parsers/libxml.rb", "lib/roxml/xml/parsers/rexml.rb", "lib/roxml/xml/references.rb", "roxml.gemspec", "spec/definition_spec.rb", "spec/examples/active_record_spec.rb", "spec/examples/amazon_spec.rb", "spec/examples/current_weather_spec.rb", "spec/examples/dashed_elements_spec.rb", "spec/examples/library_spec.rb", "spec/examples/post_spec.rb", "spec/examples/twitter_spec.rb", "spec/roxml_spec.rb", "spec/shared_specs.rb", "spec/spec.opts", "spec/spec_helper.rb", "spec/string_spec.rb", "spec/xml/parser_spec.rb", "tasks/rspec.rake", "tasks/test.rake", "test/bugs/rexml_bugs.rb", "test/fixtures/book_malformed.xml", "test/fixtures/book_pair.xml", "test/fixtures/book_text_with_attribute.xml", "test/fixtures/book_valid.xml", "test/fixtures/book_with_authors.xml", "test/fixtures/book_with_contributions.xml", "test/fixtures/book_with_contributors.xml", "test/fixtures/book_with_contributors_attrs.xml", "test/fixtures/book_with_default_namespace.xml", "test/fixtures/book_with_depth.xml", "test/fixtures/book_with_octal_pages.xml", "test/fixtures/book_with_publisher.xml", "test/fixtures/book_with_wrapped_attr.xml", "test/fixtures/dictionary_of_attr_name_clashes.xml", "test/fixtures/dictionary_of_attrs.xml", "test/fixtures/dictionary_of_guarded_names.xml", "test/fixtures/dictionary_of_mixeds.xml", "test/fixtures/dictionary_of_name_clashes.xml", "test/fixtures/dictionary_of_names.xml", "test/fixtures/dictionary_of_texts.xml", "test/fixtures/library.xml", "test/fixtures/library_uppercase.xml", "test/fixtures/muffins.xml", "test/fixtures/nameless_ageless_youth.xml", "test/fixtures/node_with_attr_name_conflicts.xml", "test/fixtures/node_with_name_conflicts.xml", "test/fixtures/numerology.xml", "test/fixtures/person.xml", "test/fixtures/person_with_guarded_mothers.xml", "test/fixtures/person_with_mothers.xml", "test/mocks/dictionaries.rb", "test/mocks/mocks.rb", "test/release/dependencies_test.rb", "test/test_helper.rb", "test/unit/definition_test.rb", "test/unit/deprecations_test.rb", "test/unit/to_xml_test.rb", "test/unit/xml_attribute_test.rb", "test/unit/xml_block_test.rb", "test/unit/xml_bool_test.rb", "test/unit/xml_construct_test.rb", "test/unit/xml_convention_test.rb", "test/unit/xml_hash_test.rb", "test/unit/xml_initialize_test.rb", "test/unit/xml_name_test.rb", "test/unit/xml_namespace_test.rb", "test/unit/xml_object_test.rb", "test/unit/xml_required_test.rb", "test/unit/xml_text_test.rb", "vendor/override_rake_task/README", "vendor/override_rake_task/init.rb", "vendor/override_rake_task/install.rb", "vendor/override_rake_task/lib/override_rake_task.rb", "website/index.html"]
-  s.has_rdoc = true
+  s.extra_rdoc_files = [
+    "History.txt",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".gitignore",
+     ".gitmodules",
+     "History.txt",
+     "MIT-LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "TODO",
+     "VERSION",
+     "config/website.yml",
+     "examples/amazon.rb",
+     "examples/current_weather.rb",
+     "examples/dashed_elements.rb",
+     "examples/library.rb",
+     "examples/posts.rb",
+     "examples/rails.rb",
+     "examples/twitter.rb",
+     "examples/xml/active_record.xml",
+     "examples/xml/amazon.xml",
+     "examples/xml/current_weather.xml",
+     "examples/xml/dashed_elements.xml",
+     "examples/xml/posts.xml",
+     "examples/xml/twitter.xml",
+     "lib/roxml.rb",
+     "lib/roxml/definition.rb",
+     "lib/roxml/hash_definition.rb",
+     "lib/roxml/xml.rb",
+     "lib/roxml/xml/parsers/libxml.rb",
+     "lib/roxml/xml/parsers/nokogiri.rb",
+     "lib/roxml/xml/references.rb",
+     "roxml.gemspec",
+     "spec/definition_spec.rb",
+     "spec/examples/active_record_spec.rb",
+     "spec/examples/amazon_spec.rb",
+     "spec/examples/current_weather_spec.rb",
+     "spec/examples/dashed_elements_spec.rb",
+     "spec/examples/library_spec.rb",
+     "spec/examples/post_spec.rb",
+     "spec/examples/twitter_spec.rb",
+     "spec/roxml_spec.rb",
+     "spec/shared_specs.rb",
+     "spec/spec.opts",
+     "spec/spec_helper.rb",
+     "spec/support/libxml.rb",
+     "spec/support/nokogiri.rb",
+     "spec/xml/attributes_spec.rb",
+     "spec/xml/namespace_spec.rb",
+     "spec/xml/namespaces_spec.rb",
+     "spec/xml/parser_spec.rb",
+     "tasks/rdoc.rake",
+     "tasks/rspec.rake",
+     "tasks/test.rake",
+     "test/fixtures/book_malformed.xml",
+     "test/fixtures/book_pair.xml",
+     "test/fixtures/book_text_with_attribute.xml",
+     "test/fixtures/book_valid.xml",
+     "test/fixtures/book_with_authors.xml",
+     "test/fixtures/book_with_contributions.xml",
+     "test/fixtures/book_with_contributors.xml",
+     "test/fixtures/book_with_contributors_attrs.xml",
+     "test/fixtures/book_with_default_namespace.xml",
+     "test/fixtures/book_with_depth.xml",
+     "test/fixtures/book_with_octal_pages.xml",
+     "test/fixtures/book_with_publisher.xml",
+     "test/fixtures/book_with_wrapped_attr.xml",
+     "test/fixtures/dictionary_of_attr_name_clashes.xml",
+     "test/fixtures/dictionary_of_attrs.xml",
+     "test/fixtures/dictionary_of_guarded_names.xml",
+     "test/fixtures/dictionary_of_mixeds.xml",
+     "test/fixtures/dictionary_of_name_clashes.xml",
+     "test/fixtures/dictionary_of_names.xml",
+     "test/fixtures/dictionary_of_texts.xml",
+     "test/fixtures/library.xml",
+     "test/fixtures/library_uppercase.xml",
+     "test/fixtures/muffins.xml",
+     "test/fixtures/nameless_ageless_youth.xml",
+     "test/fixtures/node_with_attr_name_conflicts.xml",
+     "test/fixtures/node_with_name_conflicts.xml",
+     "test/fixtures/numerology.xml",
+     "test/fixtures/person.xml",
+     "test/fixtures/person_with_guarded_mothers.xml",
+     "test/fixtures/person_with_mothers.xml",
+     "test/mocks/dictionaries.rb",
+     "test/mocks/mocks.rb",
+     "test/support/fixtures.rb",
+     "test/test_helper.rb",
+     "test/unit/definition_test.rb",
+     "test/unit/deprecations_test.rb",
+     "test/unit/to_xml_test.rb",
+     "test/unit/xml_attribute_test.rb",
+     "test/unit/xml_block_test.rb",
+     "test/unit/xml_bool_test.rb",
+     "test/unit/xml_convention_test.rb",
+     "test/unit/xml_hash_test.rb",
+     "test/unit/xml_initialize_test.rb",
+     "test/unit/xml_name_test.rb",
+     "test/unit/xml_namespace_test.rb",
+     "test/unit/xml_object_test.rb",
+     "test/unit/xml_required_test.rb",
+     "test/unit/xml_text_test.rb",
+     "website/index.html"
+  ]
   s.homepage = %q{http://roxml.rubyforge.org}
-  s.rdoc_options = ["--main", "README.rdoc"]
+  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{roxml}
-  s.rubygems_version = %q{1.3.1}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{Ruby Object to XML mapping library}
-  s.test_files = ["test/unit/definition_test.rb", "test/unit/deprecations_test.rb", "test/unit/to_xml_test.rb", "test/unit/xml_attribute_test.rb", "test/unit/xml_block_test.rb", "test/unit/xml_bool_test.rb", "test/unit/xml_construct_test.rb", "test/unit/xml_convention_test.rb", "test/unit/xml_hash_test.rb", "test/unit/xml_initialize_test.rb", "test/unit/xml_name_test.rb", "test/unit/xml_namespace_test.rb", "test/unit/xml_object_test.rb", "test/unit/xml_required_test.rb", "test/unit/xml_text_test.rb"]
+  s.test_files = [
+    "spec/definition_spec.rb",
+     "spec/examples/active_record_spec.rb",
+     "spec/examples/amazon_spec.rb",
+     "spec/examples/current_weather_spec.rb",
+     "spec/examples/dashed_elements_spec.rb",
+     "spec/examples/library_spec.rb",
+     "spec/examples/post_spec.rb",
+     "spec/examples/twitter_spec.rb",
+     "spec/roxml_spec.rb",
+     "spec/shared_specs.rb",
+     "spec/spec_helper.rb",
+     "spec/support/libxml.rb",
+     "spec/support/nokogiri.rb",
+     "spec/xml/attributes_spec.rb",
+     "spec/xml/namespace_spec.rb",
+     "spec/xml/namespaces_spec.rb",
+     "spec/xml/parser_spec.rb",
+     "test/mocks/dictionaries.rb",
+     "test/mocks/mocks.rb",
+     "test/support/fixtures.rb",
+     "test/test_helper.rb",
+     "test/unit/definition_test.rb",
+     "test/unit/deprecations_test.rb",
+     "test/unit/to_xml_test.rb",
+     "test/unit/xml_attribute_test.rb",
+     "test/unit/xml_block_test.rb",
+     "test/unit/xml_bool_test.rb",
+     "test/unit/xml_convention_test.rb",
+     "test/unit/xml_hash_test.rb",
+     "test/unit/xml_initialize_test.rb",
+     "test/unit/xml_name_test.rb",
+     "test/unit/xml_namespace_test.rb",
+     "test/unit/xml_object_test.rb",
+     "test/unit/xml_required_test.rb",
+     "test/unit/xml_text_test.rb",
+     "examples/amazon.rb",
+     "examples/current_weather.rb",
+     "examples/dashed_elements.rb",
+     "examples/library.rb",
+     "examples/posts.rb",
+     "examples/rails.rb",
+     "examples/twitter.rb"
+  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 2.1.0"])
-      s.add_runtime_dependency(%q<libxml-ruby>, [">= 1.0.0"])
-      s.add_development_dependency(%q<newgem>, [">= 1.3.0"])
+      s.add_runtime_dependency(%q<nokogiri>, [">= 1.3.3"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<sqlite3-ruby>, [">= 1.2.4"])
       s.add_development_dependency(%q<activerecord>, [">= 2.2.2"])
-      s.add_development_dependency(%q<hoe>, [">= 1.8.0"])
     else
       s.add_dependency(%q<activesupport>, [">= 2.1.0"])
-      s.add_dependency(%q<libxml-ruby>, [">= 1.0.0"])
-      s.add_dependency(%q<newgem>, [">= 1.3.0"])
+      s.add_dependency(%q<nokogiri>, [">= 1.3.3"])
+      s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<sqlite3-ruby>, [">= 1.2.4"])
       s.add_dependency(%q<activerecord>, [">= 2.2.2"])
-      s.add_dependency(%q<hoe>, [">= 1.8.0"])
     end
   else
     s.add_dependency(%q<activesupport>, [">= 2.1.0"])
-    s.add_dependency(%q<libxml-ruby>, [">= 1.0.0"])
-    s.add_dependency(%q<newgem>, [">= 1.3.0"])
+    s.add_dependency(%q<nokogiri>, [">= 1.3.3"])
+    s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<sqlite3-ruby>, [">= 1.2.4"])
     s.add_dependency(%q<activerecord>, [">= 2.2.2"])
-    s.add_dependency(%q<hoe>, [">= 1.8.0"])
   end
 end