mongoid-encrypted-fields 1.3.0 → 1.3.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmI2YWVkOGM2ZjlmOTY1NmQxMDJhNzNjMzhkNTdkZmVjNGY2NTA2Yw==
+    ZGQyOGY5NmI1MzRjMmEzMTA3MTgyOTc2YWQ4Nzk2OTJlNzdjNmM3MQ==
   data.tar.gz: !binary |-
-    NmFkYzIzNjBlNWNjYTNmYTQ5NzI0ZjEwMzliODhkYjQ4NDUzYWI1ZQ==
-!binary "U0hBNTEy":
+    NGMxNDlkOWNhMDkzMzViMDljMjUzZmZiNWJhYjc4ZDdiNmQ1NTRjMA==
+SHA512:
   metadata.gz: !binary |-
-    MjI5MTUxMmY5NzEzMjRiYmZjZjZjM2Y1ZGVhOGI3MTUzYzhhYzlkNmJmOGJj
-    N2EzYzk0ZDM0NzQ4N2NlYzZjZTZiNjJjZmY2NWM4OWNlMThlNDhlNDZkMzlh
-    YWFmZDc5ODhlOTM4ZWQ4OTM2ZDcyZWQzNDlkM2JiOTExZDdkOGQ=
+    ODkwNTU5NjAzYmIzNDc1NTM4MjYxMDcwZTYzMGQ4MDNlMmY3MGVlYzM0Njll
+    MmViNjdkNTkxMThkYmVkOGZhNjk4Mjg2YjFmZmRiYjQ4NzYwOWJhNzk5ZWZk
+    YjY0ZDI0MTE2NmM2Mjc1M2MwMWNiY2M3OGNiODgxNmI0NDIyOTI=
   data.tar.gz: !binary |-
-    NTVlOWZkNmNlZWI5OGU0NWE1NmNhMjZhNjFmODRiY2ZmMDBlMjYyZTFlZmI0
-    ZmRhNDY0NjY5YTc2YjZmNDVjNTI4OWIxYmU3MGRmMDQ3OTZjODMyOGNhNmZk
-    MDY4OTllMjJkOTJhMjA2YmYzMjMwZTUzZDlkNDNhYzI3NzU3OTI=
+    Y2NiNDY4NDU4Y2ZiZjk2ZGM0ZGJkYzYxYjk0YjVhZWUwNGY4Mjc3ODI0ZGYz
+    OTk2ZTkyZDA3MjljNTUyOWY3NTEzODljNmEzZDljZjMyYmM2OWM5Mjc5YTdj
+    ZmJhOGE4ZjBmYjgzOTgxOTQ4Y2FjOWJlYzYwN2I1MGEzZDNjMjA=

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Revision history
 
+## 1.3.1
+* \#14 Updates due to changes in Mongoid 4 and ActiveModel 4
+
 ## 1.3.0 - Breaking change - PLEASE READ
 * \#11 Support for Mongoid 4
 * \#12 EncryptedHash will now stringify the keys before storing to be consistent with Mongoid's behavior

data/README.md

@@ -52,7 +52,7 @@ Queries encrypt data before searching the database, so equality matches work aut
     ```Ruby
     Person.where(ssn: '123456789').count() # ssn is encrypted before querying the database
     ```
-* The Mongoid uniqueness validator is patched to detect of encrypted fields:
+* The Mongoid uniqueness validator is patched to detect encrypted fields:
     ```Ruby
     class Person
         ...

data/lib/mongoid-encrypted-fields.rb

@@ -27,7 +27,7 @@ case ::Mongoid::EncryptedFields.mongoid_major_version
   when 3
     require 'mongoid-encrypted-fields/mongoid3/validations/uniqueness'
   when 4
-    require 'mongoid-encrypted-fields/mongoid4/validations/uniqueness'
+    require 'mongoid-encrypted-fields/mongoid4/validatable/uniqueness'
   else
     raise "Unsupported version of Mongoid: #{::Mongoid::VERSION::MAJOR}"
 end

data/lib/mongoid-encrypted-fields/mongoid4/{validations → validatable}/uniqueness.rb

@@ -7,19 +7,29 @@ module Mongoid
     # for encrypted fields; they must always be case-sensitive.
     # Patch is confirmed to work on Mongoid >= 4.0.0
     class UniquenessValidator
+      attr_reader :klass
 
-      def setup_with_validation(klass)
-        setup_without_validation(klass)
+      # Older versions of Mongoid's UniquenessValidator have a klass variable to reference the validating document
+      # This was later replaced in ActiveModel with options[:class]
+      def initialize(options={})
+        super
+        @klass = options[:class]
+      end
+
+      def setup(klass)
+        @klass = klass
+        check_validity!
+      end
+
+      def check_validity!
         return if case_sensitive?
+        return unless klass
         attributes.each do |attribute|
-          field_type = @klass.fields[@klass.database_field_name(attribute)].options[:type]
+          field_type = klass.fields[klass.database_field_name(attribute)].options[:type]
           raise ArgumentError, "Encrypted field :#{attribute} cannot support case insensitive uniqueness" if field_type.method_defined?(:encrypted)
         end
       end
 
-      alias_method :setup_without_validation, :setup
-      alias_method :setup, :setup_with_validation
-
     end
   end
 end

data/lib/mongoid-encrypted-fields/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module EncryptedFields
-      VERSION = '1.3.0'
+      VERSION = '1.3.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-encrypted-fields
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Koan Health
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-10 00:00:00.000000000 Z
+date: 2014-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -115,6 +115,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
+- LICENSE.txt
+- README.md
+- Rakefile
+- lib/mongoid-encrypted-fields.rb
 - lib/mongoid-encrypted-fields/fields/encrypted_date.rb
 - lib/mongoid-encrypted-fields/fields/encrypted_date_time.rb
 - lib/mongoid-encrypted-fields/fields/encrypted_field.rb
@@ -123,13 +128,8 @@ files:
 - lib/mongoid-encrypted-fields/fields/encrypted_time.rb
 - lib/mongoid-encrypted-fields/logging.rb
 - lib/mongoid-encrypted-fields/mongoid3/validations/uniqueness.rb
-- lib/mongoid-encrypted-fields/mongoid4/validations/uniqueness.rb
+- lib/mongoid-encrypted-fields/mongoid4/validatable/uniqueness.rb
 - lib/mongoid-encrypted-fields/version.rb
-- lib/mongoid-encrypted-fields.rb
-- CHANGELOG.md
-- LICENSE.txt
-- README.md
-- Rakefile
 - spec/config/mongoid.yml
 - spec/mongoid-encrypted-fields/fields/encrypted_date_spec.rb
 - spec/mongoid-encrypted-fields/fields/encrypted_datetime_spec.rb
@@ -139,7 +139,7 @@ files:
 - spec/mongoid-encrypted-fields/fields/encrypted_time_spec.rb
 - spec/mongoid-encrypted-fields/fields/model_spec.rb
 - spec/mongoid-encrypted-fields/mongoid3/validations/uniqueness_spec.rb
-- spec/mongoid-encrypted-fields/mongoid4/validations/uniqueness_spec.rb
+- spec/mongoid-encrypted-fields/mongoid4/validatable/uniqueness_spec.rb
 - spec/spec_helper.rb
 - spec/support/models/person.rb
 homepage: https://github.com/KoanHealth/mongoid-encrypted-fields
@@ -162,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Custom types for storing encrypted data
@@ -176,6 +176,6 @@ test_files:
 - spec/mongoid-encrypted-fields/fields/encrypted_time_spec.rb
 - spec/mongoid-encrypted-fields/fields/model_spec.rb
 - spec/mongoid-encrypted-fields/mongoid3/validations/uniqueness_spec.rb
-- spec/mongoid-encrypted-fields/mongoid4/validations/uniqueness_spec.rb
+- spec/mongoid-encrypted-fields/mongoid4/validatable/uniqueness_spec.rb
 - spec/spec_helper.rb
 - spec/support/models/person.rb