ezcrypto 0.3 → 0.5

data/lib/ezcrypto.rb

@@ -161,7 +161,7 @@ the generate and with_password methods. This is not yet 100% complete.
 returns the Base64 encoded key.
 =end
     def encode
-      Base64.encode64 @raw
+      Base64.encode64(@raw).chop
     end
 
 =begin rdoc
@@ -200,9 +200,11 @@ Decrypts the data passed to it in binary format.
         decrypter("")
         @cipher.gulp(data)
       end
-    rescue
-      puts @algorithm
-      throw $!
+#    rescue
+#      puts @algorithm
+#      puts self.encode
+#      puts data.size
+#      throw $!
     end
 
 =begin rdoc
@@ -211,7 +213,22 @@ Decrypts a Base64 formatted string
     def decrypt64(data)
       decrypt(Base64.decode64(data))
     end
-
+    
+=begin rdoc
+Allows keys to be marshalled
+=end
+    def marshal_dump
+       "#{self.algorithm}$$$#{self.encode}"
+    end
+    
+=begin rdoc
+Allows keys to be unmarshalled
+=end
+    def marshal_load(s) 
+       a, r = s.split '$$$'
+       @algorithm = a
+       @raw = Base64.decode64(r)
+    end
 
 =begin rdoc
 Create a file with minimal permissions, and yield
@@ -459,6 +476,8 @@ Processes the entire data string using update and performs a final on it returni
     def gulp(data)
       update(data)
       final 
+#    rescue
+#      breakpoint
     end  
 
 =begin rdoc

data/rakefile

@@ -8,7 +8,7 @@ require 'rake/contrib/rubyforgepublisher'
 
 PKG_BUILD     = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
 PKG_NAME      = 'ezcrypto'
-PKG_VERSION   = '0.3' + PKG_BUILD
+PKG_VERSION   = '0.5' + PKG_BUILD
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 
 RELEASE_NAME  = "REL #{PKG_VERSION}"
@@ -59,8 +59,9 @@ spec = Gem::Specification.new do |s|
   s.require_path = 'lib'
 
   s.files = [ "rakefile", "README", "README_ACTIVE_CRYPTO", "MIT-LICENSE","CHANGELOG","init.rb" ]
-  s.files = s.files + Dir.glob( "lib/**/*" ).delete_if { |item| item.include?( "CVS" )||item.include?("\.DS_Store")||item.include?("/\._")  }
-  s.files = s.files + Dir.glob( "test/**/*" ).delete_if { |item| item.include?( "CVS" )||item.include?("\.DS_Store")||item.include?("/\._")  }
+  ["lib","test"].each do |dir|
+  		s.files = s.files + Dir.glob( "#{dir}/*" )
+  end
 end
   
 Rake::GemPackageTask.new(spec) do |p|
@@ -70,7 +71,7 @@ Rake::GemPackageTask.new(spec) do |p|
 end
 
 
-desc "Publish the API documentation"
+desc "Publish the GEM"
 task :pgem => [:package] do 
   Rake::SshFilePublisher.new("pelleb@rubyforge.org", "/var/www/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload
 end
@@ -81,8 +82,8 @@ task :pdoc => [:rdoc] do
 end
 
 desc "Publish the release files to RubyForge."
-task :release => [:package] do
-  files = ["gem", "tgz", "zip"].map { |ext| "pkg/#{PKG_FILE_NAME}.#{ext}" }
+task :rubyforge_upload => :package do
+  files = %w(gem tgz zip).map { |ext| "pkg/#{PKG_FILE_NAME}.#{ext}" }
 
   if RUBY_FORGE_PROJECT then
     require 'net/http'
@@ -144,7 +145,7 @@ task :release => [:package] do
           {
             "group_id" => group_id,
             "package_id" => package_id,
-            "release_name" => RELEASE_NAME,
+            "release_name" => PKG_FILE_NAME,
             "release_date" => release_date,
             "type_id" => type,
             "processor_id" => "8000", # Any

data/test/active_crypto_test.rb

@@ -3,6 +3,7 @@ require File.join(File.dirname(__FILE__), 'test_helper')
 require 'test/unit'
 require 'active_crypto'
 
+
 class User < ActiveRecord::Base
 	has_many :secrets
 	has_many :groups
@@ -41,6 +42,10 @@ class Asset<ActiveRecord::Base
   
 end
 
+class AssetRaw<ActiveRecord::Base
+  set_table_name "assets"
+end
+
 class Cap < ActiveRecord::Base
   belongs_to :asset
   encrypt :shared_key
@@ -93,15 +98,15 @@ class GroupSecret < ActiveRecord::Base
 end
 
 class ActiveCryptoTest < Test::Unit::TestCase
-
+ 
   def setup
   end
-  
-  def test_key_holder
+    
+  def test_key_holder_in_record
     user=User.new
     user.name="bob"
     user.save
-  	assert user.kind_of?(ActiveRecord::Crypto::KeyHolder)
+  	assert user.kind_of?(ActiveCrypto::KeyHolder)
   	assert user.kind_of?(ActiveRecord::Base)
   	assert user.kind_of?(User)
     assert_nil user.session_key
@@ -116,16 +121,16 @@ class ActiveCryptoTest < Test::Unit::TestCase
     assert_nil user.session_key
   	user.enter_password "shhcccc"
   	assert_not_nil user.session_key
-  	assert user.kind_of?(ActiveRecord::Crypto::KeyHolder)
+  	assert user.kind_of?(ActiveCrypto::KeyHolder)
   	assert user.kind_of?(ActiveRecord::Base)
   	assert user.kind_of?(User)
   	
   	jill=user.secrets.create
   	
   	assert_not_nil jill
-  	assert jill.kind_of?(ActiveRecord::Crypto::AssociationKeyHolder)
-  	assert jill.kind_of?(ActiveRecord::Crypto::KeyHolder)
-  	assert jill.kind_of?(ActiveRecord::Crypto::Encrypted)
+  	assert jill.kind_of?(ActiveCrypto::AssociationKeyHolder)
+  	assert jill.kind_of?(ActiveCrypto::KeyHolder)
+  	assert jill.kind_of?(ActiveCrypto::Encrypted)
   	assert jill.kind_of?(ActiveRecord::Base)
   	assert jill.kind_of?(Secret)
   	
@@ -181,8 +186,16 @@ class ActiveCryptoTest < Test::Unit::TestCase
     cap=Cap.find_by_key key
     assert_not_nil cap
     assert_not_nil cap.asset
+    
     assert_equal "title",cap.asset.title
+    assert_equal "title",cap.asset["title"]
     assert_equal "pelle@neubia.com",cap.email
+    assert_equal "pelle@neubia.com",cap["email"]
+    
+    # Non decrypting version
+    raw=AssetRaw.find cap.asset.id
+    assert_not_equal "title",raw.title
+    assert_not_equal "title",raw["title"]
     
     bob_key=cap.asset.share("bob@bob.com")
     bob_cap=Cap.find_by_key bob_key
@@ -195,3 +208,4 @@ class ActiveCryptoTest < Test::Unit::TestCase
   end
 end
 
+

data/test/association_key_holder_test.rb

@@ -0,0 +1,38 @@
+require 'key_holder_test'
+
+class User < ActiveRecord::Base
+  keyholder
+end
+
+class AssociationKeyHolderTest < KeyHolderTest
+  def setup
+    @key_holder=User.create
+  end
+  
+  def test_should_retain_session_key_on_reload
+    key=EzCrypto::Key.generate
+    key_holder.set_session_key key
+    assert_not_nil key_holder.session_key
+    assert_equal key.raw,key_holder.session_key.raw
+    
+    reloaded=User.find key_holder.id
+    assert_not_nil reloaded.session_key
+    assert_equal key.raw,reloaded.session_key.raw    
+  end
+  
+  def test_should_retain_session_key_on_reload_for_record_with_key_set_before_create
+    key=EzCrypto::Key.generate
+    key_holder=User.new
+    assert_nil key_holder.session_key
+    
+    key_holder.set_session_key key
+    assert_not_nil key_holder.session_key
+    
+    assert_equal key.raw,key_holder.session_key.raw
+    key_holder.save
+    
+    reloaded=User.find key_holder.id
+    assert_not_nil reloaded.session_key
+    assert_equal key.raw,reloaded.session_key.raw    
+  end
+end

data/test/debug.log

@@ -0,0 +1,203 @@
+# Logfile created on Mon Jun 26 23:08:41 CEST 2006 by logger.rb/1.5.2.7
+  Asset Columns (0.008388)   SHOW FIELDS FROM assets
+  SQL (0.007744)   BEGIN
+  SQL (0.001147)   INSERT INTO assets (`updated_at`, `title`, `created_at`) VALUES('2006-06-26 23:08:42', x'9e98fee657d4d507013994fabe456bd5', '2006-06-26 23:08:42')
+  SQL (0.000677)   COMMIT
+  Cap Columns (0.016698)   SHOW FIELDS FROM caps
+  SQL (0.001026)   BEGIN
+  SQL (0.001033)   INSERT INTO caps (`updated_at`, `key_hash`, `shared_key`, `key`, `asset_id`, `created_at`, `email`) VALUES('2006-06-26 23:08:42', NULL, NULL, NULL, 67, '2006-06-26 23:08:42', 'pelle@neubia.com')
+  SQL (0.000552)   COMMIT
+  SQL (0.000506)   BEGIN
+  Cap Update (0.001911)   UPDATE caps SET `created_at` = '2006-06-26 23:08:42', `key_hash` = '1568bd30ba9bd654d7afd8948304dde6b2caa7fd', `key` = NULL, `asset_id` = 67, `email` = 'pelle@neubia.com', `shared_key` = x'8bbdc3964a7cbe937101ca8cf774f7fe403a3e243d0c68f2042b7d48dac8e4ed', `updated_at` = '2006-06-26 23:08:42' WHERE id = 87
+  SQL (0.000556)   COMMIT
+  Cap Load (0.002457)   SELECT * FROM caps WHERE (caps.`key_hash` = '1568bd30ba9bd654d7afd8948304dde6b2caa7fd' ) LIMIT 1
+  Asset Load (0.001748)   SELECT * FROM assets WHERE (assets.id = 67) LIMIT 1
+  AssetRaw Load (0.002112)   SELECT * FROM assets WHERE (assets.id = 67) LIMIT 1
+  AssetRaw Columns (0.014849)   SHOW FIELDS FROM assets
+  SQL (0.000775)   BEGIN
+  SQL (0.001160)   INSERT INTO caps (`updated_at`, `key_hash`, `shared_key`, `key`, `asset_id`, `created_at`, `email`) VALUES('2006-06-26 23:08:42', NULL, NULL, NULL, 67, '2006-06-26 23:08:42', 'bob@bob.com')
+  SQL (0.000532)   COMMIT
+  SQL (0.000631)   BEGIN
+  Cap Update (0.001192)   UPDATE caps SET `created_at` = '2006-06-26 23:08:42', `key_hash` = 'a80ad191c09d4c2b673461436d3d184e42789b92', `key` = NULL, `asset_id` = 67, `email` = 'bob@bob.com', `shared_key` = x'82f7ba06662e9c4a8d69e8663f685a2de34b1ba7bf319e14e3ccbc06840db9ed', `updated_at` = '2006-06-26 23:08:42' WHERE id = 88
+  SQL (0.000567)   COMMIT
+  Cap Load (0.003083)   SELECT * FROM caps WHERE (caps.`key_hash` = 'a80ad191c09d4c2b673461436d3d184e42789b92' ) LIMIT 1
+  Asset Load (0.001744)   SELECT * FROM assets WHERE (assets.id = 67) LIMIT 1
+  User Columns (0.014334)   SHOW FIELDS FROM users
+  SQL (0.000734)   BEGIN
+  SQL (0.001297)   INSERT INTO users (`name`) VALUES(NULL)
+  SQL (0.000589)   COMMIT
+  Secret Load (0.001915)   SELECT * FROM secrets WHERE (secrets.user_id = 544) 
+  Secret Columns (0.032563)   SHOW FIELDS FROM secrets
+  SQL (0.000623)   BEGIN
+  SQL (0.001278)   INSERT INTO secrets (`name`, `user_id`, `email`) VALUES(NULL, 544, NULL)
+  SQL (0.000528)   COMMIT
+  User Load (0.001913)   SELECT * FROM users WHERE (users.id = 544) LIMIT 1
+  SQL (0.069614)   BEGIN
+  Secret Update (0.057050)   UPDATE secrets SET `user_id` = 544, `email` = NULL, `name` = x'c42d49cb44c44d9e9288b5d94c6dda6b' WHERE id = 75
+  SQL (0.000469)   COMMIT
+  Child Load (0.001575)   SELECT * FROM children WHERE (children.secret_id = 75) 
+  Child Columns (0.007993)   SHOW FIELDS FROM children
+  SQL (0.007694)   BEGIN
+  SQL (0.000757)   INSERT INTO children (`secret_id`, `email`) VALUES(75, NULL)
+  SQL (0.000372)   COMMIT
+  SQL (0.000347)   BEGIN
+  Secret Load (0.001658)   SELECT * FROM secrets WHERE (secrets.id = 75) LIMIT 1
+  User Load (0.001475)   SELECT * FROM users WHERE (users.id = 544) LIMIT 1
+  Child Update (0.001034)   UPDATE children SET `secret_id` = 75, `email` = '�PI36ZՖt;&��(|nF/�o�x8�A�a��' WHERE id = 60
+  SQL (0.000413)   COMMIT
+  SQL (0.000335)   BEGIN
+  SQL (0.000778)   INSERT INTO users (`name`) VALUES('bob')
+  SQL (0.000501)   COMMIT
+  SQL (0.000452)   BEGIN
+  SQL (0.072586)   INSERT INTO users (`name`) VALUES(NULL)
+  SQL (0.000446)   COMMIT
+  SQL (0.000440)   BEGIN
+  SQL (0.000991)   INSERT INTO users (`name`) VALUES(NULL)
+  SQL (0.000503)   COMMIT
+  SQL (0.000475)   BEGIN
+  SQL (0.000843)   INSERT INTO users (`name`) VALUES(NULL)
+  SQL (0.000511)   COMMIT
+  SQL (0.000485)   BEGIN
+  SQL (0.000775)   INSERT INTO users (`name`) VALUES(NULL)
+  SQL (0.000505)   COMMIT
+  SQL (0.011066)   BEGIN
+  SQL (0.000752)   INSERT INTO users (`name`) VALUES(NULL)
+  SQL (0.000398)   COMMIT
+  User Load (0.005141)   SELECT * FROM users WHERE (users.id = 550) LIMIT 1
+  SQL (0.074907)   BEGIN
+  SQL (0.000738)   INSERT INTO users (`name`) VALUES(NULL)
+  SQL (0.000395)   COMMIT
+  SQL (0.000370)   BEGIN
+  SQL (0.000676)   INSERT INTO users (`name`) VALUES(NULL)
+  SQL (0.000403)   COMMIT
+  User Load (0.001184)   SELECT * FROM users WHERE (users.id = 552) LIMIT 1
+  EncUser Columns (0.012070)   SHOW FIELDS FROM users
+  SQL (0.022249)   BEGIN
+  SQL (0.000759)   INSERT INTO users (`name`) VALUES(NULL)
+  SQL (0.000368)   COMMIT
+  SQL (0.000429)   BEGIN
+  SQL (0.001092)   INSERT INTO users (`name`) VALUES(NULL)
+  SQL (0.000379)   COMMIT
+  SQL (0.000458)   BEGIN
+  SQL (0.000688)   INSERT INTO users (`name`) VALUES(NULL)
+  SQL (0.000370)   COMMIT
+  SQL (0.003594)   BEGIN
+  SQL (0.001030)   INSERT INTO users (`name`) VALUES(NULL)
+  SQL (0.000381)   COMMIT
+  SQL (0.000461)   BEGIN
+  SQL (0.003250)   INSERT INTO users (`name`) VALUES(NULL)
+  SQL (0.000713)   COMMIT
+  SQL (0.000383)   BEGIN
+  EncUser Update (0.000966)   UPDATE users SET `name` = '�O�Ŭ�h�3)�4/�' WHERE id = 557
+  SQL (0.000389)   COMMIT
+  EncUser Load (0.001402)   SELECT * FROM users WHERE (users.id = 557) LIMIT 1
+  RawUser Load (0.001419)   SELECT * FROM users WHERE (users.id = 557) LIMIT 1
+  RawUser Columns (0.008253)   SHOW FIELDS FROM users
+  SQL (0.011267)   BEGIN
+  SQL (0.000794)   INSERT INTO users (`name`) VALUES(NULL)
+  SQL (0.000768)   COMMIT
+  SQL (0.000475)   BEGIN
+  SQL (0.000713)   INSERT INTO users (`name`) VALUES(NULL)
+  SQL (0.000394)   COMMIT
+  User Load (0.001529)   SELECT * FROM users WHERE (users.id = 559) LIMIT 1
+  Asset Columns (0.122398)   SHOW FIELDS FROM assets
+  SQL (0.003768)   BEGIN
+  SQL (0.165869)   INSERT INTO assets (`updated_at`, `title`, `created_at`) VALUES('2006-07-19 14:30:06', x'ea321f769bbedb5de9c9d936c4cb12d6', '2006-07-19 14:30:06')
+  SQL (0.000456)   COMMIT
+  Cap Columns (0.042072)   SHOW FIELDS FROM caps
+  SQL (0.007241)   BEGIN
+  SQL (0.008618)   INSERT INTO caps (`updated_at`, `key_hash`, `shared_key`, `key`, `asset_id`, `created_at`, `email`) VALUES('2006-07-19 14:30:06', NULL, NULL, NULL, 68, '2006-07-19 14:30:06', 'pelle@neubia.com')
+  SQL (0.000436)   COMMIT
+  SQL (0.000527)   BEGIN
+  Cap Update (0.001584)   UPDATE caps SET `created_at` = '2006-07-19 14:30:06', `key_hash` = 'f9c991d31301531437c441bcd8f414348d03a079', `key` = NULL, `asset_id` = 68, `email` = 'pelle@neubia.com', `shared_key` = x'41d489f5f8ef1737ffb847ed14c2b79d3af7cbfced92fdb4a26342e70ef8ccfc', `updated_at` = '2006-07-19 14:30:06' WHERE id = 89
+  SQL (0.000427)   COMMIT
+  Cap Load (0.019398)   SELECT * FROM caps WHERE (caps.`key_hash` = 'f9c991d31301531437c441bcd8f414348d03a079' ) LIMIT 1
+  Asset Load (0.001687)   SELECT * FROM assets WHERE (assets.id = 68) LIMIT 1
+  AssetRaw Load (0.001928)   SELECT * FROM assets WHERE (assets.id = 68) LIMIT 1
+  AssetRaw Columns (0.008303)   SHOW FIELDS FROM assets
+  SQL (0.006758)   BEGIN
+  SQL (0.001291)   INSERT INTO caps (`updated_at`, `key_hash`, `shared_key`, `key`, `asset_id`, `created_at`, `email`) VALUES('2006-07-19 14:30:06', NULL, NULL, NULL, 68, '2006-07-19 14:30:06', 'bob@bob.com')
+  SQL (0.000415)   COMMIT
+  SQL (0.000360)   BEGIN
+  Cap Update (0.002074)   UPDATE caps SET `created_at` = '2006-07-19 14:30:06', `key_hash` = '65cbaf99de40013ee08780c1823e5cc7e9427b34', `key` = NULL, `asset_id` = 68, `email` = 'bob@bob.com', `shared_key` = x'99b58f82b5f4e021f143d800c8aee6e523498bc4260bdcd51d226b275062dfcc', `updated_at` = '2006-07-19 14:30:06' WHERE id = 90
+  SQL (0.000428)   COMMIT
+  Cap Load (0.002402)   SELECT * FROM caps WHERE (caps.`key_hash` = '65cbaf99de40013ee08780c1823e5cc7e9427b34' ) LIMIT 1
+  Asset Load (0.001505)   SELECT * FROM assets WHERE (assets.id = 68) LIMIT 1
+  User Columns (0.176279)   SHOW FIELDS FROM users
+  SQL (0.006658)   BEGIN
+  SQL (0.013928)   INSERT INTO users (`name`) VALUES(NULL)
+  SQL (0.000436)   COMMIT
+  Secret Load (0.006232)   SELECT * FROM secrets WHERE (secrets.user_id = 560) 
+  Secret Columns (0.008093)   SHOW FIELDS FROM secrets
+  SQL (0.007102)   BEGIN
+  SQL (0.000961)   INSERT INTO secrets (`name`, `user_id`, `email`) VALUES(NULL, 560, NULL)
+  SQL (0.000410)   COMMIT
+  User Load (0.001519)   SELECT * FROM users WHERE (users.id = 560) LIMIT 1
+  SQL (0.000480)   BEGIN
+  Secret Update (0.001119)   UPDATE secrets SET `user_id` = 560, `email` = NULL, `name` = x'c42d49cb44c44d9e9288b5d94c6dda6b' WHERE id = 76
+  SQL (0.000436)   COMMIT
+  Child Load (0.034930)   SELECT * FROM children WHERE (children.secret_id = 76) 
+  Child Columns (0.008565)   SHOW FIELDS FROM children
+  SQL (0.006693)   BEGIN
+  SQL (0.000800)   INSERT INTO children (`secret_id`, `email`) VALUES(76, NULL)
+  SQL (0.000688)   COMMIT
+  SQL (0.000379)   BEGIN
+  Secret Load (0.002081)   SELECT * FROM secrets WHERE (secrets.id = 76) LIMIT 1
+  User Load (0.001388)   SELECT * FROM users WHERE (users.id = 560) LIMIT 1
+  Child Update (0.000956)   UPDATE children SET `secret_id` = 76, `email` = '�PI36ZՖt;&��(|nF/�o�x8�A�a��' WHERE id = 61
+  SQL (0.000427)   COMMIT
+  SQL (0.000325)   BEGIN
+  SQL (0.000715)   INSERT INTO users (`name`) VALUES('bob')
+  SQL (0.000502)   COMMIT
+  SQL (0.000795)   BEGIN
+  SQL (0.001039)   INSERT INTO users (`name`) VALUES(NULL)
+  SQL (0.000419)   COMMIT
+  SQL (0.000437)   BEGIN
+  SQL (0.000712)   INSERT INTO users (`name`) VALUES(NULL)
+  SQL (0.000494)   COMMIT
+  SQL (0.000428)   BEGIN
+  SQL (0.001013)   INSERT INTO users (`name`) VALUES(NULL)
+  SQL (0.000397)   COMMIT
+  SQL (0.000451)   BEGIN
+  SQL (0.003872)   INSERT INTO users (`name`) VALUES(NULL)
+  SQL (0.000425)   COMMIT
+  SQL (0.000437)   BEGIN
+  SQL (0.000697)   INSERT INTO users (`name`) VALUES(NULL)
+  SQL (0.000749)   COMMIT
+  User Load (0.001268)   SELECT * FROM users WHERE (users.id = 566) LIMIT 1
+  SQL (0.000484)   BEGIN
+  SQL (0.001166)   INSERT INTO users (`name`) VALUES(NULL)
+  SQL (0.000403)   COMMIT
+  SQL (0.000367)   BEGIN
+  SQL (0.000917)   INSERT INTO users (`name`) VALUES(NULL)
+  SQL (0.000540)   COMMIT
+  User Load (0.001214)   SELECT * FROM users WHERE (users.id = 568) LIMIT 1
+  EncUser Columns (0.011722)   SHOW FIELDS FROM users
+  SQL (0.006778)   BEGIN
+  SQL (0.003122)   INSERT INTO users (`name`) VALUES(NULL)
+  SQL (0.000419)   COMMIT
+  SQL (0.000433)   BEGIN
+  SQL (0.001564)   INSERT INTO users (`name`) VALUES(NULL)
+  SQL (0.000474)   COMMIT
+  SQL (0.009263)   BEGIN
+  SQL (0.000999)   INSERT INTO users (`name`) VALUES(NULL)
+  SQL (0.000428)   COMMIT
+  SQL (0.000530)   BEGIN
+  SQL (0.000821)   INSERT INTO users (`name`) VALUES(NULL)
+  SQL (0.000385)   COMMIT
+  SQL (0.000466)   BEGIN
+  SQL (0.000737)   INSERT INTO users (`name`) VALUES(NULL)
+  SQL (0.000368)   COMMIT
+  SQL (0.000596)   BEGIN
+  EncUser Update (0.001114)   UPDATE users SET `name` = '�T�n��O%`	��' WHERE id = 573
+  SQL (0.000407)   COMMIT
+  EncUser Load (0.001269)   SELECT * FROM users WHERE (users.id = 573) LIMIT 1
+  RawUser Load (0.003733)   SELECT * FROM users WHERE (users.id = 573) LIMIT 1
+  RawUser Columns (0.013586)   SHOW FIELDS FROM users
+  SQL (0.000795)   BEGIN
+  SQL (0.000916)   INSERT INTO users (`name`) VALUES(NULL)
+  SQL (0.000386)   COMMIT
+  SQL (0.000395)   BEGIN
+  SQL (0.001061)   INSERT INTO users (`name`) VALUES(NULL)
+  SQL (0.000410)   COMMIT
+  User Load (0.001295)   SELECT * FROM users WHERE (users.id = 575) LIMIT 1

data/test/encrypt_test.rb

@@ -0,0 +1,37 @@
+require 'association_key_holder_test'
+
+class EncUser < ActiveRecord::Base
+  set_table_name "users"
+  encrypt :name
+end
+
+class RawUser < ActiveRecord::Base
+  set_table_name "users"
+end
+
+class EncryptTest < AssociationKeyHolderTest
+  def setup
+    @key_holder=EncUser.create 
+  end
+  
+  def test_should_retain_session_key_on_reload
+    key=EzCrypto::Key.generate
+    key_holder.set_session_key key
+    assert_not_nil key_holder.session_key
+    assert_equal key.raw,key_holder.session_key.raw
+    
+    key_holder.name="bob"
+    key_holder.save
+    
+    assert_equal "bob",key_holder.name
+    
+    found=EncUser.find key_holder.id
+    assert_equal key_holder.name,found.name
+    
+    raw=RawUser.find key_holder.id
+    assert_not_nil raw.name
+    assert_not_equal key_holder.name,raw.name
+    
+  end
+  
+end