xmlparser 0.6.81 → 0.7.2.1

data/lib/xml/dom/digest.rb

@@ -6,49 +6,61 @@
 ##
 
 require 'xml/dom/core'
-require 'md5'
-require 'uconv'
+require 'digest/md5'
 
 module XML
   module DOM
-
     def self.tou16(str)
-      Uconv.u16swap(Uconv.u8tou16(str))
+      if defined?(::Encoding)
+        str.encode(::Encoding::UTF_16BE).force_encoding(::Encoding::ASCII_8BIT)
+      else
+        str.unpack("U*").map {|v|
+          if v >= 0x10000 && v <= 0x10ffff
+            ## surrogate pair
+            hi = ((v - 0x10000) >> 10) | 0xd800
+            low = (v & 1023) | 0xdc00
+            [hi, low].pack("n*")
+          else
+            [v].pack("n*")
+          end
+        }.join
+      end
     end
 
     class Node
-      def getDigest(force = false)
+      def getDigest(algorithm = Digest::MD5, force = false)
         nil
       end
     end
 
     class Text
-      def getDigest(force = false)
+      def getDigest(algorithm = Digest::MD5, force = false)
         (!force && @digest) ||
-          @digest = MD5.new([TEXT_NODE].pack("N") + DOM.tou16(nodeValue)).digest
+          @digest = algorithm.digest([TEXT_NODE].pack("N") + DOM.tou16(nodeValue))
+        @digest
       end
     end
 
 ##    class Comment
-##      def getDigest(force = false)
+##      def getDigest(algorithm = Digest::MD5, force = false)
 ##        (!force && @digest) ||
-##          @digest = MD5.new([COMMENT_NODE].pack("N") + DOM.tou16(data)).digest
+##          @digest = algorithm.digest([COMMENT_NODE].pack("N") + DOM.tou16(data)).digest
 ##      end
 ##    end
 
     class ProcessingInstruction
-      def getDigest(force = false)
+      def getDigest(algorithm = Digest::MD5, force = false)
         (!force && @digest) ||
-          @digest = MD5.new([PROCESSING_INSTRUCTION_NODE].pack("N") +
-                            DOM.tou16(target) + "\0\0" + DOM.tou16(data)).digest
+          @digest = algorithm.digest([PROCESSING_INSTRUCTION_NODE].pack("N") +
+                                     DOM.tou16(target) + "\0\0" + DOM.tou16(data))
       end
     end
 
     class Attr
-      def getDigest(force = false)
+      def getDigest(algorithm = Digest::MD5, force = false)
         (!force && @digest) ||
-          @digest = MD5.new([ATTRIBUTE_NODE].pack("N") +
-                            DOM.tou16(nodeName) + "\0\0" + DOM.tou16(nodeValue)).digest
+          @digest = algorithm.digest([ATTRIBUTE_NODE].pack("N") +
+                                     DOM.tou16(nodeName) + "\0\0" + DOM.tou16(nodeValue))
       end
     end
 
@@ -61,7 +73,7 @@ module XML
     end
 
     class Element
-      def getDigest(force = false)
+      def getDigest(algorithm = Digest::MD5, force = false)
         return @digest if (!force && @digest)
         attr = attributes
         children = childNodes
@@ -71,22 +83,22 @@ module XML
           attr_array = attr.sort {|a, b|
             DOM.tou16(a.nodeName) <=> DOM.tou16(b.nodeName)}
           attr_array.each {|a|
-            attr_digests << a.getDigest(force)
+            attr_digests << a.getDigest(algorithm, force)
           }
         end
         children_num = 0
         children.each {|c|
           next if c.nodeType == COMMENT_NODE
           children_num += 1
-          children_digests << c.getDigest(force)
+          children_digests << c.getDigest(algorithm, force)
         }
