xmlenc 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43a28e1294fa06dd78706f950aa952f66e846e5a
-  data.tar.gz: 1a0ca77fe7935b3e60e2ec8ef32df91ef9c9717e
+  metadata.gz: 869074b32ca2144be9a0c5b4344e2a962b067096
+  data.tar.gz: e33dd060461d348bec6c2160ae83c7997341e572
 SHA512:
-  metadata.gz: 425afdca319a8b8dfe4c39ef12002009f2943d3c9bf943b9d7dd7c1f0a6944e4610c0b6e7e2f81e695815842188e91ef4238f0b92a9d79c03479f4ab2b215b51
-  data.tar.gz: cee795932daba6734ce9c6d70dff6d7ebbdeb3e5f616514bea6aad36df415a4e1afaf7a296ac6e04e2c02ed7ecf4e78d4b2442af45ad8448e72f4a0ae9dcdf86
+  metadata.gz: 3216e9fef6a70ed78735a8cc6587dd22e1a1c8ced0d6ef21ec125203e0778f2379374a3bbfa9a2f9b4ed962cb49146fd71d319f42ceda0f2e4319e2284b83cc6
+  data.tar.gz: 7e80bcaaa65527a1bea1b932ee159bcd225c5335bb58601239e8de4aa64ed6993c90987a9c884d60fc90292253f98da1cebf979fc45c36a9a7d1cd130e2d26b6

data/lib/xmlenc/builder/base.rb

@@ -31,6 +31,8 @@ module Xmlenc
 
       module HappyMapperClassMethods
         def parse(xml, options = {})
+          raise Xmlenc::UnparseableMessage("Unable to parse nil document") if xml.nil?
+
           object = super
           if object.is_a?(Array)
             object.map { |x| x.from_xml = true }

data/lib/xmlenc/builder/complex_types/encrypted_type.rb

@@ -23,6 +23,13 @@ module Xmlenc
         def set_encryption_method(attributes = {})
           self.encryption_method = EncryptionMethod.new(attributes)
         end
+
+        def set_key_name(key_name)
+          if key_name
+            self.key_info ||= KeyInfo.new
+            self.key_info.key_name = key_name
+          end
+        end
       end
     end
   end

data/lib/xmlenc/version.rb

@@ -1,3 +1,3 @@
 module Xmlenc
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/spec/lib/xmlenc/builder/base_spec.rb

@@ -9,7 +9,7 @@ end
 describe BaseDummy do
   describe "parse override" do
     it "sets the from_xml flag" do
-      BaseDummy.parse("<tag></tag>", :single => true).from_xml?.should be_true
+      BaseDummy.parse("<tag></tag>", :single => true).from_xml?.should be_truthy
     end
 
     it "raises an error if the message cannot be parsed" do

data/spec/lib/xmlenc/builder/complex_types/encrypted_type_spec.rb

@@ -18,7 +18,8 @@ describe Xmlenc::Builder::ComplexTypes::EncryptedType do
 
     it "should check the presence of cipher data" do
       subject.cipher_data = nil
-      expect(subject).to have(1).error_on :cipher_data
+      expect(subject).to_not be_valid
+      expect(subject.errors[:cipher_data].size).to eq(1)
     end
   end
 
@@ -35,6 +36,24 @@ describe Xmlenc::Builder::ComplexTypes::EncryptedType do
     end
   end
 
+  describe "#set_key_name" do
+    it "sets the key info with the key name" do
+      subject.set_key_name("key name")
+      expect(subject.key_info.key_name).to eq "key name"
+    end
+
+    it "does not override old key info data" do
+      subject.set_key_name("key name")
+      expect(subject.key_info.encrypted_key).not_to be_nil
+    end
+
+    it "does not set the key info element if the keyname is nil" do
+      subject.key_info = nil
+      subject.set_key_name(nil)
+      expect(subject.key_info).to be_nil
+    end
+  end
+
   describe "#parse" do
     describe "encryption method" do
       it "should create an EncryptionMethod element" do

