oxm 0.1.3 → 0.2.0

data/.gitignore

@@ -0,0 +1,48 @@
+# rcov generated
+coverage
+
+# rdoc generated
+rdoc
+
+# yard generated
+doc
+.yardoc
+
+# bundler
+.bundle
+
+# jeweler generated
+pkg
+
+# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore: 
+#
+# * Create a file at ~/.gitignore
+# * Include files you want ignored
+# * Run: git config --global core.excludesfile ~/.gitignore
+#
+# After doing this, these files will be ignored in all your git projects,
+# saving you from having to 'pollute' every project you touch with them
+#
+# Not sure what to needs to be ignored for particular editors/OSes? Here's some ideas to get you started. (Remember, remove the leading # of the line)
+#
+# For MacOS:
+#
+#.DS_Store
+
+# For TextMate
+#*.tmproj
+#tmtags
+
+# For emacs:
+#*~
+#\#*
+#.\#*
+
+# For vim:
+*.swp
+
+# For redcar:
+#.redcar
+
+# For rubinius:
+#*.rbc

data/CHANGELOG.markdown

@@ -1,3 +1,6 @@
+### 0.2.0 / 2013/05/15
+* OXM.from_xml now returns an Enumerator when block is not given
+
 ### 0.1.3 / 2011/09/27
 * OXM can be instantiated. Warning and error messages during the last OXM#from_xml call can be accessed with OXM#warnings and OXM#errors instance methods.
 

data/Gemfile

@@ -1,15 +1,4 @@
-source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
+source 'https://rubygems.org'
 
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
-group :development do
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.6.4"
-  gem "rcov", ">= 0"
-end
-
-gem "builder", ">= 3.0.0"
-gem "nokogiri", ">= 1.5.0"
+# Specify your gem's dependencies in oxm.gemspec
+gemspec

data/Gemfile.lock

@@ -1,25 +1,20 @@
+PATH
+  remote: .
+  specs:
+    oxm (0.2.0)
+      builder (>= 3.0.0)
+      nokogiri (>= 1.5.0)
+
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    builder (3.0.0)
-    git (1.2.5)
-    jeweler (1.6.4)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-    nokogiri (1.5.0)
-    nokogiri (1.5.0-java)
-    rake (0.9.2)
-    rcov (0.9.10)
-    rcov (0.9.10-java)
+    builder (3.0.4)
+    nokogiri (1.5.9)
+    nokogiri (1.5.9-java)
 
 PLATFORMS
   java
   ruby
 
 DEPENDENCIES
-  builder (>= 3.0.0)
-  bundler (~> 1.0.0)
-  jeweler (~> 1.6.4)
-  nokogiri (>= 1.5.0)
-  rcov
+  oxm!

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2011 Junegunn Choi
+Copyright (c) 2012 Junegunn Choi
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.markdown

@@ -1,6 +1,6 @@
 # oxm
 
-A tiny, easy-to-use Object-XML-Mapper for Ruby. 
+A tiny, easy-to-use Object-XML-Mapper for Ruby.
 Internally uses Nokogiri SAX parser which allows handling of large XML documents.
 
 ## Installation
