searchable-by 0.5.2 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21e09cdcdb1a9bebd3df6bb7a28d4f4cfc566a478b757390ea7f71445f195edd
-  data.tar.gz: 3bad5ea302c2c46bceee3a966b298799c133d1c2db0ffecf6a4bd38bf5393ccc
+  metadata.gz: 412ef1f5428799d4fa13cd47f5fb61ff0f1f0ac2b24aa57080a78fe822cb3163
+  data.tar.gz: eb464947796e011504c2b56d4f23d870b74569991d63e8bb56e1f3c6cde5803c
 SHA512:
-  metadata.gz: be511c786fae03cf6f37f392bc122446101ddb7dee1ed7af52bd1d21b92e4512d8493687baa9fa842aef5460f1b6d750f83f7ad9e54b30a2c74a42a8b14971b7
-  data.tar.gz: 8029a6c09870555dcf1d9235127ae1d8312e1cb226b93cf7428176f74efee991235158b2faf12b2b0dd7b7a83f7cfc705ffdfa9e2bb032edbcc8a65a6a0e2bd3
+  metadata.gz: 3bd7cf0127afe48ffde887f891237e8875db6c84e78ed77d95c800cd77c7c6a34626b81965f4661be34d73f13200c9a1bfb73caf7e3f0aeeb3441f13e641a96f
+  data.tar.gz: ae8f9671375e16ec060ac6952abad79c57f232011f799086322d3e409ce202076c94e546a2712b1b22401b0045832662438595e3b8e91129aa4504c8ff0500ff

data/.rubocop.yml

@@ -3,8 +3,8 @@ inherit_from:
   - https://gitlab.com/bsm/misc/raw/master/rubocop/default.yml
 
 AllCops:
-  TargetRubyVersion: "2.4"
+  TargetRubyVersion: "2.5"
 
 Naming/FileName:
   Exclude:
-    - lib/searchable-by.rb
+    - lib/searchable-by.rb

data/.travis.yml

@@ -2,7 +2,6 @@ language: ruby
 rvm:
   - 2.6
   - 2.5
-  - 2.4
 cache: bundler
 before_install:
   - gem install bundler

data/Gemfile.lock

@@ -1,58 +1,57 @@
 PATH
   remote: .
   specs:
-    searchable-by (0.5.2)
+    searchable-by (0.5.4)
       activerecord
       activesupport
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (5.2.3)
-      activesupport (= 5.2.3)
-    activerecord (5.2.3)
-      activemodel (= 5.2.3)
-      activesupport (= 5.2.3)
-      arel (>= 9.0)
-    activesupport (5.2.3)
+    activemodel (6.0.1)
+      activesupport (= 6.0.1)
+    activerecord (6.0.1)
+      activemodel (= 6.0.1)
+      activesupport (= 6.0.1)
+    activesupport (6.0.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    arel (9.0.0)
+      zeitwerk (~> 2.2)
     ast (2.4.0)
     concurrent-ruby (1.1.5)
     diff-lcs (1.3)
-    i18n (1.6.0)
+    i18n (1.7.0)
       concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.3)
-    minitest (5.11.3)
-    parallel (1.17.0)
-    parser (2.6.3.0)
+    jaro_winkler (1.5.4)
+    minitest (5.13.0)
+    parallel (1.18.0)
+    parser (2.6.5.0)
       ast (~> 2.4.0)
     rainbow (3.0.0)
-    rake (12.3.3)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.2)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
+    rake (13.0.1)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.0)
+      rspec-support (~> 3.9.0)
+    rspec-expectations (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.1)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
-    rubocop (0.73.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.0)
+    rubocop (0.76.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.6)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-performance (1.4.0)
+    rubocop-performance (1.5.0)
       rubocop (>= 0.71.0)
     ruby-progressbar (1.10.1)
     sqlite3 (1.4.1)
@@ -60,6 +59,7 @@ GEM
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     unicode-display_width (1.6.0)
+    zeitwerk (2.2.1)
 
 PLATFORMS
   ruby
@@ -74,4 +74,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   2.0.1
+   2.0.2

data/lib/searchable_by.rb

@@ -1,5 +1,4 @@
 require 'active_record'
-require 'shellwords'
 
 module ActiveRecord
   module SearchableBy
@@ -42,19 +41,37 @@ module ActiveRecord
       end
     end
 
+    Value = Struct.new(:term, :negate)
+
     def self.norm_values(query)
-      values = Shellwords.split(query.to_s)
-      values.flatten!
-      values.reject!(&:blank?)
+      values = []
+      query  = query.to_s.dup
+
+      # capture any terms inside double quotes
+      # exclude from seach if preceded by '-'
+      query.gsub!(/([\-\+]?)"+([^"]*)"+/) do |_|
+        term = Regexp.last_match(2)
+        negate = Regexp.last_match(1) == '-'
+
+        values.push Value.new(term, negate) unless term.blank?
+        ''
+      end
+
+      # for the remaining terms remove sign if precedes
+      # exclude term from search if sign preceding is '-'
+      query.split(' ').each do |term|
+        negate = term[0] == '-'
+        term.slice!(0) if negate || term[0] == '+'
+
+        values.push Value.new(term, negate) unless term.blank?
+      end
+
       values.uniq!
       values
     end
 
     def self.build_clauses(columns, values)
       clauses = values.map do |value|
