happymapper 0.2.5 → 0.3.0

data/HOW_TO_RELEASE

@@ -0,0 +1,5 @@
+* Change lib/happymapper/version to new version.
+* rake prepare
+* git commit version bump
+* git push for github
+* rake release for rubyforge

data/Manifest

@@ -1,10 +1,12 @@
 examples/amazon.rb
 examples/current_weather.rb
 examples/dashed_elements.rb
+examples/multi_street_address.rb
 examples/post.rb
 examples/twitter.rb
 happymapper.gemspec
 History
+HOW_TO_RELEASE
 lib/happymapper/attribute.rb
 lib/happymapper/element.rb
 lib/happymapper/item.rb
@@ -19,7 +21,9 @@ spec/fixtures/analytics.xml
 spec/fixtures/commit.xml
 spec/fixtures/current_weather.xml
 spec/fixtures/family_tree.xml
+spec/fixtures/multi_street_address.xml
 spec/fixtures/multiple_namespaces.xml
+spec/fixtures/nested_namespaces.xml
 spec/fixtures/pita.xml
 spec/fixtures/posts.xml
 spec/fixtures/product_default_namespace.xml

data/examples/multi_street_address.rb

@@ -0,0 +1,15 @@
+dir = File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
+require File.join(dir, 'happymapper')
+
+file_contents = File.read(dir + '/../spec/fixtures/address_multi_street.xml')
+
+class MultiStreetAddress
+  include HappyMapper
+  
+  # allow primitive type to be collection
+  has_many :street_address, String, :tag => "streetaddress"
+  element :city, String
+  element :state_or_providence, String, :tag => "stateOfProvidence"
+  element :zip, String
+  element :country, String
+end

data/happymapper.gemspec

@@ -2,37 +2,33 @@
 
 Gem::Specification.new do |s|
   s.name = %q{happymapper}
-  s.version = "0.2.5"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Nunemaker"]
-  s.date = %q{2009-05-27}
+  s.date = %q{2009-10-04}
   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"]
-  s.files = ["examples/amazon.rb", "examples/current_weather.rb", "examples/dashed_elements.rb", "examples/post.rb", "examples/twitter.rb", "happymapper.gemspec", "History", "lib/happymapper/attribute.rb", "lib/happymapper/element.rb", "lib/happymapper/item.rb", "lib/happymapper/version.rb", "lib/happymapper.rb", "License", "Manifest", "Rakefile", "README", "spec/fixtures/address.xml", "spec/fixtures/analytics.xml", "spec/fixtures/commit.xml", "spec/fixtures/current_weather.xml", "spec/fixtures/family_tree.xml", "spec/fixtures/multiple_namespaces.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/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/spec.opts", "spec/spec_helper.rb", "TODO", "website/css/common.css", "website/index.html"]
-  s.has_rdoc = true
+  s.files = ["examples/amazon.rb", "examples/current_weather.rb", "examples/dashed_elements.rb", "examples/multi_street_address.rb", "examples/post.rb", "examples/twitter.rb", "happymapper.gemspec", "History", "HOW_TO_RELEASE", "lib/happymapper/attribute.rb", "lib/happymapper/element.rb", "lib/happymapper/item.rb", "lib/happymapper/version.rb", "lib/happymapper.rb", "License", "Manifest", "Rakefile", "README", "spec/fixtures/address.xml", "spec/fixtures/analytics.xml", "spec/fixtures/commit.xml", "spec/fixtures/current_weather.xml", "spec/fixtures/family_tree.xml", "spec/fixtures/multi_street_address.xml", "spec/fixtures/multiple_namespaces.xml", "spec/fixtures/nested_namespaces.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/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/spec.opts", "spec/spec_helper.rb", "TODO", "website/css/common.css", "website/index.html"]
   s.homepage = %q{http://happymapper.rubyforge.org}
   s.post_install_message = %q{May you have many happy mappings!}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Happymapper", "--main", "README"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{happymapper}
-  s.rubygems_version = %q{1.3.1}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{object to xml mapping library}
 
   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<libxml-ruby>, ["= 1.1.3"])
-      s.add_development_dependency(%q<echoe>, [">= 0"])
     else
       s.add_dependency(%q<libxml-ruby>, ["= 1.1.3"])
-      s.add_dependency(%q<echoe>, [">= 0"])
     end
   else
     s.add_dependency(%q<libxml-ruby>, ["= 1.1.3"])
-    s.add_dependency(%q<echoe>, [">= 0"])
   end
 end

data/lib/happymapper.rb

@@ -66,9 +66,6 @@ module HappyMapper
     end
         
     def parse(xml, options = {})
-      # locally scoped copy of namespace for this parse run
-      namespace = @namespace
-
       if xml.is_a?(XML::Node)
         node = xml
       else
@@ -81,22 +78,14 @@ module HappyMapper
         root = node.name == tag_name
       end
 
-      # This is the entry point into the parsing pipeline, so the default
-      # namespace prefix registered here will propagate down
-      namespaces = node.namespaces
-      if namespaces && namespaces.default
-        already_assigned = namespaces.definitions.detect do |defn|
-          namespaces.default && namespaces.default.href == defn.href && defn.prefix
-        end
-        namespaces.default_prefix = DEFAULT_NS unless already_assigned
-        namespace ||= DEFAULT_NS
-      end
+      namespace = @namespace || (node.namespaces && node.namespaces.default)
+      namespace = "#{DEFAULT_NS}:#{namespace}" if namespace
 
       xpath = root ? '/' : './/'
-      xpath += "#{namespace}:" if namespace
+      xpath += "#{DEFAULT_NS}:" if namespace
       xpath += tag_name
       
-      nodes = node.find(xpath)
+      nodes = node.find(xpath, Array(namespace))
       collection = nodes.collect do |n|
         obj = new
         

data/lib/happymapper/item.rb

@@ -59,7 +59,7 @@ module HappyMapper
     def xpath(namespace = self.namespace)
       xpath  = ''
       xpath += './/' if options[:deep]
-      xpath += "#{namespace}:" if namespace
+      xpath += "#{DEFAULT_NS}:" if namespace
       xpath += tag
       # puts "xpath: #{xpath}"
       xpath
@@ -128,20 +128,33 @@ module HappyMapper
       end
       
       def find(node, namespace, &block)
-        # this node has a custom namespace (that is present in the doc)
-        if self.namespace && node.namespaces.find_by_prefix(self.namespace)
-          # from the class definition
-          namespace = self.namespace
-        elsif options[:namespace] && node.namespaces.find_by_prefix(options[:namespace])
+        if options[:namespace] == false
+          namespace = nil
+        elsif options[:namespace]
           # from an element definition
-          namespace = options[:namespace]
+          namespace = "#{DEFAULT_NS}:#{options[:namespace]}"
+        elsif self.namespace
+          # this node has a custom namespace (that is present in the doc)
+          namespace = "#{DEFAULT_NS}:#{self.namespace}"
         end
-
+        
         if element?
-          result = node.find_first(xpath(namespace))
+          if(options[:single].nil? || options[:single])
+            result = node.find_first(xpath(namespace), namespace)
+          else
+            result = node.find(xpath(namespace))
+          end
           # puts "vfxn: #{xpath} #{result.inspect}"
           if result
-            value = yield(result)
+            if(options[:single].nil? || options[:single])
+              value = yield(result)
+            else
+              value = []
+
+              result.each do |res|
+                value << yield(res)
+              end
+            end
             if options[:attributes].is_a?(Hash)
               result.attributes.each do |xml_attribute|
                 if attribute_options = options[:attributes][xml_attribute.name.to_sym]

data/lib/happymapper/version.rb

@@ -1,3 +1,3 @@
 module HappyMapper
-  Version = '0.2.5'
+  Version = '0.3.0'
 end

data/spec/fixtures/multi_street_address.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<address>
+  <streetaddress>123 Smith Dr</streetaddress>
+  <streetaddress>Apt 31</streetaddress>
+  <city>Anytown</city>
+  <stateOrProvince>ST<stateOrProvince>
+  <zip>12345</zip>
+  <country>USA</country>
+</address>

