xommelier 0.1.25 → 0.1.26

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWZjZTQyMmJhODE1ZDYxNTViYWIxMmNlNGE5MzQ4YWU4NWYwMjQ0Yg==
+    Nzg4Y2NjMTQ3NDQxNzA3YWRmMTEwN2JjZWQ1MWY4ZDJjZGM5NTEwYw==
   data.tar.gz: !binary |-
-    OTVkZDQ4NzViOWYzMTUzNDFkOGU1NDI0NTQ5NjAzODA5MmFmYTcwNw==
+    NGY5ZTFjNDNkMGNkZjgwMzFmNzdlNzFhZjJiY2JjOGE0ZTc4ODM4ZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MTE2MWJiOTUyNjk2Y2MzMWI3MmEzMzk3ODI4ZThlOGEyZTBmZDI0ODc1Njcy
-    NjY2NzUzNGU1MzYxMWM5ZTU0ZjBhYmVlYzQwYzQ5OTE3NWEyY2YwY2JmMDc0
-    MDJiMDM0MzY3YzE3ODU5NzY4ZDY1MzBmMmRiYmM0NmYxMDRkZWE=
+    MGVmMDBkN2I1NzczYjM2YzZlZWNkNzgzYzdjYjBlZDM2OWUxYTk5YTUzNjlm
+    ZDI0NzQ0Mjg4NmY5MTQ3MWI5NDA2NjhiMjZhYzIwMWE1ODJhZjA5NDA2MDdh
+    NTcxNjA0M2EyODM5YmU2NjRjODg4OTBiMDY2NDM4YmYyYzAyNDE=
   data.tar.gz: !binary |-
-    NTk3NGYxMzFhNTg5OGUwZDdmNGY2NTBlOGNkYTNmODUzMmJkMjM1NDkyMmEy
-    ODQzY2U2NmViMDBhZjE4OWI5NzRjMmU0ZGMwODU3OWVlMWUzNzFkNzgwOTVi
-    MTdiNzM5MTAwZGI3N2QwN2YyMTY2N2ViMzUzMmRhODQ3NGNjYzA=
+    YWE5ZmJlMTc1NWQ0MzAxYTdjOGM0YjRmZWNmMWRjNWVhOTNlODFjNTU3MGZk
+    NzhiOTMwYmZiY2Y2ZjM3MWMwOGViODEzYmY0MDZhOTdhMWVhMWVmMTgzY2Jm
+    MjQ3NjRlNDc2NWM2ZGYwMDhmMzRhMWY2NmM3M2Q1YzE5NDE5ZDE=

data/lib/xommelier/schemas/atom.xsd

@@ -1,17 +1,19 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <?xml-stylesheet href="xsd.xsl" type="text/xsl"?>
 <xs:schema targetNamespace="http://www.w3.org/2005/Atom" elementFormDefault="qualified"
-	attributeFormDefault="unqualified"
-	xmlns:atom="http://www.w3.org/2005/Atom"
-	xmlns:xs="http://www.w3.org/2001/XMLSchema"
-	xmlns:xml="http://www.w3.org/XML/1998/namespace">
+           attributeFormDefault="unqualified"
+           xmlns:atom="http://www.w3.org/2005/Atom"
+           xmlns:xs="http://www.w3.org/2001/XMLSchema"
+        >
 	<xs:annotation>
 		<xs:documentation>
 			This version of the Atom schema is based on version 1.0 of the format specifications,
 			found here http://www.atomenabled.org/developers/syndication/atom-format-spec.php.
 		</xs:documentation>
 	</xs:annotation>
-	<xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/03/xml.xsd" />
+	<xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd" />
+	<xs:import namespace="http://purl.org/syndication/thread/1.0" schemaLocation="syndication/thr.xsd" />
+	<xs:import namespace="http://purl.org/syndication/history/1.0" schemaLocation="syndication/fh.xsd" />
 	<xs:annotation>
 		<xs:documentation>
 			An Atom document may have two root elements, feed and entry, as defined in section 2.

data/lib/xommelier/schemas/dublincore/dc.xsd

@@ -12,7 +12,7 @@
 
       Created 2008-02-11
 
-      Created by 
+      Created by
 
       Tim Cole (t-cole3@uiuc.edu)
       Tom Habing (thabing@uiuc.edu)
@@ -23,14 +23,14 @@
       This schema declares XML elements for the 15 DC elements from the
       http://purl.org/dc/elements/1.1/ namespace.
 
-      It defines a complexType SimpleLiteral which permits mixed content 
+      It defines a complexType SimpleLiteral which permits mixed content
       and makes the xml:lang attribute available. It disallows child elements by
       use of minOcccurs/maxOccurs.
 
       However, this complexType does permit the derivation of other complexTypes
       which would permit child elements.
 
-      All elements are declared as substitutable for the abstract element any, 
+      All elements are declared as substitutable for the abstract element any,
       which means that the default type for all elements is dc:SimpleLiteral.
 
     </xs:documentation>
@@ -39,7 +39,7 @@
 
 
   <xs:import namespace="http://www.w3.org/XML/1998/namespace"
