happymapper 0.1.6 → 0.1.7

data/History

@@ -1,3 +1,7 @@
+== 0.1.7 2009-01-29
+* 1 minor enhancement
+  * Support dashes in elements (Josh Nichols)
+  
 == 0.1.6 2009-01-17
 * 1 minor enhancement:
   * added support for nested collection elements (Justin Marney)

data/Manifest

@@ -1,7 +1,9 @@
 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
@@ -14,6 +16,7 @@ Manifest
 Rakefile
 README
 spec/fixtures/address.xml
+spec/fixtures/commit.xml
 spec/fixtures/current_weather.xml
 spec/fixtures/pita.xml
 spec/fixtures/posts.xml

data/TODO

@@ -1,2 +1 @@
-* doesn't do xml namespaces really (does work with default namespace though)
-* switch gem management to echoe as i did with httparty
+* doesn't do xml namespaces really (does work with default namespace though)

data/examples/dashed_elements.rb

@@ -0,0 +1,23 @@
+dir = File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
+require File.join(dir, 'happymapper')
+
+file_contents = File.read(dir + '/../spec/fixtures/commit.xml')
+
+module GitHub
+  class Commit
+    include HappyMapper
+
+    tag "commit"
+
+    element :url, String
+    element :tree, String
+    element :message, String
+    element :id, String
+    element :'committed-date', Date
+  end
+end
+
+commits = GitHub::Commit.parse(file_contents)
+commits.each do |commit|
+  puts commit.committed_date, commit.url, commit.id
+end

data/happymapper.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{happymapper}
-  s.version = "0.1.6"
+  s.version = "0.1.7"
 
   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-17}
+  s.date = %q{2009-01-28}
   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", "lib/libxml_ext/libxml_helper.rb", "README", "TODO"]
-  s.files = ["examples/amazon.rb", "examples/current_weather.rb", "examples/post.rb", "examples/twitter.rb", "History", "lib/happymapper/attribute.rb", "lib/happymapper/element.rb", "lib/happymapper/item.rb", "lib/happymapper/version.rb", "lib/happymapper.rb", "lib/libxml_ext/libxml_helper.rb", "License", "Manifest", "Rakefile", "README", "spec/fixtures/address.xml", "spec/fixtures/current_weather.xml", "spec/fixtures/pita.xml", "spec/fixtures/posts.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", "happymapper.gemspec"]
+  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", "lib/libxml_ext/libxml_helper.rb", "License", "Manifest", "Rakefile", "README", "spec/fixtures/address.xml", "spec/fixtures/commit.xml", "spec/fixtures/current_weather.xml", "spec/fixtures/pita.xml", "spec/fixtures/posts.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

@@ -99,13 +99,15 @@ module HappyMapper
       def create_collection(nodes, namespace=nil)
         nodes.inject([]) do |acc, el|
           obj = new
-          attributes.each { |attr| obj.send("#{attr.name}=", attr.from_xml_node(el)) }
-          elements.each   { |elem| obj.send("#{elem.name}=", elem.from_xml_node(el, namespace)) }
+          attributes.each { |attr| obj.send("#{normalize_name attr.name}=", attr.from_xml_node(el)) }
+          elements.each   { |elem| obj.send("#{normalize_name elem.name}=", elem.from_xml_node(el, namespace)) }
           acc << obj
         end
       end
       
       def create_getter(name)
+        name = normalize_name(name)
+
         class_eval <<-EOS, __FILE__, __LINE__
           def #{name}
             @#{name}
@@ -114,6 +116,8 @@ module HappyMapper
       end
 
       def create_setter(name)
+        name = normalize_name(name)
+
         class_eval <<-EOS, __FILE__, __LINE__
           def #{name}=(value)
             @#{name} = value
@@ -122,9 +126,15 @@ module HappyMapper
       end
 
       def create_accessor(name)
+        name = normalize_name(name)
+
         create_getter(name)
         create_setter(name)
       end
+
+      def normalize_name(name)
+        name.gsub('-', '_')
+      end
   end
 end
 

data/lib/happymapper/version.rb

@@ -1,3 +1,3 @@
 module HappyMapper
-  Version = '0.1.6'
+  Version = '0.1.7'
 end