data/spec/fixtures/nested_namespaces.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<EDXLDistribution>
+	<contentObject>
+		<confidentiality>Sensitive</confidentiality>
+		<xmlContent>
+			<embeddedXMLContent>
+				<ns1:alert xmlns:ns1="http://schemas.google.com/analytics/2009">
+				  <severity>Severe</severity>
+					<ns1:identifier>CDC-2006-183</ns1:identifier>
+					<ns1:info>
+						<ns1:category>Health</ns1:category>
+					</ns1:info>
+				</ns1:alert>
+			</embeddedXMLContent>
+		</xmlContent>
+	</contentObject>
+</EDXLDistribution>

data/spec/happymapper_item_spec.rb

@@ -65,8 +65,8 @@ describe HappyMapper::Item do
     
     it "should prepend namespace if namespace exists" do
       item = HappyMapper::Item.new(:foo, String, :tag => 'foobar')
-      item.namespace = 'v2'
-      item.xpath.should == 'v2:foobar'
+      item.namespace = 'http://example.com'
+      item.xpath.should == 'happymapper:foobar'
     end
   end
   

data/spec/happymapper_spec.rb

@@ -7,7 +7,7 @@ module Analytics
     include HappyMapper
     
     tag 'property'
-    namespace 'dxp'
+    namespace 'http://schemas.google.com/analytics/2009'
     attribute :name, String
     attribute :value, String
   end
@@ -19,7 +19,7 @@ module Analytics
     element :id, String
     element :updated, DateTime
     element :title, String
-    element :table_id, String, :namespace => 'dxp', :tag => 'tableId'
+    element :table_id, String, :namespace => 'http://schemas.google.com/analytics/2009', :tag => 'tableId'
     has_many :properties, Property
   end
   
@@ -84,7 +84,7 @@ module FedEx
     include HappyMapper
     
     tag 'Address'
-    namespace 'v2'
+    namespace 'http://fedex.com/ws/track/v2'
     element :city, String, :tag => 'City'
     element :state, String, :tag => 'StateOrProvinceCode'
     element :zip, String, :tag => 'PostalCode'
@@ -96,7 +96,7 @@ module FedEx
     include HappyMapper
     
     tag 'Events'
-    namespace 'v2'
+    namespace 'http://fedex.com/ws/track/v2'
     element :timestamp, String, :tag => 'Timestamp'
     element :eventtype, String, :tag => 'EventType'
     element :eventdescription, String, :tag => 'EventDescription'
@@ -107,7 +107,7 @@ module FedEx
     include HappyMapper
     
     tag 'PackageWeight'
-    namespace 'v2'
+    namespace 'http://fedex.com/ws/track/v2'
     element :units, String, :tag => 'Units'
     element :value, Integer, :tag => 'Value'
   end
@@ -116,7 +116,7 @@ module FedEx
     include HappyMapper
     
     tag 'TrackDetails'
-    namespace 'v2'
+    namespace 'http://fedex.com/ws/track/v2'
     element   :tracking_number, String, :tag => 'TrackingNumber'
     element   :status_code, String, :tag => 'StatusCode'
     element   :status_desc, String, :tag => 'StatusDescription'
@@ -131,7 +131,7 @@ module FedEx
     include HappyMapper
     
     tag 'Notifications'
-    namespace 'v2'
+    namespace 'http://fedex.com/ws/track/v2'
     element :severity, String, :tag => 'Severity'
     element :source, String, :tag => 'Source'
     element :code, Integer, :tag => 'Code'
@@ -143,7 +143,7 @@ module FedEx
     include HappyMapper
     
     tag 'TransactionDetail'
-    namespace 'v2'
+    namespace 'http://fedex.com/ws/track/v2'
     element :cust_tran_id, String, :tag => 'CustomerTransactionId'
   end
   
@@ -151,7 +151,7 @@ module FedEx
     include HappyMapper
     
     tag 'TrackReply'