@@ -61,11 +61,8 @@ end
 items = OXM.from_xml(xml_data_or_io, 'orders/order/item')
 ```
 
-## TODO
-* When block is not given, make from_xml return an Enumerator instead of an Array
-
 ## Contributing to oxm
- 
+
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
 * Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
 * Fork the project

data/Rakefile

@@ -1,30 +1,5 @@
-# encoding: utf-8
-
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
-
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "oxm"
-  gem.homepage = "http://github.com/junegunn/oxm"
-  gem.license = "MIT"
-  gem.summary = %Q{A tiny Object-XML-Mapper}
-  gem.description = %Q{A tiny Object-XML-Mapper using Nokogiri SAX parser}
-  gem.email = "junegunn.c@gmail.com"
-  gem.authors = ["Junegunn Choi"]
-  # dependencies defined in Gemfile
-end
-Jeweler::RubygemsDotOrgTasks.new
-
+#!/usr/bin/env rake
+require "bundler/gem_tasks"
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
@@ -32,22 +7,3 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-  test.rcov_opts << '--exclude "gems/*"'
-end
-
-task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "oxm #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/lib/oxm.rb

@@ -19,10 +19,10 @@ class OXM
 
   # @param [String] loop_element
   def from_xml loop_element, &block
+    return enum_for(:from_xml, loop_element, &block) unless block_given?
     @handler = OXM::SaxHandler.new(loop_element, &block)
-    parser = Nokogiri::XML::SAX::Parser.new(@handler)
+    parser = Nokogiri::XML::SAX::Parser.new(@handler, 'UTF-8')
     parser.parse @xml
-    @handler.outputs unless block_given?
   end
 
   # @return [Array] Error messages during the last from_xml call

data/lib/oxm/version.rb

@@ -0,0 +1,3 @@
+class OXM
+  VERSION = "0.2.0"
+end

data/oxm.gemspec

@@ -0,0 +1,20 @@
+# -*- encoding: utf-8 -*-
+require File.expand_path('../lib/oxm/version', __FILE__)
+
+Gem::Specification.new do |gem|
+  gem.authors       = ["Junegunn Choi"]
+  gem.email         = ["junegunn.c@gmail.com"]
+  gem.description   = %q{An Object-XML-Mapper based on Nokogiri SAX parser}
+  gem.summary       = %q{An Object-XML-Mapper based on Nokogiri SAX parser}
+  gem.homepage      = "https://github.com/junegunn/oxm"
+
+  gem.files         = `git ls-files`.split($\)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.name          = "oxm"
+  gem.require_paths = ["lib"]
+  gem.version       = OXM::VERSION
+
+  gem.add_runtime_dependency 'builder', '>= 3.0.0'
+  gem.add_runtime_dependency 'nokogiri', '>= 1.5.0'
+end

data/test/test_oxm.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'helper'
 
 class TestOxm < Test::Unit::TestCase
@@ -8,7 +9,7 @@ class TestOxm < Test::Unit::TestCase
     <container attr1="1" attr2="2">
       <item dept="A">
         <volume unit="ml"><![CDATA[ 100 ]]></volume>
-        <volume unit="ml"><![CDATA[200]]></volume>
+        <volume unit="ml"><![CDATA[백]]></volume>
       </item>
       <item dept="B">
         <volume unit="l">200</volume>
@@ -19,14 +20,14 @@ class TestOxm < Test::Unit::TestCase
 
     # Test errors (XML declaration allowed only at the start of the document)
     oxm = OXM.new str
-    result = oxm.from_xml('container')
+    result = oxm.from_xml('container').to_a
     assert_equal 0, result.length
     assert_equal 1, oxm.errors.length
     assert_equal 0, oxm.warnings.length
 
     # Test no-errors
     oxm = OXM.new str.strip
-    result = oxm.from_xml('container')
+    result = oxm.from_xml('container').to_a
     assert_equal 1, result.length
     assert_equal 0, oxm.errors.length
     assert_equal 0, oxm.warnings.length
@@ -37,12 +38,12 @@ class TestOxm < Test::Unit::TestCase
     tf.flush
 
     oxm = OXM.new File.open(tf.path)
-    result = oxm.from_xml('container')
+    result = oxm.from_xml('container').to_a
     assert_equal 1, result.length
     assert_equal 0, oxm.errors.length
     assert_equal 0, oxm.warnings.length
 
-    result = oxm.from_xml('container')
+    result = oxm.from_xml('container').to_a
     assert_equal 0, result.length
     assert_equal 2, oxm.errors.length
     assert_equal 0, oxm.warnings.length
@@ -80,7 +81,12 @@ class TestOxm < Test::Unit::TestCase
 
     [lambda { str }, lambda { File.open(tf.path) }].each do |input|
       result = OXM.from_xml(input.call, 'container')
-      assert       result.is_a?(Array)
+      if defined?(Enumerable::Enumerator)
+        assert result.is_a?(Enumerable::Enumerator)
+      else
+        assert result.is_a?(Enumerator)
+      end
+      result = result.to_a
       assert_equal 1, result.length
       assert_equal "", result.first.to_s
       assert_equal({'attr1' => '1', 'attr2' => '2'}, result.first.attributes)
@@ -101,7 +107,7 @@ class TestOxm < Test::Unit::TestCase
       assert container.compact!.equal?(container) # Object identity
       assert container.item.is_a?(Array)
 
-      result = OXM.from_xml(input.call, 'container/item')
+      result = OXM.from_xml(input.call, 'container/item').to_a
       assert_equal 4, result.length
 
       item = result.last
@@ -110,7 +116,7 @@ class TestOxm < Test::Unit::TestCase
       assert_equal '500', item.volume.to_s
       assert_equal 'L', item.volume['unit']
 
-      result = OXM.from_xml(input.call, 'container/item/volume')
+      result = OXM.from_xml(input.call, 'container/item/volume').to_a
       assert_equal 8, result.length
       assert_equal %w[100 200 200 300 300 400 500] + [""], result.map(&:to_s)
       assert_equal %w[ml ml l l l ml L] + [nil], result.map { |e| e['unit'] }
@@ -167,7 +173,7 @@ class TestOxm < Test::Unit::TestCase
       <item>
       </item>
       <item>
-      
+
       </item>
     </container>
     EOF
@@ -211,7 +217,7 @@ class TestOxm < Test::Unit::TestCase
     </container>
     EOF
 
-    items = OXM.from_xml(str, 'container/item')
+    items = OXM.from_xml(str, 'container/item').to_a
     assert_equal 6, items.length
 
     items[0].compact!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oxm
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-28 00:00:00.000000000Z
+date: 2013-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &2158741640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,60 +21,37 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2158741640
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: &2158740520 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.5.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *2158740520
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &2158738800 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: *2158738800
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &2158736100 !ruby/object:Gem::Requirement
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.6.4
-  type: :development
+        version: 1.5.0
+  type: :runtime
   prerelease: false
-  version_requirements: *2158736100
-- !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &2158735100 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *2158735100
-description: A tiny Object-XML-Mapper using Nokogiri SAX parser
-email: junegunn.c@gmail.com
+        version: 1.5.0
+description: An Object-XML-Mapper based on Nokogiri SAX parser
+email:
+- junegunn.c@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- LICENSE.txt
-- README.markdown
+extra_rdoc_files: []
 files:
 - .document
+- .gitignore
 - CHANGELOG.markdown
 - Gemfile
 - Gemfile.lock
@@ -85,11 +62,12 @@ files:
 - lib/oxm.rb
 - lib/oxm/object.rb
 - lib/oxm/sax_handler.rb
+- lib/oxm/version.rb
+- oxm.gemspec
 - test/helper.rb
 - test/test_oxm.rb
-homepage: http://github.com/junegunn/oxm
-licenses:
-- MIT
+homepage: https://github.com/junegunn/oxm
+licenses: []
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -100,9 +78,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1465942368572815623
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -111,8 +86,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: A tiny Object-XML-Mapper
-test_files: []
+summary: An Object-XML-Mapper based on Nokogiri SAX parser
+test_files:
+- test/helper.rb
+- test/test_oxm.rb