canonix 0.1.5 → 0.1.7

data/Gemfile

@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gemspec

data/Gemfile.lock

@@ -0,0 +1,29 @@
+PATH
+  remote: .
+  specs:
+    canonix (0.1.5)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    git (1.2.5)
+    jeweler (1.8.4)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+      rdoc
+    json (1.8.0)
+    rake (10.0.4)
+    rdoc (4.0.1)
+      json (~> 1.4)
+    thoughtbot-shoulda (2.11.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  canonix!
+  jeweler
+  rake
+  rdoc
+  thoughtbot-shoulda

data/Rakefile

@@ -40,11 +40,9 @@ rescue LoadError
   end
 end
 
-task :test => :check_dependencies
-
 task :default => :test
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.7

data/canonix.gemspec

@@ -4,22 +4,22 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{canonix}
-  s.version = "0.1.5"
+  s.name = "canonix"
+  s.version = "0.1.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brendon Muir"]
-  s.date = %q{2011-10-04}
-  s.description = %q{This is based on andrewferk's rewrite for Ruby 1.9 compatibility, but applies 
-      relevance's fix to ensure proper canonicalisation. It is intended that this be the new official 
-      Ruby XML Canonicaliser as the other project seems to be abandoned.}
-  s.email = %q{brendon@spike.net.nz}
+  s.date = "2013-06-09"
+  s.description = "This is based on andrewferk's rewrite for Ruby 1.9 compatibility, but applies \n      relevance's fix to ensure proper canonicalisation. It is intended that this be the new official \n      Ruby XML Canonicaliser as the other project seems to be abandoned."
+  s.email = "brendon@spike.net.nz"
   s.extra_rdoc_files = [
     "README.rdoc"
   ]
   s.files = [
     ".document",
     ".rvmrc",
+    "Gemfile",
+    "Gemfile.lock",
     "README.rdoc",
     "Rakefile",
     "VERSION",
@@ -38,20 +38,35 @@ Gem::Specification.new do |s|
     "test/test_xmlcanonicalizer.rb",
     "tests.watchr"
   ]