-    namespace 'v2'
+    namespace 'http://fedex.com/ws/track/v2'
     element   :highest_severity, String, :tag => 'HighestSeverity'
     element   :more_data, Boolean, :tag => 'MoreData'
     has_many  :notifications, Notification, :tag => 'Notifications'
@@ -215,7 +215,7 @@ class CurrentWeather
   include HappyMapper
   
   tag 'ob'
-  namespace 'aws'
+  namespace 'http://www.aws.com/aws'
   element :temperature, Integer, :tag => 'temp'
   element :feels_like, Integer, :tag => 'feels-like'
   element :current_condition, String, :tag => 'current-condition', :attributes => {:icon => String}
@@ -243,7 +243,7 @@ module PITA
     element :asin, String, :tag => 'ASIN'
     element :detail_page_url, URI, :tag => 'DetailPageURL', :parser => :parse
     element :manufacturer, String, :tag => 'Manufacturer', :deep => true
-    element :point, String, :tag => 'point', :namespace => 'georss'
+    element :point, String, :tag => 'point', :namespace => 'http://www.georss.org/georss'
     element :product_group, ProductGroup, :tag => 'ProductGroup', :deep => true, :parser => :new, :raw => true
   end
 
@@ -578,4 +578,50 @@ describe HappyMapper do
     # 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'
   end
+  
+  describe 'nested elements with namespaces' do
+    module Namespaces
+      class Info
+        include HappyMapper
+        namespace 'http://schemas.google.com/analytics/2009'
+        element :category, String
+      end
+      
+      class Alert
+        include HappyMapper
+        namespace 'http://schemas.google.com/analytics/2009'
+
+        element :identifier, String
+        element :severity, String, :namespace => false
+        has_one :info, Info
+      end
+      class Distribution
+        include HappyMapper
+
+        tag 'EDXLDistribution'
+        has_one :alert, Alert
+      end
+    end
+    
+    def mapping
+      @mapping ||= Namespaces::Distribution.parse(fixture_file('nested_namespaces.xml'))
+    end
+
+    it "should parse elements with inline namespace" do
+      lambda { mapping }.should_not raise_error
+    end
+    
+    it "should map elements with inline namespace" do
+      mapping.alert.identifier.should == 'CDC-2006-183'
+    end
+    
+    it "should map sub elements of with nested namespace" do
+      mapping.alert.info.category.should == 'Health'
+    end
+
+    it "should map elements without a namespace" do
+      mapping.alert.severity.should == 'Severe'
+    end
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: happymapper
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors: 
 - John Nunemaker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-27 00:00:00 -04:00
+date: 2009-10-04 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,16 +22,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.1.3
     version: 
-- !ruby/object:Gem::Dependency 
-  name: echoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
 description: object to xml mapping library
 email: nunemaker@gmail.com
 executables: []
@@ -50,10 +40,12 @@ files:
 - examples/amazon.rb
 - examples/current_weather.rb
 - examples/dashed_elements.rb
+- examples/multi_street_address.rb
 - examples/post.rb
 - examples/twitter.rb
 - happymapper.gemspec
 - History
+- HOW_TO_RELEASE
 - lib/happymapper/attribute.rb
 - lib/happymapper/element.rb
 - lib/happymapper/item.rb
@@ -68,7 +60,9 @@ files:
 - spec/fixtures/commit.xml
 - spec/fixtures/current_weather.xml
 - spec/fixtures/family_tree.xml
+- spec/fixtures/multi_street_address.xml
 - spec/fixtures/multiple_namespaces.xml
+- spec/fixtures/nested_namespaces.xml
 - spec/fixtures/pita.xml
 - spec/fixtures/posts.xml
 - spec/fixtures/product_default_namespace.xml
@@ -87,6 +81,8 @@ files:
 - website/index.html
 has_rdoc: true
 homepage: http://happymapper.rubyforge.org
+licenses: []
+
 post_install_message: May you have many happy mappings!
 rdoc_options: 
 - --line-numbers
@@ -112,9 +108,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: happymapper
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: object to xml mapping library
 test_files: []