happymapper 0.1.4 → 0.1.6

data/{History.txt → History}

@@ -1,3 +1,11 @@
+== 0.1.6 2009-01-17
+* 1 minor enhancement:
+  * added support for nested collection elements (Justin Marney)
+
+== 0.1.5 2009-01-05
+* 1 major enhancement:
+  * Updated to latest version of libxml-ruby (lightningdb)
+  
 == 0.1.4 2009-01-05
 * 1 major enhancement:
   * Fixed parsing when the object is the root node. (Garret Alfert)

data/{Manifest.txt → Manifest}

@@ -1,32 +1,23 @@
-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
+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
-script/console
-script/destroy
-script/generate
-script/txt2html
-setup.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
@@ -34,9 +25,6 @@ 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
+TODO
 website/css/common.css
 website/index.html

data/Rakefile

@@ -1,4 +1,43 @@
-require 'config/requirements'
-require 'config/hoe' # setup Hoe + all gem configuration
+ProjectName = 'happymapper'
+WebsitePath = "jnunemaker@rubyforge.org:/var/www/gforge-projects/#{ProjectName}"
 
-Dir['tasks/**/*.rake'].each { |rake| load rake }
+require 'rubygems'
+require 'rake'
+require 'echoe'
+require 'spec/rake/spectask'
+require "lib/#{ProjectName}/version"
+
+Echoe.new(ProjectName, HappyMapper::Version) do |p|
+  p.description     = "object to xml mapping library"
+  p.install_message = "May you have many happy mappings!"
+  p.url             = "http://#{ProjectName}.rubyforge.org"
+  p.author          = "John Nunemaker"
+  p.email           = "nunemaker@gmail.com"
+  p.extra_deps      = [['libxml-ruby', '>= 0.9.7']]
+  p.need_tar_gz     = false
+  p.docs_host       = WebsitePath
+end
+
+desc 'Upload website files to rubyforge'
+task :website do
+  sh %{rsync -av website/ #{WebsitePath}}
+  Rake::Task['website_docs'].invoke
+end
+
+task :website_docs do
+  Rake::Task['redocs'].invoke
+  sh %{rsync -av doc/ #{WebsitePath}/docs}
+end
+
+desc 'Preps the gem for a new release'
+task :prepare do
+  %w[manifest build_gemspec].each do |task|
+    Rake::Task[task].invoke
+  end
+end
+
+Rake::Task[:default].prerequisites.clear
+task :default => :spec
+Spec::Rake::SpecTask.new do |t|
+  t.spec_files = FileList["spec/**/*_spec.rb"]
+end

data/happymapper.gemspec

@@ -2,19 +2,19 @@
 
 Gem::Specification.new do |s|
   s.name = %q{happymapper}
-  s.version = "0.1.4"
+  s.version = "0.1.6"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  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-04}
+  s.date = %q{2009-01-17}
   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/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/address.xml", "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.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.has_rdoc = true
   s.homepage = %q{http://happymapper.rubyforge.org}
-  s.post_install_message = %q{}
-  s.rdoc_options = ["--main", "README.txt"]
+  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}
@@ -25,11 +25,14 @@ Gem::Specification.new do |s|
     s.specification_version = 2
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<hoe>, [">= 1.8.0"])
+      s.add_runtime_dependency(%q<libxml-ruby>, [">= 0.9.7"])
+      s.add_development_dependency(%q<echoe>, [">= 0"])
     else
-      s.add_dependency(%q<hoe>, [">= 1.8.0"])
+      s.add_dependency(%q<libxml-ruby>, [">= 0.9.7"])
+      s.add_dependency(%q<echoe>, [">= 0"])
     end
   else
-    s.add_dependency(%q<hoe>, [">= 1.8.0"])
+    s.add_dependency(%q<libxml-ruby>, [">= 0.9.7"])
+    s.add_dependency(%q<echoe>, [">= 0"])
   end
-end
+end

data/lib/happymapper.rb

