searchable-by 0.5.8 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9577dc443c9400afd9bb866e8a53a351cf1e56420ce28b140c184e6647689411
-  data.tar.gz: 6a84939c7bb80af91d31b6d6bb3fd65acd672a4b41fbc25dbe08664e74d1f58d
+  metadata.gz: 8b6f1b26859c89dfec031b51501c3f1dd6e8050d27bf7ae00bdb0ef9b8495422
+  data.tar.gz: a24dc8497c85648498fccffd56aaa4f995d7c31b48ab21e970356115a6a1ec50
 SHA512:
-  metadata.gz: 86367f8084de15d5d8e11568c1dadd5beddb090bf4dc4c334133197e15906e0bced5396a5c95f9434e6902d2ae0752698590f1b2fc1eacba26cb49a66a3e5697
-  data.tar.gz: ac9f4157b9a1705b50c95c9e1e3ee4f9c19b5ea7be9fec12a5a42df53eb0a2761a0c90c902dce641f15628ac48f2b3be4e1b504cfb36bebd6db00620dda4d787
+  metadata.gz: 33f4d29187d4bf9545af72632b1c17742be5ceeb3b699d36dc6e0f251151dabb06877269378d17f72dcb152f4413265866b9e076c537f5f0e1cf3f12689d3492
+  data.tar.gz: 6cba46e2c5ee6bf164490d5f7e2b7c715ae19dcc51d6eafbc3e93283e4d02e887e926eadc821753cf4b25522b5adb4322ac37a89d678beb76c33b7fd79fb193a

data/.github/workflows/ruby.yml

@@ -0,0 +1,21 @@
+name: Ruby
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ["2.6", "2.7", "3.0"]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
+      - run: bundle exec rake

data/Gemfile.lock

@@ -1,19 +1,19 @@
 PATH
   remote: .
   specs:
-    searchable-by (0.5.8)
+    searchable-by (0.5.9)
       activerecord
       activesupport
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (6.1.1)
-      activesupport (= 6.1.1)
-    activerecord (6.1.1)
-      activemodel (= 6.1.1)
-      activesupport (= 6.1.1)
-    activesupport (6.1.1)
+    activemodel (6.1.3)
+      activesupport (= 6.1.3)
+    activerecord (6.1.3)
+      activemodel (= 6.1.3)
+      activesupport (= 6.1.3)
+    activesupport (6.1.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -22,16 +22,16 @@ GEM
     ast (2.4.2)
     concurrent-ruby (1.1.8)
     diff-lcs (1.4.4)
-    i18n (1.8.8)
+    i18n (1.8.9)
       concurrent-ruby (~> 1.0)
-    minitest (5.14.3)
+    minitest (5.14.4)
     parallel (1.20.1)
     parser (3.0.0.0)
       ast (~> 2.4.1)
     rack (2.2.3)
     rainbow (3.0.0)
     rake (13.0.3)
-    regexp_parser (2.0.3)
+    regexp_parser (2.1.1)
     rexml (3.2.4)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
@@ -46,7 +46,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
-    rubocop (1.9.1)
+    rubocop (1.11.0)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
@@ -63,7 +63,7 @@ GEM
       rubocop-rails
       rubocop-rake
       rubocop-rspec
-    rubocop-performance (1.9.2)
+    rubocop-performance (1.10.1)
       rubocop (>= 0.90.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     rubocop-rails (2.9.1)
@@ -95,4 +95,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   2.2.3
+   2.2.5

data/lib/searchable_by/column.rb

@@ -1,14 +1,15 @@
 module SearchableBy
   class Column
-    attr_reader :attr, :type, :match, :match_phrase, :min_length
+    attr_reader :attr, :type, :match, :match_phrase, :min_length, :wildcard
     attr_accessor :node
 
-    def initialize(attr, type: :string, match: :all, match_phrase: nil, min_length: 0)
+    def initialize(attr, type: :string, match: :all, match_phrase: nil, min_length: 0, wildcard: nil) # rubocop:disable Metrics/ParameterLists
       @attr  = attr
       @type  = type.to_sym
       @match = match
       @match_phrase = match_phrase || match
       @min_length = min_length
+      @wildcard = wildcard
     end
 
     def build_condition(value)
@@ -47,6 +48,7 @@ module SearchableBy
       else
         term.gsub!('%', '\%')
         term.gsub!('_', '\_')
+        term.gsub!(wildcard, '%') if wildcard
         scope.and(node.matches("%#{term}%"))
       end
     end

data/searchable-by.gemspec

@@ -1,12 +1,12 @@
 Gem::Specification.new do |s|
   s.name        = 'searchable-by'
-  s.version     = '0.5.8'
+  s.version     = '0.5.9'
   s.authors     = ['Dimitrij Denissenko']
   s.email       = ['dimitrij@blacksquaremedia.com']
   s.summary     = 'Generate search scopes'
   s.description = 'ActiveRecord plugin'
   s.homepage    = 'https://github.com/bsm/sortable-by'
-  s.license     = 'MIT'
+  s.license     = 'Apache-2.0'
 
   s.files         = `git ls-files -z`.split("\x0").reject {|f| f.start_with?('spec/') }
   s.test_files    = `git ls-files -z -- spec/*`.split("\x0")

data/spec/searchable_by_spec.rb

@@ -22,6 +22,12 @@ describe SearchableBy do
     expect(sql).not_to include(%("posts"."id"))
     expect(sql).to include(%("posts"."title" LIKE 'foo\\%bar%'))
     expect(sql).to include(%("posts"."body" LIKE '%foo\\%bar%'))
+
+    sql = User.search_by('uni*dom').to_sql
+    expect(sql).to include(%("users"."country" LIKE '%uni%dom%'))
+
+    sql = User.search_by('"uni * dom"').to_sql
+    expect(sql).to include(%("users"."country" LIKE '%uni % dom%'))
   end
 
   it 'searches' do
@@ -74,4 +80,10 @@ describe SearchableBy do
   it 'searches integers' do
     expect(Post.search_by(POSTS[:ab1].id.to_s).count).to eq(1)
   end
+
+  it 'supports wildcard searching' do
+    expect(User.search_by('uni*dom')).to match_array([USERS[:a]])
+    expect(User.search_by('uni*o')).to match_array([USERS[:a], USERS[:b]])
+    expect(User.search_by('uni*of*dom')).to be_empty
+  end
 end

data/spec/spec_helper.rb

@@ -9,6 +9,7 @@ ActiveRecord::Base.connection.instance_eval do
   create_table :users do |t|
     t.string  :name
     t.string  :bio
+    t.string  :country
   end
   create_table :posts do |t|
     t.integer :author_id, null: false
@@ -31,6 +32,7 @@ class User < AbstractModel
 
   searchable_by do
     column :bio, min_length: 3
+    column :country, wildcard: '*'
   end
 end
 
@@ -51,8 +53,8 @@ class Post < AbstractModel
 end
 
 USERS = {
-  a: User.create!(name: 'Alice', bio: 'First user'),
-  b: User.create!(name: 'Bob', bio: 'Second user'),
+  a: User.create!(name: 'Alice', bio: 'First user', country: 'United Kingdom'),
+  b: User.create!(name: 'Bob', bio: 'Second user', country: 'United States of America'),
 }.freeze
 
 POSTS = {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: searchable-by
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.9
 platform: ruby
 authors:
 - Dimitrij Denissenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-10 00:00:00.000000000 Z
+date: 2021-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -129,9 +129,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -149,7 +149,7 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/bsm/sortable-by
 licenses:
-- MIT
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []

data/.travis.yml

@@ -1,8 +0,0 @@
-language: ruby
-rvm:
-  - 3.0
-  - 2.7
-  - 2.6
-cache: bundler
-before_install:
-  - gem install bundler