encryptor 1.1.2 → 1.1.3

data/lib/encryptor.rb

@@ -27,8 +27,8 @@ module Encryptor
   #   encrypted_value = Encryptor.encrypt(:value => 'some string to encrypt', :key => 'some secret key')
   #   # or
   #   encrypted_value = Encryptor.encrypt('some string to encrypt', :key => 'some secret key')
-  def encrypt(*args)
-    crypt :encrypt, *args
+  def encrypt(*args, &block)
+    crypt :encrypt, *args, &block
   end
 
   # Decrypts a <tt>:value</tt> with a specified <tt>:key</tt>
@@ -40,14 +40,15 @@ module Encryptor
   #   decrypted_value = Encryptor.decrypt(:value => 'some encrypted string', :key => 'some secret key')
   #   # or
   #   decrypted_value = Encryptor.decrypt('some encrypted string', :key => 'some secret key')
-  def decrypt(*args)
-    crypt :decrypt, *args
+  def decrypt(*args, &block)
+    crypt :decrypt, *args, &block
   end
 
   protected
 
     def crypt(cipher_method, *args) #:nodoc:
       options = default_options.merge(:value => args.first).merge(args.last.is_a?(Hash) ? args.last : {})
+      raise ArgumentError.new('must specify a :key') if options[:key].to_s.empty?
       cipher = OpenSSL::Cipher::Cipher.new(options[:algorithm])
       cipher.send(cipher_method)
       if options[:iv]
@@ -56,6 +57,7 @@ module Encryptor
       else
         cipher.pkcs5_keyivgen(options[:key])
       end
+      yield cipher, options if block_given?
       result = cipher.update(options[:value])
       result << cipher.final
     end

data/lib/encryptor/version.rb

@@ -3,7 +3,7 @@ module Encryptor
   module Version
     MAJOR = 1
     MINOR = 1
-    PATCH = 2
+    PATCH = 3
 
     # Returns a version string by joining <tt>MAJOR</tt>, <tt>MINOR</tt>, and <tt>PATCH</tt> with <tt>'.'</tt>
     #

data/test/encryptor_test.rb

@@ -88,4 +88,17 @@ class EncryptorTest < Test::Unit::TestCase
     assert !Encryptor.default_options[:algorithm].empty?
   end
 
+  def test_should_raise_argument_error_if_key_is_not_specified
+    assert_raises(ArgumentError) { Encryptor.encrypt('some value') }
+    assert_raises(ArgumentError) { Encryptor.decrypt('some encrypted string') }
+    assert_raises(ArgumentError) { Encryptor.encrypt('some value', :key => '') }
+    assert_raises(ArgumentError) { Encryptor.decrypt('some encrypted string', :key => '') }
+  end
+
+  def test_should_yield_block_with_cipher_and_options
+    called = false
+    Encryptor.encrypt('some value', :key => 'some key') { |cipher, options| called = true }
+    assert called
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: encryptor
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 1
-  - 2
-  version: 1.1.2
+  - 3
+  version: 1.1.3
 platform: ruby
 authors: 
 - Sean Huber
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-02 00:00:00 -07:00
+date: 2011-04-12 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -41,11 +41,8 @@ homepage: http://github.com/shuber/encryptor
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --line-numbers
-- --inline-source
-- --main
-- README.rdoc
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -69,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A simple wrapper for the standard ruby OpenSSL library