blind_index 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2a4c6e35691fe1efa918f077afda9902109591f695a3f4043ae9eb6350ffb44
-  data.tar.gz: dcbe4e3c535a2d36495370a7fa53078d6fd32979c8b7d07b7e29c3202e8fd393
+  metadata.gz: 93b1688db3ff1410b5e56fcf3fae01d76cfcb073df3647abb6582fffbb05d148
+  data.tar.gz: 3b0b3dff637c2eab2b7b4d5811b413166cd23503dec1d6081fb5bfee7533ce99
 SHA512:
-  metadata.gz: 1c80bec06e019677e606d4da2c52d0aa529f5aeb56e1091a79a138ce40b73dedb3244fdabf073a96d249e9a876e6557d73e38bd48dfddfd5b1963e19ebb91c93
-  data.tar.gz: e206e2619af60a2274f300eac56f1edf3a7f00822c8bdead7fa579252b81b7540d16832c083ed630f454c08049521b312c95f72c33e070706894a60f1c3f1eef
+  metadata.gz: fcae62db34e27e82885d6fb200b6d3549bc14d9c7c1ddedf9d59aa32a7f9691010aa641379318fbb20706823b258328013ba7eb3cc2b6e63242ae4addcdc7a0e
+  data.tar.gz: 45a07059d4d78d2a9f814db37d9a80fe37603e78603207b65f80a812bce6e18c818ebb0c3fc7e6b8439203eec4398a81a9db7b32bfaa7061865244841050ad2c

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.1
+
+- Added support for Mongoid
+
 ## 1.0.0
 
 - Added support for master key

data/README.md

@@ -2,11 +2,9 @@
 
 Securely search encrypted database fields
 
-Works with [Lockbox](https://github.com/ankane/lockbox) and [attr_encrypted](https://github.com/attr-encrypted/attr_encrypted)
+Works with [Lockbox](https://github.com/ankane/lockbox) ([full example](https://ankane.org/securing-user-emails-lockbox)) and [attr_encrypted](https://github.com/attr-encrypted/attr_encrypted) ([full example](https://ankane.org/securing-user-emails-in-rails))
 
-Here’s a [full example](https://ankane.org/securing-user-emails-in-rails) of how to use it
-
-Check out [this post](https://ankane.org/sensitive-data-rails) for more info on securing sensitive data with Rails
+Learn more about [securing sensitive data in Rails](https://ankane.org/sensitive-data-rails)
 
 [![Build Status](https://travis-ci.org/ankane/blind_index.svg?branch=master)](https://travis-ci.org/ankane/blind_index)
 
@@ -34,11 +32,11 @@ On Windows, also add:
 gem 'argon2', git: 'https://github.com/technion/ruby-argon2.git', submodules: true
 ```
 
-Until `argon2 >= 2.0.1` is released.
+Until `argon2 > 2.0.2` is released.
 
 ## Getting Started
 
-> Note: Your model should already be set up with Lockbox or attr_encrypted. The examples are for a `User` model with `encrypts :email` or `attr_encrypted :email`. See the [full example](https://ankane.org/securing-user-emails-in-rails) if needed.
+> Note: Your model should already be set up with Lockbox or attr_encrypted. The examples are for a `User` model with `encrypts :email` or `attr_encrypted :email`. See the full examples for [Lockbox](https://ankane.org/securing-user-emails-lockbox) and [attr_encrypted](https://ankane.org/securing-user-emails-in-rails) if needed.
 
 First, generate a key
 
@@ -252,6 +250,16 @@ test_user:
 
 Be sure to include the `inspect` at the end or it won’t be encoded properly in YAML.
 
+## Mongoid
+
+For Mongoid, use:
+
+```ruby
+class User
+  field :email_bidx, type: String
+end
+```
+
 ## Reference
 
 Set default options in an initializer with:

data/lib/blind_index.rb

@@ -145,3 +145,13 @@ ActiveSupport.on_load(:active_record) do
     ActiveRecord::Validations::UniquenessValidator.prepend(BlindIndex::Extensions::UniquenessValidator)
   end
 end
+
+if defined?(Mongoid)
+  # TODO find better ActiveModel hook
+  require "active_model/callbacks"
+  ActiveModel::Callbacks.include(BlindIndex::Model)
+
+  require "blind_index/mongoid"
+  Mongoid::Criteria.prepend(BlindIndex::Mongoid::Criteria)
+  Mongoid::Validatable::UniquenessValidator.prepend(BlindIndex::Mongoid::UniquenessValidator)
+end

data/lib/blind_index/model.rb

@@ -33,7 +33,7 @@ module BlindIndex
         class_method_name = :"generate_#{name}_bidx"
 
         key = options[:key]
-        key ||= -> { BlindIndex.index_key(table: table_name, bidx_attribute: bidx_attribute, master_key: options[:master_key], encode: false) }
+        key ||= -> { BlindIndex.index_key(table: try(:table_name) || collection_name.to_s, bidx_attribute: bidx_attribute, master_key: options[:master_key], encode: false) }
 
         class_eval do
           @blind_indexes ||= {}
@@ -74,7 +74,15 @@ module BlindIndex
           end
 
           if callback
-            before_validation method_name, if: -> { changes.key?(attribute.to_s) }
+            if defined?(ActiveRecord) && self < ActiveRecord::Base
+              # Active Record
+              # prevent deprecation warnings
+              before_validation method_name, if: -> { changes.key?(attribute.to_s) }
+            else
+              # Mongoid
+              # Lockbox only supports attribute_changed?
+              before_validation method_name, if: -> { send("#{attribute}_changed?") }
+            end
           end
 
           # use include so user can override

data/lib/blind_index/mongoid.rb

@@ -0,0 +1,51 @@
+module BlindIndex
+  module Mongoid
+    module Criteria
+      private
+
+      def expr_query(criterion)
+        if criterion.is_a?(Hash) && klass.respond_to?(:blind_indexes)
+          criterion.keys.each do |key|
+            key_sym = (key.is_a?(::Mongoid::Criteria::Queryable::Key) ? key.name : key).to_sym
+
+            if (bi = klass.blind_indexes[key_sym])
+              value = criterion.delete(key)
+
+              bidx_key =
+                if key.is_a?(::Mongoid::Criteria::Queryable::Key)
+                  ::Mongoid::Criteria::Queryable::Key.new(
+                    bi[:bidx_attribute],
+                    key.strategy,
+                    key.operator,
+                    key.expanded,
+                    &key.block
+                  )
+                else
+                  bi[:bidx_attribute]
+                end
+
+              criterion[bidx_key] =
+                if value.is_a?(Array)
+                  value.map { |v| BlindIndex.generate_bidx(v, bi) }
+                else
+                  BlindIndex.generate_bidx(value, bi)
+                end
+            end
+          end
+        end
+
+        super(criterion)
+      end
+    end
+
+    module UniquenessValidator
+      def create_criteria(base, document, attribute, value)
+        if base.respond_to?(:blind_indexes) && (bi = base.blind_indexes[attribute])
+          value = BlindIndex.generate_bidx(value, bi)
+          attribute = bi[:bidx_attribute]
+        end
+        super(base, document, attribute, value)
+      end
+    end
+  end
+end

data/lib/blind_index/version.rb

@@ -1,3 +1,3 @@
 module BlindIndex
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blind_index
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-08 00:00:00.000000000 Z
+date: 2019-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -177,6 +177,7 @@ files:
 - lib/blind_index/extensions.rb
 - lib/blind_index/key_generator.rb
 - lib/blind_index/model.rb
+- lib/blind_index/mongoid.rb
 - lib/blind_index/version.rb
 homepage: https://github.com/ankane/blind_index
 licenses: