xmlenc 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94efb101ace03f35e40da6184f97496ca05cdf9c
-  data.tar.gz: aa624f1dbaaff306a098c52df5f65b8e2f9b6e12
+  metadata.gz: 80959c76fdd31d7d40f3d1d5bb83ffda5d783b0b
+  data.tar.gz: a768a769b244114f6051a718fd3ae30c082cd785
 SHA512:
-  metadata.gz: 09db7cf98de7814559c9634362c1edfedb833c5876ca9fd60b2f96a49f2b68c2e9e3fb91702525909bc4f0a53384053416261e707cfa07094d4f49e4c0fa0a7f
-  data.tar.gz: 9f06d1d39d9cee75aa5879b05ab86784face57a37b5f857c540e67196513a4db794772c0d12f0755de09f81af5bbf27047cc1e0be0320d710340266508d737c6
+  metadata.gz: 09762e2cfa2bb910535b8a7eb89ee6b7dd052683ab5f1e41adff4c80c11bb8166da21bc69e827b2122c5230c62a8f1a65eabb163630d520d3f58664184ccbc1e
+  data.tar.gz: b7dde51da4ba68ef9df4026b37d87ca630ccf60077cd9bd735f23ff433a12c9e2730df160964c718c916cf29c9d6ccca2fb30eb5ef010cd3831397191dbe1be4

data/README.md

@@ -25,7 +25,8 @@ key_pem = File.read('path/to/key.pem')
 xml = File.read('path/to/file.xml')
 
 private_key = OpenSSL::PKey::RSA.new(key_pem)
-decrypted_document = Xmlenc::EncryptedDocument.decrypt(private_key)
+encrypted_document = Xmlenc::EncryptedDocument.new(xml)
+decrypted_document = encrypted_document.decrypt(private_key)
 ```
 
 ### Supported algorithms

data/lib/xmlenc.rb

@@ -7,8 +7,8 @@ require 'nokogiri'
 
 module Xmlenc
   NAMESPACES = {
-      xenc: 'http://www.w3.org/2001/04/xmlenc#',
-      ds:   'http://www.w3.org/2000/09/xmldsig#'
+      :xenc => 'http://www.w3.org/2001/04/xmlenc#',
+      :ds =>   'http://www.w3.org/2000/09/xmldsig#'
   }
 
   class UnsupportedError < StandardError

data/lib/xmlenc/builder/cipher_data.rb

@@ -8,7 +8,7 @@ module Xmlenc
       register_namespace "xenc", Xmlenc::NAMESPACES[:xenc]
       namespace "xenc"
 
-      element :cipher_value, String, namespace: "xenc", tag: "CipherValue"
+      element :cipher_value, String, :namespace => "xenc", :tag => "CipherValue"
     end
   end
 end

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

@@ -8,11 +8,11 @@ module Xmlenc
         included do
           register_namespace "xenc", Xmlenc::NAMESPACES[:xenc]
 
-          has_one :encryption_method, Xmlenc::Builder::EncryptionMethod, xpath: "./"
-          has_one :key_info, Xmlenc::Builder::KeyInfo, xpath: "./"
-          has_one :cipher_data, Xmlenc::Builder::CipherData, xpath: "./"
+          has_one :encryption_method, Xmlenc::Builder::EncryptionMethod, :xpath => "./"
+          has_one :key_info, Xmlenc::Builder::KeyInfo, :xpath => "./"
+          has_one :cipher_data, Xmlenc::Builder::CipherData, :xpath => "./"
 
-          validates :cipher_data, presence: true
+          validates :cipher_data, :presence => true
         end
 
         def initialize(attributes = {})

data/lib/xmlenc/builder/data_reference.rb

@@ -8,7 +8,7 @@ module Xmlenc
       register_namespace "xenc", Xmlenc::NAMESPACES[:xenc]
       namespace "xenc"
 
-      attribute :uri, String, tag: "URI"
+      attribute :uri, String, :tag => "URI"
     end
   end
 end

data/lib/xmlenc/builder/digest_method.rb

@@ -8,9 +8,9 @@ module Xmlenc
       register_namespace "ds", Xmlenc::NAMESPACES[:ds]
       namespace "ds"
 
-      attribute :algorithm, String, tag: "Algorithm"
+      attribute :algorithm, String, :tag => "Algorithm"
 
-      validates :algorithm, presence: true
+      validates :algorithm, :presence => true
     end
   end
 end

data/lib/xmlenc/builder/encrypted_data.rb

@@ -16,8 +16,8 @@ module Xmlenc
       tag "EncryptedData"
       namespace "xenc"
 
-      attribute :id, String, tag: "Id"
-      attribute :type, String, tag: "Type"
+      attribute :id, String, :tag => "Id"
+      attribute :type, String, :tag => "Type"
 
       def type
         'http://www.w3.org/2001/04/xmlenc#Element'
@@ -30,10 +30,10 @@ module Xmlenc
 
       def encrypt(data)
         encryptor = algorithm.setup
-        encrypted = encryptor.encrypt(data, node: encryption_method)
+        encrypted = encryptor.encrypt(data, :node => encryption_method)
         cipher_data.cipher_value = Base64.encode64(encrypted)
 
-        encrypted_key = EncryptedKey.new(data: encryptor.key)
+        encrypted_key = EncryptedKey.new(:data => encryptor.key)
         encrypted_key.add_data_reference(id)
         encrypted_key
       end

data/lib/xmlenc/builder/encrypted_key.rb

@@ -11,7 +11,7 @@ module Xmlenc
       tag "EncryptedKey"
       namespace "xenc"
 
-      has_one :reference_list, Xmlenc::Builder::ReferenceList, xpath: "./"
+      has_one :reference_list, Xmlenc::Builder::ReferenceList, :xpath => "./"
 
       attr_accessor :data
 

data/lib/xmlenc/builder/encryption_method.rb

@@ -8,14 +8,14 @@ module Xmlenc
       register_namespace "xenc", Xmlenc::NAMESPACES[:xenc]
       namespace "xenc"
 
-      attribute :algorithm, String, tag: "Algorithm"
+      attribute :algorithm, String, :tag => "Algorithm"
       has_one :digest_method, Xmlenc::Builder::DigestMethod
 
-      validates :algorithm, presence: true
+      validates :algorithm, :presence => true
 
       def initialize(attributes = {})
         digest_method_algorithm = attributes.delete(:digest_method_algorithm)
-        attributes[:digest_method] = Xmlenc::Builder::DigestMethod.new(algorithm: digest_method_algorithm)
+        attributes[:digest_method] = Xmlenc::Builder::DigestMethod.new(:algorithm => digest_method_algorithm)
         super
       end
     end

data/lib/xmlenc/builder/key_info.rb

@@ -8,9 +8,9 @@ module Xmlenc
       register_namespace "ds", Xmlenc::NAMESPACES[:ds]
       namespace "ds"
 
-      element :key_name, String, namespace: "ds", tag: "KeyName"
+      element :key_name, String, :namespace => "ds", :tag => "KeyName"
 
-      has_one :encrypted_key, Xmlenc::Builder::EncryptedKey, xpath: "./"
+      has_one :encrypted_key, Xmlenc::Builder::EncryptedKey, :xpath => "./"
     end
   end
 end

data/lib/xmlenc/builder/reference_list.rb

@@ -8,11 +8,11 @@ module Xmlenc
       register_namespace "xenc", Xmlenc::NAMESPACES[:xenc]
       namespace "xenc"
 
-      has_many :data_references, Xmlenc::Builder::DataReference, xpath: "./"
+      has_many :data_references, Xmlenc::Builder::DataReference, :xpath => "./"
 
       def add_data_reference(data_id)
         self.data_references ||= []
-        self.data_references << DataReference.new(uri: "##{data_id}")
+        self.data_references << DataReference.new(:uri => "##{data_id}")
       end
     end
   end

data/lib/xmlenc/encrypted_data.rb

@@ -35,14 +35,14 @@ module Xmlenc
 
     def decrypt(key)
       decryptor = algorithm.setup(key)
-      decrypted = decryptor.decrypt(Base64.decode64(cipher_value), node: encryption_method)
+      decrypted = decryptor.decrypt(Base64.decode64(cipher_value), :node => encryption_method)
       @node.replace(decrypted) unless @node == document.root
       decrypted
     end
 
     def encrypt(data)
       encryptor = algorithm.setup
-      encrypted = encryptor.encrypt(data, node: encryption_method)
+      encrypted = encryptor.encrypt(data, :node => encryption_method)
       self.cipher_value = Base64.encode64(encrypted)
       encryptor.key
     end

data/lib/xmlenc/encrypted_key.rb

@@ -31,12 +31,12 @@ module Xmlenc
 
     def decrypt(key)
       decryptor = algorithm.new(key)
-      decryptor.decrypt(Base64.decode64(cipher_value), node: encryption_method)
+      decryptor.decrypt(Base64.decode64(cipher_value), :node => encryption_method)
     end
 
     def encrypt(key, data)
       encryptor = algorithm.new(key)
-      encrypted = encryptor.encrypt(data, node: encryption_method)
+      encrypted = encryptor.encrypt(data, :node => encryption_method)
       self.cipher_value = Base64.encode64(encrypted)
     end
 

data/lib/xmlenc/version.rb

@@ -1,3 +1,3 @@
 module Xmlenc
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 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_true
     end
 
     it "raises an error if the message cannot be parsed" do

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

@@ -9,7 +9,7 @@ end
 describe Xmlenc::Builder::ComplexTypes::EncryptedType do
 
   let(:xml) { File.read File.join("spec", "fixtures", "encrypted_document.xml") }
-  subject   { EncryptedTypeDummy.new.parse(xml, single: true) }
+  subject   { EncryptedTypeDummy.new.parse(xml, :single => true) }
 
   describe "required fields" do
     it "should have the cipher data field" do

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

@@ -3,7 +3,7 @@ require "spec_helper"
 describe Xmlenc::Builder::DataReference do
 
   let(:xml) { File.read File.join("spec", "fixtures", "template2.xml") }
-  subject { described_class.parse(xml, single: true) }
+  subject { described_class.parse(xml, :single => true) }
 
   describe "#parse" do
     it "should have uri attribute" do

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

@@ -3,7 +3,7 @@ require "spec_helper"
 describe Xmlenc::Builder::DigestMethod do
 
   let(:xml) { File.read File.join("spec", "fixtures", "template2.xml") }
-  subject { described_class.parse(xml, single: true) }
+  subject { described_class.parse(xml, :single => true) }
 
   describe "#parse" do
     it "should have one algorithm" do

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

@@ -3,7 +3,7 @@ require "spec_helper"
 describe Xmlenc::Builder::EncryptedData do
 
   let(:xml) { File.read File.join("spec", "fixtures", "encrypted_document.xml") }
-  subject   { described_class.parse(xml, single: true) }
+  subject   { described_class.parse(xml, :single => true) }
 
   describe "required fields" do
     it "should have the cipher data field" do

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

@@ -3,7 +3,7 @@ require "spec_helper"
 describe Xmlenc::Builder::EncryptedKey do
 
   let(:xml) { File.read File.join("spec", "fixtures", "encrypted_document.xml") }
-  subject   { described_class.parse(xml, single: true) }
+  subject   { described_class.parse(xml, :single => true) }
 
   describe "required fields" do
     it "should have the cipher data field" do

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

@@ -3,7 +3,7 @@ require "spec_helper"
 describe Xmlenc::Builder::EncryptionMethod do
 
   let(:xml) { File.read File.join("spec", "fixtures", "encrypted_document.xml") }
-  subject   { described_class.parse(xml, single: true) }
+  subject   { described_class.parse(xml, :single => true) }
 
   describe "required fields" do
     it "should have the algorithm field" do

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

@@ -3,7 +3,7 @@ require "spec_helper"
 describe Xmlenc::Builder::ReferenceList do
 
   let(:xml) { File.read File.join("spec", "fixtures", "template2.xml") }
-  subject { described_class.parse(xml, single: true) }
+  subject { described_class.parse(xml, :single => true) }
 
   describe "#parse" do
     it "has data" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xmlenc
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Benoist
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-12 00:00:00.000000000 Z
+date: 2015-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -193,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A (partial)implementation of the XMLENC specificiation