lightningdb-happymapper 0.3.1 → 0.3.2

data/happymapper.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{happymapper}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = ["John Nunemaker"]
-  s.date = %q{2009-01-29}
+  s.authors = ["John Nunemaker", "Dave Bolton"]
+  s.date = %q{2009-03-17}
   s.description = %q{object to xml mapping library}
   s.email = %q{nunemaker@gmail.com}
   s.extra_rdoc_files = ["lib/happymapper/attribute.rb", "lib/happymapper/element.rb", "lib/happymapper/item.rb", "lib/happymapper/version.rb", "lib/happymapper.rb", "README", "TODO"]

data/lib/happymapper/item.rb

@@ -18,7 +18,7 @@ module HappyMapper
       self.type = type
       #self.tag = o.delete(:tag) || name.to_s
       self.tag = o[:tag] || name.to_s
-      self.options = o.merge(:name => self.name)
+      self.options = { :single => true }.merge(o.merge(:name => self.name))
 
       @xml_type = self.class.to_s.split('::').last.downcase
     end
@@ -120,29 +120,42 @@ module HappyMapper
         end
 
         if element?
-          result = node.find_first(xpath(namespace))
-          # puts "vfxn: #{xpath} #{result.inspect}"
-          if result
-            value = yield(result)
-            if options[:attributes].is_a?(Hash)
-              result.attributes.each do |xml_attribute|
-                if attribute_options = options[:attributes][xml_attribute.name.to_sym]
-                  attribute_value = Attribute.new(xml_attribute.name.to_sym, *attribute_options).from_xml_node(result, namespace)
-                  result.instance_eval <<-EOV
-                    def value.#{xml_attribute.name}
-                      #{attribute_value.inspect}
-                    end
-                  EOV
-                end
-              end
+          if options[:single]
+            result = node.find_first(xpath(namespace))
+            if result
+              value = yield(result)
+              handle_attributes_option(result,value)
+              value
+            else
+              nil
             end
-            value
           else
-            nil
+            results = node.find(xpath(namespace)).collect do |result|
+              value = yield(result)
+              handle_attributes_option(result,value)
+              value
+            end
+            results
           end
         else
           yield(node[tag])
         end
       end
+
+      def handle_attributes_option(result, value)
+        if options[:attributes].is_a?(Hash)
+          result.attributes.each do |xml_attribute|
+            if attribute_options = options[:attributes][xml_attribute.name.to_sym]
+              attribute_value = Attribute.new(xml_attribute.name.to_sym, *attribute_options).from_xml_node(result, namespace)
+              result.instance_eval <<-EOV
+                def value.#{xml_attribute.name}
+                  #{attribute_value.inspect}
+                end
+              EOV
+            end
+          end
+        end
+      end
   end
 end
+

data/spec/fixtures/family_tree.xml

@@ -2,6 +2,20 @@
 <familytree xmlns="http://api.familysearch.org/familytree/v1" xmlns:fsapi-v1="http://api.familysearch.org/v1" version="1.0.20071213.942" statusMessage="OK" statusCode="200">
 	<persons>
 		<person version="1199378491000" modified="2008-01-03T09:41:31-07:00" id="KWQS-BBQ">
+      <information>
+        <alternateIds>
+          <id>gedcom.1B5E3087E36D814FA9CBE0BE5B3721EA</id>
+          <id>KWQS-BB3</id>
+          <id>KWQS-W23</id>
+          <id>KWQS-W2S</id>
+          <id>KWQS-W29</id>
+          <id>KWQM-MMM</id>
+          <id>KWQS-W2Q</id>
+          <id>KWQS-BBQ</id>
+        </alternateIds>
+        <gender>Male</gender>
+        <living>false</living>
+      </information>
 		</person>
 	</persons>
-</familytree>
+</familytree>

data/spec/happymapper_spec.rb

@@ -35,12 +35,26 @@ class Product
 end
 
 module FamilySearch
+  class AlternateIds
+    include HappyMapper
+
+    tag 'alternateIds'
+    has_many :ids, String, :tag => 'id'
+  end
+
+  class Information
+    include HappyMapper
+
+    has_one :alternateIds, AlternateIds
+  end
+
   class Person
     include HappyMapper
 
     attribute :version, String
     attribute :modified, Time
     attribute :id, String
+    has_one :information, Information
   end
 
   class Persons
@@ -542,14 +556,16 @@ describe HappyMapper do
     track.tran_detail.cust_tran_id.should == '20090102-111321'
   end
 
-  xit "should parse family search xml" do
+  it "should parse family search xml" do
     tree = FamilySearch::FamilyTree.parse(fixture_file('family_tree.xml'))
     tree.version.should == '1.0.20071213.942'
     tree.status_message.should == 'OK'
     tree.status_code.should == '200'
-    # tree.people.size.should == 1
-    # tree.people.first.version.should == '1199378491000'
-    # tree.people.first.modified.should == Time.utc(2008, 1, 3, 16, 41, 31) # 2008-01-03T09:41:31-07:00
-    # tree.people.first.id.should == 'KWQS-BBQ'
+    tree.persons.person.size.should == 1
+    tree.persons.person.first.version.should == '1199378491000'
+    tree.persons.person.first.modified.should == Time.utc(2008, 1, 3, 16, 41, 31) # 2008-01-03T09:41:31-07:00
+    tree.persons.person.first.id.should == 'KWQS-BBQ'
+    tree.persons.person.first.information.alternateIds.ids.should_not be_kind_of(String)
+    tree.persons.person.first.information.alternateIds.ids.size.should == 8
   end
 end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification 
 name: lightningdb-happymapper
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - John Nunemaker
+- Dave Bolton
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-01-29 00:00:00 -08:00
+date: 2009-03-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency