xml_node_stream 1.0.0 → 1.0.2

data/Rakefile

@@ -6,14 +6,13 @@ desc 'Default: run unit tests.'
 task :default => :test
 
 begin
-  require 'spec/rake/spectask'
-  desc 'Test xml_node_stream.'
-  Spec::Rake::SpecTask.new(:test) do |t|
-    t.spec_files = 'spec/**/*_spec.rb'
-  end
+  require 'rspec'
+  require 'rspec/core/rake_task'
+  desc 'Run the unit tests'
+  RSpec::Core::RakeTask.new(:test)
 rescue LoadError
-  tast :test do
-    STDERR.puts "You must have rspec >= 1.2.9 to run the tests"
+  task :test do
+    STDERR.puts "You must have rspec 2.0 installed to run the tests"
   end
 end
 
@@ -33,7 +32,10 @@ begin
     gem.email = "brian@embellishedvisions.com"
     gem.homepage = "http://github.com/bdurand/xml_node_stream"
     gem.authors = ["Brian Durand"]
-    gem.add_development_dependency('rspec', '>= 1.2.9')
+    gem.files = FileList["lib/**/*", "spec/**/*", "README.rdoc", "Rakefile", "MIT_LICENSE"].to_a
+    gem.has_rdoc = true
+    gem.extra_rdoc_files = ["README.rdoc", "MIT_LICENSE"]
+    gem.add_development_dependency('rspec', '>=2.0.0')
     gem.add_development_dependency('jeweler')
   end
 

data/lib/xml_node_stream/parser/libxml_parser.rb

@@ -9,9 +9,9 @@ begin
         include Base
 
         def parse_stream (io)
-          parser = LibXML::XML::SaxParser.new
+          context = LibXML::XML::Parser::Context.io(io)
+          parser = LibXML::XML::SaxParser.new(context)
           parser.callbacks = self
-          parser.io = io
           parser.parse
         end
     

data/lib/xml_node_stream/parser/nokogiri_parser.rb

@@ -20,7 +20,15 @@ begin
           
           def start_element (name, attributes = [])
             attributes_hash = {}
-            (attributes.size / 2).times{|i| attributes_hash[attributes[i * 2]] = attributes[(i * 2) + 1]}
+            if attributes.first.is_a?(Array)
+              # Newer style where attributes are passed as an array of arrays
+              attributes.each do |k, v|
+                attributes_hash[k] = v
+              end
+            else
+              # Old style where attributes are passed as a flat array
+              (attributes.size / 2).times{|i| attributes_hash[attributes[i * 2]] = attributes[(i * 2) + 1]}
+            end
             @parser.do_start_element(name, attributes_hash)
           end
 

data/spec/spec_helper.rb

@@ -1,3 +1,2 @@
 require 'rubygems'
-require 'spec'
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'xml_node_stream'))

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: xml_node_stream
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  hash: 19
+  prerelease: 
+  segments: 
+  - 1
+  - 0
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Brian Durand
@@ -9,29 +15,39 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-07 00:00:00 -06:00
+date: 2011-07-05 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.9
-    version: 
+        hash: 15
+        segments: 
+        - 2
+        - 0
+        - 0
+        version: 2.0.0
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id002
 description: 
 email: brian@embellishedvisions.com
 executables: []
@@ -39,13 +55,12 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
+- MIT_LICENSE
 - README.rdoc
 files: 
 - MIT_LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
-- init.rb
 - lib/xml_node_stream.rb
 - lib/xml_node_stream/node.rb
 - lib/xml_node_stream/parser.rb
@@ -60,38 +75,39 @@ files:
 - spec/spec_helper.rb
 - spec/test.xml
 - spec/xml_node_stream_spec.rb
-- xml_node_stream.gemspec
 has_rdoc: true
 homepage: http://github.com/bdurand/xml_node_stream
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Simple XML parser wrapper that provides the benefits of stream parsing with the ease of using document nodes.
-test_files: 
-- spec/node_spec.rb
-- spec/parser_spec.rb
-- spec/selector_spec.rb
-- spec/spec_helper.rb
-- spec/xml_node_stream_spec.rb
+test_files: []
+

data/VERSION

@@ -1 +0,0 @@
-1.0.0

data/init.rb

@@ -1 +0,0 @@
-require "#{File.dirname(__FILE__)}/lib/xml_node_stream"

data/xml_node_stream.gemspec

@@ -1,68 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{xml_node_stream}
-  s.version = "1.0.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Brian Durand"]
-  s.date = %q{2010-02-07}
-  s.email = %q{brian@embellishedvisions.com}
-  s.extra_rdoc_files = [
-    "README.rdoc"
-  ]
-  s.files = [
-    "MIT_LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "init.rb",
-     "lib/xml_node_stream.rb",
-     "lib/xml_node_stream/node.rb",
-     "lib/xml_node_stream/parser.rb",
-     "lib/xml_node_stream/parser/base.rb",
-     "lib/xml_node_stream/parser/libxml_parser.rb",
-     "lib/xml_node_stream/parser/nokogiri_parser.rb",
-     "lib/xml_node_stream/parser/rexml_parser.rb",
-     "lib/xml_node_stream/selector.rb",
-     "spec/node_spec.rb",
-     "spec/parser_spec.rb",
-     "spec/selector_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/test.xml",
-     "spec/xml_node_stream_spec.rb",
-     "xml_node_stream.gemspec"
-  ]
-  s.homepage = %q{http://github.com/bdurand/xml_node_stream}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{Simple XML parser wrapper that provides the benefits of stream parsing with the ease of using document nodes.}
-  s.test_files = [
-    "spec/node_spec.rb",
-     "spec/parser_spec.rb",
-     "spec/selector_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/xml_node_stream_spec.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-    else
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-  end
-end
-