attr_encrypted 1.2.0 → 1.2.1

data/lib/attr_encrypted.rb

@@ -86,8 +86,10 @@ module AttrEncrypted
   #   end
   #
   #   @user = User.new
-  #   @user.encrypted_email # returns nil
+  #   @user.encrypted_email # nil
+  #   @user.email? # false
   #   @user.email = 'test@example.com'
+  #   @user.email? # true
   #   @user.encrypted_email # returns the encrypted version of 'test@example.com'
   #
   #   @user.configuration = { :time_zone => 'UTC' }
@@ -129,7 +131,12 @@ module AttrEncrypted
         instance_variable_set("@#{attribute}", value)
       end
 
-      encrypted_attributes[attribute.to_sym] = options.merge!(:attribute => encrypted_attribute_name)
+      define_method("#{attribute}?") do
+        value = send(attribute)
+        value.respond_to?(:empty?) ? !value.empty? : !!value
+      end
+
+      encrypted_attributes[attribute.to_sym] = options.merge(:attribute => encrypted_attribute_name)
     end
   end
   alias_method :attr_encryptor, :attr_encrypted
@@ -170,7 +177,12 @@ module AttrEncrypted
     if options[:if] && !options[:unless] && !encrypted_value.nil? && !(encrypted_value.is_a?(String) && encrypted_value.empty?)
       encrypted_value = encrypted_value.unpack(options[:encode]).first if options[:encode]
       value = options[:encryptor].send(options[:decrypt_method], options.merge!(:value => encrypted_value))
-      value = options[:marshaler].send(options[:load_method], value) if options[:marshal]
+      if options[:marshal]
+        value = options[:marshaler].send(options[:load_method], value)
+      elsif defined?(Encoding)
+        encoding = Encoding.default_internal || Encoding.default_external
+        value = value.force_encoding(encoding.name)
+      end
       value
     else
       encrypted_value
@@ -189,7 +201,7 @@ module AttrEncrypted
   def encrypt(attribute, value, options = {})
     options = encrypted_attributes[attribute.to_sym].merge(options)
     if options[:if] && !options[:unless] && !value.nil? && !(value.is_a?(String) && value.empty?)
-      value = options[:marshaler].send(options[:dump_method], value) if options[:marshal]
+      value = options[:marshal] ? options[:marshaler].send(options[:dump_method], value) : value.to_s
       encrypted_value = options[:encryptor].send(options[:encrypt_method], options.merge!(:value => value))
       encrypted_value = [encrypted_value].pack(options[:encode]) if options[:encode]
       encrypted_value
@@ -293,4 +305,4 @@ end
 
 Object.extend AttrEncrypted
 
-Dir[File.join(File.dirname(__FILE__), 'attr_encrypted', 'adapters', '*.rb')].each { |adapter| require adapter }
+Dir[File.join(File.dirname(__FILE__), 'attr_encrypted', 'adapters', '*.rb')].each { |adapter| require adapter }

data/lib/attr_encrypted/adapters/active_record.rb

@@ -1,4 +1,4 @@
-if defined?(ActiveRecord)
+if defined?(ActiveRecord::Base)
   module AttrEncrypted
     module Adapters
       module ActiveRecord

data/lib/attr_encrypted/version.rb

@@ -3,7 +3,7 @@ module AttrEncrypted
   module Version
     MAJOR = 1
     MINOR = 2
-    PATCH = 0
+    PATCH = 1
 
     # Returns a version string by joining <tt>MAJOR</tt>, <tt>MINOR</tt>, and <tt>PATCH</tt> with <tt>'.'</tt>
     #
@@ -14,4 +14,4 @@ module AttrEncrypted
       [MAJOR, MINOR, PATCH].join('.')
     end
   end
-end
+end

data/test/active_record_test.rb

@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 require File.expand_path('../test_helper', __FILE__)
 
 ActiveRecord::Base.establish_connection :adapter => 'sqlite3', :database => ':memory:'
@@ -51,6 +52,13 @@ class ActiveRecordTest < Test::Unit::TestCase
     create_people_table
   end
 
+  def test_should_decrypt_with_correct_encoding
+    if defined?(Encoding)
+      @person = Person.create :email => 'test@example.com'
+      assert_equal 'UTF-8', Person.find(:first).email.encoding.name
+    end
+  end
+
   def test_should_encrypt_email
     @person = Person.create :email => 'test@example.com'
     assert_not_nil @person.encrypted_email

data/test/attr_encrypted_test.rb

@@ -1,3 +1,4 @@
+# -*- encoding: utf-8 -*-
 require File.expand_path('../test_helper', __FILE__)
 
 class SillyEncryptor
@@ -61,6 +62,10 @@ class AttrEncryptedTest < Test::Unit::TestCase
     assert User.attr_encrypted?('email')
   end
 
+  def test_attr_encrypted_should_not_use_the_same_attribute_name_for_two_attributes_in_the_same_line
+    assert_not_equal User.encrypted_attributes[:email][:attribute], User.encrypted_attributes[:without_encoding][:attribute]
+  end
+
   def test_attr_encrypted_should_return_false_for_salt
     assert !User.attr_encrypted?('salt')
   end
@@ -129,14 +134,20 @@ class AttrEncryptedTest < Test::Unit::TestCase
     assert_equal User.decrypt_with_encoding(encrypted), User.decrypt_without_encoding(encrypted.unpack('m').first)
   end
 
+  def test_should_decrypt_utf8_with_encoding
+    encrypted = User.encrypt_with_encoding("test\xC2\xA0utf-8\xC2\xA0text")
+    assert_equal "test\xC2\xA0utf-8\xC2\xA0text", User.decrypt_with_encoding(encrypted)
+    assert_equal User.decrypt_with_encoding(encrypted), User.decrypt_without_encoding(encrypted.unpack('m').first)
+  end
+
   def test_should_encrypt_with_custom_encoding
-    assert_equal User.encrypt_with_encoding('test'), [User.encrypt_without_encoding('test')].pack('m')
+    assert_equal User.encrypt_with_custom_encoding('test'), [User.encrypt_without_encoding('test')].pack('m')
   end
 
   def test_should_decrypt_with_custom_encoding
-    encrypted = User.encrypt_with_encoding('test')
-    assert_equal 'test', User.decrypt_with_encoding(encrypted)
-    assert_equal User.decrypt_with_encoding(encrypted), User.decrypt_without_encoding(encrypted.unpack('m').first)
+    encrypted = User.encrypt_with_custom_encoding('test')
+    assert_equal 'test', User.decrypt_with_custom_encoding(encrypted)
+    assert_equal User.decrypt_with_custom_encoding(encrypted), User.decrypt_without_encoding(encrypted.unpack('m').first)
   end
 
   def test_should_encrypt_with_marshaling
@@ -268,4 +279,19 @@ class AttrEncryptedTest < Test::Unit::TestCase
     assert_equal "not_encrypted_stuff", @user.encrypted_with_if_changed
   end
 
-end
+  def test_should_cast_values_as_strings_before_encrypting
+    string_encrypted_email = User.encrypt_email('3')
+    assert_equal string_encrypted_email, User.encrypt_email(3)
+    assert_equal '3', User.decrypt_email(string_encrypted_email)
+  end
+
+  def test_should_create_query_accessor
+    @user = User.new
+    assert !@user.email?
+    @user.email = ''
+    assert !@user.email?
+    @user.email = 'test@example.com'
+    assert @user.email?
+  end
+
+end

data/test/test_helper.rb

@@ -3,7 +3,7 @@ require 'digest/sha2'
 require 'rubygems'
 gem 'activerecord', ENV['ACTIVE_RECORD_VERSION'] if ENV['ACTIVE_RECORD_VERSION']
 require 'active_record'
-require 'datamapper'
+require 'data_mapper'
 require 'sequel'
 require 'mocha'
 

metadata

@@ -1,106 +1,102 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: attr_encrypted
-version: !ruby/object:Gem::Version 
-  hash: 31
+version: !ruby/object:Gem::Version
+  version: 1.2.1
   prerelease: 
-  segments: 
-  - 1
-  - 2
-  - 0
-  version: 1.2.0
 platform: ruby
-authors: 
+authors:
 - Sean Huber
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-03-07 00:00:00 -08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-09-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: encryptor
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 17
-        segments: 
-        - 1
-        - 1
-        - 1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.1.1
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: activerecord
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.1
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.0.0
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: datamapper
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: datamapper
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: sequel
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sequel
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Generates attr_accessors that encrypt and decrypt attributes transparently
 email: shuber@huberry.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/attr_encrypted/adapters/active_record.rb
 - lib/attr_encrypted/adapters/data_mapper.rb
 - lib/attr_encrypted/adapters/sequel.rb
@@ -114,44 +110,35 @@ files:
 - test/data_mapper_test.rb
 - test/sequel_test.rb
 - test/test_helper.rb
-has_rdoc: true
 homepage: http://github.com/shuber/attr_encrypted
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --line-numbers
 - --inline-source
 - --main
 - README.rdoc
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.1
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Encrypt and decrypt attributes
-test_files: 
+test_files:
 - test/active_record_test.rb
 - test/attr_encrypted_test.rb
 - test/data_mapper_test.rb