@@ -1,3 +1,6 @@ +2009-01-13 - Sean Huber (shuber@huberry.com) + * :marshal no longer defaults to true in ORM adapters + 2009-01-12 - Sean Huber (shuber@huberry.com) * Remove read_attribute and write_attribute methods - unnecessary * ActiveRecord and DataMapper extensions are now "adapters" CHANGELOG @@ -267,7 +267,7 @@ If you're using this gem with ActiveRecord, you get a few extra features: #### Default options #### -For your convenience, the `:encode` and `:marshal` options are set to true by default since you'll be storing everything in a database. +For your convenience, the `:encode` option is set to true by default since you'll be storing everything in a database. #### Dynamic find\_by\_ and scoped\_by\_ methods #### @@ -291,7 +291,7 @@ NOTE: This only works if all records are encrypted with the same encryption key ### DataMapper and Sequel ### -Just like the default options for ActiveRecord, the `:encode` and `:marshal` options are set to true by default since you'll be storing everything in a database. +Just like the default options for ActiveRecord, the `:encode` option is set to true by default since you'll be storing everything in a database. Contact README.markdown @@ -4,7 +4,7 @@ if defined?(ActiveRecord) module Adapters module ActiveRecord def self.extended(base) - base.attr_encrypted_options.merge!(:encode => true, :marshal => true) + base.attr_encrypted_options[:encode] = true base.eigenclass_eval { alias_method_chain :method_missing, :attr_encrypted } end lib/huberry/attr_encrypted/adapters/active_record.rb @@ -12,7 +12,7 @@ if defined?(DataMapper) def included_with_attr_encrypted(base) included_without_attr_encrypted(base) - base.attr_encrypted_options.merge!(:encode => true, :marshal => true) + base.attr_encrypted_options[:encode] = true end end end lib/huberry/attr_encrypted/adapters/data_mapper.rb @@ -4,7 +4,7 @@ if defined?(Sequel) module Adapters module Sequel def self.extended(base) - base.attr_encrypted_options.merge!(:encode => true, :marshal => true) + base.attr_encrypted_options[:encode] = true end end end lib/huberry/attr_encrypted/adapters/sequel.rb @@ -20,7 +20,7 @@ create_people_table class Person < ActiveRecord::Base attr_encrypted :email, :key => 'a secret key' - attr_encrypted :credentials, :key => Proc.new { |user| Huberry::Encryptor.encrypt(:value => user.salt, :key => 'some private key') } + attr_encrypted :credentials, :key => Proc.new { |user| Huberry::Encryptor.encrypt(:value => user.salt, :key => 'some private key') }, :marshal => true def after_initialize self.salt ||= Digest::SHA256.hexdigest((Time.now.to_i * rand(5)).to_s) @@ -71,9 +71,8 @@ class ActiveRecordTest < Test::Unit::TestCase assert_equal @person, Person.scoped_by_email_and_password('test@example.com', 'test').find(:first) rescue NoMethodError end - def test_should_use_encode_and_marshal_options + def test_should_encode_by_default assert Person.attr_encrypted_options[:encode] - assert Person.attr_encrypted_options[:marshal] end end \ No newline at end of file test/active_record_test.rb @@ -11,7 +11,7 @@ class Client property :salt, String attr_encrypted :email, :key => 'a secret key' - attr_encrypted :credentials, :key => Proc.new { |client| Huberry::Encryptor.encrypt(:value => client.salt, :key => 'some private key') } + attr_encrypted :credentials, :key => Proc.new { |client| Huberry::Encryptor.encrypt(:value => client.salt, :key => 'some private key') }, :marshal => true def initialize(attrs = {}) super attrs @@ -45,9 +45,8 @@ class DataMapperTest < Test::Unit::TestCase assert Client.first.credentials.is_a?(Hash) end - def test_should_use_encode_and_marshal_options + def test_should_encode_by_default assert Client.attr_encrypted_options[:encode] - assert Client.attr_encrypted_options[:marshal] end end \ No newline at end of file test/data_mapper_test.rb @@ -12,7 +12,7 @@ end class Human < Sequel::Model(:humans) attr_encrypted :email, :key => 'a secret key' - attr_encrypted :credentials, :key => Proc.new { |human| Huberry::Encryptor.encrypt(:value => human.salt, :key => 'some private key') } + attr_encrypted :credentials, :key => Proc.new { |human| Huberry::Encryptor.encrypt(:value => human.salt, :key => 'some private key') }, :marshal => true def after_initialize(attrs = {}) self.salt ||= Digest::SHA1.hexdigest((Time.now.to_i * rand(5)).to_s) @@ -43,9 +43,8 @@ class SequelTest < Test::Unit::TestCase assert Human.first.credentials.is_a?(Hash) end - def test_should_use_encode_and_marshal_options + def test_should_encode_by_default assert Human.attr_encrypted_options[:encode] - assert Human.attr_encrypted_options[:marshal] end end \ No newline at end of file test/sequel_test.rb 5129e497a64d4e8fa3f49d1d9007e0ea8b16dc31 Sean Huber shuber@huberry.com http://github.com/shuber/attr_encrypted/commit/db5fc30c456818ebc688f0cb977aacfd4df3a34d db5fc30c456818ebc688f0cb977aacfd4df3a34d 2009-01-13T10:52:42-08:00 2009-01-13T10:52:42-08:00 :marshal no longer defaults to true in ORM adapters 6642f02fc694ea4be2773a82ea3c05d2168a5619 Sean Huber shuber@huberry.com