-        negate = value[0] == '-'
-        value.slice!(0) if negate || value[0] == '+'
-
         grouping = columns.map do |column|
           build_condition(column, value)
         end
@@ -62,7 +79,7 @@ module ActiveRecord
         next if grouping.empty?
 
         clause = grouping.inject(&:or)
-        clause = clause.not if negate
+        clause = clause.not if value.negate
         clause
       end
       clauses.compact!
@@ -73,15 +90,15 @@ module ActiveRecord
       case column.type
       when :int, :integer
         begin
-          column.node.not_eq(nil).and(column.node.eq(Integer(value)))
+          column.node.not_eq(nil).and(column.node.eq(Integer(value.term)))
         rescue ArgumentError
           nil
         end
       else
-        value = value.dup
-        value.gsub!('%', '\%')
-        value.gsub!('_', '\_')
-        column.node.not_eq(nil).and(column.node.matches("%#{value}%"))
+        term = value.term.dup
+        term.gsub!('%', '\%')
+        term.gsub!('_', '\_')
+        column.node.not_eq(nil).and(column.node.matches("%#{term}%"))
       end
     end
 

data/searchable-by.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'searchable-by'
-  s.version     = '0.5.2'
+  s.version     = '0.5.4'
   s.authors     = ['Dimitrij Denissenko']
   s.email       = ['dimitrij@blacksquaremedia.com']
   s.summary     = 'Generate search scopes'
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.files         = `git ls-files -z`.split("\x0").reject {|f| f.match(%r{^spec/}) }
   s.test_files    = `git ls-files -z -- spec/*`.split("\x0")
   s.require_paths = ['lib']
-  s.required_ruby_version = '>= 2.4'
+  s.required_ruby_version = '>= 2.5'
 
   s.add_dependency 'activerecord'
   s.add_dependency 'activesupport'

data/spec/searchable_by_spec.rb

@@ -1,6 +1,37 @@
 require 'spec_helper'
 
 describe ActiveRecord::SearchableBy do
+  context 'norm_values' do
+    def norm(str)
+      described_class.norm_values(str).each_with_object({}) do |val, acc|
+        acc[val.term] = val.negate
+      end
+    end
+
+    it 'should tokenise strings' do
+      expect(norm(nil)).to eq({})
+      expect(norm('""')).to eq({})
+      expect(norm('-+""')).to eq({})
+      expect(norm('simple words')).to eq('simple' => false, 'words' => false)
+      expect(norm(" with   \t spaces\n")).to eq('with' => false, 'spaces' => false)
+      expect(norm('with with duplicates with')).to eq('with' => false, 'duplicates' => false)
+      expect(norm('with "full term"')).to eq('full term' => false, 'with' => false)
+      expect(norm('"""odd double quotes around"""')).to eq('odd double quotes around' => false)
+      expect(norm('""even double quotes around""')).to eq('even double quotes around'=> false)
+      expect(norm('with\'apostrophe')).to eq("with'apostrophe" => false)
+      expect(norm('with -minus')).to eq('minus' => true, 'with' => false)
+      expect(norm('with +plus')).to eq('plus' => false, 'with' => false)
+      expect(norm('with-minus')).to eq('with-minus' => false)
+      expect(norm('with+plus')).to eq('with+plus' => false)
+      expect(norm('with -"minus before"')).to eq('minus before' => true, 'with' => false)
+      expect(norm('with "-minus within"')).to eq('-minus within' => false, 'with' => false)
+      expect(norm('with +"plus before"')).to eq('plus before' => false, 'with' => false)
+      expect(norm('with "+plus within"')).to eq('+plus within' => false, 'with' => false)
+      expect(norm('+plus "in other term"')).to eq('in other term' => false, 'plus' => false)
+      expect(norm('with_blank \'\'')).to eq('with_blank' => false, '\'\'' => false)
+      expect(norm('with_blank_doubles ""')).to eq('with_blank_doubles' => false)
+    end
+  end
 
   it 'should ignore bad inputs' do
     expect(Post.search_by(nil).count).to eq(5)

data/spec/spec_helper.rb

@@ -2,7 +2,7 @@ ENV['RACK_ENV'] ||= 'test'
 require 'searchable-by'
 require 'rspec'
 
-ActiveRecord::Base.configurations['test'] = { 'adapter' => 'sqlite3', 'database' => ':memory:' }
+ActiveRecord::Base.configurations = { 'test' => { 'adapter' => 'sqlite3', 'database' => ':memory:' } }
 ActiveRecord::Base.establish_connection :test
 
 ActiveRecord::Base.connection.instance_eval do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: searchable-by
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.4
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-26 00:00:00.000000000 Z
+date: 2019-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -154,14 +154,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Generate search scopes