jnunemaker-happymapper 0.1.5 → 0.1.6

data/happymapper.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{happymapper}
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Nunemaker"]

data/lib/happymapper.rb

@@ -75,7 +75,17 @@ module HappyMapper
       else
         doc.find("//#{get_tag_name}")
       end
-      
+
+      nodes = if namespace
+        node = doc.respond_to?(:root) ? doc.root : doc
+        node.register_default_namespace(namespace.chop)
+        node.find("#{namespace}#{get_tag_name}")
+      else
+        nested = '.' unless doc.respond_to?(:root)
+        path = "#{nested}//#{get_tag_name}"
+        doc.find(path)
+      end
+
       collection = create_collection(nodes, namespace)
       
       # per http://libxml.rubyforge.org/rdoc/classes/LibXML/XML/Document.html#M000354

data/spec/happymapper_spec.rb

@@ -1,5 +1,16 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
+class Place
+  include HappyMapper
+
+  element :name, String
+end
+
+class Radar
+  include HappyMapper
+  has_many :places, Place
+end
+
 class Post
   include HappyMapper
   
@@ -261,4 +272,23 @@ describe HappyMapper do
       @first.current_condition.icon.should == 'http://deskwx.weatherbug.com/images/Forecast/icons/cond007.gif'
     end
   end
+
+  describe "#parse (with xml that has nested elements)" do
+    before do
+      file_contents = File.read(File.dirname(__FILE__) + '/fixtures/radar.xml')
+      @radars = Radar.parse(file_contents)
+    end
+
+    it "should properly create objects" do
+      @first = @radars[0]
+      @first.places.size.should == 1
+      @first.places[0].name.should == 'Store'
+      @second = @radars[1]
+      @second.places.size.should == 0
+      @third = @radars[2]
+      @third.places.size.should == 2
+      @third.places[0].name.should == 'Work'
+      @third.places[1].name.should == 'Home'
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jnunemaker-happymapper
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
 - John Nunemaker