libxml-ruby 2.8.0 → 3.2.3

data/lib/libxml/sax_parser.rb

@@ -36,23 +36,6 @@ module LibXML
         context = XML::Parser::Context.string(string)
         self.new(context)
       end
-
-      # :enddoc:
-
-      def file=(value)
-        warn("XML::SaxParser#file is deprecated.  Use XML::SaxParser.file instead")
-        @context = XML::Parser::Context.file(value)
-      end
-
-      def io=(value)
-        warn("XML::SaxParser#io is deprecated.  Use XML::SaxParser.io instead")
-        @context = XML::Parser::Context.io(value)
-      end
-
-      def string=(value)
-        warn("XML::SaxParser#string is deprecated.  Use XML::SaxParser.string instead")
-        @context = XML::Parser::Context.string(value)
-      end
     end
   end
 end

data/lib/libxml/schema/attribute.rb

@@ -1,19 +1,19 @@
-# encoding: UTF-8
-
-module LibXML
-  module XML
-    class Schema::Attribute
-      REQUIRED = 1
-      OPTIONAL = 2
-
-      def default
-        node['default']
-      end
-
-      def required?
-        occurs == REQUIRED
-      end
-
-    end
-  end
-end
+# encoding: UTF-8
+
+module LibXML
+  module XML
+    class Schema::Attribute
+      REQUIRED = 1
+      OPTIONAL = 2
+
+      def default
+        node['default']
+      end
+
+      def required?
+        occurs == REQUIRED
+      end
+
+    end
+  end
+end

data/lib/libxml/schema/element.rb

@@ -1,27 +1,19 @@
-# encoding: UTF-8
-
-module LibXML
-  module XML
-    class Schema::Element
-      def required?
-        !min_occurs.zero?
-      end
-
-      def array?
-        max_occurs > 1
-      end
-
-      def elements
-        type.elements
-      end
-
-      def annotation
-        return if node.nil?
-        annotations = node.children.select { |n| n.name == 'annotation' }
-        annotations.map do |annotation|
-          annotation.children.map(&:content).join("\n")
-        end.join("\n")
-      end
-    end
-  end
-end
+# encoding: UTF-8
+
+module LibXML
+  module XML
+    class Schema::Element
+      def required?
+        !min_occurs.zero?
+      end
+
+      def array?
+        max_occurs > 1
+      end
+
+      def elements
+        type.elements
+      end
+    end
+  end
+end

data/lib/libxml/schema/type.rb

@@ -1,29 +1,21 @@
-module LibXML
-  module XML
-    class Schema::Type
-      def kind_name
-        Schema::Types.constants.find { |k| Schema::Types.const_get(k) == kind }
-      end
-
-      def annotation
-        return if node.nil?
-        annotations = node.children.select { |n| n.name == 'annotation' }
-        annotations.map do |annotation|
-          annotation.children.map(&:content).join("\n")
-        end.join("\n")
-      end
-
-      def annonymus_subtypes
-        elements.select { |_, e| e.type.name.nil? }
-      end
-
-      def annonymus_subtypes_recursively(parent=nil)
-        annonymus_subtypes.map do |element_name, e|
-          [{[parent, element_name].compact.join('::') => e.type},
-           e.type.annonymus_subtypes_recursively(element_name)]
-        end.flatten
-      end
-
-    end
-  end
-end
+module LibXML
+  module XML
+    class Schema::Type
+      def kind_name
+        Schema::Types.constants.find { |k| Schema::Types.const_get(k) == kind }
+      end
+
+      def annonymus_subtypes
+        elements.select { |_, e| e.type.name.nil? }
+      end
+
+      def annonymus_subtypes_recursively(parent=nil)
+        annonymus_subtypes.map do |element_name, e|
+          [{[parent, element_name].compact.join('::') => e.type},
+           e.type.annonymus_subtypes_recursively(element_name)]
+        end.flatten
+      end
+
+    end
+  end
+end

data/lib/libxml/schema.rb

@@ -1,67 +1,48 @@
-module LibXML
-  module XML
-    class Schema
-      module Types
-        XML_SCHEMA_TYPE_BASIC            = 1 # A built-in datatype
-        XML_SCHEMA_TYPE_ANY              = 2
-        XML_SCHEMA_TYPE_FACET            = 3
-        XML_SCHEMA_TYPE_SIMPLE           = 4
-        XML_SCHEMA_TYPE_COMPLEX          = 5
-        XML_SCHEMA_TYPE_SEQUENCE         = 6
-        XML_SCHEMA_TYPE_CHOICE           = 7
-        XML_SCHEMA_TYPE_ALL              = 8
-        XML_SCHEMA_TYPE_SIMPLE_CONTENT   = 9
-        XML_SCHEMA_TYPE_COMPLEX_CONTENT  = 10
-        XML_SCHEMA_TYPE_UR               = 11
-        XML_SCHEMA_TYPE_RESTRICTION      = 12
-        XML_SCHEMA_TYPE_EXTENSION        = 13
-        XML_SCHEMA_TYPE_ELEMENT          = 14
-        XML_SCHEMA_TYPE_ATTRIBUTE        = 15
-        XML_SCHEMA_TYPE_ATTRIBUTEGROUP   = 16
-        XML_SCHEMA_TYPE_GROUP            = 17
-        XML_SCHEMA_TYPE_NOTATION         = 18
-        XML_SCHEMA_TYPE_LIST             = 19
-        XML_SCHEMA_TYPE_UNION            = 20
-        XML_SCHEMA_TYPE_ANY_ATTRIBUTE    = 21
-        XML_SCHEMA_TYPE_IDC_UNIQUE       = 22
-        XML_SCHEMA_TYPE_IDC_KEY          = 23
-        XML_SCHEMA_TYPE_IDC_KEYREF       = 24
-        XML_SCHEMA_TYPE_PARTICLE         = 25
-        XML_SCHEMA_TYPE_ATTRIBUTE_USE    = 26
-        XML_SCHEMA_FACET_MININCLUSIVE    = 1000
-        XML_SCHEMA_FACET_MINEXCLUSIVE    = 1001
-        XML_SCHEMA_FACET_MAXINCLUSIVE    = 1002
-        XML_SCHEMA_FACET_MAXEXCLUSIVE    = 1003
-        XML_SCHEMA_FACET_TOTALDIGITS     = 1004
-        XML_SCHEMA_FACET_FRACTIONDIGITS  = 1005
-        XML_SCHEMA_FACET_PATTERN         = 1006
-        XML_SCHEMA_FACET_ENUMERATION     = 1007
-        XML_SCHEMA_FACET_WHITESPACE      = 1008
-        XML_SCHEMA_FACET_LENGTH          = 1009
-        XML_SCHEMA_FACET_MAXLENGTH       = 1010
-        XML_SCHEMA_FACET_MINLENGTH       = 1011
-        XML_SCHEMA_EXTRA_QNAMEREF        = 2000
-        XML_SCHEMA_EXTRA_ATTR_USE_PROHIB = 2001
-      end
-
-      class Namespaces < Array
-        def find_by_href(href)
-          find { |n| n.href == href }
-        end
-
-        def find_by_prefix(prefix)
-          find { |n| n.prefix == prefix }
-        end
-      end
-
-      def namespaces
-        Namespaces.new(_namespaces.uniq { |n| n.href })
-      end
-
-      def self.cached(location)
-        @_schemas ||= {}
-        @_schemas[location] ||= new(location)
-      end
-    end
-  end
+module LibXML
+  module XML
+    class Schema
+      module Types
+        XML_SCHEMA_TYPE_BASIC            = 1 # A built-in datatype
+        XML_SCHEMA_TYPE_ANY              = 2
+        XML_SCHEMA_TYPE_FACET            = 3
+        XML_SCHEMA_TYPE_SIMPLE           = 4
+        XML_SCHEMA_TYPE_COMPLEX          = 5
+        XML_SCHEMA_TYPE_SEQUENCE         = 6
+        XML_SCHEMA_TYPE_CHOICE           = 7
+        XML_SCHEMA_TYPE_ALL              = 8
+        XML_SCHEMA_TYPE_SIMPLE_CONTENT   = 9
+        XML_SCHEMA_TYPE_COMPLEX_CONTENT  = 10
+        XML_SCHEMA_TYPE_UR               = 11
+        XML_SCHEMA_TYPE_RESTRICTION      = 12
+        XML_SCHEMA_TYPE_EXTENSION        = 13
+        XML_SCHEMA_TYPE_ELEMENT          = 14
+        XML_SCHEMA_TYPE_ATTRIBUTE        = 15
+        XML_SCHEMA_TYPE_ATTRIBUTEGROUP   = 16
+        XML_SCHEMA_TYPE_GROUP            = 17
+        XML_SCHEMA_TYPE_NOTATION         = 18
+        XML_SCHEMA_TYPE_LIST             = 19
+        XML_SCHEMA_TYPE_UNION            = 20
+        XML_SCHEMA_TYPE_ANY_ATTRIBUTE    = 21
+        XML_SCHEMA_TYPE_IDC_UNIQUE       = 22
+        XML_SCHEMA_TYPE_IDC_KEY          = 23
+        XML_SCHEMA_TYPE_IDC_KEYREF       = 24
+        XML_SCHEMA_TYPE_PARTICLE         = 25
+        XML_SCHEMA_TYPE_ATTRIBUTE_USE    = 26
+        XML_SCHEMA_FACET_MININCLUSIVE    = 1000
+        XML_SCHEMA_FACET_MINEXCLUSIVE    = 1001
+        XML_SCHEMA_FACET_MAXINCLUSIVE    = 1002
+        XML_SCHEMA_FACET_MAXEXCLUSIVE    = 1003
+        XML_SCHEMA_FACET_TOTALDIGITS     = 1004
+        XML_SCHEMA_FACET_FRACTIONDIGITS  = 1005
+        XML_SCHEMA_FACET_PATTERN         = 1006
+        XML_SCHEMA_FACET_ENUMERATION     = 1007
+        XML_SCHEMA_FACET_WHITESPACE      = 1008
+        XML_SCHEMA_FACET_LENGTH          = 1009
+        XML_SCHEMA_FACET_MAXLENGTH       = 1010
+        XML_SCHEMA_FACET_MINLENGTH       = 1011
+        XML_SCHEMA_EXTRA_QNAMEREF        = 2000
+        XML_SCHEMA_EXTRA_ATTR_USE_PROHIB = 2001
+      end
+    end
+  end
 end

data/lib/libxml-ruby.rb

@@ -0,0 +1,30 @@
+# encoding: UTF-8
+
+# Load the C-based binding.
+begin
+  RUBY_VERSION =~ /(\d+.\d+)/
+  require "#{$1}/libxml_ruby"
+rescue LoadError
+  require "libxml_ruby"
+end
+
+# Load Ruby supporting code.
+require 'libxml/error'
+require 'libxml/parser'
+require 'libxml/document'
+require 'libxml/namespaces'
+require 'libxml/namespace'
+require 'libxml/node'
+require 'libxml/attributes'
+require 'libxml/attr'
+require 'libxml/attr_decl'
+require 'libxml/tree'
+require 'libxml/html_parser'
+require 'libxml/sax_parser'
+require 'libxml/sax_callbacks'
+
+#Schema Interface
+require 'libxml/schema'
+require 'libxml/schema/type'
+require 'libxml/schema/element'
+require 'libxml/schema/attribute'

data/lib/libxml.rb

@@ -1,35 +1,5 @@
 # encoding: UTF-8
+#
+# This include is deprecated, use libxml-ruby instead!
 
-# Load the C-based binding.
-begin
-  RUBY_VERSION =~ /(\d+.\d+)/
-  require "#{$1}/libxml_ruby"
-rescue LoadError
-  require "libxml_ruby"
-end
-# Load Ruby supporting code.
-require 'libxml/error'
-require 'libxml/parser'
-require 'libxml/document'
-require 'libxml/namespaces'
-require 'libxml/namespace'
-require 'libxml/node'
-require 'libxml/ns'
-require 'libxml/attributes'
-require 'libxml/attr'
-require 'libxml/attr_decl'
-require 'libxml/tree'
-require 'libxml/reader'
-require 'libxml/html_parser'
-require 'libxml/sax_parser'
-require 'libxml/sax_callbacks'
-require 'libxml/xpath_object'
-
-#Schema Interface
-require 'libxml/schema'
-require 'libxml/schema/type'
-require 'libxml/schema/element'
-require 'libxml/schema/attribute'
-
-# Deprecated
-require 'libxml/properties'
+require 'libxml-ruby'

data/libxml-ruby.gemspec

@@ -1,44 +1,48 @@
-# encoding: utf-8
-
-# Determine the current version of the software
-version = File.read('ext/libxml/ruby_xml_version.h').match(/\s*RUBY_LIBXML_VERSION\s*['"](\d.+)['"]/)[1]
-
-Gem::Specification.new do |spec|
-  spec.name        = 'libxml-ruby'
-  spec.version     = version
-  spec.homepage    = 'http://xml4r.github.com/libxml-ruby'
-  spec.summary     = 'Ruby Bindings for LibXML2'
-  spec.description = <<-EOS
-    The Libxml-Ruby project provides Ruby language bindings for the GNOME
-    Libxml2 XML toolkit. It is free software, released under the MIT License.
-    Libxml-ruby's primary advantage over REXML is performance - if speed
-    is your need, these are good libraries to consider, as demonstrated
-    by the informal benchmark below.
-  EOS
-  spec.authors = ['Ross Bamform', 'Wai-Sun Chia', 'Sean Chittenden',
-                  'Dan Janwoski', 'Anurag Priyam', 'Charlie Savage',
-                  'Ryan Johnson']
-  spec.platform = Gem::Platform::RUBY
-  spec.bindir = "bin"
-  spec.extensions = ["ext/libxml/extconf.rb"]
-  spec.files = Dir.glob(['HISTORY',
-                         'LICENSE',
-                         'libxml-ruby.gemspec',
-                         'MANIFEST',
-                         'Rakefile',
-                         'README.rdoc',
-                         'setup.rb',
-                         'ext/libxml/*.def',
-                         'ext/libxml/*.h',
-                         'ext/libxml/*.c',
-                         'ext/libxml/*.rb',
-                         'ext/vc/*.sln',
-                         'ext/vc/*.vcprojx',
-                         'lib/**/*.rb',
-                         'script/**/*',
-                         'test/**/*'])
-  spec.test_files = Dir.glob("test/tc_*.rb")
-  spec.required_ruby_version = '>= 1.8.6'
-  spec.date = DateTime.now
-  spec.license = 'MIT'
-end
+# encoding: utf-8
+require 'date'
+
+# Determine the current version of the software
+version = File.read('ext/libxml/ruby_xml_version.h').match(/\s*RUBY_LIBXML_VERSION\s*['"](\d.+)['"]/)[1]
+
+Gem::Specification.new do |spec|
+  spec.name        = 'libxml-ruby'
+  spec.version     = version
+  spec.homepage    = 'https://xml4r.github.io/libxml-ruby/'
+  spec.summary     = 'Ruby Bindings for LibXML2'
+  spec.description = <<-EOS
+    The Libxml-Ruby project provides Ruby language bindings for the GNOME
+    Libxml2 XML toolkit. It is free software, released under the MIT License.
+    Libxml-ruby's primary advantage over REXML is performance - if speed
+    is your need, these are good libraries to consider, as demonstrated
+    by the informal benchmark below.
+  EOS
+  spec.authors = ['Ross Bamform', 'Wai-Sun Chia', 'Sean Chittenden',
+                  'Dan Janwoski', 'Anurag Priyam', 'Charlie Savage',
+                  'Ryan Johnson']
+  spec.platform = Gem::Platform::RUBY
+  spec.bindir = 'bin'
+  spec.extensions = ['ext/libxml/extconf.rb']
+  spec.files = Dir.glob(['HISTORY',
+                         'LICENSE',
+                         'libxml-ruby.gemspec',
+                         'MANIFEST',
+                         'Rakefile',
+                         'README.rdoc',
+                         'setup.rb',
+                         'ext/libxml/*.def',
+                         'ext/libxml/*.h',
+                         'ext/libxml/*.c',
+                         'ext/libxml/*.rb',
+                         'ext/vc/*.sln',
+                         'ext/vc/*.vcprojx',
+                         'lib/**/*.rb',
+                         'script/**/*',
+                         'test/**/*'])
+
+  spec.test_files = Dir.glob('test/test_*.rb')
+  spec.required_ruby_version = '>= 2.5'
+  spec.date = DateTime.now
+  spec.add_development_dependency('rake-compiler')
+  spec.add_development_dependency('minitest')
+  spec.license = 'MIT'
+end