RubyGems - attr_encrypted - Versions diffs - 1.3.0 → 1.3.1 - Mend

attr_encrypted 1.3.0 → 1.3.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

data/Rakefile +1 -1
data/lib/attr_encrypted/adapters/active_record.rb +22 -7
data/lib/attr_encrypted/version.rb +1 -1
data/test/active_record_test.rb +7 -2
metadata +157 -165

data/Rakefile CHANGED Viewed

@@ -22,7 +22,7 @@ if RUBY_VERSION < '1.9.3'
   require 'rcov/rcovtask'
   task :rcov do
-    system "rcov -o coverage/rcov --exclude '^(?!lib)' " + FileList[ 'test/**/*_test.rb' ].join(' ')
+    sh "rcov -o coverage/rcov --exclude '^(?!lib)' " + FileList[ 'test/**/*_test.rb' ].join(' ')
   end
   desc 'Default: run unit tests under rcov.'

data/lib/attr_encrypted/adapters/active_record.rb CHANGED Viewed

@@ -5,15 +5,30 @@ if defined?(ActiveRecord::Base)
         def self.extended(base) # :nodoc:
           base.class_eval do
             attr_encrypted_options[:encode] = true
-            class << self; alias_method_chain :method_missing, :attr_encrypted; end
+            class << self
+              alias_method_chain :method_missing, :attr_encrypted
+              if ::ActiveRecord::VERSION::STRING < "3"
+                alias_method :undefine_attribute_methods, :reset_column_information
+              end
+            end
-            def assign_attributes_with_attr_encrypted(*args)
-              attributes = args.shift
-              encrypted_attributes = self.class.encrypted_attributes.keys
-              assign_attributes_without_attr_encrypted attributes.except(*encrypted_attributes), *args
-              assign_attributes_without_attr_encrypted attributes.slice(*encrypted_attributes), *args
+            if ::ActiveRecord::VERSION::STRING < "3.0" || ::ActiveRecord::VERSION::STRING > "3.1"
+              def assign_attributes_with_attr_encrypted(*args)
+                attributes = args.shift.symbolize_keys
+                encrypted_attributes = self.class.encrypted_attributes.keys
+                assign_attributes_without_attr_encrypted attributes.except(*encrypted_attributes), *args
+                assign_attributes_without_attr_encrypted attributes.slice(*encrypted_attributes), *args
+              end
+              alias_method_chain :assign_attributes, :attr_encrypted
+            else
+              def attributes_with_attr_encrypted=(attributes)
+                attributes = attributes.symbolize_keys
+                encrypted_attributes = self.class.encrypted_attributes.keys
+                self.attributes_without_attr_encrypted = attributes.except(*encrypted_attributes)
+                self.attributes_without_attr_encrypted = attributes.slice(*encrypted_attributes)
+              end
+              alias_method_chain :attributes=, :attr_encrypted
             end
-            alias_method_chain :assign_attributes, :attr_encrypted
           end
         end

data/lib/attr_encrypted/version.rb CHANGED Viewed

@@ -3,7 +3,7 @@ module AttrEncrypted
   module Version
     MAJOR = 1
     MINOR = 3
-    PATCH = 0
+    PATCH = 1
     # Returns a version string by joining <tt>MAJOR</tt>, <tt>MINOR</tt>, and <tt>PATCH</tt> with <tt>'.'</tt>
     #

data/test/active_record_test.rb CHANGED Viewed

@@ -34,8 +34,13 @@ class Person < ActiveRecord::Base
   attr_encrypted :email, :key => SECRET_KEY
   attr_encrypted :credentials, :key => Proc.new { |user| Encryptor.encrypt(:value => user.salt, :key => SECRET_KEY) }, :marshal => true
-  after_initialize :initialize_salt_and_credentials
+  if ActiveRecord::VERSION::STRING < "3"
+    def after_initialize
+      initialize_salt_and_credentials
+    end
+  else
+    after_initialize :initialize_salt_and_credentials
+  end
   protected

metadata CHANGED Viewed

@@ -1,187 +1,177 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification
 name: attr_encrypted
-version: !ruby/object:Gem::Version
-  version: 1.3.0
+version: !ruby/object:Gem::Version
+  hash: 25
   prerelease:
+  segments:
+  - 1
+  - 3
+  - 1
+  version: 1.3.1
 platform: ruby
-authors:
+authors:
 - Sean Huber
 - S. Brent Faulkner
 - William Monk
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-11-14 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+date: 2013-12-06 00:00:00 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: encryptor
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+  requirement: &id001 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        hash: 27
+        segments:
+        - 1
+        - 3
+        - 0
         version: 1.3.0
-- !ruby/object:Gem::Dependency
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+  requirement: &id002 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        hash: 15
+        segments:
+        - 2
+        - 0
+        - 0
         version: 2.0.0
-- !ruby/object:Gem::Dependency
-  name: datamapper
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    - - <
+      - !ruby/object:Gem::Version
+        hash: 63
+        segments:
+        - 4
+        - 0
+        - 0
+        version: 4.0.0
   type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency
+  name: datamapper
   prerelease: false
-  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
-        version: '0'
+  requirement: &id003 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        hash: 3
+        segments:
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency
+  name: mocha
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    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'
+  requirement: &id004 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        hash: 3
+        segments:
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency
+  name: sequel
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id005 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        hash: 3
+        segments:
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency
+  name: sqlite3
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: dm-sqlite-adapter
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id006 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        hash: 3
+        segments:
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency
+  name: dm-sqlite-adapter
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.9.2.2
+  requirement: &id007 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        hash: 3
+        segments:
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency
+  name: rake
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
+  requirement: &id008 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - "="
+      - !ruby/object:Gem::Version
+        hash: 11
+        segments:
+        - 0
+        - 9
+        - 2
+        - 2
         version: 0.9.2.2
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency
+  name: rcov
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov-rcov
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id009 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        hash: 3
+        segments:
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *id009
 description: Generates attr_accessors that encrypt and decrypt attributes transparently
-email:
+email:
 - shuber@huberry.com
 - sbfaulkner@gmail.com
 - billy.monk@gmail.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
@@ -201,41 +191,43 @@ files:
 - test/legacy_sequel_test.rb
 - test/sequel_test.rb
 - test/test_helper.rb
-homepage: http://github.com/attr_encrypted/attr_encrypted
+homepage: http://github.com/attr-encrypted/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
-      version: '0'
-      segments:
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      hash: 3
+      segments:
       - 0
-      hash: -52694865588709361
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      hash: 3
+      segments:
       - 0
-      hash: -52694865588709361
+      version: "0"
 requirements: []
 rubyforge_project:
-rubygems_version: 1.8.23
+rubygems_version: 1.8.15
 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/compatibility_test.rb