-        @digest = MD5.new([ELEMENT_NODE].pack("N") +
-                          DOM.tou16(nodeName) +
-                          "\0\0" +
-                          [attr.length].pack("N") +
-                          attr_digests +
-                          [children_num].pack("N") +
-                          children_digests).digest
+        @digest = algorithm.digest([ELEMENT_NODE].pack("N") +
+                                   DOM.tou16(nodeName) +
+                                   "\0\0" +
+                                   [attr.length].pack("N") +
+                                   attr_digests +
+                                   [children_num].pack("N") +
+                                   children_digests)
       end
     end
 

data/lib/xml/dom2/domentityresolverimpl.rb

@@ -5,30 +5,19 @@
 
 require 'xml/dom2/domentityresolver'
 require 'xml/dom2/dominputsource'
+require 'open-uri'
 
 module XML
   module DOM
     class DOMEntityResolverImpl
       include DOMEntityResolver
 
-      ## replace 'open' by WGET::open
-      begin
-        require 'wget'
-##        include WGET
-      rescue
-        ## ignore
-      end
-
       ## DOMInputSource resolveEntity(publicId, systemId)
       def resolveEntity(publicId, systemId)
         ret = DOMInputSource.new
         ret.publicId = publicId
         ret.systemId = systemId
-        if systemId =~ /file:/
-          ret.byteStream = open(systemId.sub('^file://', ''))
-        else
-          ret.byteStream = WGET::open(systemId)
-        end
+        ret.byteStream = open(systemId, 'rb')
         ret
       end
     end

metadata

@@ -1,111 +1,97 @@
---- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.3
-specification_version: 1
+--- !ruby/object:Gem::Specification
 name: xmlparser
-version: !ruby/object:Gem::Version 
-  version: 0.6.81
-date: 2007-05-21 00:00:00 -04:00
-summary: Ruby bindings to the Expat XML parsing library
-require_paths: 
-- lib
-email: 
-homepage: 
-rubyforge_project: xmlparser
-description: Ruby bindings to the Expat XML parsing library
+version: !ruby/object:Gem::Version
+  version: 0.7.2.1
+  prerelease: 
+platform: ruby
+authors:
+- Yoshida Mataso
 autorequire: 
-default_executable: 
 bindir: bin
-has_rdoc: false
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
-platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
-authors: 
-- Yoshida Mataso with Jeff Hodges
-files: 
-- lib/xmldigest.rb
-- lib/saxdriver.rb
-- lib/xmltree.rb
-- lib/xml
-- lib/xmltreebuilder.rb
-- lib/wget.rb
+cert_chain: []
+date: 2012-03-21 00:00:00.000000000 Z
+dependencies: []
+description: Ruby bindings to the Expat XML parsing library
+email: 
+executables: []
+extensions:
+- ext/extconf.rb
+extra_rdoc_files:
+- README
+- README.ja
+- MANIFEST
+files:
 - lib/sax.rb
+- lib/saxdriver.rb
+- lib/xmldigest.rb
 - lib/xmltreevisitor.rb
-- lib/xml/dom
-- lib/xml/saxdriver.rb
-- lib/xml/dom2
-- lib/xml/xpath.rb
-- lib/xml/parser.rb
-- lib/xml/parserns.rb
-- lib/xml/sax.rb
-- lib/xml/xpath.ry
-- lib/xml/encoding-ja.rb
-- lib/xml/dom/digest.rb
-- lib/xml/dom/core.rb
-- lib/xml/dom/visitor.rb
-- lib/xml/dom/builder-ja.rb
-- lib/xml/dom/builder.rb
-- lib/xml/dom2/notation.rb
-- lib/xml/dom2/domimplementation.rb
-- lib/xml/dom2/dombuilderfilter.rb
-- lib/xml/dom2/node.rb
-- lib/xml/dom2/domentityresolverimpl.rb
-- lib/xml/dom2/entity.rb
+- lib/xmltree.rb
 - lib/xml/dom2/documenttype.rb
+- lib/xml/dom2/xpath.rb
+- lib/xml/dom2/notation.rb
 - lib/xml/dom2/documentfragment.rb
-- lib/xml/dom2/comment.rb
-- lib/xml/dom2/dombuilder.rb
-- lib/xml/dom2/entityreference.rb
-- lib/xml/dom2/processinginstruction.rb
 - lib/xml/dom2/core.rb
-- lib/xml/dom2/namednodemap.rb
-- lib/xml/dom2/document.rb
+- lib/xml/dom2/dominputsource.rb
 - lib/xml/dom2/attr.rb
-- lib/xml/dom2/nodelist.rb
-- lib/xml/dom2/domentityresolver.rb
-- lib/xml/dom2/text.rb
+- lib/xml/dom2/domexception.rb
+- lib/xml/dom2/entity.rb
 - lib/xml/dom2/cdatasection.rb
-- lib/xml/dom2/xpath.rb
-- lib/xml/dom2/dominputsource.rb
+- lib/xml/dom2/node.rb
+- lib/xml/dom2/dombuilder.rb
+- lib/xml/dom2/nodelist.rb
+- lib/xml/dom2/domentityresolverimpl.rb
+- lib/xml/dom2/domimplementation.rb
 - lib/xml/dom2/element.rb
-- lib/xml/dom2/domexception.rb
+- lib/xml/dom2/dombuilderfilter.rb
 - lib/xml/dom2/characterdata.rb
+- lib/xml/dom2/text.rb
+- lib/xml/dom2/document.rb
+- lib/xml/dom2/namednodemap.rb
+- lib/xml/dom2/domentityresolver.rb
+- lib/xml/dom2/comment.rb
+- lib/xml/dom2/processinginstruction.rb
+- lib/xml/dom2/entityreference.rb
+- lib/xml/xpath.rb
+- lib/xml/sax.rb
+- lib/xml/parserns.rb
+- lib/xml/saxdriver.rb
+- lib/xml/dom/builder.rb
+- lib/xml/dom/digest.rb
+- lib/xml/dom/core.rb
+- lib/xml/dom/visitor.rb
+- lib/xml/parser.rb
+- lib/xmltreebuilder.rb
+- lib/wget.rb
+- lib/xml/xpath.ry
 - ext/encoding.h
-- ext/xmlparser
-- ext/xmlparser/xmlparser.c
-- ext/xmlparser/mkrf_conf.rb
+- ext/extconf.rb
+- ext/xmlparser.c
 - README
 - README.ja
 - MANIFEST
-- samples
-test_files: []
-
+homepage: http://www.yoshidam.net/Ruby.html
+licenses: []
+post_install_message: 
 rdoc_options: []
-
-extra_rdoc_files: 
-- README
-- README.ja
-- MANIFEST
-- samples
-executables: []
-
-extensions: 
-- Rakefile
+require_paths:
+- lib
+- ext
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: mkrf
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.2.1
-    version: 
+rubyforge_project: xmlparser
+rubygems_version: 1.8.15
+signing_key: 
+specification_version: 3
+summary: Ruby bindings to the Expat XML parsing library
+test_files: []

data/Rakefile

@@ -1,34 +0,0 @@
-#!/usr/bin/ruby
-require 'rubygems'
-require 'rake'
-require 'rake/testtask'
-require 'rake/clean'
-require 'rake/gempackagetask'
-require 'rake/rdoctask'
-require 'mkrf/rakehelper'
-require 'fileutils'
-include FileUtils
-
-setup_clean ["pkg", "lib/*.bundle", "*.gem", ".config", "ext/**/Rakefile"]
-
-setup_extension('xmlparser','xmlparser')
-
-desc "Does a full compile"
-task :default => [:xmlparser]
-
-task 'extension' => :default
-version = "0.6.81"
-name = "xmlparser"
-
-setup_gem(name, version) do |spec|
-  spec.summary = "Ruby bindings to the Expat XML parsing library"
-  spec.description = spec.summary
-  spec.author = "Yoshida Mataso with Jeff Hodges"
-  spec.add_dependency("mkrf", ">=0.2.1")
-  spec.extensions << "Rakefile"
-  spec.files = FileList["lib/**/*","ext/**/*"].exclude("rdoc").to_a
-  spec.has_rdoc = false
-  spec.extra_rdoc_files=['README', 'README.ja', 'MANIFEST', 'samples']
-  spec.rubyforge_project = 'xmlparser'
-end
-

