crypt_keeper 2.0.0.rc2 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d2c48e454fad3b2d938bbcabb028983954c991479524a7240acb772b46e37b1
-  data.tar.gz: 907dd02f441238eaa0a3a77c8be9dd5f936a615630bc96c6759930f74da99f06
+  metadata.gz: a3487da836fa168664dc80667a7ec11cf0101b74724cc63d67ea47c67e46615e
+  data.tar.gz: 9bb8281e94f569254ff80c5e153a6291e8dbe0f40469a6e0fa2aeef058c745e6
 SHA512:
-  metadata.gz: d9a292f9d37a60cf43a9f27c4981e6bfbfd7f603e5f53cbc08932103d9fd61c3c83c141ba56d67b26b7925a7f6d46b87885a9d595ce0b7eaa37ca7e846ee24ca
-  data.tar.gz: 61def2dfc5d5deadb6b9f667d2b8490cc357e4956059abf45fedc7adae856a95d5f90fe2364da402dbcd0d00b791205e1a9222ce53c190b42b6fa92d0c65bb91
+  metadata.gz: 422a52090724c857b26fafe9db634c736f1d21c66fb4a51d4516e76414f66a3f84205ef64b5e83facbb856c5dc1ee633f6827ced22144691edf43f24e79b8eb9
+  data.tar.gz: d90f464be5ef20b854fa144b40dff7f081608f3e6384176b1ab8b8efb867dd98651a8d6d7b9785a0f37ef4687f229c1679731dd2a3925f885eedeb92e58eec5a

data/.travis.yml

@@ -4,6 +4,8 @@ rvm:
   - 2.2.7
   - 2.3.4
   - 2.4.1
+  - 2.5.3
+  - 2.6.0
 
 gemfile:
   - gemfiles/activerecord_4_2.gemfile

data/crypt_keeper.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |gem|
     gem.add_development_dependency 'activerecord-jdbcpostgresql-adapter'
     gem.add_development_dependency 'activerecord-jdbcmysql-adapter'
   else
-    gem.add_development_dependency 'sqlite3'
+    gem.add_development_dependency 'sqlite3', '~> 1.3', '< 1.4'
     gem.add_development_dependency 'pg', '~> 0.18.0'
     gem.add_development_dependency 'mysql2', '>= 0.3.13', '< 0.6.0'
   end

data/gemfiles/activerecord_4_2.gemfile

@@ -4,6 +4,5 @@ source "https://rubygems.org"
 
 gem "activerecord", "~> 4.2.0"
 gem "activesupport", "~> 4.2.0"
-gem "mysql2", ">= 0.3.13", "< 0.5"
 
 gemspec :path => "../"

data/gemfiles/activerecord_5_0.gemfile

@@ -4,6 +4,5 @@ source "https://rubygems.org"
 
 gem "activerecord", "~> 5.0.0"
 gem "activesupport", "~> 5.0.0"
-gem "mysql2", ">= 0.3.18", "< 0.6.0"
 
 gemspec :path => "../"

data/gemfiles/activerecord_5_1.gemfile

@@ -4,6 +4,5 @@ source "https://rubygems.org"
 
 gem "activerecord", "~> 5.1.0"
 gem "activesupport", "~> 5.1.0"
-gem "mysql2", ">= 0.3.18", "< 0.6.0"
 
 gemspec :path => "../"

data/gemfiles/activerecord_5_2.gemfile

@@ -4,6 +4,5 @@ source "https://rubygems.org"
 
 gem "activerecord", "~> 5.2.0"
 gem "activesupport", "~> 5.2.0"
-gem "mysql2", ">= 0.4.4", "< 0.6.0"
 
 gemspec :path => "../"

data/lib/crypt_keeper/provider/postgres_pgp.rb

@@ -42,8 +42,14 @@ module CryptKeeper
       end
 
       def search(records, field, criteria)
-        records.where("(pgp_sym_decrypt(cast(\"#{field}\" AS bytea), ?) = ?)",
-          key, criteria)
+        if criteria.present?
+          records
+            .where.not("TRIM(BOTH FROM #{field}) = ?", "")
+            .where("(pgp_sym_decrypt(cast(\"#{field}\" AS bytea), ?) = ?)",
+                   key, criteria)
+        else
+          records.where(field => criteria)
+        end
       end
 
       private

data/lib/crypt_keeper/version.rb

@@ -1,3 +1,3 @@
 module CryptKeeper
-  VERSION = "2.0.0.rc2"
+  VERSION = "2.0.1"
 end

data/spec/crypt_keeper/provider/postgres_pgp_spec.rb

@@ -64,6 +64,42 @@ describe CryptKeeper::Provider::PostgresPgp do
       match = subject.create!(storage: 'blah')
       expect(subject.search_by_plaintext(:storage, 'blah').first).to eq(match)
     end
+
+    it "successfully accesses result when the data has empty strings and nil" do
+      subject.create!(storage: nil)
+      subject.create!(storage: '')
+      subject.create!(storage: '   ')
+      match = subject.create!(storage: 'blah')
+
+      results = subject.search_by_plaintext(:storage, 'blah')
+
+      expect(results).to match_array([match])
+    end
+
+    it "finds an empty string" do
+      subject.create!(storage: nil)
+      subject.create!(storage: 'blah')
+      match = subject.create!(storage: '')
+
+      expect(subject.search_by_plaintext(:storage, '')).to match_array([match])
+    end
+
+    it "finds the empty string with the right number of spaces" do
+      subject.create!(storage: '')
+      match = subject.create!(storage: '   ')
+
+      results = subject.search_by_plaintext(:storage, '   ')
+
+      expect(results).to match_array([match])
+    end
+
+    it "finds nil results" do
+      subject.create!(storage: '')
+      subject.create!(storage: 'blah')
+      match = subject.create!(storage: nil)
+
+      expect(subject.search_by_plaintext(:storage, nil)).to match_array([match])
+    end
   end
 
   describe "Custom pgcrypto options" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crypt_keeper
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc2
+  version: 2.0.1
 platform: ruby
 authors:
 - Justin Mazzi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-10 00:00:00.000000000 Z
+date: 2019-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -152,16 +152,22 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -261,9 +267,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6