-             schemaLocation="http://www.w3.org/2001/03/xml.xsd">
+             schemaLocation="../xml.xsd">
   </xs:import>
 
   <xs:complexType name="SimpleLiteral">
@@ -49,7 +49,7 @@
             It permits text content only with optional
             xml:lang attribute.
             Text is allowed because mixed="true", but sub-elements
-            are disallowed because minOccurs="0" and maxOccurs="0" 
+            are disallowed because minOccurs="0" and maxOccurs="0"
             are on the xs:any tag.
 
     	    This complexType allows for restriction or extension permitting
@@ -89,7 +89,7 @@
   	<xs:annotation>
     	<xs:documentation xml:lang="en">
     	    This group is included as a convenience for schema authors
-            who need to refer to all the elements in the 
+            who need to refer to all the elements in the
             http://purl.org/dc/elements/1.1/ namespace.
     	</xs:documentation>
   	</xs:annotation>

data/lib/xommelier/schemas/dublincore/dcterms.xsd

@@ -11,10 +11,10 @@
     <xs:documentation xml:lang="en">
       DCterms XML Schema
       XML Schema for http://purl.org/dc/terms/ namespace
- 
+
       Created 2008-02-11
 
-      Created by 
+      Created by
 
       Tim Cole (t-cole3@uiuc.edu)
       Tom Habing (thabing@uiuc.edu)
@@ -24,7 +24,7 @@
 
       This schema declares XML elements for the DC elements and
       DC element refinements from the http://purl.org/dc/terms/ namespace.
-      
+
       It reuses the complexType dc:SimpleLiteral, imported from the dc.xsd
       schema, which permits simple element content, and makes the xml:lang
       attribute available.
@@ -32,38 +32,38 @@
       This complexType permits the derivation of other complexTypes
       which would permit child elements.
 
-      XML elements corresponding to DC elements are declared as substitutable for the abstract element dc:any, and 
-      XML elements corresponding to DC element refinements are defined as substitutable for the base elements 
+      XML elements corresponding to DC elements are declared as substitutable for the abstract element dc:any, and
+      XML elements corresponding to DC element refinements are defined as substitutable for the base elements
       which they refine.
 
-      This means that the default type for all XML elements (i.e. corresponding to all DC elements and 
+      This means that the default type for all XML elements (i.e. corresponding to all DC elements and
       element refinements) is dc:SimpleLiteral.
 
       Encoding schemes are defined as complexTypes which are restrictions
-      of the dc:SimpleLiteral complexType. These complexTypes restrict 
+      of the dc:SimpleLiteral complexType. These complexTypes restrict
       values to an appropriates syntax or format using data typing,
       regular expressions, or enumerated lists.
-  
-      In order to specify one of these encodings an xsi:type attribute must 
+
+      In order to specify one of these encodings an xsi:type attribute must
       be used in the instance document.
 
-      Also, note that one shortcoming of this approach is that any type can be 
+      Also, note that one shortcoming of this approach is that any type can be
       applied to any of the elements or refinements.  There is no convenient way
       to restrict types to specific elements using this approach.
 
       Changes in 2008-02-11 version:
-      
+
       Add element declarations corresponding to 15 new dcterms URIs, and amend use of substitutionGroups.
-      
+
       Add compexType definitions corresponding to ISO639-3, RFC4646.
-      
+
     </xs:documentation>
 
   </xs:annotation>
 
 
   <xs:import namespace="http://www.w3.org/XML/1998/namespace"
-             schemaLocation="http://www.w3.org/2001/03/xml.xsd">
+             schemaLocation="../xml.xsd">
   </xs:import>
 
    <xs:import namespace="http://purl.org/dc/elements/1.1/"
@@ -213,7 +213,7 @@
         <xs:attribute ref="xml:lang" use="prohibited"/>
     </xs:restriction>
    </xs:simpleContent>
-  </xs:complexType> 
+  </xs:complexType>
 
   <xs:complexType name="DCMIType">
    <xs:simpleContent>
@@ -246,7 +246,7 @@
         <xs:attribute ref="xml:lang" use="prohibited"/>
     </xs:restriction>
    </xs:simpleContent>
-  </xs:complexType> 
+  </xs:complexType>
 
   <xs:complexType name="ISO639-2">
    <xs:simpleContent>
@@ -351,9 +351,9 @@
   	<xs:annotation>
     	<xs:documentation xml:lang="en">
     		This group is included as a convenience for schema authors
-            who need to refer to all the DC elements and element refinements 
-            in the http://purl.org/dc/elements/1.1/ and 
-            http://purl.org/dc/terms namespaces. 
+            who need to refer to all the DC elements and element refinements
+            in the http://purl.org/dc/elements/1.1/ and
+            http://purl.org/dc/terms namespaces.
             N.B. Refinements available via substitution groups.
     	</xs:documentation>
   	</xs:annotation>
@@ -363,7 +363,7 @@
 	<xs:element ref="dc:any" />
     </xs:choice>
   </xs:sequence>
-  </xs:group>	
+  </xs:group>
 
   <xs:complexType name="elementOrRefinementContainer">
   	<xs:annotation>

data/lib/xommelier/schemas/syndication/schematron.xsd

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- schemaVersion of 2001/02/15 -->
 <xs:schema targetNamespace="http://www.ascc.net/xml/schematron" xmlns:sch="http://www.ascc.net/xml/schematron" xmlns="http://www.ascc.net/xml/schematron" xmlns:xs="http://www.w3.org/2001/XMLSchema" version="+//IDN sinica.edu.tw//SGML W3C XML Schema for Schematron 1.5//EN">
-	<xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd">
+	<xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="../xml.xsd">
    	<xs:annotation>
 			<xs:documentation>
        		Get access to the xml: attribute groups for xml:lang

data/lib/xommelier/version.rb

@@ -1,3 +1,3 @@
 module Xommelier
-  VERSION = '0.1.25'
+  VERSION = '0.1.26'
 end

data/lib/xommelier/xml/element/namespace.rb

@@ -64,8 +64,7 @@ module Xommelier
           @schema_validation_errors = []
           schema = self.class.schema
           if schema
-            document = ensure_xml_document
-            document = Nokogiri::XML(to_xml)
+            document = Nokogiri::XML(ensure_xml_document.to_s)
             schema.validate(document).each do |error|
               @schema_validation_errors << error
             end

data/spec/functional/xommelier/atom/feed/building_hash_spec.rb

@@ -33,5 +33,6 @@ describe Xommelier::Atom::Feed do
 
     its(:to_hash) { should == hash}
     its(:to_xml) { should == load_xml_file('nested_atom') }
+    it_behaves_like 'Valid XML Document'
   end
 end

data/spec/functional/xommelier/atom/feed/building_spec.rb

@@ -24,7 +24,7 @@ describe Xommelier::Atom::Feed do
     let(:rng)        { Nokogiri::XML::RelaxNG(load_xml_file('atom.rng')) }
     let(:xsd)        { Xommelier::Atom.schema }
 
-    it { should be_valid }
+    it_behaves_like 'Valid XML Document'
 
     its(:to_xml) { should == load_xml_file('simple_feed.atom') }
     it('should conform to RelaxNG schema') { rng.valid?(parsed_xml).should == true }

data/spec/functional/xommelier/atom/threading/building_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'xommelier/atom/full'
 
 describe 'Atom feed building' do
-  let(:feed) do
+  subject(:feed) do
     Xommelier::Atom::Feed.new.tap do |feed|
       feed.id = 'urn:uuid:60a76c80-d399-11d9-b93C-0003939e0af6'
       feed.title = 'Example Feed'
@@ -33,8 +33,7 @@ describe 'Atom feed building' do
   let(:rng)        { Nokogiri::XML::RelaxNG(load_xml_file('atom.rng')) }
   let(:xsd)        { Nokogiri::XML::Schema(load_xml_file('atom.xsd')) }
 
-  subject { built_xml }
-
-  it { should == load_xml_file('multi_namespace_feed.atom') }
+  its(:to_xml) { should == load_xml_file('multi_namespace_feed.atom') }
   it('should conform to RelaxNG schema') { rng.valid?(parsed_xml).should == true }
+  it_behaves_like 'Valid XML Document'
 end

data/spec/functional/xommelier/open_search/description/building_spec.rb

@@ -30,7 +30,7 @@ describe Xommelier::OpenSearch::Description do
     subject(:description) { Xommelier::OpenSearch::Description.new(hash) }
 
     its(:to_hash) { should == hash }
-    it { should be_valid }
+    it_behaves_like 'Valid XML Document'
     its(:to_xml) { should == load_xml_file('opensearch.full') }
   end
 end

data/spec/functional/xommelier/rss/rss/building_spec.rb

@@ -20,7 +20,6 @@ describe 'RSS feed building' do
     )
   end
 
-  it { subject.class.schema.should be_present }
-  it { should be_valid }
+  it_behaves_like 'Valid XML Document'
   its(:to_xml) { should == load_xml_file('simple_feed.rss') }
 end

data/spec/support/schema_validatable.rb

@@ -0,0 +1,12 @@
+shared_examples 'Valid XML Document' do
+  it { subject.class.schema.should be_present }
+  specify do
+    begin
+      should be_valid
+    rescue RSpec::Expectations::ExpectationNotMetError => e
+      puts subject.to_xml
+      puts subject.schema_validation_errors
+      raise e
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xommelier
 version: !ruby/object:Gem::Version
-  version: 0.1.25
+  version: 0.1.26
 platform: ruby
 authors:
 - Alexander Semyonov
@@ -194,6 +194,7 @@ files:
 - spec/namespaced_module.rb
 - spec/spec_helper.rb
 - spec/support/fixtures.rb
+- spec/support/schema_validatable.rb
 - xommelier.gemspec
 homepage: http://github.com/alsemyonov/xommelier
 licenses: []
@@ -246,3 +247,4 @@ test_files:
 - spec/namespaced_module.rb
 - spec/spec_helper.rb
 - spec/support/fixtures.rb
+- spec/support/schema_validatable.rb