asir_xml 1.1.11 → 1.1.12

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NzljMzM4OWRlYzlmYTg4ZjZlODRlYmU5OTNlOGQ4OWI5ZWVlOWJlMA==
+  data.tar.gz: !binary |-
+    NDgyNTk0ZjZiZmUxZDM4ODI4YmI0NTFmY2UwOWMwMDc5MzRjZjgyMQ==
+SHA512:
+  metadata.gz: !binary |-
+    YTMyZDYyODhhNDI5MGFjOTg2NmQzZDE1NjVlOGJjMmI2YzEwNmE0ZDNlNzM2
+    NDE3YzZhOGNhMWQwMzFmYjZhNmMzZTEwMjA4NjgwYTllMzk5MzYyNmI0ZjI0
+    MjNiYTE5NjQyNjk1ZjU1MTE2ODY3NDc4MmEyMDcxNzdmNjJlMDA=
+  data.tar.gz: !binary |-
+    ODRiOTQ3NTE3NzkxZjJmZjc2YTI1N2U1MmQ5M2I1MmExNTk3YzEwYWExZDJl
+    OGQxY2U0YTQ2MTNmODdmODY3MDcwMDVmOWVhYWI0MjliM2FkYTljOGUwZTUx
+    OTAyYTI3MTczYWRiNmRlODJlZjViNWYyZjE3YTBhYjlmZGU5NTc=

data/.jrubyrc

@@ -0,0 +1 @@
+-Xcext.enabled=true

data/.travis.yml

@@ -10,3 +10,7 @@ rvm:
   - jruby-head
   - 1.8.7
   - ree
+
+matrix:
+  allow_failures:
+    - rvm: ruby-head

data/asir_xml.gemspec

@@ -18,9 +18,15 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency "asir", ">= 1.1.10"
-  gem.add_dependency "libxml-ruby", "~> 2.3.3"
+
+  case (RUBY_PLATFORM rescue "UNKNOWN")
+  when /java/i
+    gem.add_development_dependency 'spoon', '>= 0.0'
+  else
+    gem.add_dependency "libxml-ruby", "~> 2.7.0"
+  end
 
   gem.add_development_dependency 'rake', '>= 0.9.0'
-  gem.add_development_dependency 'rspec', '~> 2.12.0'
+  gem.add_development_dependency 'rspec', '~> 2.14.0'
   gem.add_development_dependency 'simplecov', '>= 0.1'
 end

data/example/example_helper.rb

@@ -39,11 +39,12 @@ def server_process &blk
     else
       $stderr.puts "  spawning at #{__FILE__}:#{__LINE__}"
       ENV['ASIR_JRUBY_SPAWNED'] = "1"
-      cmd = "ruby -I #{File.dirname(__FILE__)} -I #{File.expand_path('../../lib', __FILE__)} #{$0} #{ARGV * ' '}"
-      $stderr.puts "  cmd = #{cmd}"
-      $server_pid = Spoon.spawnp(cmd)
+      cmd = [ RUBY_INTERPRETER_PATH, "-I", "#{File.dirname(__FILE__)}", "-I", "#{File.expand_path('../../lib', __FILE__)}", "#{$0}", *ARGV ]
+      $stderr.puts "  cmd = #{cmd * ' '}"
+      $server_pid = Spoon.spawnp(*cmd)
       ENV.delete('ASIR_JRUBY_SPAWNED')
       $stderr.puts "  spawned #{$server_pid} at #{__FILE__}:#{__LINE__}"
+      sleep 10
     end
   else
     # $stderr.puts "  at #{__FILE__}:#{__LINE__}"
@@ -66,7 +67,12 @@ ensure
   $server_pid = nil
 end
 
+require 'rbconfig'
+RUBY_INTERPRETER_PATH = File.join(RbConfig::CONFIG["bindir"],
+                             RbConfig::CONFIG["RUBY_INSTALL_NAME"] +
+                             RbConfig::CONFIG["EXEEXT"])
 end
 
+
 puts "*** #{$$}: client process"; $stdout.flush
 

data/lib/asir/coder/xml.rb

@@ -1,7 +1,5 @@
 require 'asir'
 require 'asir/object_resolving'
-gem 'libxml-ruby'
-require 'xml'
 
 module ASIR
   class Coder
@@ -28,8 +26,8 @@ module ASIR
         @dom_id_map = { }
         @dom_id = 0
         @cls_tag_map = { }
-        @parser = ::XML::Parser.string(@stream)
-        @dom = @parser.parse
+        @parser = Parser.new
+        @dom = @parser.parse(@stream)
         decode_dom @dom.root
       end
 
@@ -213,3 +211,5 @@ module ASIR
     # !SLIDE END
   end
 end