data/spec/lib/xmlenc/builder/digest_method_spec.rb

@@ -12,7 +12,8 @@ describe Xmlenc::Builder::DigestMethod do
 
     it "raises error when no algorithm" do
       subject.algorithm = nil
-      expect(subject).to have(1).error_on :algorithm
+      expect(subject).to_not be_valid
+      expect(subject.errors[:algorithm].size).to eq(1)
     end
   end
 end

data/spec/lib/xmlenc/builder/encrypted_data_spec.rb

@@ -12,7 +12,8 @@ describe Xmlenc::Builder::EncryptedData do
 
     it "should check the presence of cipher data" do
       subject.cipher_data = nil
-      expect(subject).to have(1).error_on :cipher_data
+      expect(subject).to_not be_valid
+      expect(subject.errors[:cipher_data].size).to eq(1)
     end
   end
 

data/spec/lib/xmlenc/builder/encrypted_key_spec.rb

@@ -12,7 +12,8 @@ describe Xmlenc::Builder::EncryptedKey do
 
     it "should check the presence of cipher data" do
       subject.cipher_data = nil
-      expect(subject).to have(1).error_on :cipher_data
+      expect(subject).to_not be_valid
+      expect(subject.errors[:cipher_data].size).to eq(1)
     end
   end
 

data/spec/lib/xmlenc/builder/encryption_method_spec.rb

@@ -12,7 +12,8 @@ describe Xmlenc::Builder::EncryptionMethod do
 
     it "should check the presence of algorithm" do
       subject.algorithm = nil
-      expect(subject).to have(1).error_on :algorithm
+      expect(subject).to_not be_valid
+      expect(subject.errors[:algorithm].size).to eq(1)
     end
   end
 

data/spec/lib/xmlenc/encrypted_data_spec.rb

@@ -46,9 +46,10 @@ describe Xmlenc::EncryptedData do
 
     describe 'aes256-cbc' do
       it 'replaces returns the decrypted value' do
-        encrypted_data_node.at_xpath('./xenc:EncryptionMethod', Xmlenc::NAMESPACES).replace <<-XML
-          <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"></EncryptionMethod>
+        fragment = <<-XML
+          <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc" xmlns="http://www.w3.org/2001/04/xmlenc#"></EncryptionMethod>
         XML
+        encrypted_data_node.at_xpath('./xenc:EncryptionMethod', Xmlenc::NAMESPACES).replace(Nokogiri::XML::DocumentFragment.parse(fragment))
         subject.stub(:cipher_value) { 'DpNYC0Np5hHaQAUyHWpM3MQ99wkDFtGRc7TywqxmhI4sJKDXM5SRjVlKf6st5wOz' }
         key = %w(b0621c35317af207b92e3a6b317a122a93772a7261e3f13a4297eb64a91af10a).pack('H*')
 
@@ -58,9 +59,11 @@ describe Xmlenc::EncryptedData do
 
     describe 'des3-cbc' do
       it 'replaces returns the decrypted value' do
-        encrypted_data_node.at_xpath('./xenc:EncryptionMethod', Xmlenc::NAMESPACES).replace <<-XML
-            <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"></EncryptionMethod>
+        fragment = <<-XML
+            <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc" xmlns="http://www.w3.org/2001/04/xmlenc#"></EncryptionMethod>
         XML
+
+        encrypted_data_node.at_xpath('./xenc:EncryptionMethod', Xmlenc::NAMESPACES).replace(Nokogiri::XML::DocumentFragment.parse(fragment))
         subject.stub(:cipher_value) { 'kY6scZxpyRXQbaDZp+LbuvSFYgmI3pQrfsrCVt3/9sZzpeUTPXJEatQ5KPOXYpJC
                                       Gid01h/T8PIezic0Ooz/jU+r3kYMKesMYiXin4CXTZYcGhd0TjmOd4kg1vlhE8kt
                                       WLC7JDzFLPAqXbOug3ghmWunFiUETbGJaF5V4AHIoZrYP+RS3DTLgJcATuDeWyOd

data/spec/lib/xmlenc/encrypted_document_spec.rb

@@ -31,7 +31,7 @@ describe Xmlenc::EncryptedDocument do
 
     it 'converts the elements to EncryptedKey' do
       all_converted = subject.encrypted_keys.all? { |ek| ek.is_a?(Xmlenc::EncryptedKey) }
-      expect(all_converted).to be_true
+      expect(all_converted).to be_truthy
     end
   end
 

data/spec/lib/xmlenc/encrypted_key_spec.rb

@@ -68,21 +68,24 @@ describe Xmlenc::EncryptedKey do
           SBMpGzkVfDuv8aAFXOtf+LV67Ov6hJAt7FB65tE9Hg==
         CV
 
-        encrypted_key_node.at_xpath('./xenc:EncryptionMethod', Xmlenc::NAMESPACES).replace <<-XML
-          <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p">
+        fragment = <<-XML
+          <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p" xmlns="http://www.w3.org/2001/04/xmlenc#">
             <ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" xmlns:ds="http://www.w3.org/2000/09/xmldsig#"/>
           </EncryptionMethod>
         XML
+        encrypted_key_node.at_xpath('./xenc:EncryptionMethod', Xmlenc::NAMESPACES).replace(Nokogiri::XML::DocumentFragment.parse(fragment)) 
       end
 
       describe 'with unsupported digest method' do
         it 'raises an unsupported error' do
-          encrypted_key_node.at_xpath('./xenc:EncryptionMethod', Xmlenc::NAMESPACES).replace <<-XML
-            <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p">
+          fragment = <<-XML
+            <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p" xmlns="http://www.w3.org/2001/04/xmlenc#">
               <ds:DigestMethod Algorithm="unsupported" xmlns:ds="http://www.w3.org/2000/09/xmldsig#"/>
             </EncryptionMethod>
           XML
 
+          encrypted_key_node.at_xpath('./xenc:EncryptionMethod', Xmlenc::NAMESPACES).replace(Nokogiri::XML::DocumentFragment.parse(fragment)) 
+
           expect {
             subject.decrypt(private_key)
           }.to raise_error(Xmlenc::UnsupportedError)
@@ -96,10 +99,12 @@ describe Xmlenc::EncryptedKey do
 
     describe 'with unsupported algorithm' do
       it 'raises an unsupported error' do
-        encrypted_key_node.at_xpath('./xenc:EncryptionMethod', Xmlenc::NAMESPACES).replace <<-XML
-          <EncryptionMethod Algorithm="unsupported"></EncryptionMethod>
+        fragment = <<-XML
+          <EncryptionMethod Algorithm="unsupported" xmlns="http://www.w3.org/2001/04/xmlenc#"></EncryptionMethod>
         XML
 
+        encrypted_key_node.at_xpath('./xenc:EncryptionMethod', Xmlenc::NAMESPACES).replace(Nokogiri::XML::DocumentFragment.parse(fragment))
+
         expect {
           subject.decrypt(private_key)
         }.to raise_error(Xmlenc::UnsupportedError)

data/spec/lib/xmlenc/phaos_compat_spec.rb

@@ -84,7 +84,7 @@ describe 'Phaos compatibility tests' do
       result     = cipher.update(data_cipher[cipher.iv_len..-1])
       result << cipher.final
 
-      doc.at_xpath('//xenc:EncryptedData', Xmlenc::NAMESPACES).replace(result)
+      doc.at_xpath('//xenc:EncryptedData', Xmlenc::NAMESPACES).replace(Nokogiri::XML::DocumentFragment.parse(result))
       expect(doc.to_xml.chomp).to be == plain_xml
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xmlenc
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Benoist
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-24 00:00:00.000000000 Z
+date: 2015-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport