saxy 0.1.2 → 0.2.0

data/README.md

@@ -31,34 +31,38 @@ Assume the XML file:
         <product>
           <name>Kindle - The world's best-selling e-reader.</name>
           <images>
-            <thumb>http://amazon.com/kindle_thumb.jpg</thumb>
+            <thumbSize width="80" height="60">http://amazon.com/kindle_thumb.jpg</thumbSize>
           </images>
         </product>
         <product>
           <name>Kindle Touch - Simple-to-use touchscreen with built-in WIFI.</name>
           <images>
-            <thumb>http://amazon.com/kindle_touch_thumb.jpg</thumb>
+            <thumbSize width="120" height="90">http://amazon.com/kindle_touch_thumb.jpg</thumbSize>
           </images>
         </product>
       </products>
     </webstore>
 
-You instantiate the parser by passing path to XML file and object-identyfing tag name as it's arguments.
+You instantiate the parser by passing path to XML file and object-identyfing tag name as its arguments.
 
-The following will parse the XML, find product definitions (inside `<product>` and `</product>` tags), build `OpenStruct`s and yield them inside the block:
+The following will parse the XML, find product definitions (inside `<product>` and `</product>` tags), build `OpenStruct`s and yield them inside the block.
+Tag attributes become object attributes and attributes' name are underscored.
 
     Saxy.parse("filename.xml", "product").each do |product|
       puts product.name
-      puts product.images.thumb
+      puts product.images.thumb_size
+      puts "#{product.images.thumb_size.width}x#{product.images.thumb_size.height}"
     end
 
     # =>
       Kindle - The world's best-selling e-reader.
       http://amazon.com/kindle_thumb.jpg
+      80x60
       Kindle Touch - Simple-to-use touchscreen with built-in WIFI.
       http://amazon.com/kindle_touch_thumb.jpg
+      120x90
 
-Saxy supports Enumerable, so you can use it's goodies to your comfort without building intermediate arrays:
+Saxy supports Enumerable, so you can use its goodies to your comfort without building intermediate arrays:
 
     Saxy.parse("filename.xml", "product").map do |object|
       # map OpenStructs to ActiveRecord instances, etc.

data/lib/saxy.rb

@@ -14,5 +14,9 @@ module Saxy
         parser.each
       end
     end
+
+    def ruby_18?
+      RUBY_VERSION =~ /^1\.8/
+    end
   end
 end

data/lib/saxy/parser.rb

@@ -26,6 +26,10 @@ module Saxy
 
       if tag == @object_tag || elements.any?
         elements << Element.new
+
+        attributes.each do |(attr, value)|
+          current_element.set_attribute(attr, value)
+        end
       end
     end
 
@@ -65,8 +69,8 @@ module Saxy
         parser = Nokogiri::XML::SAX::Parser.new(self)
         parser.parse_file(@xml_file)
       else
-        (RUBY_VERSION =~ /^1\.8/ ? Enumerable::Enumerator : Enumerator).new(self, :each)
+        (Saxy.ruby_18? ? Enumerable::Enumerator : Enumerator).new(self, :each)
       end
     end
   end
-end
+end

data/lib/saxy/version.rb

@@ -1,3 +1,3 @@
 module Saxy
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/spec/fixtures/webstore.xml

@@ -7,7 +7,7 @@
       <name>Kindle</name>
       <description>The world's best-selling e-reader.</description>
       <price>$109</price>
-      <images>
+      <images count="2">
         <thumb>http://amazon.com/kindle_thumb.jpg</thumb>
         <large>http://amazon.com/kindle.jpg</large>
       </images>
@@ -17,10 +17,10 @@
       <name>Kindle Touch</name>
       <description>Simple-to-use touchscreen with built-in WIFI.</description>
       <price>$79</price>
-      <images>
+      <images count="2">
         <thumb>http://amazon.com/kindle_touch_thumb.jpg</thumb>
         <large>http://amazon.com/kindle_touch.jpg</large>
       </images>
     </product>
   </products>
-</webstore>
+</webstore>

data/spec/saxy/parser_spec.rb

@@ -126,6 +126,11 @@ describe Saxy::Parser do
       parser.characters("bar")
       parser.end_element("foo")
     end
+
+    it "should set element's attributes when opening tag with attributes" do
+      parser.start_element("foo", [["bar", "baz"]])
+      parser.current_element.as_object.bar.should == "baz"
+    end
   end
 
   it "should raise Saxy::ParsingError on error" do
@@ -139,4 +144,4 @@ describe Saxy::Parser do
   it "should return Enumerator when calling #each without a block", :if => RUBY_1_8 do
     parser.each.should be_instance_of Enumerable::Enumerator
   end
-end
+end

metadata

@@ -1,71 +1,90 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: saxy
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.2.0
   prerelease: 
-  version: 0.1.2
 platform: ruby
-authors: 
-- "Micha\xC5\x82 Szajbe"
+authors:
+- Michał Szajbe
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-08-19 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-02-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: ZenTest
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ZenTest
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-description: Saxy finds object definitions in XML files and translates them into Ruby objects. It uses SAX parser under the hood, which means that it doesn't load the whole XML file into memory. It goes once though it and yields objects along the way.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Saxy finds object definitions in XML files and translates them into Ruby
+  objects. It uses SAX parser under the hood, which means that it doesn't load the
+  whole XML file into memory. It goes once though it and yields objects along the
+  way.
+email:
 - michal.szajbe@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - .travis.yml
@@ -87,32 +106,30 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/monterail/saxy
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Memory-efficient XML parser. Finds object definitions and translates them into Ruby objects.
-test_files: 
+summary: Memory-efficient XML parser. Finds object definitions and translates them
+  into Ruby objects.
+test_files:
 - spec/fixtures/webstore.xml
 - spec/fixtures_helper.rb
 - spec/saxy/element_spec.rb