nokogiri 1.6.0.rc1 → 1.6.0

data/Gemfile

@@ -0,0 +1,21 @@
+# -*- ruby -*-
+
+# DO NOT EDIT THIS FILE. Instead, edit Rakefile, and run `rake bundler:gemfile`.
+
+source "https://rubygems.org/"
+
+
+gem "hoe-bundler", ">=1.1", :group => [:development, :test]
+gem "hoe-debugging", ">=1.0.3", :group => [:development, :test]
+gem "hoe-gemspec", ">=1.0", :group => [:development, :test]
+gem "hoe-git", ">=1.4", :group => [:development, :test]
+gem "mini_portile", ">=0.2.2", :group => [:development, :test]
+gem "minitest", "~>2.2.2", :group => [:development, :test]
+gem "rake", ">=0.9", :group => [:development, :test]
+gem "rake-compiler", "~>0.8.0", :group => [:development, :test]
+gem "racc", ">=1.4.6", :group => [:development, :test], :platform => :ruby
+gem "rexical", ">=1.0.5", :group => [:development, :test], :platform => :ruby
+gem "rdoc", "~>3.10", :group => [:development, :test]
+gem "hoe", "~>2.16", :group => [:development, :test]
+
+# vim: syntax=ruby

data/Manifest.txt

@@ -1,8 +1,10 @@
 .autotest
 .gemtest
+.travis.yml
 CHANGELOG.ja.rdoc
 CHANGELOG.rdoc
 C_CODING_STYLE.rdoc
+Gemfile
 Manifest.txt
 README.ja.rdoc
 README.rdoc
@@ -12,6 +14,7 @@ STANDARD_RESPONSES.md
 Y_U_NO_GEMSPEC.md
 bin/nokogiri
 build_all
+dependencies.yml
 ext/java/nokogiri/EncodingHandler.java
 ext/java/nokogiri/HtmlDocument.java
 ext/java/nokogiri/HtmlElementDescription.java
@@ -219,6 +222,7 @@ test/files/2ch.html
 test/files/address_book.rlx
 test/files/address_book.xml
 test/files/bar/bar.xsd
+test/files/bogus.xml
 test/files/dont_hurt_em_why.xml
 test/files/encoding.html
 test/files/encoding.xhtml
@@ -229,6 +233,10 @@ test/files/metacharset.html
 test/files/noencoding.html
 test/files/po.xml
 test/files/po.xsd
+test/files/saml/saml20assertion_schema.xsd
+test/files/saml/saml20protocol_schema.xsd
+test/files/saml/xenc_schema.xsd
+test/files/saml/xmldsig_schema.xsd
 test/files/shift_jis.html
 test/files/shift_jis.xml
 test/files/snuggles.xml
@@ -253,6 +261,10 @@ test/html/test_element_description.rb
 test/html/test_named_characters.rb
 test/html/test_node.rb
 test/html/test_node_encoding.rb
+test/namespaces/test_additional_namespaces_in_builder_doc.rb
+test/namespaces/test_namespaces_in_builder_doc.rb
+test/namespaces/test_namespaces_in_created_doc.rb
+test/namespaces/test_namespaces_in_parsed_doc.rb
 test/test_convert_xpath.rb
 test/test_css_cache.rb
 test/test_encoding_handler.rb

data/ROADMAP.md

@@ -32,7 +32,7 @@
 * https://github.com/sparklemotion/nokogiri/issues/451
   chained :not pseudoselectors
 
-* better jQuery selector support:
+* better jQuery selector and CSS pseudo-selector support:
   * https://github.com/sparklemotion/nokogiri/issues/621
   * https://github.com/sparklemotion/nokogiri/issues/342
   * https://github.com/sparklemotion/nokogiri/issues/628

data/ext/nokogiri/extconf.rb

@@ -136,8 +136,8 @@ else
 
     $CFLAGS << " -DNOKOGIRI_USE_PACKAGED_LIBRARIES -DNOKOGIRI_LIBXML2_PATH='\"#{libxml2_recipe.path}\"' -DNOKOGIRI_LIBXSLT_PATH='\"#{libxslt_recipe.path}\"'"
 
-    HEADER_DIRS = [libxml2_recipe, libxslt_recipe].map { |_| File.join(_.path, "include") }
-    LIB_DIRS = [libxml2_recipe, libxslt_recipe].map { |_| File.join(_.path, "lib") }
+    HEADER_DIRS = [libxml2_recipe, libxslt_recipe].map { |f| File.join(f.path, "include") }
+    LIB_DIRS = [libxml2_recipe, libxslt_recipe].map { |f| File.join(f.path, "lib") }
     XML2_HEADER_DIRS = HEADER_DIRS + [File.join(libxml2_recipe.path, "include", "libxml2")]
   end
 end

data/ext/nokogiri/html_element_description.c

@@ -86,7 +86,10 @@ static VALUE default_sub_element(VALUE self)
   htmlElemDesc * description;
   Data_Get_Struct(self, htmlElemDesc, description);
 
-  return NOKOGIRI_STR_NEW2(description->defaultsubelt);
+  if (description->defaultsubelt)
+    return NOKOGIRI_STR_NEW2(description->defaultsubelt);
+
+  return Qnil;
 }
 
 /*

data/ext/nokogiri/xslt_stylesheet.c

@@ -209,7 +209,7 @@ static void * initFunc(xsltTransformContextPtr ctxt, const xmlChar *uri)
     int i;
 
     for(i = 0; i < RARRAY_LEN(methods); i++) {
-	VALUE method_name = rb_obj_as_string(RARRAY_PTR(methods)[i]);
+	VALUE method_name = rb_obj_as_string(rb_ary_entry(methods, i));
 	xsltRegisterExtFunction(ctxt,
           (unsigned char *)StringValuePtr(method_name), uri, method_caller);
     }

data/lib/nokogiri/version.rb

@@ -1,6 +1,6 @@
 module Nokogiri
   # The version of Nokogiri you are using
-  VERSION = '1.6.0.rc1'
+  VERSION = '1.6.0'
 
   class VersionInfo # :nodoc:
     def jruby?

data/lib/nokogiri/xml/document.rb

@@ -45,12 +45,13 @@ module Nokogiri
         # Give the options to the user
         yield options if block_given?
 
+        return new if empty_doc?(string_or_io)
+
         doc = if string_or_io.respond_to?(:read)
           url ||= string_or_io.respond_to?(:path) ? string_or_io.path : nil
           read_io(string_or_io, url, encoding, options.to_i)
         else
           # read_memory pukes on empty docs
-          return new if string_or_io.nil? or string_or_io.empty?
           read_memory(string_or_io, url, encoding, options.to_i)
         end
 
@@ -260,6 +261,12 @@ module Nokogiri
       end
 
       private
+      def self.empty_doc? string_or_io
+        string_or_io.nil? ||
+          (string_or_io.respond_to?(:empty?) && string_or_io.empty?) ||
+          (string_or_io.respond_to?(:eof?) && string_or_io.eof?)
+      end
+
       def implied_xpath_context
         "/"
       end

data/lib/nokogiri/xml/node.rb

@@ -917,18 +917,23 @@ module Nokogiri
       end
 
       def coerce data # :nodoc:
-        return data                    if data.is_a?(XML::NodeSet)
-        return data.children           if data.is_a?(XML::DocumentFragment)
-        return fragment(data).children if data.is_a?(String)
+        case data
+        when XML::NodeSet
+          return data
+        when XML::DocumentFragment
+          return data.children
+        when String
+          return fragment(data).children
+        when Document, XML::Attr
+          # unacceptable
+        when XML::Node
+          return data
+        end
 
-        if data.is_a?(Document) || data.is_a?(XML::Attr) || !data.is_a?(XML::Node)
-          raise ArgumentError, <<-EOERR
+        raise ArgumentError, <<-EOERR
 Requires a Node, NodeSet or String argument, and cannot accept a #{data.class}.
 (You probably want to select a node from the Document with at() or search(), or create a new Node via Node.new().)
-          EOERR
-        end
-
-        data
+        EOERR
       end
 
       def implied_xpath_context

data/lib/nokogiri/xml/node_set.rb

@@ -23,16 +23,14 @@ module Nokogiri
       def first n = nil
         return self[0] unless n
         list = []
-        0.upto(n - 1) do |i|
-          list << self[i]
-        end
+        n.times { |i| list << self[i] }
         list
       end
 
       ###
       # Get the last element of the NodeSet.
       def last
-        self[length - 1]
+        self[-1]
       end
 
       ###

data/lib/xsd/xmlparser/nokogiri.rb

@@ -17,7 +17,7 @@ module XSD # :nodoc:
     #   gem 'soap4r'
     #   require 'defaultDriver'
     #   require 'xsd/xmlparser/nokogiri'
-    #   
+    #
     #   obj = AvlPortType.new
     #   obj.getLatestByRoute(obj.getAgencies.first, 8).each do |bus|
     #     p "#{bus.routeID}, #{bus.longitude}, #{bus.latitude}"
@@ -62,6 +62,13 @@ module XSD # :nodoc:
         characters string
       end
 
+      ###
+      # Called at the beginning of an element
+      # +name+ is the element name
+      # +attrs+ is a list of attributes
+      # +prefix+ is the namespace prefix for the element
+      # +uri+ is the associated namespace URI
+      # +ns+ is a hash of namespace prefix:urls associated with the element
       def start_element_namespace name, attrs = [], prefix = nil, uri = nil, ns = []
         ###
         # Deal with SAX v1 interface
@@ -74,6 +81,11 @@ module XSD # :nodoc:
         start_element name, attributes
       end
 
+      ###
+      # Called at the end of an element
+      # +name+ is the element's name
+      # +prefix+ is the namespace prefix associated with the element
+      # +uri+ is the associated namespace URI
       def end_element_namespace name, prefix = nil, uri = nil
         ###
         # Deal with SAX v1 interface

data/test/files/saml/saml20assertion_schema.xsd

@@ -0,0 +1,283 @@
+<?xml version="1.0" encoding="US-ASCII"?>
+<schema
+    targetNamespace="urn:oasis:names:tc:SAML:2.0:assertion"
+    xmlns="http://www.w3.org/2001/XMLSchema"
+    xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
+    xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+    xmlns:xenc="http://www.w3.org/2001/04/xmlenc#"
+    elementFormDefault="unqualified"
+    attributeFormDefault="unqualified"
+    blockDefault="substitution"
+    version="2.0">
+    <import namespace="http://www.w3.org/2000/09/xmldsig#"
+        schemaLocation="xmldsig_schema.xsd"/>
+    <import namespace="http://www.w3.org/2001/04/xmlenc#"
+        schemaLocation="xenc_schema.xsd"/>
+    <annotation>
+        <documentation>
+            Document identifier: saml-schema-assertion-2.0
+            Location: http://docs.oasis-open.org/security/saml/v2.0/
+            Revision history:
+            V1.0 (November, 2002):
+              Initial Standard Schema.
+            V1.1 (September, 2003):
+              Updates within the same V1.0 namespace.
+            V2.0 (March, 2005):
+              New assertion schema for SAML V2.0 namespace.
+        </documentation>
+    </annotation>
+    <attributeGroup name="IDNameQualifiers">
+        <attribute name="NameQualifier" type="string" use="optional"/>
+        <attribute name="SPNameQualifier" type="string" use="optional"/>
+    </attributeGroup>
+    <element name="BaseID" type="saml:BaseIDAbstractType"/>
+    <complexType name="BaseIDAbstractType" abstract="true">
+        <attributeGroup ref="saml:IDNameQualifiers"/>
+    </complexType>
+    <element name="NameID" type="saml:NameIDType"/>
+    <complexType name="NameIDType">
+        <simpleContent>
+            <extension base="string">
+                <attributeGroup ref="saml:IDNameQualifiers"/>
+                <attribute name="Format" type="anyURI" use="optional"/>
+                <attribute name="SPProvidedID" type="string" use="optional"/>
+            </extension>
+        </simpleContent>
+    </complexType>
+    <complexType name="EncryptedElementType">
+        <sequence>
+            <element ref="xenc:EncryptedData"/>
+            <element ref="xenc:EncryptedKey" minOccurs="0" maxOccurs="unbounded"/>
+        </sequence>
+    </complexType>
+    <element name="EncryptedID" type="saml:EncryptedElementType"/>
+    <element name="Issuer" type="saml:NameIDType"/>
+    <element name="AssertionIDRef" type="NCName"/>
+    <element name="AssertionURIRef" type="anyURI"/>
+    <element name="Assertion" type="saml:AssertionType"/>
+    <complexType name="AssertionType">
+        <sequence>
+            <element ref="saml:Issuer"/>
+            <element ref="ds:Signature" minOccurs="0"/>
+            <element ref="saml:Subject" minOccurs="0"/>
+            <element ref="saml:Conditions" minOccurs="0"/>
+            <element ref="saml:Advice" minOccurs="0"/>
+            <choice minOccurs="0" maxOccurs="unbounded">
+                <element ref="saml:Statement"/>
+                <element ref="saml:AuthnStatement"/>
+                <element ref="saml:AuthzDecisionStatement"/>
+                <element ref="saml:AttributeStatement"/>
+            </choice>
+        </sequence>
+        <attribute name="Version" type="string" use="required"/>
+        <attribute name="ID" type="ID" use="required"/>
+        <attribute name="IssueInstant" type="dateTime" use="required"/>
+    </complexType>
+    <element name="Subject" type="saml:SubjectType"/>
+    <complexType name="SubjectType">
+        <choice>
+            <sequence>
+                <choice>
+                    <element ref="saml:BaseID"/>
+                    <element ref="saml:NameID"/>
+                    <element ref="saml:EncryptedID"/>
+                </choice>
+                <element ref="saml:SubjectConfirmation" minOccurs="0" maxOccurs="unbounded"/>
+            </sequence>
+            <element ref="saml:SubjectConfirmation" maxOccurs="unbounded"/>
+        </choice>
+    </complexType>
+    <element name="SubjectConfirmation" type="saml:SubjectConfirmationType"/>
+    <complexType name="SubjectConfirmationType">
+        <sequence>
+            <choice minOccurs="0">
+                <element ref="saml:BaseID"/>
+                <element ref="saml:NameID"/>
+                <element ref="saml:EncryptedID"/>
+            </choice>
+            <element ref="saml:SubjectConfirmationData" minOccurs="0"/>
+        </sequence>
+        <attribute name="Method" type="anyURI" use="required"/>
+    </complexType>
+    <element name="SubjectConfirmationData" type="saml:SubjectConfirmationDataType"/>
+    <complexType name="SubjectConfirmationDataType" mixed="true">
+        <complexContent>
+            <restriction base="anyType">
+                <sequence>
+                    <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+                </sequence>
+                <attribute name="NotBefore" type="dateTime" use="optional"/>
+                <attribute name="NotOnOrAfter" type="dateTime" use="optional"/>
+                <attribute name="Recipient" type="anyURI" use="optional"/>
+                <attribute name="InResponseTo" type="NCName" use="optional"/>
+                <attribute name="Address" type="string" use="optional"/>
+                <anyAttribute namespace="##other" processContents="lax"/>
+            </restriction>
+        </complexContent>
+    </complexType>
+    <complexType name="KeyInfoConfirmationDataType" mixed="false">
+        <complexContent>
+            <restriction base="saml:SubjectConfirmationDataType">
+                <sequence>
+                    <element ref="ds:KeyInfo" maxOccurs="unbounded"/>
+                </sequence>
+            </restriction>
+        </complexContent>
+    </complexType>
+    <element name="Conditions" type="saml:ConditionsType"/>
+    <complexType name="ConditionsType">
+        <choice minOccurs="0" maxOccurs="unbounded">
+            <element ref="saml:Condition"/>
+            <element ref="saml:AudienceRestriction"/>
+            <element ref="saml:OneTimeUse"/>
+            <element ref="saml:ProxyRestriction"/>
+        </choice>
+        <attribute name="NotBefore" type="dateTime" use="optional"/>
+        <attribute name="NotOnOrAfter" type="dateTime" use="optional"/>
+    </complexType>
+    <element name="Condition" type="saml:ConditionAbstractType"/>
+    <complexType name="ConditionAbstractType" abstract="true"/>
+    <element name="AudienceRestriction" type="saml:AudienceRestrictionType"/>
+    <complexType name="AudienceRestrictionType">
+        <complexContent>
+            <extension base="saml:ConditionAbstractType">
+                <sequence>
+                    <element ref="saml:Audience" maxOccurs="unbounded"/>
+                </sequence>
+            </extension>
+        </complexContent>
+    </complexType>
+    <element name="Audience" type="anyURI"/>
+    <element name="OneTimeUse" type="saml:OneTimeUseType" />
+    <complexType name="OneTimeUseType">
+        <complexContent>
+            <extension base="saml:ConditionAbstractType"/>
+        </complexContent>
+    </complexType>
+    <element name="ProxyRestriction" type="saml:ProxyRestrictionType"/>
+    <complexType name="ProxyRestrictionType">
+    <complexContent>
+        <extension base="saml:ConditionAbstractType">
+            <sequence>
+                <element ref="saml:Audience" minOccurs="0" maxOccurs="unbounded"/>
+            </sequence>
+            <attribute name="Count" type="nonNegativeInteger" use="optional"/>
+        </extension>
+	</complexContent>
+    </complexType>
+    <element name="Advice" type="saml:AdviceType"/>
+    <complexType name="AdviceType">
+        <choice minOccurs="0" maxOccurs="unbounded">
+            <element ref="saml:AssertionIDRef"/>
+            <element ref="saml:AssertionURIRef"/>
+            <element ref="saml:Assertion"/>
+            <element ref="saml:EncryptedAssertion"/>
+            <any namespace="##other" processContents="lax"/>
+        </choice>
+    </complexType>
+    <element name="EncryptedAssertion" type="saml:EncryptedElementType"/>
+    <element name="Statement" type="saml:StatementAbstractType"/>
+    <complexType name="StatementAbstractType" abstract="true"/>
+    <element name="AuthnStatement" type="saml:AuthnStatementType"/>
+    <complexType name="AuthnStatementType">
+        <complexContent>
+            <extension base="saml:StatementAbstractType">
+                <sequence>
+                    <element ref="saml:SubjectLocality" minOccurs="0"/>
+                    <element ref="saml:AuthnContext"/>
+                </sequence>
+                <attribute name="AuthnInstant" type="dateTime" use="required"/>
+                <attribute name="SessionIndex" type="string" use="optional"/>
+                <attribute name="SessionNotOnOrAfter" type="dateTime" use="optional"/>
+            </extension>
+        </complexContent>
+    </complexType>
+    <element name="SubjectLocality" type="saml:SubjectLocalityType"/>
+    <complexType name="SubjectLocalityType">
+        <attribute name="Address" type="string" use="optional"/>
+        <attribute name="DNSName" type="string" use="optional"/>
+    </complexType>
+    <element name="AuthnContext" type="saml:AuthnContextType"/>
+    <complexType name="AuthnContextType">
+        <sequence>
+            <choice>
+                <sequence>
+                    <element ref="saml:AuthnContextClassRef"/>
+                    <choice minOccurs="0">
+                        <element ref="saml:AuthnContextDecl"/>
+                        <element ref="saml:AuthnContextDeclRef"/>
+                    </choice>
+                </sequence>
+                <choice>
+                    <element ref="saml:AuthnContextDecl"/>
+                    <element ref="saml:AuthnContextDeclRef"/>
+                </choice>
+            </choice>
+            <element ref="saml:AuthenticatingAuthority" minOccurs="0" maxOccurs="unbounded"/>
+        </sequence>
+    </complexType>
+    <element name="AuthnContextClassRef" type="anyURI"/>
+    <element name="AuthnContextDeclRef" type="anyURI"/>
+    <element name="AuthnContextDecl" type="anyType"/>
+    <element name="AuthenticatingAuthority" type="anyURI"/>
+    <element name="AuthzDecisionStatement" type="saml:AuthzDecisionStatementType"/>
+    <complexType name="AuthzDecisionStatementType">
+        <complexContent>
+            <extension base="saml:StatementAbstractType">
+                <sequence>
+                    <element ref="saml:Action" maxOccurs="unbounded"/>
+                    <element ref="saml:Evidence" minOccurs="0"/>
+                </sequence>
+                <attribute name="Resource" type="anyURI" use="required"/>
+                <attribute name="Decision" type="saml:DecisionType" use="required"/>
+            </extension>
+        </complexContent>
+    </complexType>
+    <simpleType name="DecisionType">
+        <restriction base="string">
+            <enumeration value="Permit"/>
+            <enumeration value="Deny"/>
+            <enumeration value="Indeterminate"/>
+        </restriction>
+    </simpleType>
+    <element name="Action" type="saml:ActionType"/>
+    <complexType name="ActionType">
+        <simpleContent>
+            <extension base="string">
+                <attribute name="Namespace" type="anyURI" use="required"/>
+            </extension>
+        </simpleContent>
+    </complexType>
+    <element name="Evidence" type="saml:EvidenceType"/>
+    <complexType name="EvidenceType">
+        <choice maxOccurs="unbounded">
+            <element ref="saml:AssertionIDRef"/>
+            <element ref="saml:AssertionURIRef"/>
+            <element ref="saml:Assertion"/>
+            <element ref="saml:EncryptedAssertion"/>
+        </choice>
+    </complexType>
+    <element name="AttributeStatement" type="saml:AttributeStatementType"/>
+    <complexType name="AttributeStatementType">
+        <complexContent>
+            <extension base="saml:StatementAbstractType">
+                <choice maxOccurs="unbounded">
+                    <element ref="saml:Attribute"/>
+                    <element ref="saml:EncryptedAttribute"/>
+                </choice>
+            </extension>
+        </complexContent>
+    </complexType>
+    <element name="Attribute" type="saml:AttributeType"/>
+    <complexType name="AttributeType">
+        <sequence>
+            <element ref="saml:AttributeValue" minOccurs="0" maxOccurs="unbounded"/>
+        </sequence>
+        <attribute name="Name" type="string" use="required"/>
+        <attribute name="NameFormat" type="anyURI" use="optional"/>
+        <attribute name="FriendlyName" type="string" use="optional"/>
+        <anyAttribute namespace="##other" processContents="lax"/>
+    </complexType>
+    <element name="AttributeValue" type="anyType" nillable="true"/>
+    <element name="EncryptedAttribute" type="saml:EncryptedElementType"/>
+</schema>