tylerhunt-relief 0.0.2 → 0.0.3

data/Rakefile

@@ -1,22 +1,28 @@
 require 'rubygems'
 require 'rake'
+require 'rake/rdoctask'
+require 'spec/rake/spectask'
 
 begin
   require 'jeweler'
+
   Jeweler::Tasks.new do |gem|
     gem.name = "relief"
-    gem.summary = %Q{An XML to Hash Ruby parser DSL.}
+    gem.summary = %Q{An XML to hash Ruby parser DSL.}
     gem.email = "tyler@tylerhunt.com"
     gem.homepage = "http://github.com/tylerhunt/relief"
     gem.authors = ["Tyler Hunt"]
 
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+    gem.add_dependency 'nokogiri', '~> 1.2.3'
+
+    gem.add_development_dependency('jeweler', '~> 0.11.0')
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
 end
 
-require 'spec/rake/spectask'
+task :default => :spec
+
 Spec::Rake::SpecTask.new(:spec) do |spec|
   spec.libs << 'lib' << 'spec'
   spec.spec_files = FileList['spec/**/*_spec.rb']
@@ -28,10 +34,6 @@ Spec::Rake::SpecTask.new(:rcov) do |spec|
   spec.rcov = true
 end
 
-
-task :default => :spec
-
-require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
   if File.exist?('VERSION.yml')
     config = YAML.load(File.read('VERSION.yml'))
@@ -43,6 +45,6 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "relief #{version}"
   rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('LICENSE*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
-

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 0
-:patch: 2
+:patch: 3

data/lib/relief/element.rb

@@ -5,16 +5,16 @@ module Relief
     def initialize(name, options, &block)
       @name = name
       @options = options
-      @children = {}
+      @children = []
 
       instance_eval(&block) if block_given?
     end
 
     def parse(document)
-      @children.inject({}) do |values, child|
-        name, element = child
+      @children.inject({}) do |values, element|
+        key = element.options[:as] || element.name
 
-        values[name] = begin
+        values[key] = begin
           target = (document / element.xpath)
 
           parse_node = lambda { |target|
@@ -34,8 +34,7 @@ module Relief
 
     def element(name, options={}, &block)
       options[:xpath] ||= name if name =~ %r([/.])
-      name = options[:as].to_sym if options.has_key?(:as)
-      @children[name] ||= self.class.new(name, options, &block)
+      @children << self.class.new(name, options, &block)
     end
 
     def elements(name, options={}, &block)
@@ -49,12 +48,12 @@ module Relief
     def xpath
       if options.has_key?(:xpath)
         options[:xpath]
-      elsif @children.empty?
+      elsif @children.any?
+        name.to_s
+      else
         attribute = @options[:attribute]
         attribute = name if attribute == true
         !attribute ? "#{name}/text()" : "@#{attribute}"
-      else
-        name.to_s
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tylerhunt-relief
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Tyler Hunt
@@ -11,8 +11,27 @@ cert_chain: []
 
 date: 2009-05-07 00:00:00 -07:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: nokogiri
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.2.3
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.11.0
+    version: 
 description: 
 email: tyler@tylerhunt.com
 executables: []
@@ -57,7 +76,7 @@ rubyforge_project:
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: An XML to Hash Ruby parser DSL.
+summary: An XML to hash Ruby parser DSL.
 test_files: 
 - spec/parser_spec.rb
 - spec/spec_helper.rb