relief 0.0.4 → 0.0.5

data/Rakefile

@@ -12,8 +12,9 @@ begin
     gem.email = "tyler@tylerhunt.com"
     gem.homepage = "http://github.com/tylerhunt/relief"
     gem.authors = ["Tyler Hunt"]
+    gem.rubyforge_project = 'relief'
 
-    gem.add_dependency 'nokogiri', '~> 1.2.3'
+    gem.add_dependency 'nokogiri', '~> 1.3.3'
 
     gem.add_development_dependency('jeweler', '~> 0.11.0')
   end

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 0
-:patch: 4
+:patch: 5

data/lib/relief/element.rb

@@ -1,3 +1,5 @@
+require 'time'
+
 module Relief
   class Element
     attr_reader :name, :options, :children
@@ -24,9 +26,13 @@ module Relief
             else
               value = target.to_s
 
-              if type == Integer then value.to_i
+              if type.nil? then value
+              elsif value.empty? then nil
+              elsif type == Integer then value.to_i
               elsif type == Float then value.to_f
               elsif type == Date then Date.parse(value)
+              elsif type == Time then Time.parse(value)
+              elsif type == DateTime then DateTime.parse(value)
               elsif type.is_a?(Parser) then type.parse(document)
               else value
               end
@@ -65,7 +71,7 @@ module Relief
       else
         attribute = @options[:attribute]
         attribute = name if attribute == true
-        !attribute ? "#{name}/text()" : "@#{attribute}"
+        !attribute ? "#{name}/text()" : ".//@#{attribute}"
       end
     end
   end

data/lib/relief/parser.rb

@@ -1,7 +1,10 @@
-gem 'nokogiri', '~> 1.2.3'
+gem 'nokogiri', '~> 1.3.3'
 require 'nokogiri'
 
 module Relief
+  class Error < StandardError ; end
+  class ParseError < Error ; end
+
   class Parser
     attr_reader :root
 
@@ -14,6 +17,8 @@ module Relief
         document = Nokogiri::XML(document.to_s)
       end
 
+      raise ParseError if document.root.nil?
+
       @root.parse(document)
     end
   end

data/spec/parser_spec.rb

@@ -1,6 +1,17 @@
 require File.join(File.dirname(__FILE__), 'spec_helper')
 
 describe Relief::Parser do
+  it "raises a ParseError if the document can't be parsed" do
+    parser = Relief::Parser.new(:photo) do
+      element :name
+      element :url
+    end
+
+    lambda {
+      parser.parse('')
+    }.should raise_error(Relief::ParseError)
+  end
+
   it "parses elements" do
     parser = Relief::Parser.new(:photo) do
       element :name
@@ -50,6 +61,8 @@ describe Relief::Parser do
 
   it "parses attributes" do
     parser = Relief::Parser.new(:photos) do
+      attribute :status
+
       elements :photo do
         attribute :name
         attribute :url
@@ -58,13 +71,14 @@ describe Relief::Parser do
 
     photos = parser.parse(<<-XML)
       <?xml version="1.0" encoding="UTF-8"?>
-      <photos>
+      <photos status="fine">
         <photo name="Cucumbers" url="/photos/cucumbers.jpg" />
         <photo name="Lemons" url="/photos/lemons.jpg" />
       </photos>
     XML
 
     photos.should == {
+      :status => 'fine',
       :photo => [
         { :name => 'Cucumbers', :url => '/photos/cucumbers.jpg' },
         { :name => 'Lemons', :url => '/photos/lemons.jpg' }
@@ -128,7 +142,9 @@ describe Relief::Parser do
     parser = Relief::Parser.new(:photo) do
       element :id, :type => Integer
       element :rating, :type => Float
-      element :published, :type => Date
+      element :taken, :type => Date
+      element :modified, :type => Time
+      element :published, :type => DateTime
     end
 
     photo = parser.parse(<<-XML)
@@ -136,14 +152,18 @@ describe Relief::Parser do
       <photo>
         <id>86634</id>
         <rating>3.5</rating>
-        <published>2009-05-08T18:23:26-07:00</url>
+        <taken>2009-05-06</taken>
+        <modified>2009-05-08T18:23:48-07:00</modified>
+        <published>2009-05-08T18:23:26-07:00</published>
       </photo>
     XML
 
     photo.should == {
       :id => 86634,
       :rating => 3.5,
-      :published => Date.parse('2009-05-08T18:23:26-07:00')
+      :taken => Date.new(2009, 5, 6),
+      :modified => Time.parse('2009-05-08T18:23:48-07:00'),
+      :published => DateTime.new(2009, 5, 8, 18, 23, 26, Date.time_to_day_fraction(-7, 0, 0))
     }
   end
 
@@ -174,4 +194,33 @@ describe Relief::Parser do
       }
     }
   end
+
+  it "doesn't type cast elements with empty values" do
+    parser = Relief::Parser.new(:photo) do
+      element :name
+      element :id, :type => Integer
+      element :rating, :type => Float
+      element :taken, :type => Date
+      element :published, :type => DateTime
+    end
+
+    photo = parser.parse(<<-XML)
+      <?xml version="1.0" encoding="UTF-8"?>
+      <photo>
+        <name></name>
+        <id></id>
+        <rating></rating>
+        <taken></taken>
+        <published></published>
+      </photo>
+    XML
+
+    photo.should == {
+      :name => '',
+      :id => nil,
+      :rating => nil,
+      :taken => nil,
+      :published => nil
+    }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: relief
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Tyler Hunt
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-12 00:00:00 -04:00
+date: 2009-08-31 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.2.3
+        version: 1.3.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: jeweler
@@ -53,6 +53,8 @@ files:
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/tylerhunt/relief
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -72,10 +74,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.3.1
+rubyforge_project: relief
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: An XML to hash Ruby parser DSL.
 test_files: 
 - spec/parser_spec.rb