searchable-by 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c1c5cfdea465a6a9ff73159a062558c5475889d27e0119e81212bb8bb37bbc1
-  data.tar.gz: c77c158c890b37b67d1243c93b4d5c982731b55fb48d284ecc404de58142da26
+  metadata.gz: 21e09cdcdb1a9bebd3df6bb7a28d4f4cfc566a478b757390ea7f71445f195edd
+  data.tar.gz: 3bad5ea302c2c46bceee3a966b298799c133d1c2db0ffecf6a4bd38bf5393ccc
 SHA512:
-  metadata.gz: 1ba79022ae7056fc1cd6f6ef7af109ed6e0a7228601241ac2bc8f501818b6f487a6fd929f77bc3ce0dba9956b879def3dc705159c3696246d4653e3197f3d71f
-  data.tar.gz: c023dff5eb1bb4685dcfe7d10b7164242a090a930189ccc1b336c6de3437ab05d1de0dc90d13f52412e8e15b16a0a1386d5dacb289b208e00eefca5eab0cc2f7
+  metadata.gz: be511c786fae03cf6f37f392bc122446101ddb7dee1ed7af52bd1d21b92e4512d8493687baa9fa842aef5460f1b6d750f83f7ad9e54b30a2c74a42a8b14971b7
+  data.tar.gz: 8029a6c09870555dcf1d9235127ae1d8312e1cb226b93cf7428176f74efee991235158b2faf12b2b0dd7b7a83f7cfc705ffdfa9e2bb032edbcc8a65a6a0e2bd3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    searchable-by (0.5.1)
+    searchable-by (0.5.2)
       activerecord
       activesupport
 
@@ -25,41 +25,41 @@ GEM
     diff-lcs (1.3)
     i18n (1.6.0)
       concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.2)
+    jaro_winkler (1.5.3)
     minitest (5.11.3)
     parallel (1.17.0)
     parser (2.6.3.0)
       ast (~> 2.4.0)
     rainbow (3.0.0)
-    rake (12.3.2)
+    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.0)
+    rspec-core (3.8.2)
       rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.3)
+    rspec-expectations (3.8.4)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+    rspec-mocks (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    rubocop (0.68.1)
+    rspec-support (3.8.2)
+    rubocop (0.73.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.5, != 2.5.1.1)
+      parser (>= 2.6)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.6)
-    rubocop-performance (1.2.0)
-      rubocop (>= 0.68.0)
-    ruby-progressbar (1.10.0)
+      unicode-display_width (>= 1.4.0, < 1.7)
+    rubocop-performance (1.4.0)
+      rubocop (>= 0.71.0)
+    ruby-progressbar (1.10.1)
     sqlite3 (1.4.1)
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    unicode-display_width (1.5.0)
+    unicode-display_width (1.6.0)
 
 PLATFORMS
   ruby

data/lib/searchable_by.rb

@@ -73,7 +73,7 @@ module ActiveRecord
       case column.type
       when :int, :integer
         begin
-          column.node.eq(Integer(value))
+          column.node.not_eq(nil).and(column.node.eq(Integer(value)))
         rescue ArgumentError
           nil
         end
@@ -81,7 +81,7 @@ module ActiveRecord
         value = value.dup
         value.gsub!('%', '\%')
         value.gsub!('_', '\_')
-        column.node.matches("%#{value}%")
+        column.node.not_eq(nil).and(column.node.matches("%#{value}%"))
       end
     end
 

data/searchable-by.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'searchable-by'
-  s.version     = '0.5.1'
+  s.version     = '0.5.2'
   s.authors     = ['Dimitrij Denissenko']
   s.email       = ['dimitrij@blacksquaremedia.com']
   s.summary     = 'Generate search scopes'

data/spec/searchable_by_spec.rb

@@ -3,13 +3,13 @@ require 'spec_helper'
 describe ActiveRecord::SearchableBy do
 
   it 'should ignore bad inputs' do
-    expect(Post.search_by(nil).count).to eq(4)
-    expect(Post.search_by('').count).to eq(4)
+    expect(Post.search_by(nil).count).to eq(5)
+    expect(Post.search_by('').count).to eq(5)
   end
 
   it 'should configure correctly' do
     expect(AbstractModel._searchable_by_config.columns.size).to eq(1)
-    expect(Post._searchable_by_config.columns.size).to eq(4)
+    expect(Post._searchable_by_config.columns.size).to eq(5)
   end
 
   it 'should generate SQL' do
@@ -23,26 +23,27 @@ describe ActiveRecord::SearchableBy do
   end
 
   it 'should search' do
