minidusen 0.8.3 → 0.10.1

data/Gemfile.6.1.mysql2.lock

@@ -0,0 +1,71 @@
+PATH
+  remote: .
+  specs:
+    minidusen (0.10.1)
+      activerecord (>= 3.2)
+      activesupport (>= 3.2)
+      edge_rider (>= 0.2.5)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    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)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    byebug (11.1.3)
+    concurrent-ruby (1.1.8)
+    database_cleaner (2.0.1)
+      database_cleaner-active_record (~> 2.0.0)
+    database_cleaner-active_record (2.0.0)
+      activerecord (>= 5.a)
+      database_cleaner-core (~> 2.0.0)
+    database_cleaner-core (2.0.1)
+    diff-lcs (1.4.4)
+    edge_rider (2.1.1)
+      activerecord (>= 3.2)
+    gemika (0.5.0)
+    i18n (1.8.9)
+      concurrent-ruby (~> 1.0)
+    minitest (5.14.4)
+    mysql2 (0.5.3)
+    rake (13.0.3)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    zeitwerk (2.4.2)
+
+PLATFORMS
+  x86_64-linux
+
+DEPENDENCIES
+  activerecord (~> 6.1.0)
+  byebug
+  database_cleaner
+  gemika
+  minidusen!
+  mysql2 (~> 0.5)
+  rake
+  rspec (~> 3.5)
+
+BUNDLED WITH
+   2.2.24

data/Gemfile.6.1.pg

@@ -0,0 +1,15 @@
+source 'https://rubygems.org'
+
+# Runtime dependencies
+gem 'activerecord', '~>6.1.0'
+gem 'pg', '~>1.1'
+
+# Development dependendcies
+gem 'rake'
+gem 'database_cleaner'
+gem 'rspec', '~>3.5'
+gem 'byebug'
+gem 'gemika'
+
+# Gem under test
+gem 'minidusen', :path => '.'

data/Gemfile.6.1.pg.lock

@@ -0,0 +1,71 @@
+PATH
+  remote: .
+  specs:
+    minidusen (0.10.1)
+      activerecord (>= 3.2)
+      activesupport (>= 3.2)
+      edge_rider (>= 0.2.5)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    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)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    byebug (11.1.3)
+    concurrent-ruby (1.1.8)
+    database_cleaner (2.0.1)
+      database_cleaner-active_record (~> 2.0.0)
+    database_cleaner-active_record (2.0.0)
+      activerecord (>= 5.a)
+      database_cleaner-core (~> 2.0.0)
+    database_cleaner-core (2.0.1)
+    diff-lcs (1.4.4)
+    edge_rider (2.1.1)
+      activerecord (>= 3.2)
+    gemika (0.5.0)
+    i18n (1.8.9)
+      concurrent-ruby (~> 1.0)
+    minitest (5.14.4)
+    pg (1.2.3)
+    rake (13.0.3)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    zeitwerk (2.4.2)
+
+PLATFORMS
+  x86_64-linux
+
+DEPENDENCIES
+  activerecord (~> 6.1.0)
+  byebug
+  database_cleaner
+  gemika
+  minidusen!
+  pg (~> 1.1)
+  rake
+  rspec (~> 3.5)
+
+BUNDLED WITH
+   2.2.24

data/Gemfile.7.0.mysql2

@@ -0,0 +1,15 @@
+source 'https://rubygems.org'
+
+# Runtime dependencies
+gem 'activerecord', '~>7.0.0'
+gem 'mysql2', '~>0.5'
+
+# Development dependencies
+gem 'rake'
+gem 'database_cleaner'
+gem 'rspec', '~>3.5'
+gem 'byebug'
+gem 'gemika'
+
+# Gem under test
+gem 'minidusen', :path => '.'

data/Gemfile.7.0.mysql2.lock

