encrypted_attributes 0.1.2 → 0.1.3

data/CHANGELOG.rdoc

@@ -1,5 +1,9 @@
 == master
 
+== 0.1.3 / 2008-10-26
+
+* Change how the base module is included to prevent namespacing conflicts
+
 == 0.1.2 / 2008-07-05
 
 * Leave salt stringification up to PluginAWeek::EncryptedString::ShaEncryptor

data/Rakefile

@@ -5,11 +5,11 @@ require 'rake/contrib/sshpublisher'
 
 spec = Gem::Specification.new do |s|
   s.name              = 'encrypted_attributes'
-  s.version           = '0.1.2'
+  s.version           = '0.1.3'
   s.platform          = Gem::Platform::RUBY
   s.summary           = 'Adds support for automatically encrypting ActiveRecord attributes'
   
-  s.files             = FileList['{lib,test}/**/*'].to_a - FileList['test/app_root/log/*'].to_a + %w(CHANGELOG.rdoc init.rb LICENSE Rakefile README.rdoc)
+  s.files             = FileList['{lib,test}/**/*'] + %w(CHANGELOG.rdoc init.rb LICENSE Rakefile README.rdoc) - FileList['test/app_root/{log,log/*,script,script/*}']
   s.require_path      = 'lib'
   s.has_rdoc          = true
   s.test_files        = Dir['test/**/*_test.rb']

data/lib/encrypted_attributes.rb

@@ -3,10 +3,6 @@ require 'encrypted_attributes/sha_encryptor'
 
 module PluginAWeek #:nodoc:
   module EncryptedAttributes
-    def self.included(base) #:nodoc:
-      base.extend(MacroMethods)
-    end
-    
     module MacroMethods
       # Encrypts the specified attribute.
       # 
@@ -127,7 +123,11 @@ module PluginAWeek #:nodoc:
           value = read_attribute(to_attr_name)
           
           # Make sure we set the encryptor for equality comparison when reading
-          # from the database
+          # from the database. This should only be done if the value is *not*
+          # blank, is *not* encrypted, and hasn't changed since it was read from
+          # the database. The dirty checking is important when the encypted value
+          # is written to the same attribute as the unencrypted value (i.e. you
+          # don't want to encrypt when a new value has been set)
           unless value.blank? || value.encrypted? || attribute_changed?(to_attr_name)
             # Create the encryptor configured for this attribute
             value.encryptor = create_encryptor(encryptor_class, options, :read, value)
@@ -151,5 +151,5 @@ module PluginAWeek #:nodoc:
 end
 
 ActiveRecord::Base.class_eval do
-  include PluginAWeek::EncryptedAttributes
+  extend PluginAWeek::EncryptedAttributes::MacroMethods
 end

data/test/factory.rb

@@ -13,12 +13,16 @@ module Factory
   def valid_attributes_for(model, attributes = {})
     name = model.to_s.underscore
     send("#{name}_attributes", attributes)
+    attributes.stringify_keys!
     attributes
   end
   
   # Build an unsaved record
   def new_record(model, *args)
-    model.new(valid_attributes_for(model, *args))
+    attributes = valid_attributes_for(model, *args)
+    record = model.new(attributes)
+    attributes.each {|attr, value| record.send("#{attr}=", value) if model.accessible_attributes && !model.accessible_attributes.include?(attr) || model.protected_attributes && model.protected_attributes.include?(attr)}
+    record
   end
   
   # Build and save/reload a record

data/test/test_helper.rb

@@ -8,6 +8,6 @@ ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate")
 
 # Mixin the factory helper
 require File.expand_path("#{File.dirname(__FILE__)}/factory")
-class Test::Unit::TestCase #:nodoc:
+Test::Unit::TestCase.class_eval do
   include Factory
 end

data/test/unit/encrypted_attributes_test.rb

@@ -115,25 +115,25 @@ end
 
 class EncryptedAttributesWithConditionalsTest < Test::Unit::TestCase
   def test_should_not_encrypt_if_if_conditional_is_false
-    User.encrypts :password, :if => Proc.new {false}
+    User.encrypts :password, :if => lambda {false}
     user = create_user(:login => 'admin', :password => 'secret')
     assert_equal 'secret', user.password
   end
   
   def test_should_encrypt_if_if_conditional_is_true
-    User.encrypts :password, :if => Proc.new {true}
+    User.encrypts :password, :if => lambda {true}
     user = create_user(:login => 'admin', :password => 'secret')
     assert_equal '8152bc582f58c854f580cb101d3182813dec4afe', "#{user.password}"
   end
   
   def test_should_not_encrypt_if_unless_conditional_is_true
-    User.encrypts :password, :unless => Proc.new {true}
+    User.encrypts :password, :unless => lambda {true}
     user = create_user(:login => 'admin', :password => 'secret')
     assert_equal 'secret', user.password
   end
   
   def test_should_encrypt_if_unless_conditional_is_false
-    User.encrypts :password, :unless => Proc.new {false}
+    User.encrypts :password, :unless => lambda {false}
     user = create_user(:login => 'admin', :password => 'secret')
     assert_equal '8152bc582f58c854f580cb101d3182813dec4afe', "#{user.password}"
   end

data/test/unit/sha_encryptor_test.rb

@@ -16,13 +16,13 @@ class ShaEncryptorOnWriteTest < Test::Unit::TestCase
   end
   
   def test_should_allow_block_salt
-    dynamic_salt = Proc.new {|user| user.login}
+    dynamic_salt = lambda {|user| user.login}
     encryptor = PluginAWeek::EncryptedAttributes::ShaEncryptor.new(@user, 'password', :write, :salt => dynamic_salt)
     assert_equal 'admin', encryptor.salt
   end
   
   def test_should_allow_dynamic_nil_salt
-    dynamic_salt = Proc.new {|user| nil}
+    dynamic_salt = lambda {|user| nil}
     encryptor = PluginAWeek::EncryptedAttributes::ShaEncryptor.new(@user, 'password', :write, :salt => dynamic_salt)
     assert_equal '', encryptor.salt
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: encrypted_attributes
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Aaron Pfeifer
@@ -9,11 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-05 00:00:00 -04:00
+date: 2008-10-26 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: encrypted_strings
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -37,15 +38,11 @@ files:
 - test/app_root/app
 - test/app_root/app/models
 - test/app_root/app/models/user.rb
-- test/app_root/script
-- test/app_root/script/rails_framework_root.rb
-- test/app_root/script/console
 - test/app_root/config
 - test/app_root/config/environment.rb
 - test/app_root/db
 - test/app_root/db/migrate
 - test/app_root/db/migrate/001_create_users.rb
-- test/app_root/log
 - test/keys
 - test/keys/private
 - test/keys/public
@@ -81,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: pluginaweek
-rubygems_version: 1.1.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Adds support for automatically encrypting ActiveRecord attributes

data/test/app_root/script/console

@@ -1,8 +0,0 @@
-irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
-libs =  " -r irb/completion"
-libs << " -r test/app_root/script/rails_framework_root"
-libs << " -r test/test_helper"
-libs << " -r plugin_test_helper/console_with_fixtures"
-libs << " -r console_app"
-libs << " -r console_with_helpers"
-exec "#{irb} #{libs} --simple-prompt"

data/test/app_root/script/rails_framework_root.rb

@@ -1 +0,0 @@
-RAILS_FRAMEWORK_ROOT = '/home/aaron/Projects/Vendor/rails'