@@ -5,7 +5,7 @@ require 'date'
 require 'time'
 require 'rubygems'
 
-gem 'libxml-ruby', '>= 0.8.3'
+gem 'libxml-ruby', '>= 0.9.7'
 require 'xml'
 require 'libxml_ext/libxml_helper'
 
@@ -75,7 +75,17 @@ module HappyMapper
       else
         doc.find("//#{get_tag_name}")
       end
-      
+
+      nodes = if namespace
+        node = doc.respond_to?(:root) ? doc.root : doc
+        node.register_default_namespace(namespace.chop)
+        node.find("#{namespace}#{get_tag_name}")
+      else
+        nested = '.' unless doc.respond_to?(:root)
+        path = "#{nested}//#{get_tag_name}"
+        doc.find(path)
+      end
+
       collection = create_collection(nodes, namespace)
       
       # per http://libxml.rubyforge.org/rdoc/classes/LibXML/XML/Document.html#M000354
@@ -120,4 +130,4 @@ end
 
 require 'happymapper/item'
 require 'happymapper/attribute'
-require 'happymapper/element'
+require 'happymapper/element'

data/lib/happymapper/version.rb

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

data/lib/libxml_ext/libxml_helper.rb

@@ -54,7 +54,7 @@ class XML::Node
  
   # provide a name for the default namespace
   def register_default_namespace(name)
-    default_namespace = namespace.detect { |n| n.to_s == nil }
+    default_namespace = namespaces.default
     
     if default_namespace
       register_namespace("#{name}:#{default_namespace.href}")
@@ -90,4 +90,4 @@ class String
     xp.string = self
     return xp.parse
   end
-end
+end

data/spec/fixtures/radar.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<radars>
+  <radar>
+    <places>
+      <place>
+        <name>Store</name>
+      </place>
+    </places>
+  </radar>
+  <radar></radar>
+  <radar>
+    <places>
+      <place>
+        <name>Work</name>
+      </place>
+      <place>
+        <name>Home</name>
+      </place>
+    </places>
+  </radar>
+</radars>

data/spec/happymapper_spec.rb

@@ -1,5 +1,16 @@
 require File.dirname(__FILE__) + '/spec_helper.rb'
 
+class Place
+  include HappyMapper
+
+  element :name, String
+end
+
+class Radar
+  include HappyMapper
+  has_many :places, Place
+end
+
 class Post
   include HappyMapper
   
@@ -261,4 +272,23 @@ describe HappyMapper do
       @first.current_condition.icon.should == 'http://deskwx.weatherbug.com/images/Forecast/icons/cond007.gif'
     end
   end
+
+  describe "#parse (with xml that has nested elements)" do
+    before do
+      file_contents = File.read(File.dirname(__FILE__) + '/fixtures/radar.xml')
+      @radars = Radar.parse(file_contents)
+    end
+
+    it "should properly create objects" do
+      @first = @radars[0]
+      @first.places.size.should == 1
+      @first.places[0].name.should == 'Store'
+      @second = @radars[1]
+      @second.places.size.should == 0
+      @third = @radars[2]
+      @third.places.size.should == 2
+      @third.places[0].name.should == 'Work'
+      @third.places[1].name.should == 'Home'
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: happymapper
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors: 
 - John Nunemaker
@@ -9,63 +9,65 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-04 00:00:00 -05:00
+date: 2009-01-17 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: libxml-ruby
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.9.7
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: echoe
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.0
+        version: "0"
     version: 
 description: object to xml mapping library
-email: 
-- nunemaker@gmail.com
+email: nunemaker@gmail.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- History.txt
-- License.txt
-- Manifest.txt
-- PostInstall.txt
-- README.txt
-- TODO.txt
+- 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
 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
+- 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
-- script/console
-- script/destroy
-- script/generate
-- script/txt2html
-- setup.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
@@ -73,18 +75,20 @@ files:
 - spec/happymapper_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- tasks/deployment.rake
