xmldsig 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98aac2a76000eb71d7ffa6c40da165f06be77e8c
-  data.tar.gz: 0d27d369a535d97ba1df2f9569046af06ca7e794
+  metadata.gz: 96f6cce84663869fcc116f7468d838596f071814
+  data.tar.gz: 4d4c59ff3419b6f450b804a3d7ae00c02a4d7c3e
 SHA512:
-  metadata.gz: 5eb81ff2508010a34823abf06e2ab49ee79e8dc7b190a2bc4a8a96ab9a58ba8120a5442fb304ee46e842cd8c9d35e2e1f5e6405db231df9c1a997d317e96c305
-  data.tar.gz: 23763f54372e453c23b29f75037389ab318874469a0e14296cedcaa2b9a946dea3c299156acd2185171a98ee700cf3633827ed9039769b707579c53f0b5ee19a
+  metadata.gz: 47df30bf57027840f070b89c7008c0532f5461fb021da00671d149c7e9e4b519c1df39f5d92b574b4addf627ba9a9800dc340a4d417f64359c08c2a1ca60b982
+  data.tar.gz: 33f8d0eaf16ba7cdd032e9f1c2916e38d1d70b1c32fe9722868cf45bd53b7d6663da55361ee294a9dba5517a9ef8398f270f1bc4c44bbe58242cf47cbd5abb2b

data/lib/xmldsig/signed_document.rb

@@ -3,7 +3,11 @@ module Xmldsig
     attr_accessor :document
 
     def initialize(document, options = {})
-      @document = Nokogiri::XML(document, nil, nil, Nokogiri::XML::ParseOptions::STRICT)
+      @document = if document.kind_of?(Nokogiri::XML::Document)
+        document
+      else
+        Nokogiri::XML(document, nil, nil, Nokogiri::XML::ParseOptions::STRICT)
+      end
     end
 
     def validate(certificate = nil, &block)

data/lib/xmldsig/version.rb

@@ -1,3 +1,3 @@
 module Xmldsig
-  VERSION = '0.2.5'
+  VERSION = '0.2.6'
 end

data/spec/lib/xmldsig/signature_spec.rb

@@ -74,7 +74,7 @@ describe Xmldsig::Signature do
 
   describe "#valid?" do
     it "returns true with the correct certificate" do
-      signature.valid?(certificate).should be_true
+      signature.valid?(certificate).should be == true
     end
 
     it "returns false if the xml changed" do
@@ -86,7 +86,7 @@ describe Xmldsig::Signature do
     end
 
     it "returns false with a difference certificate" do
-      signature.valid?(other_certificate).should be_false
+      signature.valid?(other_certificate).should be == false
     end
 
     it "accepts a block" do

data/spec/lib/xmldsig/signed_document_spec.rb

@@ -26,6 +26,12 @@ describe Xmldsig::SignedDocument do
         described_class.new(badly_formed)
       }.to raise_error
     end
+
+    it "accepts a nokogiri document" do
+      doc = Nokogiri::XML(unsigned_xml)
+      signed_document = described_class.new(doc)
+      signed_document.document.should be_a(Nokogiri::XML::Document)
+    end
   end
 
   describe "#signatures" do
@@ -49,36 +55,36 @@ describe Xmldsig::SignedDocument do
 
   describe "#validate" do
     it "returns true if the signature and digest value are correct" do
-      signed_document.validate(certificate).should be_true
+      signed_document.validate(certificate).should be == true
     end
 
     it "returns false if the certificate is not valid" do
-      signed_document.validate(other_certificate).should be_false
+      signed_document.validate(other_certificate).should be == false
     end
 
     it "returns false if there are no signatures and validation is strict" do
       xml_without_signature = Xmldsig::SignedDocument.new('<foo></foo>')
-      xml_without_signature.validate(certificate).should be_false
+      xml_without_signature.validate(certificate).should be == false
     end
 
     it "accepts a block" do
       signed_document.validate do |signature_value, data|
         certificate.public_key.verify(OpenSSL::Digest::SHA256.new, signature_value, data)
-      end.should be_true
+      end.should be == true
     end
   end
 
   describe "#sign" do
     it "returns a signed document" do
       signed_document = unsigned_document.sign(private_key)
-      Xmldsig::SignedDocument.new(signed_document).validate(certificate).should be_true
+      Xmldsig::SignedDocument.new(signed_document).validate(certificate).should be == true
     end
 
     it "accepts a block" do
       signed_document = unsigned_document.sign do |data|
         private_key.sign(OpenSSL::Digest::SHA256.new, data)
       end
-      Xmldsig::SignedDocument.new(signed_document).validate(certificate).should be_true
+      Xmldsig::SignedDocument.new(signed_document).validate(certificate).should be == true
     end
   end
 
@@ -89,7 +95,7 @@ describe Xmldsig::SignedDocument do
     let(:signed_document) { unsigned_document.sign(private_key) }
 
     it "when signed should be valid" do
-      Xmldsig::SignedDocument.new(signed_document).validate(certificate).should be_true
+      Xmldsig::SignedDocument.new(signed_document).validate(certificate).should be == true
     end
 
     it "should sign 2 elements" do
@@ -98,8 +104,8 @@ describe Xmldsig::SignedDocument do
 
     it "allows individual signs" do
       unsigned_document.signatures.last.sign(private_key)
-      unsigned_document.validate(certificate).should be_false
-      unsigned_document.signatures.last.valid?(certificate).should be_true
+      unsigned_document.validate(certificate).should be == false
+      unsigned_document.signatures.last.valid?(certificate).should be == true
     end
   end
 

data/spec/lib/xmldsig_spec.rb

@@ -12,7 +12,7 @@ describe Xmldsig do
         let(:signed_document) { unsigned_document.sign(private_key) }
 
         it "should be signable an validateable" do
-          Xmldsig::SignedDocument.new(signed_document).validate(certificate).should be_true
+          Xmldsig::SignedDocument.new(signed_document).validate(certificate).should be == true
         end
 
         it 'should have a signature element' do
@@ -38,7 +38,7 @@ describe Xmldsig do
         let(:certificate) { OpenSSL::X509::Certificate.new(File.read(document.gsub('.txt', '.cert'))) }
 
         it "should be validateable" do
-          signed_document.validate(certificate).should be_true
+          signed_document.validate(certificate).should be == true
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xmldsig
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - benoist
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-01 00:00:00.000000000 Z
+date: 2015-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -96,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: This gem is a (partial) implementation of the XMLDsig specification (http://www.w3.org/TR/xmldsig-core)