shuber-attr_encrypted 1.0.4 → 1.0.5

data/CHANGELOG

@@ -2,6 +2,10 @@
   * Remove read_attribute and write_attribute methods - unnecessary
   * ActiveRecord and DataMapper extensions are now "adapters"
   * Check for existing reader and writer methods separately before creating default ones for encrypted attributes
+  * Typo: should send(encrypted_attribute_name.to_sym) instead of send(encrypted_attribute_name.to_s)
+  * Add Sequel adapter
+  * Update DataMapper tests
+  * Update README
 
 2009-01-11 - Sean Huber (shuber@huberry.com)
   * Update README

data/README.markdown

@@ -3,7 +3,7 @@ attr\_encrypted
 
 Generates attr\_accessors that encrypt and decrypt attributes transparently
 
-Works with ANY class including ActiveRecord and DataMapper
+Works with ANY class including ActiveRecord, DataMapper, and Sequel
 
 
 Installation
@@ -261,18 +261,13 @@ Then you'll have these two class methods available for each attribute: `User.enc
 be useful when you're using ActiveRecord (see below).
 
 
-### DataMapper ###
-
-For your convenience, the `:encode` and `:marshal` options are set to true by default since you'll be storing everything in a database.
-
-
 ### ActiveRecord ###
 
 If you're using this gem with ActiveRecord, you get a few extra features:
 
 #### Default options ####
 
-Just like the default options for DataMapper, 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` and `:marshal` options are set to true by default since you'll be storing everything in a database.
 
 
 #### Dynamic find\_by\_ and scoped\_by\_ methods ####
@@ -294,6 +289,11 @@ The dynamic scope methods like `scoped_by_email_and_password` work the same way.
 NOTE: This only works if all records are encrypted with the same encryption key (per attribute).
 
 
+### 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.
+
+
 Contact
 -------
 

data/lib/huberry/attr_encrypted/adapters/sequel.rb

@@ -0,0 +1,19 @@
+if defined?(Sequel)
+  module Huberry
+    module AttrEncrypted
+      module Adapters
+        module Sequel
+          protected
+            # Calls attr_encrypted with the options <tt>:encode</tt> and <tt>:marshal</tt> set to true
+            # unless they've already been specified
+            def attr_encrypted(*attrs)
+              options = { :encode => true, :marshal => true }.merge(attrs.last.is_a?(Hash) ? attrs.pop : {})
+              super *(attrs << options)
+            end
+        end
+      end
+    end
+  end
+  
+  Sequel::Model.extend Huberry::AttrEncrypted::Adapters::Sequel
+end

data/lib/huberry/attr_encrypted/class.rb

@@ -130,7 +130,7 @@ module Huberry
             
             define_method "#{attribute}" do
               value = instance_variable_get("@#{attribute}")
-              encrypted_value = send(encrypted_attribute_name.to_s)
+              encrypted_value = send(encrypted_attribute_name.to_sym)
               original_options = [:key, :if, :unless].inject({}) do |hash, option|
                 hash[option] = options[option]
                 options[option] = self.class.send :evaluate_attr_encrypted_option, options[option], self

data/test/data_mapper_test.rb

@@ -29,19 +29,19 @@ class DataMapperTest < Test::Unit::TestCase
   end
   
   def test_should_encrypt_email
-    @person = Client.new :email => 'test@example.com'
-    assert @person.save
-    assert_not_nil @person.encrypted_email
-    assert_not_equal @person.email, @person.encrypted_email
-    assert_equal @person.email, Client.first.email
+    @client = Client.new :email => 'test@example.com'
+    assert @client.save
+    assert_not_nil @client.encrypted_email
+    assert_not_equal @client.email, @client.encrypted_email
+    assert_equal @client.email, Client.first.email
   end
   
   def test_should_marshal_and_encrypt_credentials
-    @person = Client.new
-    assert @person.save
-    assert_not_nil @person.encrypted_credentials
-    assert_not_equal @person.credentials, @person.encrypted_credentials
-    assert_equal @person.credentials, Client.first.credentials
+    @client = Client.new
+    assert @client.save
+    assert_not_nil @client.encrypted_credentials
+    assert_not_equal @client.credentials, @client.encrypted_credentials
+    assert_equal @client.credentials, Client.first.credentials
     assert Client.first.credentials.is_a?(Hash)
   end
   

data/test/sequel_test.rb

@@ -0,0 +1,46 @@
+require File.dirname(__FILE__) + '/test_helper'
+
+DB = Sequel.sqlite
+
+DB.create_table :humans do
+  primary_key :id
+  column :encrypted_email, :string
+  column :password, :string
+  column :encrypted_credentials, :string
+  column :salt, :string
+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') }
+  
+  def after_initialize(attrs = {})
+    self.salt ||= Digest::SHA1.hexdigest((Time.now.to_i * rand(5)).to_s)
+    self.credentials ||= { :username => 'example', :password => 'test' }
+  end
+end
+
+class SequelTest < Test::Unit::TestCase
+  
+  def setup
+    Human.all.each(&:destroy)
+  end
+  
+  def test_should_encrypt_email
+    @human = Human.new :email => 'test@example.com'
+    assert @human.save
+    assert_not_nil @human.encrypted_email
+    assert_not_equal @human.email, @human.encrypted_email
+    assert_equal @human.email, Human.first.email
+  end
+  
+  def test_should_marshal_and_encrypt_credentials
+    @human = Human.new
+    assert @human.save
+    assert_not_nil @human.encrypted_credentials
+    assert_not_equal @human.credentials, @human.encrypted_credentials
+    assert_equal @human.credentials, Human.first.credentials
+    assert Human.first.credentials.is_a?(Hash)
+  end
+  
+end

data/test/test_helper.rb

@@ -6,10 +6,12 @@ gem 'shuber-eigenclass', '>= 1.0.1'
 gem 'shuber-encryptor'
 gem 'activerecord'
 gem 'datamapper'
+gem 'sequel'
 
 require 'eigenclass'
 require 'encryptor'
 require 'active_record'
 require 'datamapper'
+require 'sequel'
 
 require File.dirname(__FILE__) + '/../lib/attr_encrypted'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: shuber-attr_encrypted
 version: !ruby/object:Gem::Version 
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors: 
 - Sean Huber
@@ -43,6 +43,7 @@ files:
 - lib/attr_encrypted.rb
 - lib/huberry/attr_encrypted/adapters/active_record.rb
 - lib/huberry/attr_encrypted/adapters/data_mapper.rb
+- lib/huberry/attr_encrypted/adapters/sequel.rb
 - lib/huberry/attr_encrypted/class.rb
 - lib/huberry/attr_encrypted/object.rb
 - MIT-LICENSE
@@ -82,3 +83,4 @@ test_files:
 - test/active_record_test.rb
 - test/attr_encrypted_test.rb
 - test/data_mapper_test.rb
+- test/sequel_test.rb