data/ext/xmlparser/mkrf_conf.rb

@@ -1,28 +0,0 @@
-#!/usr/bin/ruby
-
-require 'rubygems'
-require 'mkrf'
-
-def crash(str)
-  printf(" extconf failure: %s\n", str)
-  exit 1
-end
-
-Mkrf::Generator.new('xmlparser') do |g|
-  if g.include_header('expat.h', '/opt/include','/usr/local/include','/usr/include')
-    g.include_library('expat',function='XML_ParserCreate', '/opt/lib', '/usr/local/lib', '/usr/lib')
-  elsif g.include_header('libxmltok', '/opt/include','/usr/local/include','/usr/include')
-    g.include_library('xmltok', function='XML_ParserCreate', '/opt/lib', '/usr/local/lib', '/usr/lib')
-  end
-  if g.has_function?("XML_SetNotStandaloneHandler")
-    #g.cflags << ' -DNEW_EXPAT'
-    g.add_define('NEW_EXPAT')
-  end
-  if g.has_function?("XML_SetParamEntityParsing")
-    #g.cflags << ' -DXML_DTD'
-    g.add_define('XML_DTD')
-  end
-
-  #g.include_library("socket", function="ntohl")
-  g.include_library("wsock32") if RUBY_PLATFORM =~ /mswin32|mingw/
-end

data/lib/xml/dom/builder-ja.rb

@@ -1,58 +0,0 @@
-## -*- Ruby -*-
-## Tree builder class for Japanese encoding
-## 1998 by yoshidam
-
-require 'xml/dom/builder'
-
-module XML
-module DOM
-  class JapaneseBuilder<Builder
-    require 'kconv'
-    include Kconv
-    require 'uconv'
-    include Uconv
-
-    def nameConverter(str)
-      u8toeuc(str)
-    end
-    def cdataConverter(str)
-      u8toeuc(str)
-    end
-
-    def parseStream(stream, trim = false)
-      ## empty file
-      if ((xml = stream.gets).nil?); exit 1; end
-      ## rewrite encoding in XML decl.
-      if xml =~ /^<\?xml\sversion=.+\sencoding=.EUC-JP./i
-        xml.sub!(/EUC-JP/i, "UTF-8")
-        encoding = 'EUC-JP'
-      elsif xml =~ /^<\?xml\sversion=.+\sencoding=.Shift_JIS./i
-        xml.sub!(/Shift_JIS/i, "UTF-8")
-        encoding = "Shift_JIS"
-      elsif xml =~ /^<\?xml\sversion=.+\sencoding=.ISO-2022-JP./i
-        xml.sub!(/ISO-2022-JP/i, "UTF-8")
-        encoding = "ISO-2022-JP"
-      end
-
-      ## read body
-      xml += String(stream.read)
-
-      ## convert body encoding
-      if encoding == "EUC-JP"
-        xml = euctou8(xml)
-      elsif encoding == "Shift_JIS"
-        xml = euctou8(kconv(xml, EUC, SJIS))
-      elsif encoding == "ISO-2022-JP"
-        xml = euctou8(kconv(xml, EUC, JIS))
-      end
-
-      return parse(xml, trim)
-    end
-
-
-    def Uconv.unknown_unicode_handler(u)
-      return '®'
-    end
-  end
-end
-end