-    expect(Post.search_by('ALICE').pluck(:title)).to match_array(%w[titla title])
-    expect(Post.search_by('bOb').pluck(:title)).to match_array(%w[titlo titlu])
+    expect(Post.search_by('ALICE').pluck(:title)).to match_array(%w[a1 a2 ab])
+    expect(Post.search_by('bOb').pluck(:title)).to match_array(%w[b1 b2 ab])
   end
 
   it 'should search across multiple words' do
-    expect(Post.search_by('ALICE title').pluck(:title)).to match_array(%w[title])
+    expect(Post.search_by('ALICE your').pluck(:title)).to match_array(%w[a2])
   end
 
   it 'should support search markers' do
-    expect(Post.search_by('aLiCe -title').pluck(:title)).to match_array(%w[titla])
-    expect(Post.search_by('+alice "pie recipe"').pluck(:title)).to match_array(%w[title])
-    expect(Post.search_by('bob -"piu recipe"').pluck(:title)).to match_array(%w[titlo])
+    expect(Post.search_by('aLiCe -your').pluck(:title)).to match_array(%w[a1 ab])
+    expect(Post.search_by('+alice "your recipe"').pluck(:title)).to match_array(%w[a2])
+    expect(Post.search_by('bob -"her recipe"').pluck(:title)).to match_array(%w[b2 ab])
+    expect(Post.search_by('bob +"her recipe"').pluck(:title)).to match_array(%w[b1])
   end
 
   it 'should search within scopes' do
-    expect(Post.where(title: 'title').search_by('ALICE').pluck(:title)).to match_array(%w[title])
-    expect(Post.where(title: 'title').search_by('bOb').pluck(:title)).to match_array(%w[])
+    expect(Post.where(title: 'a1').search_by('ALICE').pluck(:title)).to match_array(%w[a1])
+    expect(Post.where(title: 'a1').search_by('bOb').pluck(:title)).to match_array(%w[])
   end
 
   it 'should search integers' do
-    expect(Post.search_by(POSTS[:alice1].id.to_s).count).to eq(1)
+    expect(Post.search_by(POSTS[:ab].id.to_s).count).to eq(1)
   end
 end

data/spec/spec_helper.rb

@@ -6,11 +6,12 @@ ActiveRecord::Base.configurations['test'] = { 'adapter' => 'sqlite3', 'database'
 ActiveRecord::Base.establish_connection :test
 
 ActiveRecord::Base.connection.instance_eval do
-  create_table :authors do |t|
+  create_table :users do |t|
     t.string  :name
   end
   create_table :posts do |t|
     t.integer :author_id, null: false
+    t.integer :reviewer_id
     t.string  :title
     t.text    :body
   end
@@ -24,31 +25,34 @@ class AbstractModel < ActiveRecord::Base
   end
 end
 
-class Author < AbstractModel
-  has_many :posts
+class User < AbstractModel
+  has_many :posts, foreign_key: :author_id
 end
 
 class Post < AbstractModel
-  belongs_to :author
+  belongs_to :author, class_name: 'User'
+  belongs_to :reviewer, class_name: 'User'
 
   searchable_by do
     column :title, :body
-    column { Author.arel_table[:name] }
+    column { User.arel_table[:name] }
+    column { User.arel_table.alias('reviewers_posts')[:name] }
 
     scope do
-      joins(:author)
+      joins(:author).left_outer_joins(:reviewer)
     end
   end
 end
 
-AUTHORS = {
-  alice: Author.create!(name: 'Alice'),
-  bob: Author.create!(name: 'Bob'),
+USERS = {
+  a: User.create!(name: 'Alice'),
+  b: User.create!(name: 'Bob'),
 }.freeze
 
 POSTS = {
-  alice1: AUTHORS[:alice].posts.create!(title: 'titla', body: 'my pia recipe '),
-  alice2: AUTHORS[:alice].posts.create!(title: 'title', body: 'your pie recipe'),
-  bob1: AUTHORS[:bob].posts.create!(title: 'titlo', body: 'her pio recipe'),
-  bob2: AUTHORS[:bob].posts.create!(title: 'titlu', body: 'our piu recipe'),
+  a1: USERS[:a].posts.create!(title: 'a1', body: 'my recipe '),
+  a2: USERS[:a].posts.create!(title: 'a2', body: 'your recipe'),
+  b1: USERS[:b].posts.create!(title: 'b1', body: 'her recipe'),
+  b2: USERS[:b].posts.create!(title: 'b2', body: 'our recipe'),
+  ab: USERS[:a].posts.create!(title: 'ab', reviewer: USERS[:b], body: 'their recipe'),
 }.freeze

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: searchable-by
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-10 00:00:00.000000000 Z
+date: 2019-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord