encryption 1.1.2 → 1.1.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    encryption (1.1.0)
+    encryption (1.1.3)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -83,7 +83,7 @@ private_key.to_pem('passphrase')
 
   `Encryption::PublicKey` and `Encryption::PrivateKey`
   ----------------------------------------------------
-  Both classes have the same syntax
+  Both classes have the same methods
 
   ```ruby
 # Import an existing key
@@ -92,13 +92,12 @@ Encryption::PublicKey.new(string[, password]) # From string
 
 # Encrypt / Decrypt data
 public_key = Encryption::PublicKey.new("existing key")
-public_key.encrypt("Hello!")
-public_key.encrypt("H3LL0¡")
+public_key.encrypt("2001: A Space Odyssey")
+public_key.decrypt("H3LL0¡")
 
 # Note that you can use both public and private keys to encrypt and decrypt data
   ```
 
-
 Helpers
 -------
   String helper
@@ -113,13 +112,19 @@ Helpers
 "h3LL0".decrypt!
 
 # With custom settings (and custom encryptor instance)
-"Hello".encrypt({ key: 'encryption key', iv: 'initialization vector', cipher: 'encryption algorithm' })
+"Contact".encrypt({ key: 'encryption key', iv: 'initialization vector', cipher: 'encryption algorithm' })
+
+# Or with a custom encryptor
+encryptor = Encryption::Symmetric.new
+encryptor.key = 'random string'
+"Interstate 60".encrypt(encryptor: encryptor)
   ```
 
 License
 -------
-This gem is distributed under the MIT License.
+This gem is distributed under The MIT License.
 
   Author
   ------
-  Itay Grudev - ![Itay Grudev](http://safemail.justlikeed.net/e/a5307c0c2dd405f756cab9f4c76cd63a.png)
+  Itay Grudev  
+    ![Itay Grudev](http://safemail.justlikeed.net/e/a5307c0c2dd405f756cab9f4c76cd63a.png)

data/encryption.gemspec

@@ -2,7 +2,7 @@ require 'date'
 
 Gem::Specification.new do |s|
   s.name        = 'encryption'
-  s.version     = '1.1.2'
+  s.version     = '1.1.3'
   s.date        = Date.today.to_s
   s.summary     = 'A simple wrapper for the OpenSSL Cipher library'
   s.description = 'Encryption provides a simple interface for symmetric / asymmetric encryption with the OpenSSL Cipher library'

data/lib/helpers/string.rb

@@ -21,6 +21,7 @@ module Encryption
 
     def encryptor(options)
       return Encryption if options.empty?
+      return options[:encryptor] if ! options[:encryptor].nil?
 
       encrypt = Encryption::Symmetric.new
 

data/lib/modules/symmetric.rb

@@ -20,35 +20,26 @@ module Encryption
     end
 
     def encrypt(data)
-      cipher_init
+      cipher_init(:cipher, :encrypt)
       @cipher.update(data) + @cipher.final
     end
 
     def decrypt(data)
-      decipher_init
+      cipher_init(:decipher, :decrypt)
       @decipher.update(data) + @decipher.final
     end
 
     private
-    
-    def cipher_init
-      if @cipher.nil?
-        @cipher = OpenSSL::Cipher.new(@configuration.cipher)
-        @cipher.encrypt
-      end
 
-      @cipher.key = @configuration.key
-      @cipher.iv = @configuration.iv
-    end
-
-    def decipher_init
-      if @decipher.nil?
-        @decipher = OpenSSL::Cipher.new(@configuration.cipher)
-        @decipher.decrypt
+    def cipher_init(name, mode)
+      obj = instance_variable_get((name = '@' + name.to_s))
+      if obj.nil?
+        obj = instance_variable_set(name, OpenSSL::Cipher.new(@configuration.cipher))
+        obj.send mode
       end
-
-      @decipher.key = @configuration.key
-      @decipher.iv = @configuration.iv
+      
+      obj.key = @configuration.key
+      obj.iv = @configuration.iv
     end
 
   end

data/spec/helpers/string_spec.rb

@@ -40,4 +40,24 @@ describe String do
     end
   end
 
+  describe "with custom encryptor" do
+    before(:each) do
+      @string = String.random
+      encryptor = Encryption::Symmetric.new
+      encryptor.key = String.random
+      encryptor.iv = String.random
+      @options = {
+        encryptor: encryptor
+      }
+    end
+
+    it 'should generate encryption different then the original string' do
+      @string.encrypt(@options).should_not == @string
+    end
+
+    it 'should decrypt, encrypted values and match the original string' do
+      @string.encrypt(@options).decrypt(@options).should == @string
+    end
+  end
+
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: encryption
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
+  prerelease: 
 platform: ruby
 authors:
 - Itay Grudev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-30 00:00:00.000000000 Z
+date: 2013-03-31 00:00:00.000000000 Z
 dependencies: []
 description: Encryption provides a simple interface for symmetric / asymmetric encryption
   with the OpenSSL Cipher library
@@ -53,25 +54,26 @@ files:
 homepage: https://github.com/Itehnological/encryption
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A simple wrapper for the OpenSSL Cipher library
 test_files: []

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YTBkNmY0MjNlNGVlZjI2NzNlOGM3NDBjM2UxYzlmYTJiMDI0MTcxYQ==
-  data.tar.gz: !binary |-
-    MGY0ZjExNjA3NGI2Yzk1ZGQ0NzM5YmQyZDM4ZmUxMDNjMmQwODYzMA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    OWEyYWE2NzU0ZWQ2YmZkZmJhMmY4Yjc3ZGFlZWZiZTlhYTAxNDcwODQ5OTMx
-    Mjg1YjE5Njg2MmE2NWE0NmQ4NjExYWQ0MWQ0ZTY1ZTQ3NTM0ODZkNTZjOWVm
-    MmFmYzJhMGExOGYyMWJhMWFlODAzYzE5OWQ0ZDA3ZDExMDZkMjc=
-  data.tar.gz: !binary |-
-    ZDY1MjhkMTk1YWQ4YzQ1OTY3OTI5YTdiZmU5NTRmODE0MGVjZDQ3YWMyZTk5
-    ZjdhZjAxYzFhYThmN2I4Njc4ODliN2U3YzRmMGM5YTljYzk4Yzk3MDUyZDBi
-    NDY2ZGQ4ZmZmYzIwOGM2MGQ1MzBkOWNiNGNmMmY1N2E3YTEzOTk=