<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -1,5 +1,9 @@
 == master
 
+== 0.1.2 / 2008-07-05
+
+* Leave salt stringification up to PluginAWeek::EncryptedString::ShaEncryptor
+
 == 0.1.1 / 2008-06-22
 
 * Remove log files from gems</diff>
      <filename>CHANGELOG.rdoc</filename>
    </modified>
    <modified>
      <diff>@@ -5,7 +5,7 @@ require 'rake/contrib/sshpublisher'
 
 spec = Gem::Specification.new do |s|
   s.name              = 'encrypted_attributes'
-  s.version           = '0.1.1'
+  s.version           = '0.1.2'
   s.platform          = Gem::Platform::RUBY
   s.summary           = 'Adds support for automatically encrypting ActiveRecord attributes'
   
@@ -13,7 +13,7 @@ spec = Gem::Specification.new do |s|
   s.require_path      = 'lib'
   s.has_rdoc          = true
   s.test_files        = Dir['test/**/*_test.rb']
-  s.add_dependency    'encrypted_strings', '&gt;= 0.0.1'
+  s.add_dependency    'encrypted_strings', '&gt;= 0.0.5'
   
   s.author            = 'Aaron Pfeifer'
   s.email             = 'aaron@pluginaweek.org'</diff>
      <filename>Rakefile</filename>
    </modified>
    <modified>
      <diff>@@ -15,9 +15,9 @@ module PluginAWeek #:nodoc:
             options[:salt] =
               case salt
               when Symbol
-                object.send(salt).to_s
+                object.send(salt)
               when Proc
-                salt.call(object).to_s
+                salt.call(object)
               else
                 salt
               end
@@ -31,7 +31,7 @@ module PluginAWeek #:nodoc:
           # The salt is at the end of the value if it's dynamic
           salt = value[40..-1]
           if @dynamic_salt = !salt.blank?
-            options.merge!(:salt =&gt; salt) 
+            options[:salt] = salt 
           end
           
           super(options)</diff>
      <filename>lib/encrypted_attributes/sha_encryptor.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>b71af8e8cf4b76beb70d93b0ab0a09b6fd8df5b7</id>
    </parent>
  </parents>
  <author>
    <name>Aaron Pfeifer</name>
    <email>aaron.pfeifer@gmail.com</email>
  </author>
  <url>http://github.com/pluginaweek/encrypted_attributes/commit/20629b6c8531dd2cb488dea927da858e7aa27aed</url>
  <id>20629b6c8531dd2cb488dea927da858e7aa27aed</id>
  <committed-date>2008-07-05T17:54:46-07:00</committed-date>
  <authored-date>2008-07-05T17:54:46-07:00</authored-date>
  <message>Leave salt stringification up to PluginAWeek::EncryptedString::ShaEncryptor</message>
  <tree>e82e74ef546fb8a7d419cb20af093e2fe16e19a5</tree>
  <committer>
    <name>Aaron Pfeifer</name>
    <email>aaron.pfeifer@gmail.com</email>
  </committer>
</commit>
