happymapper 0.1.2 → 0.1.3

data/History.txt

@@ -1,3 +1,7 @@
+== 0.1.3 2008-12-31
+* 1 major enhancement:
+  * Added parsing of attributes of elements that are also mapped, see current_weather.rb for example (jeremyf)
+
 == 0.1.2 2008-12-12
 * 1 major enhancement:
   * Fixed that :deep only worked for first item (dvrensk)

data/Manifest.txt

@@ -8,6 +8,7 @@ TODO.txt
 config/hoe.rb
 config/requirements.rb
 examples/amazon.rb
+examples/current_weather.rb
 examples/post.rb
 examples/twitter.rb
 happymapper.gemspec
@@ -22,6 +23,7 @@ script/destroy
 script/generate
 script/txt2html
 setup.rb
+spec/fixtures/current_weather.xml
 spec/fixtures/pita.xml
 spec/fixtures/posts.xml
 spec/fixtures/statuses.xml

data/examples/current_weather.rb

@@ -0,0 +1,19 @@
+dir = File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
+require File.join(dir, 'happymapper')
+
+file_contents = File.read(dir + '/../spec/fixtures/current_weather.xml')
+
+class CurrentWeather
+  include HappyMapper
+  tag 'aws:ob'
+  element :temperature, Integer, :tag => 'aws:temp'
+  element :feels_like, Integer, :tag => 'aws:feels-like'
+  element :current_condition, String, :tag => 'aws:current-condition', :attributes => {:icon => String}
+end
+
+CurrentWeather.parse(file_contents).each do |current_weather|
+  puts "temperature: #{current_weather.temperature}"
+  puts "feels_like: #{current_weather.feels_like}"
+  puts "current_condition: #{current_weather.current_condition}"
+  puts "current_condition.icon: #{current_weather.current_condition.icon}"
+end

data/happymapper.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{happymapper}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Nunemaker"]
-  s.date = %q{2008-12-12}
+  s.date = %q{2009-01-04}
   s.description = %q{object to xml mapping library}
   s.email = ["nunemaker@gmail.com"]
   s.extra_rdoc_files = ["History.txt", "License.txt", "Manifest.txt", "PostInstall.txt", "README.txt", "TODO.txt"]
-  s.files = ["History.txt", "License.txt", "Manifest.txt", "PostInstall.txt", "README.txt", "Rakefile", "TODO.txt", "config/hoe.rb", "config/requirements.rb", "examples/amazon.rb", "examples/post.rb", "examples/twitter.rb", "happymapper.gemspec", "lib/happymapper.rb", "lib/happymapper/attribute.rb", "lib/happymapper/element.rb", "lib/happymapper/item.rb", "lib/happymapper/version.rb", "lib/libxml_ext/libxml_helper.rb", "script/console", "script/destroy", "script/generate", "script/txt2html", "setup.rb", "spec/fixtures/pita.xml", "spec/fixtures/posts.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", "tasks/deployment.rake", "tasks/environment.rake", "tasks/rspec.rake", "tasks/website.rake", "website/css/common.css", "website/index.html"]
+  s.files = ["History.txt", "License.txt", "Manifest.txt", "PostInstall.txt", "README.txt", "Rakefile", "TODO.txt", "config/hoe.rb", "config/requirements.rb", "examples/amazon.rb", "examples/current_weather.rb", "examples/post.rb", "examples/twitter.rb", "happymapper.gemspec", "lib/happymapper.rb", "lib/happymapper/attribute.rb", "lib/happymapper/element.rb", "lib/happymapper/item.rb", "lib/happymapper/version.rb", "lib/libxml_ext/libxml_helper.rb", "script/console", "script/destroy", "script/generate", "script/txt2html", "setup.rb", "spec/fixtures/current_weather.xml", "spec/fixtures/pita.xml", "spec/fixtures/posts.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", "tasks/deployment.rake", "tasks/environment.rake", "tasks/rspec.rake", "tasks/website.rake", "website/css/common.css", "website/index.html"]
   s.has_rdoc = true
   s.homepage = %q{http://happymapper.rubyforge.org}
   s.post_install_message = %q{}

data/lib/happymapper/item.rb

@@ -19,9 +19,11 @@ module HappyMapper
       @name = new_name.to_s
     end
         
-    def from_xml_node(node, namespace=nil)
+    def from_xml_node(node, namespace = nil)
       if primitive?
-        typecast(value_from_xml_node(node, namespace))
+        value_from_xml_node(node, namespace) do |value_before_type_cast|
+          typecast(value_before_type_cast)
+        end
       else
         use_default_namespace = !namespace.nil?
         type.parse(node, options.merge(:use_default_namespace => use_default_namespace))
@@ -77,9 +79,26 @@ module HappyMapper
         if element?
           depth = options[:deep] ? './/' : ''
           result = node.find_first("#{depth}#{namespace}#{tag}")
-          result ? result.content : nil
+          if result
+            value = yield(result.content)
+            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)
+                  result.instance_eval <<-EOV
+                    def value.#{xml_attribute.name}
+                      #{attribute_value.inspect}
+                    end
+                  EOV
+                end
+              end
+            end
+            value
+          else
+            nil
+          end
         else
-          node[tag]
+          yield(node[tag])
         end
       end
   end

data/lib/happymapper/version.rb

@@ -2,7 +2,7 @@ module HappyMapper
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 1
-    TINY  = 2
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/spec/fixtures/current_weather.xml

@@ -0,0 +1,89 @@
+<aws:weather xmlns:aws="http://www.aws.com/aws">
+  <aws:api version="2.0"/>
+  <aws:WebURL>http://weather.weatherbug.com/IN/Carmel-weather.html?ZCode=Z5546&amp;Units=0&amp;stat=MOCAR</aws:WebURL>
+  <aws:ob>
+    <aws:ob-date>
+      <aws:year number="2008"/>
+      <aws:month number="12" text="December" abbrv="Dec"/>
+      <aws:day number="30" text="Tuesday" abbrv="Tue"/>
+      <aws:hour number="4" hour-24="16"/>
+      <aws:minute number="18"/>
+      <aws:second number="01"/>
+      <aws:am-pm abbrv="PM"/>
+      <aws:time-zone offset="-5" text="Eastern Standard Time" abbrv="EST"/>
+    </aws:ob-date>
+    <aws:requested-station-id>mocar</aws:requested-station-id>
+    <aws:station-id>MOCAR</aws:station-id>
+    <aws:station>Mohawk Trail ES</aws:station>
+    <aws:city-state zipcode="46033">Carmel,  IN</aws:city-state>
+    <aws:country>USA</aws:country>
+    <aws:latitude>39.9711111111111</aws:latitude>
+    <aws:longitude>-86.0938888888889</aws:longitude>
+    <aws:site-url>http://www1.ccs.k12.in.us/mte/home</aws:site-url>
+    <aws:aux-temp units="&amp;deg;F">74</aws:aux-temp>
+    <aws:aux-temp-rate units="&amp;deg;F">+0.0</aws:aux-temp-rate>
+    <aws:current-condition icon="http://deskwx.weatherbug.com/images/Forecast/icons/cond007.gif">Sunny</aws:current-condition>
+    <aws:dew-point units="&amp;deg;F">35</aws:dew-point>
+    <aws:elevation units="ft">817</aws:elevation>
+    <aws:feels-like units="&amp;deg;F">51</aws:feels-like>
+    <aws:gust-time>
+      <aws:year number="0001"/>
+      <aws:month number="1" text="January" abbrv="Jan"/>
+      <aws:day number="1" text="Monday" abbrv="Mon"/>
+      <aws:hour number="12" hour-24="00"/>
+      <aws:minute number="00"/>
+      <aws:second number="00"/>
+      <aws:am-pm abbrv="AM"/>
+      <aws:time-zone offset="-5" text="Eastern Standard Time" abbrv="EST"/>
+    </aws:gust-time>
+    <aws:gust-direction>W</aws:gust-direction>
+    <aws:gust-speed units="mph">25</aws:gust-speed>
+    <aws:humidity units="%">53</aws:humidity>
+    <aws:humidity-high units="%">100.0</aws:humidity-high>
+    <aws:humidity-low units="%">42.5</aws:humidity-low>
+    <aws:humidity-rate>-5.0</aws:humidity-rate>
+    <aws:indoor-temp units="&amp;deg;F">75</aws:indoor-temp>
+    <aws:indoor-temp-rate units="&amp;deg;F">+0.0</aws:indoor-temp-rate>
+    <aws:light>28</aws:light>
+    <aws:light-rate>-1.5</aws:light-rate>
+    <aws:moon-phase moon-phase-img="http://api.wxbug.net/images/moonphase/mphase02.gif">-10</aws:moon-phase>
+    <aws:pressure units="&quot;">29.71</aws:pressure>
+    <aws:pressure-high units="&quot;">30.18</aws:pressure-high>
+    <aws:pressure-low units="&quot;">29.71</aws:pressure-low>
+    <aws:pressure-rate units="&quot;/h">-0.04</aws:pressure-rate>
+    <aws:rain-month units="&quot;">6.64</aws:rain-month>
+    <aws:rain-rate units="&quot;/h">0.00</aws:rain-rate>
+    <aws:rain-rate-max units="&quot;/h">0.00</aws:rain-rate-max>
+    <aws:rain-today units="&quot;">0.00</aws:rain-today>
+    <aws:rain-year units="&quot;">53.83</aws:rain-year>
+    <aws:temp units="&amp;deg;F">51.8</aws:temp>
+    <aws:temp-high units="&amp;deg;F">52</aws:temp-high>
+    <aws:temp-low units="&amp;deg;F">29</aws:temp-low>
+    <aws:temp-rate units="&amp;deg;F/h">+2.5</aws:temp-rate>
+    <aws:sunrise>
+      <aws:year number="2008"/>
+      <aws:month number="12" text="December" abbrv="Dec"/>
+      <aws:day number="30" text="Tuesday" abbrv="Tue"/>
+      <aws:hour number="8" hour-24="08"/>
+      <aws:minute number="06"/>
+      <aws:second number="02"/>
+      <aws:am-pm abbrv="AM"/>
+      <aws:time-zone offset="-5" text="Eastern Standard Time" abbrv="EST"/>
+    </aws:sunrise>
+    <aws:sunset>
+      <aws:year number="2008"/>
+      <aws:month number="12" text="December" abbrv="Dec"/>
+      <aws:day number="30" text="Tuesday" abbrv="Tue"/>
+      <aws:hour number="5" hour-24="17"/>
+      <aws:minute number="28"/>
+      <aws:second number="53"/>
+      <aws:am-pm abbrv="PM"/>
+      <aws:time-zone offset="-5" text="Eastern Standard Time" abbrv="EST"/>
+    </aws:sunset>
+    <aws:wet-bulb units="&amp;deg;F">44.24</aws:wet-bulb>
+    <aws:wind-speed units="mph">4</aws:wind-speed>
+    <aws:wind-speed-avg units="mph">7</aws:wind-speed-avg>
+    <aws:wind-direction>SSW</aws:wind-direction>
+    <aws:wind-direction-avg>SW</aws:wind-direction-avg>
+  </aws:ob>
+</aws:weather>

data/spec/happymapper_spec.rb

@@ -40,6 +40,15 @@ class Status
 	has_one :user, User
 end
 
+class CurrentWeather
+  include HappyMapper
+  tag 'aws:ob'
+  element :temperature, Integer, :tag => 'aws:temp'
+  element :feels_like, Integer, :tag => 'aws:feels-like'
+  element :current_condition, String, :tag => 'aws:current-condition', :attributes => {:icon => String}
+end
+
+
 module PITA
   class Item
     include HappyMapper
@@ -213,4 +222,19 @@ describe HappyMapper do
       second.manufacturer.should == 'Wrox'
     end
   end
+
+  describe "#parse (with xml that has attributes of elements)" do
+    before do
+      file_contents = File.read(File.dirname(__FILE__) + '/fixtures/current_weather.xml')
+      @items = CurrentWeather.parse(file_contents)
+    end
+    
+    it "should properly create objects" do
+      @first = @items[0]
+      @first.temperature.should == 51
+      @first.feels_like.should == 51
+      @first.current_condition.should == 'Sunny'
+      @first.current_condition.icon.should == 'http://deskwx.weatherbug.com/images/Forecast/icons/cond007.gif'
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: happymapper
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - John Nunemaker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-12 00:00:00 -05:00
+date: 2009-01-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,6 +47,7 @@ files:
 - config/hoe.rb
 - config/requirements.rb
 - examples/amazon.rb
+- examples/current_weather.rb
 - examples/post.rb
 - examples/twitter.rb
 - happymapper.gemspec
@@ -61,6 +62,7 @@ files:
 - script/generate
 - script/txt2html
 - setup.rb
+- spec/fixtures/current_weather.xml
 - spec/fixtures/pita.xml
 - spec/fixtures/posts.xml
 - spec/fixtures/statuses.xml