xmldsig 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23aefdcfb75c3ff59055a9751c19d5872f16819a
-  data.tar.gz: 17ec48f80925f06c21759cd7c21407531d51811b
+  metadata.gz: 86696b5c6faa51b3c24f483af3a51eaf8bfc82cf
+  data.tar.gz: d79a464cae245bb59b63b1cc98e5664e7f8292d2
 SHA512:
-  metadata.gz: fe51378403b39e0c55f729304816bba9b68108e98c4fa9d5fc7415ecf4d6a6860b58626cfb2c96c6f489b584d16859d0d2ec1a98ba6aaa3c25a3d35d25c6b47f
-  data.tar.gz: bef5d4bebd40e3abcc5023f7f4e622d3d0a1a0cf9221e99212f9bd7f7cc5e4c9a09e06e62a5b18f638438d847e2b7351836e72c6ea81b24426acaa28af6733cc
+  metadata.gz: ba491cf35dd77d78c471fcb29871004cbd6fc1c02e08ede8a25db7bec3d21693f4f32a235d79a59a1b996310eda589f55a07755444fa8bf38dfcad68797be796
+  data.tar.gz: 1fbb14729b3d1ae1ab7d8ece83b874fdbe4e63e0d77e6bd8ba22cf9089f430c1e4416de770f84871aa827092b08a086f5c5985fb8809db9ccb61f0c2463547d3

data/.travis.yml

@@ -1,4 +1,4 @@
 language: ruby
 rvm:
-  - 2.0.0
-  - 1.9.3
+  - 2.3.0
+  - 2.2.4

data/lib/xmldsig.rb

@@ -2,14 +2,6 @@ require "nokogiri"
 require "openssl"
 require "base64"
 require "xmldsig/version"
-require "xmldsig/canonicalizer"
-require "xmldsig/signed_document"
-require "xmldsig/transforms/transform"
-require "xmldsig/transforms/canonicalize"
-require "xmldsig/transforms/enveloped_signature"
-require "xmldsig/transforms"
-require "xmldsig/reference"
-require "xmldsig/signature"
 
 module Xmldsig
   NAMESPACES = {
@@ -26,3 +18,12 @@ module Xmldsig
 
   XSD_FILE = File.read(File.expand_path('../xmldsig/xmldsig-core-schema.xsd', __FILE__))
 end
+
+require "xmldsig/canonicalizer"
+require "xmldsig/signed_document"
+require "xmldsig/transforms/transform"
+require "xmldsig/transforms/canonicalize"
+require "xmldsig/transforms/enveloped_signature"
+require "xmldsig/transforms"
+require "xmldsig/reference"
+require "xmldsig/signature"

data/lib/xmldsig/canonicalizer.rb

@@ -1,12 +1,14 @@
 module Xmldsig
   class Canonicalizer
+    class UnsupportedException < Xmldsig::Error
+    end
     attr_accessor :node, :method, :inclusive_namespaces, :with_comments
 
     def initialize(node, method = nil, inclusive_namespaces = [], with_comments = false)
-      @node = node
-      @method = method
+      @node                 = node
+      @method               = method
       @inclusive_namespaces = inclusive_namespaces
-      @with_comments = with_comments
+      @with_comments        = with_comments
     end
 
     def canonicalize
@@ -16,16 +18,26 @@ module Xmldsig
     private
 
     def mode(method)
-      case method
-        when "http://www.w3.org/2001/10/xml-exc-c14n#",
-             "http://www.w3.org/2001/10/xml-exc-c14n#WithComments"
-          Nokogiri::XML::XML_C14N_EXCLUSIVE_1_0
-        when "http://www.w3.org/TR/2001/REC-xml-c14n-20010315"
-          Nokogiri::XML::XML_C14N_1_0
-        when "http://www.w3.org/2006/12/xml-c14n11"
-          Nokogiri::XML::XML_C14N_1_1
-        else
-          Nokogiri::XML::XML_C14N_1_0
+      if RUBY_PLATFORM == "java"
+        case method
+          when "http://www.w3.org/2001/10/xml-exc-c14n#",
+              "http://www.w3.org/2001/10/xml-exc-c14n#WithComments"
+            Nokogiri::XML::XML_C14N_EXCLUSIVE_1_0
+          else
+            raise UnsupportedException.new("Canonicalizer method #{method} unsupported in JRuby")
+        end
+      else
+        case method
+          when "http://www.w3.org/2001/10/xml-exc-c14n#",
+              "http://www.w3.org/2001/10/xml-exc-c14n#WithComments"
+            Nokogiri::XML::XML_C14N_EXCLUSIVE_1_0
+          when "http://www.w3.org/TR/2001/REC-xml-c14n-20010315"
+            Nokogiri::XML::XML_C14N_1_0
+          when "http://www.w3.org/2006/12/xml-c14n11"
+            Nokogiri::XML::XML_C14N_1_1
+          else
+            Nokogiri::XML::XML_C14N_1_0
+        end
       end
     end
   end

data/lib/xmldsig/version.rb

@@ -1,3 +1,3 @@
 module Xmldsig
-  VERSION = '0.4.1'
+  VERSION = '0.5.0'
 end

data/spec/lib/xmldsig_spec.rb

@@ -52,7 +52,7 @@ describe Xmldsig do
       let(:certificate) { OpenSSL::X509::Certificate.new(File.read('spec/fixtures/certificate.cer')) }
 
       it "raises schema error" do
-        expect{ signed_document.validate(certificate) }.to raise_error(Xmldsig::SchemaError)
+        expect { signed_document.validate(certificate) }.to raise_error(Xmldsig::SchemaError)
       end
     end
   end

data/xmldsig.gemspec

@@ -16,5 +16,5 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Xmldsig::VERSION
 
-  gem.add_dependency("nokogiri")
+  gem.add_dependency("nokogiri", '~> 1.6.8')
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: xmldsig
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - benoist
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-23 00:00:00.000000000 Z
+date: 2016-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.8
 description: This gem is a (partial) implementation of the XMLDsig specification
 email:
 - benoist.claassen@gmail.com