-  s.homepage = %q{http://github.com/brendon/canonix}
+  s.homepage = "http://github.com/brendon/canonix"
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.4.2}
-  s.summary = %q{XML Canonicalizer for Ruby >= 1.9.2}
+  s.rubygems_version = "1.8.24"
+  s.summary = "XML Canonicalizer for Ruby >= 1.9.2"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<canonix>, [">= 0"])
+      s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+      s.add_development_dependency(%q<rake>, [">= 0"])
+      s.add_development_dependency(%q<rdoc>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
     else
+      s.add_dependency(%q<canonix>, [">= 0"])
+      s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+      s.add_dependency(%q<rake>, [">= 0"])
+      s.add_dependency(%q<rdoc>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
     end
   else
+    s.add_dependency(%q<canonix>, [">= 0"])
+    s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+    s.add_dependency(%q<rake>, [">= 0"])
+    s.add_dependency(%q<rdoc>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
   end
 end

data/lib/xml/util/xmlcanonicalizer.rb

@@ -10,9 +10,8 @@ require "base64"
 
 module XML
   include REXML
-  
+
   module Util
-      
       class NamespaceNode
         attr_reader :prefix, :uri
         def initialize(prefix, uri)
@@ -20,21 +19,20 @@ module XML
           @uri = uri
         end
       end
-      
+
       class XmlCanonicalizer
         attr_accessor :prefix_list, :logger, :inclusive_namespaces
-        
+
         BEFORE_DOC_ELEMENT = 0
         INSIDE_DOC_ELEMENT = 1
         AFTER_DOC_ELEMENT  = 2
-        
+
         NODE_TYPE_ATTRIBUTE  = 3
         NODE_TYPE_WHITESPACE = 4
         NODE_TYPE_COMMENT    = 5
         NODE_TYPE_PI         = 6
         NODE_TYPE_TEXT       = 7
-        
-        
+
         def initialize(with_comments, excl_c14n)
           @with_comments = with_comments
           @exclusive = excl_c14n
@@ -44,7 +42,7 @@ module XML
           @prevVisibleNamespacesEnd = 0
           @visibleNamespaces = Array.new()
         end
-        
+
         def add_inclusive_namespaces(prefix_list, element, visible_namespaces)
           namespaces = element.attributes()
           namespaces.each_attribute{|ns|
@@ -58,11 +56,11 @@ module XML
           add_inclusive_namespaces(prefix_list, parent, visible_namespaces) if (parent)
           visible_namespaces
         end
-        
+
         def canonicalize(document)
           write_document_node(document)
         end
-        
+
         def canonicalize_element(element, logging = true)
           @preserve_document = element.document()
           tmp_parent = element.parent()
@@ -76,7 +74,7 @@ module XML
           document.root().add_namespace(element.prefix(), ns)
           write_document_node(document)
         end
-        
+
         def write_document_node(document)
           @res = ""
           @state = BEFORE_DOC_ELEMENT
@@ -89,7 +87,7 @@ module XML
           end
           @res
         end
-        
+
         def write_node(node)
           visible = is_node_visible(node)
           if ((node.node_type() == :text) && white_text?(node.value()))
@@ -113,7 +111,7 @@ module XML
           if (node.node_type() == :comment)
           end
         end
-        
+
         def write_element_node(node, visible)
           savedPrevVisibleNamespacesStart = @prevVisibleNamespacesStart
           savedPrevVisibleNamespacesEnd = @prevVisibleNamespacesEnd
@@ -133,7 +131,7 @@ module XML
           @prevVisibleNamespacesEnd = savedPrevVisibleNamespacesEnd
           @visibleNamespaces.slice!(savedVisibleNamespacesSize, @visibleNamespaces.size() - savedVisibleNamespacesSize) if (@visibleNamespaces.size() > savedVisibleNamespacesSize)
         end
-        
+
         def write_namespace_axis(node, visible)
           doc = node.document()
           has_empty_namespace = false
@@ -157,14 +155,14 @@ module XML
           if (visible && !has_empty_namespace && !is_namespace_rendered(nil, nil))
             @res = @res + ' xmlns=""'
           end
-          
+
           #: ns of inclusive_list
           if self.inclusive_namespaces && !self.inclusive_namespaces.empty?
             self.inclusive_namespaces.each{|prefix|
               list.push(prefix) if (!list.include?(prefix) && (node.attributes.prefixes.include?(prefix)))
             }
           end
-          
+
           if list.delete('xmlns')
             list = ["xmlns"] + list.sort
           else
@@ -182,7 +180,7 @@ module XML
             @prevVisibleNamespacesEnd = @visibleNamespaces.size()
           end
         end
-        
+
         def node_namespaces(node)
           ns = Array.new()
           ns.push(node.prefix())
@@ -196,7 +194,7 @@ module XML
           }
           ns
         end
-        
+
         def write_attribute_axis(node)
           list = Array.new()
           node.attributes.keys.sort.each{|key|
@@ -233,11 +231,11 @@ module XML
             end
           }
         end
-        
+
         def is_namespace_node(namespace_uri)
           return (namespace_uri == "http://www.w3.org/2000/xmlns/")
         end
-        
+
         def is_namespace_rendered(prefix, uri)
           is_empty_ns = prefix == nil && uri == nil
           if (is_empty_ns)
@@ -259,7 +257,7 @@ module XML
           # }
           # return is_empty_ns
         end
-        
+
         def is_node_visible(node)
           return true if (@xnl.size() == 0)
           @xnl.each{|element|
@@ -267,7 +265,7 @@ module XML
           }
           return false
         end
-        
+
         def normalize_string(input, type)
           sb = ""
           return input
@@ -294,29 +292,29 @@ module XML
           # }
           # sb
         end
-        
+
         def write_text_node(node, visible)
           if (visible)
-            @res = @res + normalize_string(node.value(), node.node_type())
+            @res = @res + normalize_string(node.to_s, node.node_type())
           end
         end
-        
+
         def white_text?(text)
           return true if ((text.strip() == "") || (text.strip() == nil))
           return false
         end
-        
+
         def is_namespace_decl(attribute)
           # return true if (attribute.name() == "xmlns")
           return true if (attribute.prefix().index("xmlns") == 0)
           return false
         end
-        
+
         def is_text_node(type)
           return true if (type == NODE_TYPE_TEXT || type == NODE_TYPE_CDATA || type == NODE_TYPE_WHITESPACE)
           return false
         end
-        
+
         def remove_whitespace(string)
           new_string = ""
           in_white = false
@@ -339,12 +337,11 @@ module XML
   end #Util
 end #XML
 
-
 if __FILE__ == $0
   document = Document.new(File.new(ARGV[0]))
   body = nil
   c = WSS4R::Security::Util::XmlCanonicalizer.new(false, true)
-  
+
   if (ARGV.size() == 3)
     body = ARGV[2]
     if (body == "true")
@@ -361,7 +358,7 @@ if __FILE__ == $0
   else
     result = c.canonicalize(document)
   end
-    
+
   file = File.new(ARGV[1], "wb")
   file.write(result)
   file.close()

data/test/saml_with_inclusive_ns_assertion.xml

@@ -26,7 +26,7 @@
         <saml:AttributeValue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:anyType">00550000001b7Kf</saml:AttributeValue>
       </saml:Attribute>
       <saml:Attribute Name="username" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:unspecified">
-        <saml:AttributeValue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:anyType">mail@example.com</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:anyType">some &amp; example</saml:AttributeValue>
       </saml:Attribute>
       <saml:Attribute Name="email" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:unspecified">
         <saml:AttributeValue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:anyType">mail@example.com</saml:AttributeValue>

data/test/saml_with_inclusive_ns_expected_canonical_form.xml

@@ -26,7 +26,7 @@
         <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:anyType">00550000001b7Kf</saml:AttributeValue>
       </saml:Attribute>
       <saml:Attribute Name="username" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:unspecified">
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:anyType">mail@example.com</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:anyType">some &amp; example</saml:AttributeValue>
       </saml:Attribute>
       <saml:Attribute Name="email" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:unspecified">
         <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:anyType">mail@example.com</saml:AttributeValue>

data/test/test_xmlcanonicalizer.rb

@@ -112,5 +112,4 @@ class TestXmlCanonicalizer < Test::Unit::TestCase
     xml_expect = fixture("saml_with_inclusive_ns_expected_canonical_form.xml")
     assert_equal xml_expect, xml_canonicalized #, (xml_canonicalized.to_s + "\n\n" + xml_expect)
   end
-
 end

metadata

@@ -1,51 +1,126 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: canonix
-version: !ruby/object:Gem::Version 
-  hash: 17
+version: !ruby/object:Gem::Version
+  version: 0.1.7
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 5
-  version: 0.1.5
 platform: ruby
-authors: 
+authors:
 - Brendon Muir
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-04 00:00:00 +13:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-06-09 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: canonix
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: thoughtbot-shoulda
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-description: |-
-  This is based on andrewferk's rewrite for Ruby 1.9 compatibility, but applies 
-        relevance's fix to ensure proper canonicalisation. It is intended that this be the new official 
-        Ruby XML Canonicaliser as the other project seems to be abandoned.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: thoughtbot-shoulda
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: ! "This is based on andrewferk's rewrite for Ruby 1.9 compatibility,
+  but applies \n      relevance's fix to ensure proper canonicalisation. It is intended
+  that this be the new official \n      Ruby XML Canonicaliser as the other project
+  seems to be abandoned."
 email: brendon@spike.net.nz
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - .document
 - .rvmrc
+- Gemfile
+- Gemfile.lock
 - README.rdoc
 - Rakefile
 - VERSION
@@ -63,39 +138,31 @@ files:
 - test/saml_with_inclusive_ns_expected_canonical_form.xml
 - test/test_xmlcanonicalizer.rb
 - tests.watchr
-has_rdoc: true
 homepage: http://github.com/brendon/canonix
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 1387874799767718647
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: XML Canonicalizer for Ruby >= 1.9.2
 test_files: []
-