nokogiri-happymapper 0.3.3 → 0.3.4

data/Manifest

@@ -18,6 +18,7 @@ lib/happymapper/text_node.rb
 lib/happymapper/version.rb
 nokogiri-happymapper.gemspec
 spec/fixtures/address.xml
+spec/fixtures/ambigous_items.xml
 spec/fixtures/analytics.xml
 spec/fixtures/commit.xml
 spec/fixtures/current_weather.xml

data/README

@@ -19,6 +19,7 @@ http://github.com/dam5s/happymapper/
 == EXAMPLES:
 
 Here is a simple example that maps Twitter statuses and users.
+  require 'happymapper'
 
   class User
     include HappyMapper
@@ -54,7 +55,7 @@ http://github.com/dam5s/happymapper/tree/master/examples/
 
 == INSTALL:
 
-* sudo gem install nokogiri-happymapper -s http://gemcutter.org
+* sudo gem install nokogiri-happymapper
 
 == TICKETS:
 

data/Rakefile

@@ -5,10 +5,10 @@ require 'spec/rake/spectask'
 require "lib/happymapper/version"
 
 Echoe.new('nokogiri-happymapper', HappyMapper::Version) do |p|
-  p.description     = "object to xml mapping library, using nokogiri (fork from John Nunemaker's Happymapper)"
+  p.description     = "Object to XML Mapping Library, using Nokogiri (fork from John Nunemaker's Happymapper)"
   p.install_message = "May you have many happy mappings!"
   p.url             = "http://github.com/dam5s/happymapper"
-  p.author          = "Damien Le Berrigaud, John Nunemaker, David Bolton, Roland Swingler"
+  p.author          = "Damien Le Berrigaud, John Nunemaker, David Bolton, Roland Swingler, Etienne Vallette d'Osia"
   p.email           = "damien@meliondesign.com"
   p.extra_deps      = ['nokogiri >=1.4.0']
   p.need_tar_gz     = false

data/lib/happymapper.rb

@@ -93,7 +93,11 @@ module HappyMapper
 
       # This is the entry point into the parsing pipeline, so the default
       # namespace prefix registered here will propagate down
-      namespaces = options[:namespaces] || xml.namespaces
+      namespaces   = options[:namespaces]
+      namespaces ||= {}
+      namespaces   = namespaces.merge(xml.collect_namespaces) if xml.respond_to?(:collect_namespaces)
+      namespaces   = namespaces.merge(xml.namespaces)
+
       if namespaces.has_key?("xmlns")
         namespace ||= DEFAULT_NS
         namespaces[namespace] = namespaces.delete("xmlns")
@@ -101,18 +105,24 @@ module HappyMapper
         namespace ||= DEFAULT_NS
       end
 
-      xpath = root ? '/' : './/'
-      xpath += "#{namespace}:" if namespace
-      #puts "parse: #{xpath}"
-
-      nodes = []
-      # when finding nodes, do it in this order:
-      # 1. specified tag
-      # 2. name of element
-      # 3. tag_name (derived from class name by default)
-      [options[:tag], options[:name], tag_name].compact.each do |xpath_ext|
-        nodes = node.xpath(xpath + xpath_ext.to_s, namespaces)
-        break if nodes && nodes.size > 0
+      nodes = options.fetch(:nodes) do
+        xpath  = (root ? '/' : './/')
+        xpath  = options[:xpath].to_s.sub(/([^\/])$/, '\1/') if options[:xpath]
+        xpath += "#{namespace}:" if namespace
+        #puts "parse: #{xpath}"
+
+        nodes = []
+
+        # when finding nodes, do it in this order:
+        # 1. specified tag
+        # 2. name of element
+        # 3. tag_name (derived from class name by default)
+        [options[:tag], options[:name], tag_name].compact.each do |xpath_ext|
+          nodes = node.xpath(xpath + xpath_ext.to_s, namespaces)
+          break if nodes && !nodes.empty?
+        end
+
+        nodes
       end
 
       collection = nodes.collect do |n|

data/lib/happymapper/version.rb

@@ -1,3 +1,3 @@
 module HappyMapper
-  Version = '0.3.3'
+  Version = '0.3.4'
 end

data/nokogiri-happymapper.gemspec

@@ -2,22 +2,22 @@
 
 Gem::Specification.new do |s|
   s.name = %q{nokogiri-happymapper}
-  s.version = "0.3.3"
+  s.version = "0.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Damien Le Berrigaud, John Nunemaker, David Bolton, Roland Swingler"]
-  s.date = %q{2010-03-19}
-  s.description = %q{object to xml mapping library, using nokogiri (fork from John Nunemaker's Happymapper)}
+  s.authors = ["Damien Le Berrigaud, John Nunemaker, David Bolton, Roland Swingler, Etienne Vallette d'Osia"]
+  s.date = %q{2010-06-24}
+  s.description = %q{Object to XML Mapping Library, using Nokogiri (fork from John Nunemaker's Happymapper)}
   s.email = %q{damien@meliondesign.com}
   s.extra_rdoc_files = ["README", "TODO", "lib/happymapper.rb", "lib/happymapper/attribute.rb", "lib/happymapper/element.rb", "lib/happymapper/item.rb", "lib/happymapper/text_node.rb", "lib/happymapper/version.rb"]
-  s.files = ["History", "License", "Manifest", "README", "Rakefile", "TODO", "examples/amazon.rb", "examples/current_weather.rb", "examples/dashed_elements.rb", "examples/family_tree.rb", "examples/post.rb", "examples/twitter.rb", "lib/happymapper.rb", "lib/happymapper/attribute.rb", "lib/happymapper/element.rb", "lib/happymapper/item.rb", "lib/happymapper/text_node.rb", "lib/happymapper/version.rb", "nokogiri-happymapper.gemspec", "spec/fixtures/address.xml", "spec/fixtures/analytics.xml", "spec/fixtures/commit.xml", "spec/fixtures/current_weather.xml", "spec/fixtures/dictionary.xml", "spec/fixtures/family_tree.xml", "spec/fixtures/lastfm.xml", "spec/fixtures/multiple_namespaces.xml", "spec/fixtures/multiple_primitives.xml", "spec/fixtures/pita.xml", "spec/fixtures/posts.xml", "spec/fixtures/product_default_namespace.xml", "spec/fixtures/product_no_namespace.xml", "spec/fixtures/product_single_namespace.xml", "spec/fixtures/quarters.xml", "spec/fixtures/radar.xml", "spec/fixtures/statuses.xml", "spec/happymapper_attribute_spec.rb", "spec/happymapper_element_spec.rb", "spec/happymapper_item_spec.rb", "spec/happymapper_spec.rb", "spec/happymapper_text_node_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "website/css/common.css", "website/index.html"]
+  s.files = ["History", "License", "Manifest", "README", "Rakefile", "TODO", "examples/amazon.rb", "examples/current_weather.rb", "examples/dashed_elements.rb", "examples/family_tree.rb", "examples/post.rb", "examples/twitter.rb", "lib/happymapper.rb", "lib/happymapper/attribute.rb", "lib/happymapper/element.rb", "lib/happymapper/item.rb", "lib/happymapper/text_node.rb", "lib/happymapper/version.rb", "nokogiri-happymapper.gemspec", "spec/fixtures/address.xml", "spec/fixtures/ambigous_items.xml", "spec/fixtures/analytics.xml", "spec/fixtures/commit.xml", "spec/fixtures/current_weather.xml", "spec/fixtures/dictionary.xml", "spec/fixtures/family_tree.xml", "spec/fixtures/lastfm.xml", "spec/fixtures/multiple_namespaces.xml", "spec/fixtures/multiple_primitives.xml", "spec/fixtures/pita.xml", "spec/fixtures/posts.xml", "spec/fixtures/product_default_namespace.xml", "spec/fixtures/product_no_namespace.xml", "spec/fixtures/product_single_namespace.xml", "spec/fixtures/quarters.xml", "spec/fixtures/radar.xml", "spec/fixtures/statuses.xml", "spec/happymapper_attribute_spec.rb", "spec/happymapper_element_spec.rb", "spec/happymapper_item_spec.rb", "spec/happymapper_spec.rb", "spec/happymapper_text_node_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "website/css/common.css", "website/index.html"]
   s.homepage = %q{http://github.com/dam5s/happymapper}
   s.post_install_message = %q{May you have many happy mappings!}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Nokogiri-happymapper", "--main", "README"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{nokogiri-happymapper}
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{object to xml mapping library, using nokogiri (fork from John Nunemaker's Happymapper)}
+  s.rubygems_version = %q{1.3.6}
+  s.summary = %q{Object to XML Mapping Library, using Nokogiri (fork from John Nunemaker's Happymapper)}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

data/spec/fixtures/ambigous_items.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ambigous>
+  <my-items>
+    <item>
+      <name>My first item</name>
+      <item><name>My first internal item</name></item>
+    </item>
+    <item>
+      <name>My second item</name>
+      <item><name>My second internal item</name></item>
+    </item>
+    <item>
+      <name>My third item</name>
+      <item><name>My third internal item</name></item>
+    </item>
+  </my-items>
+  <others-items>
+    <item>
+      <name>Other item</name>
+    </item>
+  <others-items>
+</ambigous>

data/spec/happymapper_spec.rb

@@ -378,6 +378,16 @@ module Dictionary
   end
 end
 
+module AmbigousItems
+  class Item
+    include HappyMapper
+
+    tag 'item'
+    element :name, String
+    element :item, String
+  end
+end
+
 describe HappyMapper do
 
   describe "being included into another class" do
@@ -386,12 +396,12 @@ describe HappyMapper do
         include HappyMapper
         
         def self.to_s
-          'Foo'
+          'Boo'
         end
       end
     end
 
-    class Foo; include HappyMapper end
+    class Boo; include HappyMapper end
 
     it "should set attributes to an array" do
       @klass.attributes.should == []
@@ -453,7 +463,7 @@ describe HappyMapper do
     end
 
     it "should default tag name to lowercase class" do
-      @klass.tag_name.should == 'foo'
+      @klass.tag_name.should == 'boo'
     end
 
     it "should default tag name of class in modules to the last constant lowercase" do
@@ -467,7 +477,7 @@ describe HappyMapper do
     end
 
     it "should allow setting a namespace" do
-      @klass.namespace(namespace = "foo")
+      @klass.namespace(namespace = "boo")
       @klass.namespace.should == namespace
     end
 
@@ -732,4 +742,10 @@ describe HappyMapper do
         '<em>white</em> cockatoo'
     end
   end
+
+  it "should parse ambigous items" do
+    items = AmbigousItems::Item.parse(fixture_file('ambigous_items.xml'),
+                                       :xpath => '/ambigous/my-items')
+    items.map(&:name).should == %w(first second third).map{|s| "My #{s} item" }
+  end
 end

metadata

@@ -1,28 +1,37 @@
 --- !ruby/object:Gem::Specification 
 name: nokogiri-happymapper
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 4
+  version: 0.3.4
 platform: ruby
 authors: 
-- Damien Le Berrigaud, John Nunemaker, David Bolton, Roland Swingler
+- Damien Le Berrigaud, John Nunemaker, David Bolton, Roland Swingler, Etienne Vallette d'Osia
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-03-19 00:00:00 +11:00
+date: 2010-06-24 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 4
+        - 0
         version: 1.4.0
-    version: 
-description: object to xml mapping library, using nokogiri (fork from John Nunemaker's Happymapper)
+  type: :runtime
+  version_requirements: *id001
+description: Object to XML Mapping Library, using Nokogiri (fork from John Nunemaker's Happymapper)
 email: damien@meliondesign.com
 executables: []
 
@@ -58,6 +67,7 @@ files:
 - lib/happymapper/version.rb
 - nokogiri-happymapper.gemspec
 - spec/fixtures/address.xml
+- spec/fixtures/ambigous_items.xml
 - spec/fixtures/analytics.xml
 - spec/fixtures/commit.xml
 - spec/fixtures/current_weather.xml
@@ -101,20 +111,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 2
       version: "1.2"
-  version: 
 requirements: []
 
 rubyforge_project: nokogiri-happymapper
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: object to xml mapping library, using nokogiri (fork from John Nunemaker's Happymapper)
+summary: Object to XML Mapping Library, using Nokogiri (fork from John Nunemaker's Happymapper)
 test_files: []