happymapper 0.2.3 → 0.2.4

data/Manifest

@@ -15,6 +15,7 @@ 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

data/happymapper.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{happymapper}
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Nunemaker"]
@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   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/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.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.homepage = %q{http://happymapper.rubyforge.org}
   s.post_install_message = %q{May you have many happy mappings!}

data/lib/happymapper.rb

@@ -1,5 +1,4 @@
 dir = File.dirname(__FILE__)
-$:.unshift(dir) unless $:.include?(dir) || $:.include?(File.expand_path(dir))
 
 require 'date'
 require 'time'
@@ -86,14 +85,16 @@ module HappyMapper
       # namespace prefix registered here will propagate down
       namespaces = node.namespaces
       if namespaces && namespaces.default
-        namespaces.default_prefix = DEFAULT_NS
+        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
 
       xpath = root ? '/' : './/'
       xpath += "#{namespace}:" if namespace
       xpath += tag_name
-      # puts "parse: #{xpath}"
       
       nodes = node.find(xpath)
       collection = nodes.collect do |n|
@@ -108,7 +109,7 @@ module HappyMapper
           obj.send("#{elem.method_name}=", 
                     elem.from_xml_node(n, namespace))
         end
-
+        
         obj
       end
 
@@ -124,6 +125,6 @@ module HappyMapper
   end
 end
 
-require 'happymapper/item'
-require 'happymapper/attribute'
-require 'happymapper/element'
+require File.join(dir, 'happymapper/item')
+require File.join(dir, 'happymapper/attribute')
+require File.join(dir, 'happymapper/element')

data/lib/happymapper/version.rb

@@ -1,3 +1,3 @@
 module HappyMapper
-  Version = '0.2.3'
+  Version = '0.2.4'
 end

data/spec/fixtures/analytics.xml

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom" 
+      xmlns:openSearch="http://a9.com/-/spec/opensearchrss/1.0/" 
+      xmlns:dxp="http://schemas.google.com/analytics/2009">
+  <id>http://www.google.com/analytics/feeds/accounts/nunemaker@gmail.com</id>
+  <updated>2009-04-22T23:21:23.000-07:00</updated>
+  <title type="text">Profile list for nunemaker@gmail.com</title>
+  <link rel="self" type="application/atom+xml" 
+        href="http://www.google.com/analytics/feeds/accounts/default"/>
+  <author>
+    <name>Google Analytics</name>
+  </author>
+  <generator version="1.0">Google Analytics</generator>
+  <openSearch:totalResults>4</openSearch:totalResults>
+  <openSearch:startIndex>1</openSearch:startIndex>
+  <openSearch:itemsPerPage>4</openSearch:itemsPerPage>
+  <entry>
+    <id>http://www.google.com/analytics/feeds/accounts/ga:47912</id>
+    <updated>2008-11-24T12:11:32.000-08:00</updated>
+    <title type="text">addictedtonew.com</title>
+    <link rel="alternate" type="text/html" href="http://www.google.com/analytics"/>
+    <dxp:tableId>ga:47912</dxp:tableId>
+    <dxp:property name="ga:accountId" value="85301"/>
+    <dxp:property name="ga:accountName" value="addictedtonew.com"/>
+    <dxp:property name="ga:profileId" value="47912"/>
+    <dxp:property name="ga:webPropertyId" value="UA-85301-1"/>
+  </entry>
+  <entry>
+    <id>http://www.google.com/analytics/feeds/accounts/ga:1897579</id>
+    <updated>2008-11-24T12:11:32.000-08:00</updated>
+    <title type="text">railstips.org</title>
+    <link rel="alternate" type="text/html" href="http://www.google.com/analytics"/>
+    <dxp:tableId>ga:1897579</dxp:tableId>
+    <dxp:property name="ga:accountId" value="85301"/>
+    <dxp:property name="ga:accountName" value="addictedtonew.com"/>
+    <dxp:property name="ga:profileId" value="1897579"/>
+    <dxp:property name="ga:webPropertyId" value="UA-85301-7"/>
+  </entry>
+  <entry>
+    <id>http://www.google.com/analytics/feeds/accounts/ga:17132454</id>
+    <updated>2009-04-22T23:21:23.000-07:00</updated>
+    <title type="text">johnnunemaker.com</title>
+    <link rel="alternate" type="text/html" href="http://www.google.com/analytics"/>
+    <dxp:tableId>ga:17132454</dxp:tableId>
+    <dxp:property name="ga:accountId" value="85301"/>
+    <dxp:property name="ga:accountName" value="addictedtonew.com"/>
+    <dxp:property name="ga:profileId" value="17132454"/>
+    <dxp:property name="ga:webPropertyId" value="UA-85301-25"/>
+  </entry>
+  <entry>
+    <id>http://www.google.com/analytics/feeds/accounts/ga:17132478</id>
+    <updated>2009-04-22T23:21:23.000-07:00</updated>
+    <title type="text">harmonyapp.com</title>
+    <link rel="alternate" type="text/html" href="http://www.google.com/analytics"/>
+    <dxp:tableId>ga:17132478</dxp:tableId>
+    <dxp:property name="ga:accountId" value="85301"/>
+    <dxp:property name="ga:accountName" value="addictedtonew.com"/>
+    <dxp:property name="ga:profileId" value="17132478"/>
+    <dxp:property name="ga:webPropertyId" value="UA-85301-26"/>
+  </entry>
+</feed>

data/spec/happymapper_spec.rb

@@ -2,6 +2,38 @@ require File.dirname(__FILE__) + '/spec_helper.rb'
 require 'pp'
 require 'uri'
 
+module Analytics
+  class Property
+    include HappyMapper
+    
+    tag 'property'
+    namespace 'dxp'
+    attribute :name, String
+    attribute :value, String
+  end
+  
+  class Entry
+    include HappyMapper
+    
+    tag 'entry'
+    element :id, String
+    element :updated, DateTime
+    element :title, String
+    element :table_id, String, :namespace => 'dxp', :tag => 'tableId'
+    has_many :properties, Property
+  end
+  
+  class Feed
+    include HappyMapper
+    
+    tag 'feed'
+    element :id, String
+    element :updated, DateTime
+    element :title, String
+    has_many :entries, Entry
+  end
+end
+
 class Feature
   include HappyMapper
   element :name, String, :tag => '.|.//text()'
@@ -505,6 +537,20 @@ describe HappyMapper do
     track.tran_detail.cust_tran_id.should == '20090102-111321'
   end
   
+  it "should be able to parse google analytics api xml" do
+    data = Analytics::Feed.parse(fixture_file('analytics.xml'))
+    data.id.should == 'http://www.google.com/analytics/feeds/accounts/nunemaker@gmail.com'
+    data.entries.size.should == 4
+    
+    entry = data.entries[0]
+    entry.title.should == 'addictedtonew.com'
+    entry.properties.size.should == 4
+    
+    property = entry.properties[0]
+    property.name.should == 'ga:accountId'
+    property.value.should == '85301'
+  end
+  
   xit "should parse family search xml" do
     tree = FamilySearch::FamilyTree.parse(fixture_file('family_tree.xml'))
     tree.version.should == '1.0.20071213.942'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: happymapper
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - John Nunemaker
@@ -64,6 +64,7 @@ files:
 - Rakefile
 - README
 - spec/fixtures/address.xml
+- spec/fixtures/analytics.xml
 - spec/fixtures/commit.xml
 - spec/fixtures/current_weather.xml
 - spec/fixtures/family_tree.xml