saxy 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 134c308ec032a7fd67bcde3a744f8f75bd656da9
-  data.tar.gz: 11d8785e94c498dfd91b0ef0d2656ffb97fc314d
+  metadata.gz: e902b0cd867994419869833857f4c96bb6427f17
+  data.tar.gz: f4e5babf7a86675953869fbec446404fceb9ea0a
 SHA512:
-  metadata.gz: c76931d22bee9d2f6723f1d6587a8af51ca510df4d74c15304b06a9b80e7bec63a1330993573af7a2e697f07d174f358a51e18b1a339b1e91953ac027695e17a
-  data.tar.gz: 38a2eaee5c237f4c46fe463e13e777a9978557e2483150cad4cbb930c505c4577d7604a5dabdb7f226fe24daa9c9743947472b0b88b7dbeb25af60435bed6a01
+  metadata.gz: aebfd829d32a73141a4c289cc4f557ed6c2c647248b659bbc037d9bca1e58196394dd42c9439841262062c29dfb49af953ce7e9cde99179d9ce5e1be2c87962d
+  data.tar.gz: c3d2f658bae270cc76da97881037fb598eb2b254760f349c304fc6943409c9fa1913d2cb65d3bada50c223354e49eed2a4183b5869f7d8b0c7a1debadfc08954

data/.travis.yml

@@ -2,4 +2,7 @@ script: "bundle exec rspec ./spec/"
 sudo: false
 language: ruby
 rvm:
-  - 1.9.2
+  - 2.2
+  - 2.1
+  - 2.0.0
+  - 1.9.3

data/README.md

@@ -9,11 +9,9 @@ It uses SAX parser under the hood, which means that it doesn't load the whole XM
 
 ## Installation
 
-This version supports only ruby 1.9.2, it is not maintained anymore. See master branch if you're looking for support of different ruby versions.
-
 Add this line to your application's Gemfile:
 
-    gem 'saxy', '~> 0.4.0'
+    gem 'saxy'
 
 And then execute:
 
@@ -21,7 +19,22 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install saxy --version '~> 0.4.0'
+    $ gem install saxy
+
+As of `0.5.0` version `saxy` requires ruby 1.9.3 or higher. Previous versions of the gem work with ruby 1.8 and 1.9.2 (see below), but they are not maintained anymore.
+
+## Ruby 1.8 support
+
+See `ruby-1.8` branch. Install with:
+
+    gem 'saxy', '~> 0.3.0'
+
+## Ruby 1.9.2 support
+
+See `ruby-1.9.2` branch. Install with:
+
+    gem 'saxy', '~> 0.4.0'
+
 
 ## Usage
 
@@ -48,15 +61,15 @@ Assume the XML file:
 
 You instantiate the parser by passing path to XML file or an IO-like object 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 `Hash`s and yield them inside the block.
 Tag attributes become object attributes and attributes' name are underscored.
 
 Usage with a file path:
 
     Saxy.parse("filename.xml", "product").each do |product|
-      puts product.name
-      puts product.images.thumb_size.contents
-      puts "#{product.images.thumb_size.width}x#{product.images.thumb_size.height}"
+      puts product[:name]
+      puts product[:images][:thumb_size][:contents]
+      puts "#{product[:images][:thumb_size][:width]}x#{product[:images][:thumb_size][:height]}"
     end
 
     # =>
@@ -80,7 +93,7 @@ Usage with an IO-like object `ARGF`:
 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.
+      # map yielded Hash to ActiveRecord instances, etc.
     end
 
 You can also grab an Enumerator for external use (e.g. lazy evaluation, etc.):
@@ -91,7 +104,7 @@ You can also grab an Enumerator for external use (e.g. lazy evaluation, etc.):
 Multiple definitions of child objects are grouped in arrays:
 
     webstore = Saxy.parse("filename.xml", "webstore").first
-    webstore.products.product.size # => 2
+    webstore[:products][:product].size # => 2
 
 ## Contributing
 

data/lib/saxy.rb

@@ -2,8 +2,8 @@ require 'saxy/version'
 
 module Saxy
   class << self
-    def parse(xml_file, object_tag, &blk)
-      parser = Parser.new(xml_file, object_tag)
+    def parse(object, object_tag, &blk)
+      parser = Parser.new(object, object_tag)
 
       if blk
         parser.each(blk)
@@ -11,6 +11,7 @@ module Saxy
         parser.each
       end
     end
+
   end
 end
 

data/lib/saxy/element.rb

@@ -1,5 +1,4 @@
 require 'active_support/core_ext/string/inflections'
-require 'ostruct'
 
 module Saxy
   class Element
@@ -23,22 +22,18 @@ module Saxy
       end
     end
 
-    def as_object
-      if attributes.any?
-        object = OpenStruct.new
-        attributes.each do |name, value|
-          value = value.first if value.size == 1
-          object.send("#{name}=", value)
-        end
-        object.contents = value
-        object
-      else
-        value
+    def to_h
+      return value unless attributes.any?
+      data = attributes.reduce({}) do |memo, (name, value)|
+        memo[name.to_sym] = value.size == 1 ? value.first : value
+        memo
       end
+      data[:contents] = value
+      data
     end
 
     def attribute_name(name)
-      name.underscore
+      name.underscore.to_sym
     end
   end
 end

data/lib/saxy/parser.rb

@@ -36,7 +36,7 @@ module Saxy
     def end_element(tag)
       tags.pop
       if element = elements.pop
-        object = element.as_object
+        object = element.to_h
 
         if current_element
           current_element.set_attribute(tag, object)

data/lib/saxy/version.rb

@@ -1,3 +1,3 @@
 module Saxy
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/saxy.gemspec

@@ -15,10 +15,9 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Saxy::VERSION
 
-  gem.required_ruby_version = [">= 1.9.0", "< 1.9.3"]
+  gem.required_ruby_version = ">= 1.9.3"
 
-  gem.add_dependency "activesupport", "< 4.0.0"
-  gem.add_dependency "i18n", "< 0.7.0"
+  gem.add_dependency "activesupport"
   gem.add_dependency "nokogiri"
   gem.add_development_dependency "rspec"
 end

data/spec/saxy/element_spec.rb

@@ -16,34 +16,34 @@ describe Saxy::Element do
 
   it "should dump as string when no attributes are set" do
     element.stub(:value).and_return("foo")
-    element.as_object.should == "foo"
+    element.to_h.should == "foo"
   end
 
   it "should dump as object when attributes are set" do
     element.stub(:attributes).and_return("foo" => 1, "bar" => 2)
-    object = element.as_object
+    object = element.to_h
 
-    object.foo.should == 1
-    object.bar.should == 2
+    object[:foo].should == 1
+    object[:bar].should == 2
   end
 
   it "should dump as object with value when attributes and contents are set" do
     element.set_attribute("foo", "bar")
     element.append_value("value")
-    object = element.as_object
+    object = element.to_h
 
-    object.foo.should == "bar"
-    object.contents.should == "value"
+    object[:foo].should == "bar"
+    object[:contents].should == "value"
   end
 
   it "should add attributes under underscored names" do
     element.set_attribute("FooBar", "baz")
-    element.as_object.foo_bar.should == "baz"
+    element.to_h[:foo_bar].should == "baz"
   end
 
   it "should create array if adding multiple attributtes with the same name" do
     element.set_attribute("foo", "bar")
     element.set_attribute("foo", "baz")
-    element.as_object.foo.should == ["bar", "baz"]
+    element.to_h[:foo].should == ["bar", "baz"]
   end
 end

data/spec/saxy/parser_spec.rb

@@ -112,7 +112,7 @@ describe Saxy::Parser do
       end
 
       it "should yield the object inside the callback after detecting object tag closing" do
-        @callback.should_receive(:call).with(parser.current_element.as_object)
+        @callback.should_receive(:call).with(parser.current_element.to_h)
         parser.end_element("product")
       end
 
@@ -147,7 +147,7 @@ describe Saxy::Parser do
 
     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"
+      parser.current_element.to_h[:bar].should == "baz"
     end
   end
 
@@ -158,4 +158,5 @@ describe Saxy::Parser do
   it "should return Enumerator when calling #each without a block" do
     parser.each.should be_instance_of Enumerator
   end
+
 end

data/spec/saxy_spec.rb

@@ -9,26 +9,26 @@ describe Saxy do
       arr
     end
 
-    products[0].uid.should == "FFCF177"
-    products[0].name.should == "Kindle"
-    products[0].description.should == "The world's best-selling e-reader."
-    products[0].price.should == "$109"
-    products[0].images.thumb.should == "http://amazon.com/kindle_thumb.jpg"
-    products[0].images.large.should == "http://amazon.com/kindle.jpg"
+    products[0][:uid].should == "FFCF177"
+    products[0][:name].should == "Kindle"
+    products[0][:description].should == "The world's best-selling e-reader."
+    products[0][:price].should == "$109"
+    products[0][:images][:thumb].should == "http://amazon.com/kindle_thumb.jpg"
+    products[0][:images][:large].should == "http://amazon.com/kindle.jpg"
 
-    products[1].uid.should == "YD26NT"
-    products[1].name.should == "Kindle Touch"
-    products[1].description.should == "Simple-to-use touchscreen with built-in WIFI."
-    products[1].price.should == "$79"
-    products[1].images.thumb.should == "http://amazon.com/kindle_touch_thumb.jpg"
-    products[1].images.large.should == "http://amazon.com/kindle_touch.jpg"
+    products[1][:uid].should == "YD26NT"
+    products[1][:name].should == "Kindle Touch"
+    products[1][:description].should == "Simple-to-use touchscreen with built-in WIFI."
+    products[1][:price].should == "$79"
+    products[1][:images][:thumb].should == "http://amazon.com/kindle_touch_thumb.jpg"
+    products[1][:images][:large].should == "http://amazon.com/kindle_touch.jpg"
   end
 
   it "should group multiple definitions of child objects into arrays" do
     webstore = Saxy.parse(fixture_file("webstore.xml"), "webstore").first
 
-    webstore.products.product.should be_instance_of Array
-    webstore.products.product.size.should == 2
+    webstore[:products][:product].should be_instance_of Array
+    webstore[:products][:product].size.should == 2
   end
 
   it "should return Enumerator when calling #parse without a block" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: saxy
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Michał Szajbe
@@ -14,30 +14,16 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 4.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 4.0.0
-- !ruby/object:Gem::Dependency
-  name: i18n
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -106,9 +92,6 @@ require_paths:
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
-    - !ruby/object:Gem::Version
-      version: 1.9.0
-  - - "<"
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement