mongoid-encrypted-fields 1.2.1 → 1.2.2

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZmZkZTFkMzNjYzIwYTBkYWMxYzVmNzBlNjg2MjdiMWU4OGE2Njc0OA==
+  data.tar.gz: !binary |-
+    YmVjZTZmNGU4NDFiNzIwOTA4ZDdjZWE2M2I2Yjg0MThhMjYwOGU4Nw==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    N2ViYzJlNGYzOTI1ZWY5NjQ5YjY3MWZjMTNmZjZhY2I3ZDIyMjMyYjJkMGJi
+    MTgxNmEwNmNjOTE2MmZiOTU1NjU2NDkzNjE1MjFhMGE3YWYyN2I0NjZkZGVk
+    ZjFkYmExNGY4NjM5MzVmNzJhMmU2YmIyZjc4MWI1OTNlZmM1MzQ=
+  data.tar.gz: !binary |-
+    MjIyNDViMDdhYmY3OGE5NjNlMWIyZWQ1NjJiZWVkZmUxNWNkYmY0NzMwNmUw
+    MzNkM2Y3ZTZlM2E2MmNjZmE2MzA2ODA4ZjZjMTk5M2RjMTUwYzIxMjgwYmE5
+    Y2JmMDgzNDM2Njk2OTYxYWFmZDNjZTdlMTc1YmY5YTg1Njk5YzU=

data/.coveralls.yml

@@ -0,0 +1 @@
+service_name: travis-ci

data/.gitignore

@@ -20,3 +20,4 @@ tmp
 
 #Ignore IDEA directory
 /.idea
+.tags*

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+bundler_args: --without development
+rvm:
+  - 1.9.3
+notifications:
+  recipients:
+    - jerry.clinesmith@koanhealth.com
+services:
+  - mongodb

data/CHANGLOG.md

@@ -1,10 +1,13 @@
 # Revision history
 
-## 1.2.1 - Uniqueness validator fails if developer attempts to use case-insensitive option for an encrypted field
+## 1.2.2
+* Accepted [pull request](https://github.com/KoanHealth/mongoid-encrypted-fields/pull/10) to support aliased fields with the uniqueness validator (@johnnyshields)
 
-## 1.2 - Add EncryptedHash
+## 1.2.1
+* Uniqueness validator fails if developer attempts to use case-insensitive option for an encrypted field
 
-* Accepted [pull request](https://github.com/KoanHealth/mongoid-encrypted-fields/pull/4) from ashirazi to add support for encrypted hashes
+## 1.2 - Add EncryptedHash
+* Accepted [pull request](https://github.com/KoanHealth/mongoid-encrypted-fields/pull/4) to add support for encrypted hashes (@ashirazi)
 
 ## 1.1 - Breaking changes - PLEASE READ
 

data/Gemfile

@@ -1,4 +1,13 @@
 source 'https://rubygems.org'
-
-# Specify your gem's dependencies in mongoid-encrypted-fields.gemspec
 gemspec
+
+gem 'rake'
+gem 'mongoid', '~> 3'
+
+gem 'coveralls', require: false
+
+group :test do
+  gem 'rspec', '~> 2.13'
+  gem 'gibberish', '~> 1.2.2'
+  gem 'encrypted_strings', '~> 0.3'
+end

data/README.md

@@ -1,5 +1,9 @@
 mongoid-encrypted-fields
 ========================
+[![Build Status](https://secure.travis-ci.org/KoanHealth/mongoid-encrypted-fields.png?branch=master&.png)](http://travis-ci.org/KoanHealth/mongoid-encrypted-fields)
+[![Code Climate](https://codeclimate.com/github/KoanHealth/mongoid-encrypted-fields.png)](https://codeclimate.com/github/KoanHealth/mongoid-encrypted-fields)
+[![Coverage Status](https://coveralls.io/repos/KoanHealth/mongoid-encrypted-fields/badge.png?branch=master)](https://coveralls.io/r/KoanHealth/mongoid-encrypted-fields)
+[![Dependency Status](https://gemnasium.com/KoanHealth/mongoid-encrypted-fields.png)](https://gemnasium.com/KoanHealth/mongoid-encrypted-fields)
 
 A library for storing encrypted data in Mongo using Mongoid.  We looked at a few alternatives, but wanted something that stored the values securely and unobtrusively.
 

data/Rakefile

@@ -1,8 +1,17 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler'
+require 'bundler/gem_tasks'
+Bundler.setup
 
-RSpec::Core::RakeTask.new do |task|
-  task.rspec_opts = ["-c", "-f progress", "-r ./spec/spec_helper.rb"]
-  task.pattern    = 'spec/**/*_spec.rb'
+require 'rake'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new('spec') do |spec|
+  spec.pattern = 'spec/**/*_spec.rb'
+end
+
+RSpec::Core::RakeTask.new('spec:progress') do |spec|
+  spec.rspec_opts = %w(--format progress)
+  spec.pattern = 'spec/**/*_spec.rb'
 end
 
+task :default => :spec

data/lib/mongoid-encrypted-fields/validations/uniqueness.rb

@@ -3,21 +3,18 @@
 module Mongoid
   module Validations # renamed to module Validatable in Mongoid 4.0
 
-    # Monkey-patch for Mongoid's uniqueness validator to encrypt
-    # uniqueness test values before querying the database
+    # Monkey-patch for Mongoid's uniqueness validator to enforce that the :case_sensitive option does not work
+    # for encrypted fields; they must always be case-sensitive.
     #
     # Patch is confirmed to work on Mongoid >= 3.0.0
     # Should work in Mongoid >= 4.0.0 by renaming module Validations to Validatable
-    #
-    # A known limitation is that the :case_sensitive option does not work
-    # for encrypted fields; they must always be case-sensitive.
     class UniquenessValidator
 
       def setup_with_validation(klass)
         setup_without_validation(klass)
         return if case_sensitive?
         attributes.each do |attribute|
-          field_type = @klass.fields[attribute.to_s].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

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

@@ -1,5 +1,5 @@
 module Mongoid
   module EncryptedFields
-      VERSION = '1.2.1'
+      VERSION = '1.2.2'
   end
 end

data/mongoid-encrypted-fields.gemspec

@@ -4,23 +4,24 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'mongoid-encrypted-fields/version'
 
 Gem::Specification.new do |gem|
-  gem.name          = "mongoid-encrypted-fields"
+  gem.name          = 'mongoid-encrypted-fields'
   gem.version       = Mongoid::EncryptedFields::VERSION
-  gem.authors       = ["Koan Health"]
-  gem.email         = ["development@koanhealth.com"]
-  gem.description   = "A library for storing encrypted data in Mongo"
-  gem.summary       = "Custom types for storing encrypted data"
-  gem.homepage      = "https://github.com/KoanHealth/mongoid-encrypted-fields"
+  gem.authors       = ['Koan Health']
+  gem.email         = ['development@koanhealth.com']
+  gem.description   = 'A library for storing encrypted data in Mongo'
+  gem.summary       = 'Custom types for storing encrypted data'
+  gem.homepage      = 'https://github.com/KoanHealth/mongoid-encrypted-fields'
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ["lib"]
+  gem.require_paths = ['lib']
 
-  gem.add_dependency "mongoid", "~> 3"
+  gem.add_dependency 'mongoid', '~> 3'
 
-  gem.add_development_dependency "rake"
-  gem.add_development_dependency "rspec"
-  gem.add_development_dependency "gibberish", "~> 1.2.2"
-  gem.add_development_dependency "encrypted_strings", "~> 0.3"
+  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'gibberish', '~> 1.2.2'
+  gem.add_development_dependency 'encrypted_strings', '~> 0.3'
+  gem.add_development_dependency 'coveralls'
 end

data/spec/mongoid-encrypted-fields/validations/uniqueness_spec.rb

@@ -14,7 +14,7 @@ describe Mongoid::Validations::UniquenessValidator do
   describe "#valid?" do
 
     let(:person) do
-      Person.new(name: "bill", ssn: "abc456789")
+      Person.new(name: "bill", ssn: "abc456789", credit_card: "12345678", phone_number: "12345678")
     end
 
     after do
@@ -54,8 +54,13 @@ describe Mongoid::Validations::UniquenessValidator do
 
         context "when the validation is case-sensitive" do
 
+          before do
+            Person.validates_uniqueness_of :ssn
+            Person.create!(ssn: "abc456789")
+          end
+
           it "behaves as case-sensitive" do
-            expect(person).to be_valid
+            expect(person).not_to be_valid
           end
         end
 
@@ -95,5 +100,52 @@ describe Mongoid::Validations::UniquenessValidator do
         end
       end
     end
+
+    context "when the field name is aliased" do
+
+      context "when the aliased name is used" do
+
+        context "when the field is encrypted" do
+
+          it "throws an exception" do
+            expect { Person.validates_uniqueness_of :credit_card, case_sensitive: false }.to raise_error 'Encrypted field :credit_card cannot support case insensitive uniqueness'
+          end
+        end
+
+        context "when the field is not encrypted" do
+
+          before do
+            Person.validates_uniqueness_of :phone_number, case_sensitive: false
+            Person.create!(phone_number: "12345678")
+          end
+
+          it "correctly detects a uniqueness conflict" do
+            expect(person).to_not be_valid
+          end
+        end
+      end
+
+      context "when the underlying name is used" do
+
+        context "when the field is encrypted" do
+
+          it "throws an exception" do
+            expect { Person.validates_uniqueness_of :cc, case_sensitive: false }.to raise_error 'Encrypted field :cc cannot support case insensitive uniqueness'
+          end
+        end
+
+        context "when the field is not encrypted" do
+
+          before do
+            Person.validates :ph, uniqueness: { case_sensitive: false }
+            Person.create!(phone_number: "12345678")
+          end
+
+          it "correctly detects a uniqueness conflict" do
+            expect(person).to_not be_valid
+          end
+        end
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -3,6 +3,9 @@ require 'bundler/setup'
 require 'mongoid'
 require 'rspec'
 
+require 'coveralls'
+Coveralls.wear!
+
 require 'mongoid-encrypted-fields'
 
 Dir["#{File.dirname(__FILE__)}/../examples/**/*.rb"].each {|f| require f}
@@ -11,9 +14,12 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 ENV['MONGOID_ENV'] ||= 'test'
 Mongoid.load!("#{File.dirname(__FILE__)}/config/mongoid.yml")
 
-Mongoid::EncryptedFields.logger.level = Logger::DEBUG
+Mongoid::EncryptedFields.logger.level = Logger::FATAL
 
 RSpec.configure do |config|
+  Mongoid.logger = Mongoid::EncryptedFields.logger
+  Moped.logger = Mongoid::EncryptedFields.logger
+
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus

data/spec/support/models/person.rb

@@ -5,5 +5,7 @@ class Person
   field :ssn, type: Mongoid::EncryptedString
   field :birth_date, type: Mongoid::EncryptedDate
   field :address, type: Mongoid::EncryptedHash
+  field :ph, as: :phone_number, type: String
+  field :cc, as: :credit_card, type: Mongoid::EncryptedString
 
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-encrypted-fields
 version: !ruby/object:Gem::Version
-  version: 1.2.1
-  prerelease: 
+  version: 1.2.2
 platform: ruby
 authors:
 - Koan Health
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-22 00:00:00.000000000 Z
+date: 2013-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: gibberish
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: encrypted_strings
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,11 +76,24 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A library for storing encrypted data in Mongo
 email:
 - development@koanhealth.com
@@ -98,11 +101,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .coveralls.yml
 - .gitignore
-- .rspec
 - .ruby-gemset
 - .ruby-version
-- .rvmrc
+- .travis.yml
 - CHANGLOG.md
 - Gemfile
 - LICENSE.txt
@@ -135,33 +138,26 @@ files:
 - spec/support/models/person.rb
 homepage: https://github.com/KoanHealth/mongoid-encrypted-fields
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3728144320335115622
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3728144320335115622
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Custom types for storing encrypted data
 test_files:
 - spec/config/mongoid.yml

data/.rspec

@@ -1,2 +0,0 @@
---color
---format progress

data/.rvmrc

@@ -1 +0,0 @@
-rvm use 1.9.3@mongoid-encrypted-fields --create