relief 0.0.3 → 0.0.4

data/VERSION.yml

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

data/lib/relief/element.rb

@@ -2,7 +2,7 @@ module Relief
   class Element
     attr_reader :name, :options, :children
 
-    def initialize(name, options, &block)
+    def initialize(name=nil, options={}, &block)
       @name = name
       @options = options
       @children = []
@@ -13,12 +13,24 @@ module Relief
     def parse(document)
       @children.inject({}) do |values, element|
         key = element.options[:as] || element.name
+        type = element.options[:type]
 
         values[key] = begin
           target = (document / element.xpath)
 
           parse_node = lambda { |target|
-            element.children.any? ? element.parse(target) : target.to_s
+            if element.children.any?
+              element.parse(target)
+            else
+              value = target.to_s
+
+              if type == Integer then value.to_i
+              elsif type == Float then value.to_f
+              elsif type == Date then Date.parse(value)
+              elsif type.is_a?(Parser) then type.parse(document)
+              else value
+              end
+            end
           }
 
           if element.options[:collection]

data/lib/relief/parser.rb

@@ -5,13 +5,13 @@ module Relief
   class Parser
     attr_reader :root
 
-    def initialize(name, options={}, &block)
+    def initialize(name=nil, options={}, &block)
       @root = Element.new(name, options, &block)
     end
 
     def parse(document)
       unless document.is_a?(Nokogiri::XML::NodeSet)
-        document = Nokogiri::XML(document)
+        document = Nokogiri::XML(document.to_s)
       end
 
       @root.parse(document)

data/spec/parser_spec.rb

@@ -123,4 +123,55 @@ describe Relief::Parser do
 
     photos.should == { :name => ['Cucumbers', 'Lemons'] }
   end
+
+  it "parses elements with type casting" do
+    parser = Relief::Parser.new(:photo) do
+      element :id, :type => Integer
+      element :rating, :type => Float
+      element :published, :type => Date
+    end
+
+    photo = parser.parse(<<-XML)
+      <?xml version="1.0" encoding="UTF-8"?>
+      <photo>
+        <id>86634</id>
+        <rating>3.5</rating>
+        <published>2009-05-08T18:23:26-07:00</url>
+      </photo>
+    XML
+
+    photo.should == {
+      :id => 86634,
+      :rating => 3.5,
+      :published => Date.parse('2009-05-08T18:23:26-07:00')
+    }
+  end
+
+  it "parses elements with custom type casting" do
+    author = Relief::Parser.new do
+      element :name
+      element :email
+    end
+
+    parser = Relief::Parser.new(:photo) do
+      element :author, :type => author
+    end
+
+    photo = parser.parse(<<-XML)
+      <?xml version="1.0" encoding="UTF-8"?>
+      <photo>
+        <author>
+          <name>Jennifer Stone</name>
+          <email>jstone@example.com</email>
+        </author>
+      </photo>
+    XML
+
+    photo.should == {
+      :author => {
+        :name => 'Jennifer Stone',
+        :email => 'jstone@example.com'
+      }
+    }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: relief
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Tyler Hunt
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-07 00:00:00 -07:00
+date: 2009-05-12 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency