libxml-ruby 2.3.3 → 2.4.0

data/ext/libxml/ruby_xml_schema_type.h

@@ -0,0 +1,9 @@
+#ifndef __RXML_SCHEMA_TYPE__
+#define __RXML_SCHEMA_TYPE__
+
+extern VALUE cXMLSchemaType;
+
+VALUE rxml_wrap_schema_type(xmlSchemaTypePtr xtype);
+void rxml_init_schema_type(void);
+
+#endif

data/ext/libxml/ruby_xml_version.h

@@ -1,9 +1,9 @@
 /* Don't nuke this block!  It is used for automatically updating the
  * versions below. VERSION = string formatting, VERNUM = numbered
  * version for inline testing: increment both or none at all.*/
-#define RUBY_LIBXML_VERSION  "2.3.3"
-#define RUBY_LIBXML_VERNUM   233
+#define RUBY_LIBXML_VERSION  "2.4.0"
+#define RUBY_LIBXML_VERNUM   240
 #define RUBY_LIBXML_VER_MAJ   2
-#define RUBY_LIBXML_VER_MIN   3
-#define RUBY_LIBXML_VER_MIC   3
+#define RUBY_LIBXML_VER_MIN   4
+#define RUBY_LIBXML_VER_MIC   0
 #define RUBY_LIBXML_VER_PATCH 0

data/lib/libxml.rb

@@ -25,5 +25,11 @@ 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'

data/lib/libxml/schema.rb

@@ -0,0 +1,67 @@
+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
+end

data/lib/libxml/schema/attribute.rb

@@ -0,0 +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

data/lib/libxml/schema/element.rb

@@ -0,0 +1,27 @@
+# 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

data/lib/libxml/schema/type.rb

@@ -0,0 +1,29 @@
+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

data/test/model/shiporder.xsd

@@ -1,31 +1,40 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <xs:element name="shiporder">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element name="orderperson" type="xs:string"/>
-        <xs:element name="shipto">
-          <xs:complexType>
-            <xs:sequence>
-              <xs:element name="name" type="xs:string"/>
-              <xs:element name="address" type="xs:string"/>
-              <xs:element name="city" type="xs:string"/>
-              <xs:element name="country" type="xs:string"/>
-            </xs:sequence>
-          </xs:complexType>
-        </xs:element>
-        <xs:element name="item" maxOccurs="unbounded">
-          <xs:complexType>
-            <xs:sequence>
-              <xs:element name="title" type="xs:string"/>
-              <xs:element name="note" type="xs:string" minOccurs="0"/>
-              <xs:element name="quantity" type="xs:positiveInteger"/>
-              <xs:element name="price" type="xs:decimal"/>
-            </xs:sequence>
-          </xs:complexType>
-        </xs:element>
-      </xs:sequence>
-      <xs:attribute name="orderid" type="xs:string" use="required"/>
-    </xs:complexType>
-  </xs:element>
+  <xs:element name="shiporder" type="shiporder"/>
+
+  <xs:complexType name="shiporder">
+    <xs:annotation>
+      <xs:documentation>Shiporder type documentation</xs:documentation>
+    </xs:annotation>
+    <xs:sequence>
+      <xs:element name="orderperson" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>orderperson element documentation</xs:documentation>
+        </xs:annotation>
+      </xs:element>
+      <xs:element name="shipto">
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element name="name" type="xs:string"/>
+            <xs:element name="address" type="xs:string"/>
+            <xs:element name="city" type="xs:string"/>
+            <xs:element name="country" type="xs:string"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+      <xs:element name="item" maxOccurs="unbounded">
+        <xs:complexType>
+          <xs:sequence>
+            <xs:element name="title" type="xs:string"/>
+            <xs:element name="note" type="xs:string" minOccurs="0"/>
+            <xs:element name="quantity" type="xs:positiveInteger"/>
+            <xs:element name="price" type="xs:decimal"/>
+          </xs:sequence>
+        </xs:complexType>
+      </xs:element>
+    </xs:sequence>
+    <xs:attribute name="orderid" type="xs:string" use="required"/>
+    <xs:attribute name="foo" default="1" type="xs:integer" use="optional"/>
+    <xs:attribute name="bar" use="prohibited"/>
+  </xs:complexType>
 </xs:schema>

data/test/tc_encoding.rb

@@ -118,4 +118,9 @@ class TestEncoding < Test::Unit::TestCase
     assert_equal("109 246 116 108 101 121 95 99 114 252 101",
                  name.bytes.to_a.join(" "))
   end
-end
+
+  def test_encoding_conversions
+    assert_equal("UTF-8", XML::Encoding.to_s(XML::Encoding::UTF_8))
+    assert_equal(XML::Encoding::UTF_8, XML::Encoding.from_s("UTF-8"))
+  end
+end

data/test/tc_html_parser.rb

@@ -99,7 +99,7 @@ class HTMLParserTest < Test::Unit::TestCase
         <body>Hello<br>World</html>
    EOS
 
-    parser = XML::HTMLParser.string(html)
+    parser = XML::HTMLParser.string(html, :options => XML::HTMLParser::Options::NOBLANKS)
     doc = parser.parse
     assert_instance_of XML::Document, doc
 

data/test/tc_node.rb

@@ -206,4 +206,11 @@ class TestNode < Test::Unit::TestCase
     text_node = node.first
     assert(text_node.empty?)
   end
-end
+
+  def test_set_content
+    node = XML::Node.new('test')
+    node.content = "unescaped & string"
+    assert_equal("unescaped & string", node.content)
+    assert_equal("<test>unescaped &amp; string</test>", node.to_s)
+  end
+end

data/test/tc_schema.rb

@@ -8,17 +8,17 @@ class TestSchema < Test::Unit::TestCase
     file = File.join(File.dirname(__FILE__), 'model/shiporder.xml')
     @doc = XML::Document.file(file)
   end
-  
+
   def teardown
     @doc = nil
   end
-  
+
   def schema
     document = XML::Document.file(File.join(File.dirname(__FILE__), 'model/shiporder.xsd'))
     XML::Schema.document(document)
   end
 
-   def check_error(error)
+  def check_error(error)
     assert_not_nil(error)
     assert(error.message.match(/Error: Element 'invalid': This element is not expected. Expected is \( item \)/))
     assert_kind_of(XML::Error, error)
@@ -26,7 +26,6 @@ class TestSchema < Test::Unit::TestCase
     assert_equal(XML::Error::SCHEMAV_ELEMENT_CONTENT, error.code)
     assert_equal(XML::Error::ERROR, error.level)
     assert(error.file.match(/shiporder.xml/)) if error.file
-    assert_nil(error.line)
     assert_nil(error.str1)
     assert_nil(error.str2)
     assert_nil(error.str3)
@@ -51,6 +50,7 @@ class TestSchema < Test::Unit::TestCase
     end
 
     check_error(error)
+    assert_nil(error.line)
     assert_not_nil(error.node)
     assert_equal('invalid', error.node.name)
   end
@@ -84,7 +84,79 @@ class TestSchema < Test::Unit::TestCase
 
     error = errors.first
     check_error(error)
+    assert_equal(21, error.line)
   ensure
     XML::Error.set_handler(&LibXML::XML::Error::VERBOSE_HANDLER)
   end
+
+
+  # Schema meta-data tests
+
+  def test_elements
+    assert_instance_of(Hash, schema.elements)
+    assert_equal(1, schema.elements.length)
+    assert_instance_of(XML::Schema::Element, schema.elements['shiporder'])
+  end
+
+  def test_types
+    assert_instance_of(Hash, schema.types)
+    assert_equal(1, schema.types.length)
+    assert_instance_of(XML::Schema::Type, schema.types['shiporder'])
+  end
+
+  def test_schema_type
+    type = schema.types['shiporder']
+
+    assert_equal('shiporder', type.name)
+    assert_equal(nil, type.namespace)
+    assert_equal("Shiporder type documentation", type.annotation)
+    assert_instance_of(XML::Node, type.node)
+    assert_equal(XML::Schema::Types::XML_SCHEMA_TYPE_COMPLEX, type.kind)
+    assert_instance_of(XML::Schema::Type, type.base)
+    assert_equal("anyType", type.base.name)
+    assert_equal(XML::Schema::Types::XML_SCHEMA_TYPE_BASIC, type.base.kind)
+
+    assert_instance_of(Hash, type.elements)
+    assert_equal(3, type.elements.length)
+  end
+
+  def test_schema_element
+    element = schema.types['shiporder'].elements['orderperson']
+
+    assert_equal('orderperson', element.name)
+    assert_equal(nil, element.namespace)
+    assert_equal("orderperson element documentation", element.annotation)
+    assert_equal(1, element.min_occurs)
+    assert_equal(1, element.max_occurs)
+
+
+    element = schema.types['shiporder'].elements['item']
+    assert_equal(Float::INFINITY, element.max_occurs)
+
+    element = schema.types['shiporder'].elements['item'].type.elements['note']
+    assert_equal(0, element.min_occurs)
+    assert_equal('string', element.type.name)
+  end
+
+  def test_schema_attributes
+    type = schema.types['shiporder']
+
+    assert_instance_of(Array, type.attributes)
+    assert_equal(2, type.attributes.length)
+    assert_instance_of(XML::Schema::Attribute, type.attributes.first)
+  end
+
+  def test_schema_attribute
+    attribute = schema.types['shiporder'].attributes.first
+
+    assert_equal("orderid", attribute.name)
+    assert_equal(nil, attribute.namespace)
+    assert_equal(1, attribute.occurs)
+    assert_equal('string', attribute.type.name)
+
+    attribute = schema.types['shiporder'].attributes[1]
+    assert_equal(2, attribute.occurs)
+    assert_equal('1', attribute.default)
+    assert_equal('integer', attribute.type.name)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libxml-ruby
 version: !ruby/object:Gem::Version
-  version: 2.3.3
+  version: 2.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-01 00:00:00.000000000 Z
+date: 2012-12-14 00:00:00.000000000 Z
 dependencies: []
 description: ! "    The Libxml-Ruby project provides Ruby language bindings for the
   GNOME\n    Libxml2 XML toolkit. It is free software, released under the MIT License.\n
@@ -62,6 +62,10 @@ files:
 - ext/libxml/ruby_xml_sax2_handler.h
 - ext/libxml/ruby_xml_sax_parser.h
 - ext/libxml/ruby_xml_schema.h
+- ext/libxml/ruby_xml_schema_attribute.h
+- ext/libxml/ruby_xml_schema_element.h
+- ext/libxml/ruby_xml_schema_facet.h
+- ext/libxml/ruby_xml_schema_type.h
 - ext/libxml/ruby_xml_version.h
 - ext/libxml/ruby_xml_xinclude.h
 - ext/libxml/ruby_xml_xpath.h
@@ -95,6 +99,10 @@ files:
 - ext/libxml/ruby_xml_sax2_handler.c
 - ext/libxml/ruby_xml_sax_parser.c
 - ext/libxml/ruby_xml_schema.c
+- ext/libxml/ruby_xml_schema_attribute.c
+- ext/libxml/ruby_xml_schema_element.c
+- ext/libxml/ruby_xml_schema_facet.c
+- ext/libxml/ruby_xml_schema_type.c
 - ext/libxml/ruby_xml_xinclude.c
 - ext/libxml/ruby_xml_xpath.c
 - ext/libxml/ruby_xml_xpath_context.c
@@ -119,6 +127,10 @@ files:
 - lib/libxml/reader.rb
 - lib/libxml/sax_callbacks.rb
 - lib/libxml/sax_parser.rb
+- lib/libxml/schema/attribute.rb
+- lib/libxml/schema/element.rb
+- lib/libxml/schema/type.rb
+- lib/libxml/schema.rb
 - lib/libxml/tree.rb
 - lib/libxml/xpath_object.rb
 - lib/libxml.rb