strongbox 0.4.4 → 0.4.5

data/lib/strongbox.rb

@@ -5,7 +5,7 @@ require 'strongbox/lock'
 
 module Strongbox
 
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
 
   RSA_PKCS1_PADDING	= OpenSSL::PKey::RSA::PKCS1_PADDING
   RSA_SSLV23_PADDING	= OpenSSL::PKey::RSA::SSLV23_PADDING

data/lib/strongbox/lock.rb

@@ -8,7 +8,7 @@ module Strongbox
       @name              = name
       @instance          = instance
 
-      @size = nil
+      @size = 0
 
       options = Strongbox.options.merge(options)
 

data/test/strongbox_test.rb

@@ -191,63 +191,6 @@ class StrongboxTest < Test::Unit::TestCase
     end
   end
 
-  context 'with validations' do
-    context 'using validates_presence_of' do
-      setup do
-        rebuild_class(:key_pair => File.join(FIXTURES_DIR,'keypair.pem'))
-        Dummy.send(:validates_presence_of, :secret)
-        @valid = Dummy.new(:secret => 'Shhhh')
-        @invalid = Dummy.new(:secret => nil)
-      end
-
-      should 'not have an error on the secret when valid' do
-        assert @valid.valid?
-        assert_does_not_have_errors_on(@valid,:secret)
-      end
-
-      should 'have an error on the secret when invalid' do
-        assert !@invalid.valid?
-        assert_has_errors_on(@invalid,:secret)
-      end
-    end
-
-    context 'using validates_length_of' do
-      setup do
-        rebuild_class(:key_pair => File.join(FIXTURES_DIR,'keypair.pem'))
-        Dummy.send(:validates_length_of,
-                   :secret,
-                   :in => 5..10,
-                   :allow_nil => true,
-                   :allow_blank => true
-                   )
-        @valid = Dummy.new(:secret => 'Shhhh')
-        @valid_nil = Dummy.new(:secret => nil)
-        @valid_blank = Dummy.new(:secret => '')
-        @invalid = Dummy.new(:secret => '1')
-      end
-
-      should 'not have an error on the secret when in range' do
-        assert @valid.valid?
-        assert_does_not_have_errors_on(@valid,:secret)
-      end
-
-      should 'not have an error on the secret when nil' do
-        assert @valid_nil.valid?
-        assert_does_not_have_errors_on(@valid_nil,:secret)
-      end
-
-      should 'not have an error on the secret when blank' do
-        assert @valid_blank.valid?
-        assert_does_not_have_errors_on(@valid_blank,:secret)
-      end
-
-      should 'have an error on the secret when invalid' do
-        assert !@invalid.valid?
-        assert_has_errors_on(@invalid,:secret)
-      end
-    end
-  end
-
   context 'A Class with two secured fields' do
     setup do
       @password = 'boost facile'

data/test/validations_test.rb

@@ -0,0 +1,101 @@
+require 'test/test_helper'
+
+class ValidationsTest < Test::Unit::TestCase
+  context 'with validations' do
+    setup do
+      rebuild_model :key_pair => File.join(FIXTURES_DIR,'keypair.pem')
+    end
+
+    context 'using validates_presence_of' do
+      setup do
+        Dummy.send(:validates_presence_of, :secret)
+        @valid = Dummy.new(:secret => 'Shhhh')
+        @invalid = Dummy.new(:secret => nil)
+      end
+      
+      should 'not have an error on the secret when valid' do
+        assert @valid.valid?
+        assert_does_not_have_errors_on(@valid,:secret)
+      end
+      
+      should 'have an error on the secret when invalid' do
+        assert !@invalid.valid?
+        assert_has_errors_on(@invalid,:secret)
+      end
+    end
+    
+    context 'using validates_length_of' do
+      setup do
+        rebuild_class(:key_pair => File.join(FIXTURES_DIR,'keypair.pem'))
+        Dummy.send(:validates_length_of,
+                   :secret,
+                   :in => 5..10,
+                   :allow_nil => true,
+                   :allow_blank => true
+                   )
+        @valid = Dummy.new(:secret => 'Shhhh')
+        @valid_nil = Dummy.new(:secret => nil)
+        @valid_blank = Dummy.new(:secret => '')
+        @invalid = Dummy.new(:secret => '1')
+      end
+      
+      should 'not have an error on the secret when in range' do
+        assert @valid.valid?
+        assert_does_not_have_errors_on(@valid,:secret)
+      end
+      
+      should 'not have an error on the secret when nil' do
+        assert @valid_nil.valid?
+        assert_does_not_have_errors_on(@valid_nil,:secret)
+      end
+      
+      should 'not have an error on the secret when blank' do
+        assert @valid_blank.valid?
+        assert_does_not_have_errors_on(@valid_blank,:secret)
+      end
+      
+      should 'have an error on the secret when invalid' do
+        assert !@invalid.valid?
+        assert_has_errors_on(@invalid,:secret)
+      end
+    end
+
+        
+    if defined?(ActiveModel::Validations)  # Rails 3
+      context 'using validates for length' do
+        setup do
+          rebuild_class(:key_pair => File.join(FIXTURES_DIR,'keypair.pem'))
+          Dummy.send(:validates,
+                     :secret,
+                     :length => {:minimum => 4, :maximum => 16})
+          @valid = Dummy.new(:secret => 'Shhhh')
+          @out_of_range = [Dummy.new(:secret => 'x' * 3),
+                           Dummy.new(:secret => 'x' * 17)]
+          @blank = [Dummy.new(:secret => nil),
+                    Dummy.new(:secret => '')]
+        end
+      
+        should 'not have an error on the secret when in range' do
+          assert @valid.valid?
+          assert_does_not_have_errors_on(@valid,:secret)
+        end
+
+        should 'have an error on the secret when out of range' do
+          @out_of_range.each do |instance|
+            assert !instance.valid?
+            assert_has_errors_on(instance,:secret)
+          end
+        end
+
+        should 'have an error on the secret when blank' do
+          @blank.each do |instance|
+            assert !instance.valid?
+            assert_has_errors_on(instance,:secret)
+          end
+        end
+      end
+    end
+  end
+
+end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: strongbox
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 0
   - 4
-  - 4
-  version: 0.4.4
+  - 5
+  version: 0.4.5
 platform: ruby
 authors: 
 - Spike Ilacqua
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-09 00:00:00 -07:00
+date: 2011-03-18 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -85,6 +85,7 @@ files:
 - test/missing_attributes_test.rb
 - test/strongbox_test.rb
 - test/test_helper.rb
+- test/validations_test.rb
 has_rdoc: true
 homepage: http://stuff-things.net/strongbox
 licenses: []
@@ -115,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Secures ActiveRecord fields with public key encryption.
@@ -126,3 +127,4 @@ test_files:
 - test/missing_attributes_test.rb
 - test/strongbox_test.rb
 - test/test_helper.rb
+- test/validations_test.rb