multi_xml 0.4.2 → 0.4.3

data/.gitignore

@@ -1,6 +1,5 @@
 *.gem
 *.rbc
-.DS_Store
 .bundle
 .yardoc
 Gemfile.lock

data/.travis.yml

@@ -1,6 +1,6 @@
+language: ruby
 rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
-  - jruby
-  - ree
+  - jruby-18mode

data/README.md

@@ -98,10 +98,8 @@ implementations:
 * Ruby 1.9.2
 * Ruby 1.9.3
 * [JRuby][]
-* [Ruby Enterprise Edition][ree]
 
 [jruby]: http://www.jruby.org/
-[ree]: http://www.rubyenterpriseedition.com/
 
 If something doesn't work on one of these interpreters, it should be considered
 a bug.

data/lib/multi_xml.rb

@@ -17,8 +17,6 @@ module MultiXml
 
   CONTENT_ROOT = '__content__'.freeze unless defined?(CONTENT_ROOT)
 
-  # TODO: use Time.xmlschema instead of Time.parse;
-  #       use regexp instead of Date.parse
   unless defined?(PARSING)
     PARSING = {
       'symbol'       => Proc.new{|symbol| symbol.to_sym},
@@ -30,9 +28,9 @@ module MultiXml
       'boolean'      => Proc.new{|boolean| !%w(0 false).include?(boolean.strip)},
       'string'       => Proc.new{|string| string.to_s},
       'yaml'         => Proc.new{|yaml| YAML::load(yaml) rescue yaml},
-      'base64Binary' => Proc.new{|binary| binary.unpack('m').first},
+      'base64Binary' => Proc.new{|binary| ::Base64.decode64(binary)},
       'binary'       => Proc.new{|binary, entity| parse_binary(binary, entity)},
-      'file'         => Proc.new{|file, entity| parse_file(file, entity)}
+      'file'         => Proc.new{|file, entity| parse_file(file, entity)},
     }
 
     PARSING.update(
@@ -41,12 +39,26 @@ module MultiXml
     )
   end
 
+  TYPE_NAMES = {
+    'Symbol'     => 'symbol',
+    'Fixnum'     => 'integer',
+    'Bignum'     => 'integer',
+    'BigDecimal' => 'decimal',
+    'Float'      => 'float',
+    'TrueClass'  => 'boolean',
+    'FalseClass' => 'boolean',
+    'Date'       => 'date',
+    'DateTime'   => 'datetime',
+    'Time'       => 'datetime',
+    'Array'      => 'array',
+    'Hash'       => 'hash'
+  } unless defined?(TYPE_NAMES)
+
   class << self
     # Get the current parser class.
     def parser
-      return @parser if @parser
+      return @@parser if defined?(@@parser)
       self.parser = self.default_parser
-      @parser
     end
 
     # The default parser based on what you currently
@@ -79,9 +91,9 @@ module MultiXml
       case new_parser
       when String, Symbol
         require "multi_xml/parsers/#{new_parser.to_s.downcase}"
-        @parser = MultiXml::Parsers.const_get("#{new_parser.to_s.split('_').map{|s| s.capitalize}.join('')}")
+        @@parser = MultiXml::Parsers.const_get("#{new_parser.to_s.split('_').map{|s| s.capitalize}.join('')}")
       when Class, Module
-        @parser = new_parser
+        @@parser = new_parser
       else
         raise "Did not recognize your parser specification. Please specify either a symbol or a class."
       end

data/lib/multi_xml/parsers/libxml.rb

@@ -15,11 +15,11 @@ module MultiXml
       end
 
       def each_child(node, &block)
-        node.each_child &block
+        node.each_child(&block)
       end
 
       def each_attr(node, &block)
-        node.each_attr &block
+        node.each_attr(&block)
       end
 
       def node_name(node)

data/lib/multi_xml/parsers/nokogiri.rb

@@ -17,11 +17,11 @@ module MultiXml
       end
 
       def each_child(node, &block)
-        node.children.each &block
+        node.children.each(&block)
       end
 
       def each_attr(node, &block)
-        node.attribute_nodes.each &block
+        node.attribute_nodes.each(&block)
       end
 
       def node_name(node)

data/lib/multi_xml/version.rb

@@ -1,3 +1,3 @@
 module MultiXml
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

data/multi_xml.gemspec

@@ -2,8 +2,8 @@
 require File.expand_path('../lib/multi_xml/version', __FILE__)
 
 Gem::Specification.new do |gem|
+  gem.add_development_dependency 'maruku'
   gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'rdiscount'
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'simplecov'
   gem.add_development_dependency 'yard'

data/spec/helper.rb

@@ -1,3 +1,5 @@
-require 'simplecov'
-SimpleCov.start
+unless ENV['CI']
+  require 'simplecov'
+  SimpleCov.start
+end
 require 'multi_xml'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multi_xml
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,10 +9,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-12 00:00:00.000000000 Z
+date: 2012-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: maruku
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -28,7 +28,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rdiscount
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -139,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.18
+rubygems_version: 1.8.22
 signing_key: 
 specification_version: 3
 summary: A generic swappable back-end for XML parsing