data/spec/fixtures/commit.xml

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<commit>
+  <removed type="array">
+    <removed>
+      <filename>commands.rb</filename>
+    </removed>
+    <removed>
+      <filename>helpers.rb</filename>
+    </removed>
+  </removed>
+  <added type="array">
+    <added>
+      <filename>commands/commands.rb</filename>
+    </added>
+    <added>
+      <filename>commands/helpers.rb</filename>
+    </added>
+  </added>
+  <message>move commands.rb and helpers.rb into commands/ dir</message>
+  <modified type="array">
+    <modified>
+      <diff>@@ -56,7 +56,7 @@ module GitHub
+   end
+ 
+   def load(file)
+-    file[0] == ?/ ? super : super(BasePath + "/#{file}")
++    file[0] == ?/ ? super : super(BasePath + "/commands/#{file}")
+   end
+ 
+   def debug(*messages)</diff>
+      <filename>lib/github.rb</filename>
+    </modified>
+  </modified>
+  <parents type="array">
+    <parent>
+      <id>d462d2a2e60438ded3dd9e8e6593ca4146c5a0ba</id>
+    </parent>
+  </parents>
+  <url>http://github.com/defunkt/github-gem/commit/c26d4ce9807ecf57d3f9eefe19ae64e75bcaaa8b</url>
+  <author>
+    <name>Chris Wanstrath</name>
+    <email>chris@ozmm.org</email>
+  </author>
+  <id>c26d4ce9807ecf57d3f9eefe19ae64e75bcaaa8b</id>
+  <committed-date>2008-03-02T16:45:41-08:00</committed-date>
+  <authored-date>2008-03-02T16:45:41-08:00</authored-date>
+  <tree>28a1a1ca3e663d35ba8bf07d3f1781af71359b76</tree>
+  <committer>
+    <name>Chris Wanstrath</name>
+    <email>chris@ozmm.org</email>
+  </committer>
+</commit>

data/spec/fixtures/posts.xml

@@ -20,4 +20,4 @@
   <post href="http://codeclimber.blogspot.com/2008/06/using-ruby-for-imap-with-gmail.html" hash="33bbf2492beac5fbf1fc167014060067" description="CodeClimber: using Ruby for IMAP with Gmail" tag="email gems gmail google imap rails railstips ruby" time="2008-07-05T20:06:47Z" others="118" extended="how to check gmail using ruby's IMAP libraries. the key is to use the login method instead of the authenticate one."/> 
   <post href="http://xullicious.blogspot.com/2008/07/updated-curb-multi-interface-patch.html" hash="f95dcc012bdc13bc26bace3ceed10656" description="Xul for thought: Updated curb multi interface patch" tag="curl ruby http" time="2008-07-03T21:52:45Z" others="1" extended="Really cool multi curl stuff to rapidly hit urls."/> 
 </posts> 
-<!-- fe04.api.del.ac4.yahoo.net uncompressed/chunked Sat Aug  9 00:20:11 PDT 2008 -->
+<!-- fe04.api.del.ac4.yahoo.net uncompressed/chunked Sat Aug  9 00:20:11 PDT 2008 -->

data/spec/happymapper_spec.rb

@@ -89,6 +89,20 @@ module PITA
   end
 end
 
+module GitHub
+  class Commit
+    include HappyMapper
+
+    tag "commit"
+
+    element :url, String
+    element :tree, String
+    element :message, String
+    element :id, String
+    element :'committed-date', Date
+  end
+end
+
 describe HappyMapper do
   
   describe "being included into another class" do
@@ -112,6 +126,12 @@ describe HappyMapper do
       }.should change(Foo, :attributes)
     end
     
+    it "should allow adding an attribute containing a dash" do
+      lambda {
+        Foo.attribute :'bar-baz', String
+      }.should change(Foo, :attributes)
+    end
+
     it "should be able to get all attributes in array" do
       Foo.attribute :name, String
       Foo.attributes.size.should == 1
@@ -122,6 +142,13 @@ describe HappyMapper do
         Foo.element :name, String
       }.should change(Foo, :elements)
     end
+
+    it "should allow adding an element containing a dash" do
+      lambda {
+        Foo.element :'bar-baz', String
+      }.should change(Foo, :elements)
+
+    end
     
     it "should be able to get all elements in array" do
       Foo.element(:name, String)
@@ -291,4 +318,20 @@ describe HappyMapper do
       @third.places[1].name.should == 'Home'
     end
   end
-end
+
+  describe "#parse (with xml that has elements with dashes in them)" do
+    before do
+      file_contents = File.read(File.dirname(__FILE__) + '/fixtures/commit.xml')
+      @commit = GitHub::Commit.parse(file_contents).first
+    end
+
+    it "should properly create objects" do
+      @commit.message.should == "move commands.rb and helpers.rb into commands/ dir"
+      @commit.url.should == "http://github.com/defunkt/github-gem/commit/c26d4ce9807ecf57d3f9eefe19ae64e75bcaaa8b"
+      @commit.id.should == "c26d4ce9807ecf57d3f9eefe19ae64e75bcaaa8b"
+      @commit.committed_date.should == Date.parse("2008-03-02T16:45:41-08:00")
+      @commit.tree.should == "28a1a1ca3e663d35ba8bf07d3f1781af71359b76"
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: happymapper
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors: 
 - John Nunemaker
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-17 00:00:00 -05:00
+date: 2009-01-28 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,8 +50,10 @@ extra_rdoc_files:
 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
@@ -64,6 +66,7 @@ files:
 - Rakefile
 - README
 - spec/fixtures/address.xml
+- spec/fixtures/commit.xml
 - spec/fixtures/current_weather.xml
 - spec/fixtures/pita.xml
 - spec/fixtures/posts.xml
@@ -78,7 +81,6 @@ files:
 - TODO
 - website/css/common.css
 - website/index.html
-- happymapper.gemspec
 has_rdoc: true
 homepage: http://happymapper.rubyforge.org
 post_install_message: May you have many happy mappings!