+
+require 'asir/coder/xml/parser'

data/lib/asir/coder/xml/parser.rb

@@ -0,0 +1,92 @@
+require 'asir/coder/xml'
+
+module ASIR
+  class Coder
+    class XML
+      class Parser
+        case (RUBY_PLATFORM rescue "UNKNOWN")
+        when /java/i
+          include Java
+          require File.expand_path('../../../../../jdom/jdom-2.0.5.jar', __FILE__)
+
+          def parse stream
+            case stream
+            when String
+              input_stream = java.io.ByteArrayInputStream.new(stream.to_java_bytes)
+              builder = org.jdom2.input.SAXBuilder.new
+            when IO
+              input_stream = stream.to_io
+            else
+              raise TypeError, "cannot parse #{stream.class.name}"
+            end
+            jdom = builder.build(input_stream)
+            Document.new(jdom)
+          end
+
+          # Make JDOM compatible with libXML DOM.
+          class BaseElement
+            def initialize j; @j = j; end
+          end
+
+          class Document < BaseElement
+            def root
+              Element.new(@j.getRootElement)
+            end
+          end
+
+          class Element < BaseElement
+            def name
+              @j.getName
+            end
+
+            def content
+              return @content if @content
+              @content = @j.getContent.map{ | a | a.getText.to_s } * ''
+            end
+
+            def attributes
+              return @attributes if @attributes
+              h = { }
+              @j.getAttributes.each { | a | h[a.getName] = a.getValue }
+              h.extend(IndifferentAccess)
+              @attributes = h
+            end
+
+            def elements
+              return @elements if @elements
+              @elements = @j.getChildren.map { | a | Element.new(a) }
+            end
+
+            def first; elements.first; end
+
+            def each_element &blk
+              elements.each &blk
+            end
+          end
+
+          module IndifferentAccess
+            def [] x
+              x = x.to_s if Symbol === x
+              super(x)
+            end
+          end
+
+        else
+          gem 'libxml-ruby'
+          require 'xml'
+
+          def parse stream
+            case stream
+            when String
+              ::XML::Parser.string(stream).parse
+            else
+              raise TypeError, "cannot parse #{stream.class.name}"
+            end
+          end
+       end
+      end
+    end
+  end
+end
+
+

data/lib/asir_xml/version.rb

@@ -1,3 +1,3 @@
 module AsirXml
-  VERSION = "1.1.11"
+  VERSION = "1.1.12"
 end

data/spec/example_spec.rb

@@ -48,7 +48,7 @@ describe "ASIR Example" do
     exc = system_exit = nil; exit_code = 0
     begin
       if true
-        cmd = "ASIR_EXAMPLE_SILENT=1 ruby -I example -I lib #{file}"
+        cmd = "ASIR_EXAMPLE_SILENT=1 #{ruby} -I example -I lib #{file}"
         $stderr.puts "\n   Running #{cmd}:" if ENV['SPEC_VERBOSE']
         output = `#{cmd} 2>&1 | tee #{file}.out`
       else
@@ -74,6 +74,13 @@ describe "ASIR Example" do
     end
   end
 
+  require 'rbconfig'
+  RUBY_INTERPRETER_PATH = File.join(RbConfig::CONFIG["bindir"],
+                               RbConfig::CONFIG["RUBY_INSTALL_NAME"] +
+                               RbConfig::CONFIG["EXEEXT"])
+
+  def ruby; RUBY_INTERPRETER_PATH; end
+
   def expect rx, mode = :'=~'
     @expects << [ rx, mode ]
   end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: asir_xml
 version: !ruby/object:Gem::Version
-  version: 1.1.11
-  prerelease: 
+  version: 1.1.12
 platform: ruby
 authors:
 - Kurt Stephens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-29 00:00:00.000000000 Z
+date: 2013-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asir
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,23 +27,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: libxml-ruby
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.3
+        version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.3
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,23 +55,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -99,6 +88,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .jrubyrc
 - .rspec
 - .travis.yml
 - ChangeLog
@@ -109,7 +99,9 @@ files:
 - asir_xml.gemspec
 - example/ex01.rb
 - example/example_helper.rb
+- jdom/jdom-2.0.5.jar
 - lib/asir/coder/xml.rb
+- lib/asir/coder/xml/parser.rb
 - lib/asir_xml.rb
 - lib/asir_xml/version.rb
 - spec/example_spec.rb
@@ -117,33 +109,26 @@ files:
 - spec/xml_spec.rb
 homepage: http://github.com/kstephens/abstracting_services_in_ruby
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2373877049933297676
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2373877049933297676
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.1.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: XML Coder for ASIR
 test_files:
 - spec/example_spec.rb