minidusen 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21b9abdca5644bbe2c9d7266988f8a0a22927435
-  data.tar.gz: 8fde451ba5ee361aa2c7ee3377ac195edd641d0e
+  metadata.gz: 5bd84ad91feb76221d8d3f3b23995fceebf512b9
+  data.tar.gz: cf0b8b10d9caab23d4b4f4b7bb5c9d22ed185502
 SHA512:
-  metadata.gz: fbd3c16faed08b0ec651898c609f78da008688701513dbfa372f495327540d14d283f031d9723d75a8425069499aab945129ee794b0bd1aa85699bc9bcd36e6c
-  data.tar.gz: fc869ed7bd8b21f1babd9c433bf6c5c31383188a6d9672e3a43680591bde2989dbd61ce4678d9ff525a1ef2d266935fd3da245a288eb3b110ba0c00846d01812
+  metadata.gz: a2002af4871106833bd6d2e861fa6cf78b879837e493668cfb5490749a8e99a5ed065d375a55b0cb1e7d6640be2863447b584574230306eca1e7497704353102
+  data.tar.gz: 9e22eb209770e120e23de9d8ab3c19c07ecb019bbb6f7aaa8ee4dc8d230c6a4a3b77ce47cec6eeb4735491615a64ef6998e28fb50684c742c75f2986d533af75

data/.travis.yml

@@ -1,30 +1,34 @@
 language: ruby
+
 rvm:
-  - "2.1.8"
-  - "2.3.1"
+  - 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
-branches:
-  only:
-    - master
+
 matrix:
   exclude:
-    - rvm: "2.3.1"
-      gemfile: gemfiles/Gemfile.3.2.mysql2
-    - rvm: "2.1.8"
+    - rvm: 2.1.8
       gemfile: gemfiles/Gemfile.5.0.mysql2
-    - rvm: "2.1.8"
+    - rvm: 2.1.8
       gemfile: gemfiles/Gemfile.5.0.pg

data/CHANGELOG.md

@@ -0,0 +1,5 @@
+# Minidusen change log
+
+## 0.8.0 (2017-08-21)
+
+- Filters are now run in the context of the filter instance, not the filter class. This allows using private methods or instance variables.

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Henning Koch
+Copyright (c) 2016 Henning Koch
 
 MIT License
 

data/README.md

@@ -1,4 +1,4 @@
-Minidusen [![Build Status](https://secure.travis-ci.org/makandra/minidusen.png?branch=master)](https://travis-ci.org/makandra/minidusen)
+Minidusen [![Build Status](https://travis-ci.org/makandra/minidusen.svg?branch=master)](https://travis-ci.org/makandra/minidusen)
 =========
 
 Low-tech search solution for ActiveRecord with MySQL or PostgreSQL
@@ -7,6 +7,13 @@ Low-tech search solution for ActiveRecord with MySQL or PostgreSQL
 Minidusen lets you filter ActiveRecord models with a single query string.
 It works with your existing MySQL or PostgreSQL schema by mostly relying on simple `LIKE` queries. No additional indexes, tables or indexing databases are required.
 
+This makes Minidusen a quick way to implement find-as-you-type filters for index views:
+
+![A list of records filtered by a query](https://raw.githubusercontent.com/makandra/minidusen/master/doc/filtered_index_view.cropped.png)
+
+
+### Supported queries
+
 Minidusen accepts a single, Google-like query string and converts it into `WHERE` conditions for [an ActiveRecord scope](http://guides.rubyonrails.org/active_record_querying.html#conditions).
 
 The following type of queries are supported:
@@ -18,11 +25,14 @@ The following type of queries are supported:
 - `filetype:pdf` (developer-defined filter for file type)
 - `some words 'a phrase' filetype:pdf -excluded -'excluded  phrase' -filetype:pdf` (combination of the above)
 
-Minidusen is a quick way to implement find-as-you-type filters for index views:
 
-![A list of records filtered by a query](https://raw.githubusercontent.com/makandra/minidusen/master/doc/filtered_index_view.cropped.png)
+### Limitations
+
+Since Minidusen doesn't use an index, it scales linearly with the amount of of text that needs to be searched. Yet `LIKE` queries are pretty fast and we have found this low-tech approach to scale well for many thousand records.
 
-We have found it to scale well for many thousand records. It's probably not a good idea to use Minidusen for hundreds of thousands of records or very long text columns. For this we recommend to use PostgreSQL with [pg_search](https://github.com/Casecommons/pg_search) or full-text databases like [Solr](https://github.com/sunspot/sunspot).
+It's probably not a good idea to use Minidusen for hundreds of thousands of records, or for very long text columns. For this we recommend to use PostgreSQL with [pg_search](https://github.com/Casecommons/pg_search) or full-text databases like [Solr](https://github.com/sunspot/sunspot).
+
+Another limitation of Minidusen is that it only *filters*, but does not *rank*. A record either matches or not. Minidusen won't tell you if one record matches *better* than another record.
 
 
 Installation
@@ -134,17 +144,17 @@ Google supports queries like `filetype:pdf` that filters records by some criteri
 Let's support a query like `email:foo@bar.com` to explictly search for a contact's email address, without filtering against other columns.
 
 We can learn this syntax by adding a `filter:email` instruction
-to our `ContactFilter` class`:
+to our `ContactFilter` class:
 
 ```ruby
 class ContactFilter
   include Minidusen::Filter
 
-  search_by :email do |scope, email|
+  filter :email do |scope, email|
     scope.where(emai: email)
   end
 
-  search_by :text do |scope, phrases|
+  filter :text do |scope, phrases|
     columns = [:name, :email]
     scope.where_like(columns => phrases)
   end
@@ -186,13 +196,12 @@ 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.
-- TravisCI will test additional Ruby versions (2.1.8 and 2.3.1)
+- 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).
 - 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.
-- You can bundle all test applications by saying `bundle exec rake all:install`
-- You can run specs from the project root by saying `bundle exec rake all:spec`.
+- 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.
 
 If you would like to contribute:
 

data/Rakefile

@@ -1,42 +1,9 @@
 require 'rake'
 require 'bundler/gem_tasks'
-
-desc 'Default: Run all specs.'
-task :default => 'all:spec'
-
-namespace :all do
-
-  desc "Run specs on all versions"
-  task :spec do
-    success = true
-    for_each_gemfile do
-      success &= system("bundle exec rspec spec")
-    end
-    fail "Tests failed" unless success
-  end
-
-  desc "Bundle all versions"
-  task :install do
-    for_each_gemfile do
-      system('bundle install')
-    end
-  end
-
-  desc "Update all versions"
-  task :update do
-    for_each_gemfile do
-      system('bundle update')
-    end
-  end
-
+begin
+  require 'gemika/tasks'
+rescue LoadError
+  puts 'Run `gem install gemika` for additional tasks'
 end
 
-def for_each_gemfile
-  version = ENV['VERSION'] || '*'
-  Dir["gemfiles/Gemfile.#{version}"].sort.each do |gemfile|
-    next if gemfile =~ /.lock/
-    puts '', "\033[44m#{gemfile}\033[0m", ''
-    ENV['BUNDLE_GEMFILE'] = gemfile
-    yield
-  end
-end
+task :default => 'matrix:spec'

data/gemfiles/Gemfile.3.2.mysql2

@@ -1,10 +1,16 @@
 source 'https://rubygems.org'
 
+# Runtime dependencies
 gem 'activerecord', '=3.2.22'
-gem 'rspec', '~> 3.4'
 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 => '..'
-gem 'i18n', '=0.6.11' # 0.7 no longer builds for Ruby 1.8.7

data/gemfiles/Gemfile.3.2.mysql2.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    minidusen (0.7.0)
+    minidusen (0.8.0)
       activerecord (>= 3.2)
       activesupport (>= 3.2)
       edge_rider (>= 0.2.5)
@@ -22,27 +22,30 @@ GEM
       multi_json (~> 1.0)
     arel (3.0.3)
     builder (3.0.4)
-    byebug (8.2.0)
+    byebug (9.0.5)
+    database_cleaner (1.5.3)
     diff-lcs (1.2.5)
     edge_rider (0.3.1)
       activerecord
+    gemika (0.3.2)
     i18n (0.6.11)
-    multi_json (1.11.2)
+    multi_json (1.12.1)
     mysql2 (0.3.17)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.1)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
+    rake (11.3.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.3)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.1)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
-    tzinfo (0.3.46)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    tzinfo (0.3.51)
 
 PLATFORMS
   ruby
@@ -50,9 +53,12 @@ PLATFORMS
 DEPENDENCIES
   activerecord (= 3.2.22)
   byebug
+  database_cleaner
+  gemika
   i18n (= 0.6.11)
   minidusen!
   mysql2 (= 0.3.17)
+  rake
   rspec (~> 3.4)
 
 BUNDLED WITH

data/gemfiles/Gemfile.4.2.mysql2

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

data/gemfiles/Gemfile.4.2.mysql2.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    minidusen (0.7.0)
+    minidusen (0.8.0)
       activerecord (>= 3.2)
       activesupport (>= 3.2)
       edge_rider (>= 0.2.5)
@@ -9,14 +9,14 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.2.5)
-      activesupport (= 4.2.5)
+    activemodel (4.2.7.1)
+      activesupport (= 4.2.7.1)
       builder (~> 3.1)
-    activerecord (4.2.5)
-      activemodel (= 4.2.5)
-      activesupport (= 4.2.5)
+    activerecord (4.2.7.1)
+      activemodel (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
       arel (~> 6.0)
-    activesupport (4.2.5)
+    activesupport (4.2.7.1)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -24,27 +24,30 @@ GEM
       tzinfo (~> 1.1)
     arel (6.0.3)
     builder (3.2.2)
-    byebug (8.2.0)
+    byebug (9.0.5)
+    database_cleaner (1.5.3)
     diff-lcs (1.2.5)
     edge_rider (0.3.1)
       activerecord
+    gemika (0.3.2)
     i18n (0.7.0)
     json (1.8.3)
-    minitest (5.8.3)
-    mysql2 (0.3.20)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.1)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
+    minitest (5.9.0)
+    mysql2 (0.3.21)
+    rake (11.3.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.3)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.1)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
     thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
@@ -55,8 +58,11 @@ PLATFORMS
 DEPENDENCIES
   activerecord (~> 4.2.1)
   byebug
+  database_cleaner
+  gemika
   minidusen!
   mysql2 (~> 0.3.17)
+  rake
   rspec (~> 3.4)
 
 BUNDLED WITH

data/gemfiles/Gemfile.4.2.pg

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

data/gemfiles/Gemfile.4.2.pg.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    minidusen (0.7.0)
+    minidusen (0.8.0)
       activerecord (>= 3.2)
       activesupport (>= 3.2)
       edge_rider (>= 0.2.5)
@@ -9,14 +9,14 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.2.5)
-      activesupport (= 4.2.5)
+    activemodel (4.2.7.1)
+      activesupport (= 4.2.7.1)
       builder (~> 3.1)
-    activerecord (4.2.5)
-      activemodel (= 4.2.5)
-      activesupport (= 4.2.5)
+    activerecord (4.2.7.1)
+      activemodel (= 4.2.7.1)
+      activesupport (= 4.2.7.1)
       arel (~> 6.0)
-    activesupport (4.2.5)
+    activesupport (4.2.7.1)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -24,27 +24,30 @@ GEM
       tzinfo (~> 1.1)
     arel (6.0.3)
     builder (3.2.2)
-    byebug (8.2.0)
+    byebug (9.0.5)
+    database_cleaner (1.5.3)
     diff-lcs (1.2.5)
     edge_rider (0.3.1)
       activerecord
+    gemika (0.3.2)
     i18n (0.7.0)
     json (1.8.3)
-    minitest (5.8.3)
-    pg (0.18.4)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.1)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
+    minitest (5.9.0)
+    pg (0.19.0)
+    rake (11.3.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.3)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.1)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
     thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
@@ -55,8 +58,11 @@ PLATFORMS
 DEPENDENCIES
   activerecord (~> 4.2.1)
   byebug
+  database_cleaner
+  gemika
   minidusen!
   pg
+  rake
   rspec (~> 3.4)
 
 BUNDLED WITH

data/gemfiles/Gemfile.5.0.mysql2

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

data/gemfiles/Gemfile.5.0.mysql2.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    minidusen (0.7.0)
+    minidusen (0.8.0)
       activerecord (>= 3.2)
       activesupport (>= 3.2)
       edge_rider (>= 0.2.5)
@@ -23,12 +23,15 @@ GEM
     arel (7.1.2)
     byebug (9.0.5)
     concurrent-ruby (1.0.2)
+    database_cleaner (1.5.3)
     diff-lcs (1.2.5)
     edge_rider (0.3.1)
       activerecord
+    gemika (0.3.2)
     i18n (0.7.0)
     minitest (5.9.0)
     mysql2 (0.4.4)
+    rake (11.3.0)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
@@ -52,8 +55,11 @@ PLATFORMS
 DEPENDENCIES
   activerecord (~> 5.0.0)
   byebug
+  database_cleaner
+  gemika
   minidusen!
   mysql2 (~> 0.4.4)
+  rake
   rspec (~> 3.5)
 
 BUNDLED WITH

data/gemfiles/Gemfile.5.0.pg

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

data/gemfiles/Gemfile.5.0.pg.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    minidusen (0.7.0)
+    minidusen (0.8.0)
       activerecord (>= 3.2)
       activesupport (>= 3.2)
       edge_rider (>= 0.2.5)
@@ -23,12 +23,15 @@ GEM
     arel (7.1.2)
     byebug (9.0.5)
     concurrent-ruby (1.0.2)
+    database_cleaner (1.5.3)
     diff-lcs (1.2.5)
     edge_rider (0.3.1)
       activerecord
+    gemika (0.3.2)
     i18n (0.7.0)
     minitest (5.9.0)
     pg (0.18.4)
+    rake (11.3.0)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
@@ -52,8 +55,11 @@ PLATFORMS
 DEPENDENCIES
   activerecord (~> 5.0.0)
   byebug
+  database_cleaner
+  gemika
   minidusen!
   pg (~> 0.18.4)
+  rake
   rspec (~> 3.5)
 
 BUNDLED WITH

data/lib/minidusen/filter.rb

@@ -18,7 +18,7 @@ module Minidusen
     end
 
     def filter(scope, query)
-      minidusen_syntax.search(scope, query)
+      minidusen_syntax.search(self, scope, query)
     end
 
     private

data/lib/minidusen/syntax.rb

@@ -10,12 +10,12 @@ module Minidusen
       @scopers[field] = scoper
     end
 
-    def search(root_scope, query)
+    def search(instance, root_scope, query)
       query = parse(query) if query.is_a?(String)
       query = query.condensed
-      matches = apply_query(root_scope, query.include)
+      matches = apply_query(instance, root_scope, query.include)
       if query.exclude.any?
-        matches = append_excludes(matches, query.exclude)
+        matches = append_excludes(instance, matches, query.exclude)
       end
       matches
     end
@@ -34,17 +34,17 @@ module Minidusen
       scope.where('1=2')
     end
 
-    def apply_query(root_scope, query)
+    def apply_query(instance, root_scope, query)
       scope = root_scope
       query.each do |token|
         scoper = @scopers[token.field] || NONE
-        scope = scoper.call(scope, token.value)
+        scope = instance.instance_exec(scope, token.value, &scoper)
       end
       scope
     end
 
-    def append_excludes(matches, exclude_query)
-      excluded_records = apply_query(matches.origin_class, exclude_query)
+    def append_excludes(instance, matches, exclude_query)
+      excluded_records = apply_query(instance, matches.origin_class, exclude_query)
       qualified_id_field = Util.qualify_column_name(excluded_records, excluded_records.primary_key)
       exclude_sql = "#{qualified_id_field} NOT IN (#{excluded_records.select(qualified_id_field).to_sql})"
       matches.where(exclude_sql)

data/lib/minidusen/util.rb

@@ -2,7 +2,7 @@ module Minidusen
   module Util
     extend self
 
-    def postgres?(scope)
+    def postgresql?(scope)
       adapter_name = scope.connection.class.name
       adapter_name =~ /postgres/i
     end
@@ -12,7 +12,7 @@ module Minidusen
     end
 
     def ilike_operator(scope)
-      if postgres?(scope)
+      if postgresql?(scope)
         'ILIKE'
       else
         'LIKE'
@@ -20,7 +20,7 @@ module Minidusen
     end
 
     def regexp_operator(scope)
-      if postgres?(scope)
+      if postgresql?(scope)
         '~'
       else
         'REGEXP'

data/lib/minidusen/version.rb

@@ -1,3 +1,3 @@
 module Minidusen
-  VERSION = '0.7.0'
+  VERSION = '0.8.0'
 end

data/spec/minidusen/filter_spec.rb

@@ -181,6 +181,27 @@ describe Minidusen::Filter do
 
     end
 
+    it 'runs filter in the instance context' do
+      filter_class = Class.new do
+        include Minidusen::Filter
+
+        def columns
+          [:name, :email, :city]
+        end
+
+        filter :text do |scope, phrases|
+          scope.report_instance(self)
+          scope.where_like(columns => phrases)
+        end
+      end
+      filter_instance = filter_class.new
+
+      match = User.create!(:name => 'Abraham')
+      no_match = User.create!(:name => 'Elizabath')
+      expect(User).to receive(:report_instance).with(filter_instance)
+      filter_instance.filter(User, 'Abra').to_a.should == [match]
+    end
+
   end
 
   describe '#minidusen_syntax' do

data/spec/spec_helper.rb

@@ -2,28 +2,15 @@ $: << File.join(File.dirname(__FILE__), "/../../lib" )
 
 require 'minidusen'
 require 'byebug'
+require 'gemika'
 
 ActiveRecord::Base.default_timezone = :local
 
 Dir["#{File.dirname(__FILE__)}/support/*.rb"].sort.each {|f| require f}
 Dir["#{File.dirname(__FILE__)}/shared_examples/*.rb"].sort.each {|f| require f}
 
+Gemika::RSpec.configure_clean_database_before_example
 
-RSpec.configure do |config|
-
+Gemika::RSpec.configure do |config|
   config.expect_with(:rspec) { |c| c.syntax = [:should, :expect] }
-
-  config.around do |example|
-    if example.metadata.fetch(:rollback, true)
-      ActiveRecord::Base.transaction do
-        begin
-          example.run
-        ensure
-          raise ActiveRecord::Rollback
-        end
-      end
-    else
-      example.run
-    end
-  end
 end

data/spec/support/database.rb

@@ -1,31 +1,4 @@
-require 'yaml'
-
-database_config_file = ENV['TRAVIS'] ? 'database.travis.yml' : 'database.yml'
-database_config_file = File.join(File.dirname(__FILE__), database_config_file)
-File.exists?(database_config_file) or raise "Missing database configuration file: #{database_config_file}"
-
-database_config = YAML.load_file(database_config_file)
-
-connection_config = {}
-
-case ENV['BUNDLE_GEMFILE']
-when /pg/, /postgres/
-  connection_config = database_config['postgresql'].merge(adapter: 'postgresql')
-when /mysql2/
-  connection_config = database_config['mysql'].merge(adapter: 'mysql2', encoding: 'utf8')
-else
-  raise "Unknown database type in Gemfile suffix: #{ENV['BUNDLE_GEMFILE']}"
-end
-
-ActiveRecord::Base.establish_connection(connection_config)
-
-
-connection = ::ActiveRecord::Base.connection
-connection.tables.each do |table|
-  connection.drop_table table
-end
-
-ActiveRecord::Migration.class_eval do
+Gemika::Database.new.rewrite_schema! do
 
   create_table :users do |t|
     t.string :name

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minidusen
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Henning Koch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-15 00:00:00.000000000 Z
+date: 2017-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -62,6 +62,7 @@ files:
 - ".rspec"
 - ".ruby-version"
 - ".travis.yml"
+- CHANGELOG.md
 - LICENSE
 - README.md
 - Rakefile