happymapper 0.2.1 → 0.2.2

data/History

@@ -1,3 +1,9 @@
+== 0.2.2
+* 2 minor tweaks
+  * removed GC.start (libxml recommended this) as setting nodes to nil should be enough, specs run 3-4x faster (Brandon Keepers)
+  * renamed get_tag_name to tag_name (Brandon Keepers)
+  * removed libxml helpers as they are no longer needed
+  
 == 0.2.1
 * 1 minor fix, 3 major enhancements
   * fixed warnings about using XML::Parser (mojodna)

data/Manifest

@@ -3,13 +3,13 @@ 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

data/happymapper.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{happymapper}
-  s.version = "0.2.1"
+  s.version = "0.2.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.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/dashed_elements.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/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", "happymapper.gemspec"]
+  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.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

@@ -4,11 +4,8 @@ $:.unshift(dir) unless $:.include?(dir) || $:.include?(File.expand_path(dir))
 require 'date'
 require 'time'
 require 'rubygems'
-
 gem 'libxml-ruby', '= 0.9.8'
 require 'xml'
-require 'libxml_ext/libxml_helper'
-
 
 class Boolean; end
 
@@ -65,10 +62,8 @@ module HappyMapper
       @tag_name = new_tag_name.to_s
     end
     
-    def get_tag_name
-      @tag_name ||= begin
-        to_s.split('::')[-1].downcase
-      end
+    def tag_name
+      @tag_name ||= to_s.split('::')[-1].downcase
     end
         
     def parse(xml, options = {})
@@ -81,10 +76,10 @@ module HappyMapper
         if xml.is_a?(XML::Document)
           node = xml.root
         else
-          node = xml.to_libxml_doc.root
+          node = XML::Parser.string(xml).parse.root
         end
 
-        root = node.name == get_tag_name
+        root = node.name == tag_name
       end
 
       # This is the entry point into the parsing pipeline, so the default
@@ -97,7 +92,7 @@ module HappyMapper
 
       xpath = root ? '/' : './/'
       xpath += "#{namespace}:" if namespace
-      xpath += get_tag_name
+      xpath += tag_name
       # puts "parse: #{xpath}"
       
       nodes = node.find(xpath)
@@ -119,7 +114,6 @@ module HappyMapper
 
       # per http://libxml.rubyforge.org/rdoc/classes/LibXML/XML/Document.html#M000354
       nodes = nil
-      GC.start
 
       if options[:single] || root
         collection.first

data/lib/happymapper/version.rb

@@ -1,3 +1,3 @@
 module HappyMapper
-  Version = '0.2.1'
+  Version = '0.2.2'
 end

data/spec/happymapper_spec.rb

@@ -307,17 +307,17 @@ describe HappyMapper do
     end
 
     it "should default tag name to lowercase class" do
-      Foo.get_tag_name.should == 'foo'
+      Foo.tag_name.should == 'foo'
     end
     
     it "should default tag name of class in modules to the last constant lowercase" do
       module Bar; class Baz; include HappyMapper; end; end
-      Bar::Baz.get_tag_name.should == 'baz'
+      Bar::Baz.tag_name.should == 'baz'
     end
     
     it "should allow setting tag name" do
       Foo.tag('FooBar')
-      Foo.get_tag_name.should == 'FooBar'
+      Foo.tag_name.should == 'FooBar'
     end
     
     it "should allow setting a namespace" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: happymapper
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - John Nunemaker
@@ -44,7 +44,6 @@ extra_rdoc_files:
 - lib/happymapper/item.rb
 - lib/happymapper/version.rb
 - lib/happymapper.rb
-- lib/libxml_ext/libxml_helper.rb
 - README
 - TODO
 files: 
@@ -53,13 +52,13 @@ files:
 - 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
@@ -85,7 +84,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!

data/lib/libxml_ext/libxml_helper.rb

@@ -1,55 +0,0 @@
-require "xml/libxml"
- 
-class XML::Node
-  ##
-  # Open up XML::Node from libxml and add convenience methods inspired
-  # by hpricot.
-  # (http://code.whytheluckystiff.net/hpricot/wiki/HpricotBasics)
-  
-  # find the child node with the given xpath
-  def at(xpath)
-    self.find_first(xpath)
-  end
- 
-  # find the array of child nodes matching the given xpath
-  def search(xpath)
-    results = self.find(xpath).to_a
-    if block_given?
-      results.each do |result|
-        yield result
-      end
-    end
-    return results
-  end
- 
-  # alias for search
-  def /(xpath)
-    search(xpath)
-  end
- 
-  # return the inner contents of this node as a string
-  def inner_xml
-    child.to_s
-  end
- 
-  # alias for inner_xml
- def inner_html
-    inner_xml
-  end
- 
-  # return this node and its contents as an xml string
-  def to_xml
-    self.to_s
-  end
- 
-  # alias for path
-  def xpath
-    self.path
-  end
-end
- 
-class String
-  def to_libxml_doc
-    XML::Parser.string(self).parse
-  end
-end