@@ -0,0 +1,69 @@
+PATH
+  remote: .
+  specs:
+    minidusen (0.10.1)
+      activerecord (>= 3.2)
+      activesupport (>= 3.2)
+      edge_rider (>= 0.2.5)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (7.0.0)
+      activesupport (= 7.0.0)
+    activerecord (7.0.0)
+      activemodel (= 7.0.0)
+      activesupport (= 7.0.0)
+    activesupport (7.0.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    byebug (11.1.3)
+    concurrent-ruby (1.1.9)
+    database_cleaner (2.0.1)
+      database_cleaner-active_record (~> 2.0.0)
+    database_cleaner-active_record (2.0.1)
+      activerecord (>= 5.a)
+      database_cleaner-core (~> 2.0.0)
+    database_cleaner-core (2.0.1)
+    diff-lcs (1.5.0)
+    edge_rider (2.1.1)
+      activerecord (>= 3.2)
+    gemika (0.6.1)
+    i18n (1.8.11)
+      concurrent-ruby (~> 1.0)
+    minitest (5.15.0)
+    mysql2 (0.5.3)
+    rake (13.0.6)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.3)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+
+PLATFORMS
+  x86_64-linux
+
+DEPENDENCIES
+  activerecord (~> 7.0.0)
+  byebug
+  database_cleaner
+  gemika
+  minidusen!
+  mysql2 (~> 0.5)
+  rake
+  rspec (~> 3.5)
+
+BUNDLED WITH
+   2.2.3

data/Gemfile.7.0.pg

@@ -0,0 +1,15 @@
+source 'https://rubygems.org'
+
+# Runtime dependencies
+gem 'activerecord', '~>7.0.0'
+gem 'pg', '~>1.1'
+
+# Development dependendcies
+gem 'rake'
+gem 'database_cleaner'
+gem 'rspec', '~>3.5'
+gem 'byebug'
+gem 'gemika'
+
+# Gem under test
+gem 'minidusen', :path => '.'

data/Gemfile.7.0.pg.lock

@@ -0,0 +1,69 @@
+PATH
+  remote: .
+  specs:
+    minidusen (0.10.1)
+      activerecord (>= 3.2)
+      activesupport (>= 3.2)
+      edge_rider (>= 0.2.5)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (7.0.0)
+      activesupport (= 7.0.0)
+    activerecord (7.0.0)
+      activemodel (= 7.0.0)
+      activesupport (= 7.0.0)
+    activesupport (7.0.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    byebug (11.1.3)
+    concurrent-ruby (1.1.9)
+    database_cleaner (2.0.1)
+      database_cleaner-active_record (~> 2.0.0)
+    database_cleaner-active_record (2.0.1)
+      activerecord (>= 5.a)
+      database_cleaner-core (~> 2.0.0)
+    database_cleaner-core (2.0.1)
+    diff-lcs (1.5.0)
+    edge_rider (2.1.1)
+      activerecord (>= 3.2)
+    gemika (0.6.1)
+    i18n (1.8.11)
+      concurrent-ruby (~> 1.0)
+    minitest (5.15.0)
+    pg (1.2.3)
+    rake (13.0.6)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.3)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+
+PLATFORMS
+  x86_64-linux
+
+DEPENDENCIES
+  activerecord (~> 7.0.0)
+  byebug
+  database_cleaner
+  gemika
+  minidusen!
+  pg (~> 1.1)
+  rake
+  rspec (~> 3.5)
+
+BUNDLED WITH
+   2.2.3

data/README.md

@@ -1,4 +1,4 @@
-Minidusen [![Build Status](https://travis-ci.org/makandra/minidusen.svg?branch=master)](https://travis-ci.org/makandra/minidusen)
+Minidusen [![Tests](https://github.com/makandra/minidusen/workflows/Tests/badge.svg)](https://github.com/makandra/minidusen/actions)
 =========
 
 Low-tech search solution for ActiveRecord with MySQL or PostgreSQL
@@ -53,7 +53,7 @@ Basic Usage
 Our example will be a simple address book:
 
 ```ruby
-class Contact < ActiveRecord::Base
+class Contact < ApplicationRecord
   validates_presence_of :name, :street, :city, :email
 end
 ```
@@ -68,7 +68,6 @@ class ContactFilter
     columns = [:name, :email]
     scope.where_like(columns => phrases)
   end
-
 end
 ```
 
@@ -136,8 +135,45 @@ You can also use `where_like` to find all the records *not* matching some phrase
 Contact.where_like(name: 'foo', negate: true)
 ```
 
-Processing queries for qualified fields
----------------------------------------
+Filtering associated records
+----------------------------
+
+Minidusen lets you find text in associated records.
+
+Assume the following model where a `Contact` record may be associated with a `Group` record:
+
+```ruby
+class Contact < ApplicationRecord
+  belongs_to :group
+
+  validates_presence_of :name, :street, :city, :email
+end
+
+class Group < ApplicationRecord
+  has_many :contacts
+
+  validates_presence_of :name
+end
+```
+
+We can filter contacts by their group name by joining the `groups` table and filtering on a joined column.
+Note how the joined column is qualified as `groups.name` (rather than just `name`):
+
+```ruby
+class ContactFilter
+  include Minidusen::Filter
+
+  filter :text do |scope, phrases|
+    columns = [:name, :email, 'groups.name']
+    scope.includes(:group).where_like(columns => phrases)
+  end
+end
+```
+
+
+
+Supporting qualified field syntax
+---------------------------------
 
 Google supports queries like `filetype:pdf` that filters records by some criteria without performing a full text search. Minidusen gives you a simple way to support such search syntax.
 
@@ -151,7 +187,7 @@ class ContactFilter
   include Minidusen::Filter
 
   filter :email do |scope, email|
-    scope.where(emai: email)
+    scope.where(email: email)
   end
 
   filter :text do |scope, phrases|
@@ -183,9 +219,10 @@ Supported Rails versions
 
 Minidusen is tested on:
 
-- Rails 3.2
 - Rails 4.2
-- Rails 5.0
+- Rails 5.2
+- Rails 6.0
+- Rails 6.1
 - MySQL 5.6
 - PostgreSQL
 
@@ -196,10 +233,10 @@ Development
 -----------
 
 - There are tests in `spec`. We only accept PRs with tests.
-- We currently develop using Ruby 2.2.4 (see `.ruby-version`) since that version works for all versions of ActiveRecord that we support. Travis CI will test additional Ruby versions (2.1.8 and 2.3.1).
+- We currently develop using the Ruby version in `.ruby-version`. It is required to change the Ruby Version to cover all Rails version or just use Gitlab CI.
 - Put your database credentials into `spec/support/database.yml`. There's a `database.sample.yml` you can use as a template.
 - Create a database `minidusen_test` in both MySQL and PostgreSQL.
-- There are gem bundles in `gemfiles` for each combination of ActiveRecord version and database type that we support.
+- There are gem bundles in the project root for each combination of ActiveRecord version and database type that we support.
 - You can bundle all test applications by saying `bundle exec rake matrix:install`
 - You can run specs from the project root by saying `bundle exec rake matrix:spec`. This will run all gemfiles compatible with your current Ruby.
 

data/lib/minidusen/version.rb

@@ -1,3 +1,3 @@
 module Minidusen
-  VERSION = '0.8.3'
+  VERSION = '0.10.1'
 end

data/minidusen.gemspec

@@ -10,6 +10,7 @@ Gem::Specification.new do |s|
   s.summary = 'Low-tech search for ActiveRecord with MySQL or PostgreSQL'
   s.description = s.summary
   s.license = 'MIT'
+  s.metadata = { 'rubygems_mfa_required' => 'true' }
 
   s.files         = `git ls-files`.split("\n").reject { |path| File.lstat(path).symlink? }
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n").reject { |path| File.lstat(path).symlink? }

data/spec/minidusen/filter_spec.rb

@@ -25,7 +25,9 @@ describe Minidusen::Filter do
     it 'should not find stale text after fields were updated (bugfix)' do
       match = User.create!(:name => 'Abraham')
       no_match = User.create!(:name => 'Elizabath')
-      match.update_attributes!(:name => 'Johnny')
+      match.name = 'Johnny'
+      match.save!
+
       user_filter.filter(User, 'Abraham').to_a.should be_empty
       user_filter.filter(User, 'Johnny').to_a.should == [match]
     end

data/spec/spec_helper.rb

@@ -4,7 +4,11 @@ require 'minidusen'
 require 'byebug'
 require 'gemika'
 
-ActiveRecord::Base.default_timezone = :local
+if ActiveRecord::VERSION::MAJOR >= 7
+  ActiveRecord.default_timezone = :local
+else
+  ActiveRecord::Base.default_timezone = :local
+end
 
 Dir["#{File.dirname(__FILE__)}/support/*.rb"].sort.each {|f| require f}
 Dir["#{File.dirname(__FILE__)}/shared_examples/*.rb"].sort.each {|f| require f}

data/spec/support/database.github.yml

@@ -0,0 +1,13 @@
+mysql:
+  database: test
+  username: root
+  password: password
+  host: 127.0.0.1
+  port: 3306
+
+postgresql:
+  database: test
+  host: localhost
+  username: postgres
+  password: postgres
+  port: 5432

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minidusen
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.10.1
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-13 00:00:00.000000000 Z
+date: 2022-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -58,25 +58,35 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
 - ".ruby-version"
-- ".travis.yml"
 - CHANGELOG.md
+- Gemfile.4.2.mysql2
+- Gemfile.4.2.mysql2.lock
+- Gemfile.4.2.pg
+- Gemfile.4.2.pg.lock
+- Gemfile.5.2.mysql2
+- Gemfile.5.2.mysql2.lock
+- Gemfile.5.2.pg
+- Gemfile.5.2.pg.lock
+- Gemfile.6.0.mysql2
+- Gemfile.6.0.mysql2.lock
+- Gemfile.6.0.pg
+- Gemfile.6.0.pg.lock
+- Gemfile.6.1.mysql2
+- Gemfile.6.1.mysql2.lock
+- Gemfile.6.1.pg
+- Gemfile.6.1.pg.lock
+- Gemfile.7.0.mysql2
+- Gemfile.7.0.mysql2.lock
+- Gemfile.7.0.pg
+- Gemfile.7.0.pg.lock
 - LICENSE
 - README.md
 - Rakefile
 - doc/filtered_index_view.cropped.png
-- gemfiles/Gemfile.3.2.mysql2
-- gemfiles/Gemfile.3.2.mysql2.lock
-- gemfiles/Gemfile.4.2.mysql2
-- gemfiles/Gemfile.4.2.mysql2.lock
-- gemfiles/Gemfile.4.2.pg
-- gemfiles/Gemfile.4.2.pg.lock
-- gemfiles/Gemfile.5.0.mysql2
-- gemfiles/Gemfile.5.0.mysql2.lock
-- gemfiles/Gemfile.5.0.pg
-- gemfiles/Gemfile.5.0.pg.lock
 - lib/minidusen.rb
 - lib/minidusen/active_record_ext.rb
 - lib/minidusen/filter.rb
@@ -93,14 +103,15 @@ files:
 - spec/minidusen/query_spec.rb
 - spec/minidusen/util_spec.rb
 - spec/spec_helper.rb
+- spec/support/database.github.yml
 - spec/support/database.rb
 - spec/support/database.sample.yml
-- spec/support/database.travis.yml
 - spec/support/models.rb
 homepage: https://github.com/makandra/minidusen
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -116,8 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.2.28
 signing_key: 
 specification_version: 4
 summary: Low-tech search for ActiveRecord with MySQL or PostgreSQL

data/.travis.yml

@@ -1,39 +0,0 @@
-language: ruby
-
-rvm:
-  - 2.1.8
-  - 2.2.4
-  - 2.3.1
-
-gemfile:
-  - gemfiles/Gemfile.3.2.mysql2
-  - gemfiles/Gemfile.4.2.mysql2
-  - gemfiles/Gemfile.4.2.pg
-  - gemfiles/Gemfile.5.0.mysql2
-  - gemfiles/Gemfile.5.0.pg
-
-before_script:
-  - psql -c 'create database minidusen_test;' -U postgres
-  - mysql -e 'create database IF NOT EXISTS minidusen_test;'
-
-script: bundle exec rspec spec
-
-sudo: false
-
-cache: bundler
-
-notifications:
-  email:
-    - fail@makandra.de
-
-install:
-  # Replace default Travis CI bundler script with a version that doesn't
-  # explode when lockfile doesn't match recently bumped version
-  - bundle install --no-deployment --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}
-
-matrix:
-  exclude:
-    - rvm: 2.1.8
-      gemfile: gemfiles/Gemfile.5.0.mysql2
-    - rvm: 2.1.8
-      gemfile: gemfiles/Gemfile.5.0.pg

data/gemfiles/Gemfile.3.2.mysql2

@@ -1,16 +0,0 @@
-source 'https://rubygems.org'
-
-# Runtime dependencies
-gem 'activerecord', '=3.2.22'
-gem 'mysql2', '= 0.3.17'
-gem 'i18n', '=0.6.11' # 0.7 no longer builds for Ruby 1.8.7
-
-# Development dependencies
-gem 'rake'
-gem 'database_cleaner'
-gem 'rspec', '~> 3.4'
-gem 'byebug'
-gem 'gemika'
-
-# Gem under test
-gem 'minidusen', :path => '..'