xmldsig 0.2.0 → 0.2.1

data/.gitignore

@@ -16,3 +16,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.idea

data/lib/xmldsig/signed_document.rb

@@ -20,7 +20,7 @@ module Xmldsig
     end
 
     def signatures
-      document.xpath("//ds:Signature", NAMESPACES).collect { |node| Signature.new(node) } || []
+      document.xpath("//ds:Signature", NAMESPACES).reverse.collect { |node| Signature.new(node) } || []
     end
   end
 end

data/lib/xmldsig/transforms/enveloped_signature.rb

@@ -2,7 +2,7 @@ module Xmldsig
   class Transforms < Array
     class EnvelopedSignature < Transform
       def transform
-        node.xpath("descendant::ds:Signature", Xmldsig::NAMESPACES).remove
+        node.xpath("descendant::ds:Signature", Xmldsig::NAMESPACES).first.remove
         node
       end
     end

data/lib/xmldsig/version.rb

@@ -1,3 +1,3 @@
 module Xmldsig
-  VERSION = "0.2.0"
+  VERSION = '0.2.1'
 end

data/spec/lib/xmldsig/signed_document_spec.rb

@@ -17,9 +17,16 @@ describe Xmldsig::SignedDocument do
   end
 
   describe "#signatures" do
+    let(:unsigned_xml) { File.read("spec/fixtures/unsigned_nested_signature.xml") }
+    let(:unsigned_document) { Xmldsig::SignedDocument.new(unsigned_xml) }
+
     it "returns only the signed nodes" do
       signed_document.signatures.should be_all { |signature| signature.is_a?(Xmldsig::Signature) }
     end
+
+    it "returns the nested signatures first" do
+      unsigned_document.signatures.first.references.first.reference_uri.should == '#baz'
+    end
   end
 
   describe "#signed_nodes" do
@@ -36,7 +43,7 @@ describe Xmldsig::SignedDocument do
     it "returns false if the certificate is not valid" do
       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

data/spec/lib/xmldsig/transforms/enveloped_signature_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe Xmldsig::Transforms::EnvelopedSignature do
+  let(:unsigned_xml) { File.read('spec/fixtures/unsigned_nested_signature.xml') }
+  let(:unsigned_document) { Xmldsig::SignedDocument.new(unsigned_xml) }
+
+  it 'only removes the first signature element' do
+    node_with_nested_signature = unsigned_document.signatures.last.references.first.referenced_node
+
+    described_class.new(node_with_nested_signature, nil).transform
+
+    remaining_signatures = node_with_nested_signature.xpath('descendant::ds:Signature', Xmldsig::NAMESPACES)
+    remaining_signatures.count.should == 1
+    signature = Xmldsig::Signature.new(remaining_signatures.first)
+
+    signature.references.first.reference_uri.should == '#baz'
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xmldsig
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-30 00:00:00.000000000 Z
+date: 2013-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -69,6 +69,7 @@ files:
 - spec/lib/xmldsig/reference_spec.rb
 - spec/lib/xmldsig/signature_spec.rb
 - spec/lib/xmldsig/signed_document_spec.rb
+- spec/lib/xmldsig/transforms/enveloped_signature_spec.rb
 - spec/lib/xmldsig/transforms/transform_spec.rb
 - spec/lib/xmldsig_spec.rb
 - spec/spec_helper.rb
@@ -115,6 +116,7 @@ test_files:
 - spec/lib/xmldsig/reference_spec.rb
 - spec/lib/xmldsig/signature_spec.rb
 - spec/lib/xmldsig/signed_document_spec.rb
+- spec/lib/xmldsig/transforms/enveloped_signature_spec.rb
 - spec/lib/xmldsig/transforms/transform_spec.rb
 - spec/lib/xmldsig_spec.rb
 - spec/spec_helper.rb