-- tasks/environment.rake
-- tasks/rspec.rake
-- tasks/website.rake
+- TODO
 - website/css/common.css
 - website/index.html
+- happymapper.gemspec
 has_rdoc: true
 homepage: http://happymapper.rubyforge.org
-post_install_message: ""
+post_install_message: May you have many happy mappings!
 rdoc_options: 
+- --line-numbers
+- --inline-source
+- --title
+- Happymapper
 - --main
-- README.txt
+- README
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -97,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "0"
+      version: "1.2"
   version: 
 requirements: []
 

data/config/hoe.rb

@@ -1,73 +0,0 @@
-require 'happymapper/version'
-
-AUTHOR = 'John Nunemaker'  # can also be an array of Authors
-EMAIL = "nunemaker@gmail.com"
-DESCRIPTION = "object to xml mapping library"
-GEM_NAME = 'happymapper' # what ppl will type to install your gem
-RUBYFORGE_PROJECT = 'happymapper' # The unix name for your project
-HOMEPATH = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
-DOWNLOAD_PATH = "http://rubyforge.org/projects/#{RUBYFORGE_PROJECT}"
-EXTRA_DEPENDENCIES = [
-  ['libxml-ruby', '>= 0.8.3']
-]
-
-@config_file = "~/.rubyforge/user-config.yml"
-@config = nil
-RUBYFORGE_USERNAME = "unknown"
-def rubyforge_username
-  unless @config
-    begin
-      @config = YAML.load(File.read(File.expand_path(@config_file)))
-    rescue
-      puts <<-EOS
-ERROR: No rubyforge config file found: #{@config_file}
-Run 'rubyforge setup' to prepare your env for access to Rubyforge
- - See http://newgem.rubyforge.org/rubyforge.html for more details
-      EOS
-      exit
-    end
-  end
-  RUBYFORGE_USERNAME.replace @config["username"]
-end
-
-
-REV = nil
-# UNCOMMENT IF REQUIRED:
-# REV = YAML.load(`svn info`)['Revision']
-VERS = HappyMapper::VERSION::STRING + (REV ? ".#{REV}" : "")
-RDOC_OPTS = ['--quiet', '--title', 'happymapper documentation',
-    "--opname", "index.html",
-    "--line-numbers",
-    "--main", "README",
-    "--inline-source"]
-
-class Hoe
-  def extra_deps
-    @extra_deps.reject! { |x| Array(x).first == 'hoe' }
-    @extra_deps
-  end
-end
-
-# Generate all the Rake tasks
-# Run 'rake -T' to see list of generated tasks (from gem root directory)
-$hoe = Hoe.new(GEM_NAME, VERS) do |p|
-  p.developer(AUTHOR, EMAIL)
-  p.description = DESCRIPTION
-  p.summary = DESCRIPTION
-  p.url = HOMEPATH
-  p.rubyforge_name = RUBYFORGE_PROJECT if RUBYFORGE_PROJECT
-  p.test_globs = ["test/**/test_*.rb"]
-  p.clean_globs |= ['**/.*.sw?', '*.gem', '.config', '**/.DS_Store']  #An array of file patterns to delete on clean.
-
-  # == Optional
-  p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  #p.extra_deps = EXTRA_DEPENDENCIES
-
-    #p.spec_extras = {}    # A hash of extra values to set in the gemspec.
-  end
-
-CHANGES = $hoe.paragraphs_of('History.txt', 0..1).join("\\n\\n")
-PATH    = (RUBYFORGE_PROJECT == GEM_NAME) ? RUBYFORGE_PROJECT : "#{RUBYFORGE_PROJECT}/#{GEM_NAME}"
-$hoe.remote_rdoc_dir = File.join(PATH.gsub(/^#{RUBYFORGE_PROJECT}\/?/,''), 'rdoc')
-$hoe.rsync_args = '-av --delete --ignore-errors'
-$hoe.spec.post_install_message = File.open(File.dirname(__FILE__) + "/../PostInstall.txt").read rescue ""