mincer 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d97a97f1c5f14b8411b406709621b4fe9f2c14b
-  data.tar.gz: bf7f943474b0fc73e112bb5d78ce0edf5f018dea
+  metadata.gz: 977d1742d488e2ec263b062b0ebd6ff27335a377
+  data.tar.gz: 436e3e27dc8664fd945af1ba045b58bfff108f57
 SHA512:
-  metadata.gz: d01b5f077f72bb1e9b70b7f88bbe64a5afb92409d476a04a8200f15d02e95491cd4a0c6db067266d95c3beb377488fb58be3a77f34fdc47d80933c750f1238d0
-  data.tar.gz: 9bd281ba05fcd19e8f8ff96eb2da31eba134a9e163c925431e5b43f3564ad59aaaa567c882db7cb6128659fac58c1c12e666d267b058f4c1b67265854cf4267c
+  metadata.gz: f984595c4b855119c56707fff4e997f3d1790d4a4d46f4f53b8480d4b4527e69c17ba0d30aef198d79d623155fd9769dc7c47553149bbf57e2a33c183a4139b0
+  data.tar.gz: e3bc8da6242291d4786574a4b5654c86148b96e3012f6583d7ff256b11751d2db54364af4193edf9203843a15c1a3cba2cb61431d6f74f54b5e4ab06b7c862d6

data/README.md

@@ -38,7 +38,20 @@ Lets assume we have 2 models
         has_many :employees
     end
 
-Lets create class EmployeesListQuery class that will inherit from Mincer::Base, and instantiate it
+### Generating custom query
+
+    rails generate mincer:query EmployeesList
+
+Will generate employees_list_query.rb file in /app/queries/ directory
+
+    class EmployeesListQuery < Mincer::Base
+      def build_query(relation, args)
+        # Apply your conditions, custom selects, etc. to relation
+        relation
+      end        
+    end
+
+It inherits from Mincer::Base. Lets instantiate it
 
     class EmployeesListQuery < Mincer::Base
         # method should always return relation
@@ -205,6 +218,12 @@ If you set `ignore_case` attribute to true - search will ignore case.
 
     pg_search [{ :columns => %w{employees.full_name companies.name} }, :ignore_case => true ]
 
+Options like `unaccent`, `any_word`, `ignore_case` can be set to be used only on query or document. In Example if you use specific column that already has unaccented and lowercased text with GIN/GIST index and do not want to additionally use `unaccent` or `ignore_case` functions on that column(because this will cause index not to work) -you can disable those options. Ex.
+
+    pg_search [{ :columns => %w{employees.full_name} }, :ignore_case => {query: true} ]
+
+This way `ignore_case` function will be used only on pattern that you are searching for and not on columns.
+
 If you set `param_name` attribute to any other string - this string will be used to extract search term from params(Default param_name = 'patern').
 
     pg_search [{ :columns => %w{employees.full_name companies.name} }, :param_name => 's']
@@ -299,6 +318,7 @@ or run `CREATE EXTENSION IF NOT EXISTS pgcrypto;`
     2. Change default arguments(sort, order, pattern, page, per_page..)
     3. Disable some processors for all Mincer objects
 2. Create rails generators.
+3. Add coalescing as option for document
 
 
 ## Contributing

data/lib/generators/mincer/query_generator.rb

@@ -0,0 +1,18 @@
+require 'rails/generators'
+
+module Mincer
+  module Generators
+    class QueryGenerator < ::Rails::Generators::NamedBase
+      source_root File.expand_path("../templates", __FILE__)
+
+      desc <<DESC
+  Description:
+      Creates query file for selected model
+DESC
+
+      def create_query_file
+        template 'query.rb', "app/queries/#{file_name}_query.rb"
+      end
+    end
+  end
+end

data/lib/generators/mincer/templates/query.rb

@@ -0,0 +1,8 @@
+# encoding: utf-8
+
+class <%= class_name %>Query < Mincer::Base
+  def build_query(relation, args)
+    # Apply your conditions, custom selects, etc. to relation
+    relation
+  end
+end

data/lib/mincer/processors/pg_search/search_engines/array.rb

@@ -29,7 +29,7 @@ module Mincer
 
         def query_for(search_statement)
           normalized_pattern = search_statement.pattern.split(%r{\s|,}).uniq.reject(&:empty?).map do |item|
-            sanitize_string_quoted(item, search_statement.sanitizers).to_sql
+            sanitize_string_quoted(item, search_statement.sanitizers(:query)).to_sql
           end.join(',')
           Arel.sql("ARRAY[#{normalized_pattern}]")
         end

data/lib/mincer/processors/pg_search/search_engines/fulltext.rb

@@ -7,10 +7,14 @@ module Mincer
         def conditions
           return nil unless prepared_search_statements.any?
           arel_group do
-            conditions = prepared_search_statements.map do |search_statement|
-              arel_group(Arel::Nodes::InfixOperation.new('@@', document_for(search_statement), query_for(search_statement)))
-            end
-            join_expressions(conditions, :or)
+            documents = prepared_search_statements.map do |search_statement|
+              ts_query = ts_query_for(search_statement)
+              ts_vectors_for(search_statement).map do |ts_vector|
+                arel_group(Arel::Nodes::InfixOperation.new('@@', ts_vector, ts_query))
+              end
+            end.flatten
+
+            join_expressions(documents, :or)
           end
         end
 
@@ -18,8 +22,12 @@ module Mincer
           return nil unless prepared_search_statements.any?
           arel_group do
             ranks = prepared_search_statements.map do |search_statement|
-              Arel::Nodes::NamedFunction.new('ts_rank', [document_for(search_statement), query_for(search_statement)]).to_sql
-            end
+              ts_query = ts_query_for(search_statement)
+              ts_vectors_for(search_statement).map do |ts_vector|
+                Arel::Nodes::NamedFunction.new('ts_rank', [ts_vector, ts_query])
+              end
+            end.flatten
+
             join_expressions(ranks, '+')
           end
         end
@@ -34,23 +42,20 @@ module Mincer
           end.compact
         end
 
-        def document_for(search_statement)
-          arel_group do
-            search_statement.columns.map do |search_column|
-              sanitized_term = sanitize_column(search_column, search_statement.sanitizers + [:coalesce])
-              Arel::Nodes::NamedFunction.new('to_tsvector', [search_statement.dictionary, sanitized_term]).to_sql
-            end.join(' || ')
+        def ts_vectors_for(search_statement)
+          sanitizers = search_statement.sanitizers(:document)
+          # sanitizers += [:coalesce] if (search_statement.columns.size > 1)
+          documents =  search_statement.columns.map do |search_column|
+            sanitized_term = sanitize_column(search_column, sanitizers)
+            ts_vector = Arel::Nodes::NamedFunction.new('to_tsvector', [search_statement.dictionary, sanitized_term])
           end
         end
 
-        def query_for(search_statement)
+        def ts_query_for(search_statement)
           terms_delimiter = search_statement.options[:any_word] ? '|' : '&'
-          tsquery_sql = Arel.sql(search_statement.terms.map { |term| sanitize_string_quoted(term, search_statement.sanitizers).to_sql }.join(" || ' #{terms_delimiter} ' || "))
-          arel_group do
-            Arel::Nodes::NamedFunction.new('to_tsquery', [search_statement.dictionary, tsquery_sql])
-          end
+          tsquery_sql = Arel.sql(search_statement.terms.map { |term| sanitize_string_quoted(term, search_statement.sanitizers(:query)).to_sql }.join(" || ' #{terms_delimiter} ' || "))
+          Arel::Nodes::NamedFunction.new('to_tsquery', [search_statement.dictionary, tsquery_sql])
         end
-
       end
 
     end

data/lib/mincer/processors/pg_search/search_engines/trigram.rb

@@ -2,6 +2,7 @@ module Mincer
   module PgSearch
     module SearchEngines
       class Trigram < Base
+        @@default_threshold = nil
 
         def conditions
           return nil unless prepared_search_statements.any?
@@ -22,19 +23,38 @@ module Mincer
 
         def document_for(search_statement)
           documents = search_statement.columns.map do |search_column|
-            similarity = Arel::Nodes::NamedFunction.new('similarity', [sanitize_column(search_column, search_statement.sanitizers), sanitize_string(search_statement.pattern, search_statement.sanitizers)])
-            arel_group(similarity.gteq(search_statement.threshold))
+            if self.class.default_threshold == search_statement.threshold
+              arel_group(join_expressions([sanitize_column(search_column, search_statement.sanitizers(:document)), sanitize_string(search_statement.pattern, search_statement.sanitizers(:query))], '%'))
+            else
+              arel_group(similarity_function(search_column, search_statement).gteq(search_statement.threshold))
+            end
           end
           join_expressions(documents, :or)
         end
 
         def rank_for(search_statement)
           ranks = search_statement.columns.map do |search_column|
-            Arel::Nodes::NamedFunction.new('similarity', [sanitize_column(search_column, search_statement.sanitizers), sanitize_string(search_statement.pattern, search_statement.sanitizers)])
+            similarity_function(search_column, search_statement)
           end
           join_expressions(ranks, :+)
         end
 
+        def similarity_function(search_column, search_statement)
+          Arel::Nodes::NamedFunction.new('similarity', [sanitize_column(search_column, search_statement.sanitizers(:document)), sanitize_string(search_statement.pattern, search_statement.sanitizers(:query))])
+        end
+
+        def self.default_threshold
+          if @@default_threshold.nil?
+            grab_default_threshold
+          else
+            @@default_threshold
+          end
+        end
+
+        def self.grab_default_threshold
+          @@default_threshold = ::Mincer.connection.execute('SELECT show_limit();').first['show_limit'].to_r
+        end
+
       end
     end
   end

data/lib/mincer/processors/pg_search/search_statement.rb

@@ -9,8 +9,11 @@ module Mincer
           @columns, @options = columns, ::ActiveSupport::HashWithIndifferentAccess.new(options)
         end
 
-        def sanitizers
-          @sanitizers ||= Sanitizer::AVAILABLE_SANITIZERS.select { |sanitizer| options[sanitizer] }
+        def sanitizers(type = :all)
+          @sanitizers ||= {}
+          @sanitizers[type] ||= Sanitizer::AVAILABLE_SANITIZERS.select do |sanitizer|
+            options[sanitizer].is_a?(Hash) && [:query, :document].include?(type) ? options[sanitizer][type] : options[sanitizer]
+          end
         end
 
         def dictionary

data/lib/mincer/processors/sorting/processor.rb

@@ -8,7 +8,7 @@ module Mincer
 
         def apply
           relation = @relation.order(sort_string)
-          @mincer.sort_attribute, @mincer.sort_order = sort_attr, order_attr
+          @mincer.sort_attribute, @mincer.sort_order = sort_attr.to_s, order_attr.to_s
           relation
         end
 
@@ -21,11 +21,11 @@ module Mincer
         end
 
         def sort_attr
-          @mincer.send(:allowed_sort_attributes).include?(sort) && sort
+          (@mincer.send(:allowed_sort_attributes).include?(sort) && sort) || default_sort
         end
 
         def order_attr
-          %w{asc desc}.include?(order.try(:downcase)) && order
+          (%w{asc desc}.include?(order.try(:downcase)) && order) || default_order
         end
 
         def sort

data/lib/mincer/version.rb

@@ -1,7 +1,7 @@
 module Mincer
 
   def self.version
-    Gem::Version.new '0.2.2'
+    Gem::Version.new '0.2.3'
   end
 
   module VERSION #:nodoc:

data/mincer.gemspec

@@ -26,4 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'sqlite3'
   spec.add_development_dependency 'kaminari'
   spec.add_development_dependency 'will_paginate'
+  spec.add_development_dependency 'generator_spec'
 end

data/spec/generators/query/query_generator_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+require 'generators/mincer/query_generator'
+
+describe ::Mincer::Generators::QueryGenerator, :type => :generator do
+  destination File.expand_path("../../tmp", __FILE__)
+
+  before :each do
+    prepare_destination
+  end
+
+  it 'should properly create query file' do
+    run_generator %w(User)
+    assert_file 'app/queries/user_query.rb', /class UserQuery < Mincer::Base/
+  end
+end

data/spec/lib/mincer/processors/pg_search/processor_spec.rb

@@ -33,7 +33,7 @@ describe ::Mincer::Processors::PgSearch::Processor do
 
           it 'order by rank' do
             query = subject.new(ActiveRecordModel, { 'pattern' => 'Bingo' })
-            query.to_sql.should include("(ts_rank((to_tsvector('simple', unaccent(coalesce(active_record_models.text, '')))), (to_tsquery('simple', unaccent('Bingo')))))")
+            query.to_sql.should include("(ts_rank(to_tsvector('simple', unaccent(active_record_models.text)), to_tsquery('simple', unaccent('Bingo'))))")
             query.to_a.count.should eq(1)
           end
 

data/spec/lib/mincer/processors/pg_search/search_engines/fulltext_spec.rb

@@ -28,73 +28,86 @@ describe ::Mincer::PgSearch::SearchEngines::Fulltext do
   end
 
   describe '.conditions' do
-    it 'generates search condition with one column, one term and no options with columns wrapped with coalesce' do
-      search_statement1 = search_statement_class.new(['"records"."text"'], engines: [:fulltext])
-      search_engine = search_engine_class.new({ pattern: 'search' }, [search_statement1])
-      search_engine.conditions.to_sql.should == %{(((to_tsvector('simple', coalesce("records"."text", ''))) @@ (to_tsquery('simple', 'search'))))}
-    end
 
-    it 'generates search condition with two columns, one term and no options' do
-      search_statement1 = search_statement_class.new(['"records"."text"', '"records"."text2"'], engines: [:fulltext])
-      search_engine = search_engine_class.new({ pattern: 'search' }, [search_statement1])
-      search_engine.conditions.to_sql.should == %{(((to_tsvector('simple', coalesce("records"."text", '')) || to_tsvector('simple', coalesce("records"."text2", ''))) @@ (to_tsquery('simple', 'search'))))}
+    context 'when only one column is searchable' do
+      it 'generates search condition with one column, one term and no options without columns wrapped with coalesce' do
+        search_statement1 = search_statement_class.new(['"records"."text"'], engines: [:fulltext])
+        search_engine = search_engine_class.new({ pattern: 'search' }, [search_statement1])
+        search_engine.conditions.to_sql.should == %{((to_tsvector('simple', "records"."text") @@ to_tsquery('simple', 'search')))}
+      end
     end
 
-    it 'generates search condition with two columns, two terms and no options' do
-      search_statement1 = search_statement_class.new(['"records"."text"', '"records"."text2"'], engines: [:fulltext])
-      search_engine = search_engine_class.new({ pattern: 'search word' }, [search_statement1])
-      search_engine.conditions.to_sql.should == %{(((to_tsvector('simple', coalesce("records"."text", '')) || to_tsvector('simple', coalesce("records"."text2", ''))) @@ (to_tsquery('simple', 'search' || ' & ' || 'word'))))}
-    end
+    context 'when 2 columns is searchable' do
+      it 'generates search condition with two columns, one term and no options' do
+        search_statement1 = search_statement_class.new(['"records"."text"', '"records"."text2"'], engines: [:fulltext])
+        search_engine = search_engine_class.new({ pattern: 'search' }, [search_statement1])
+        search_engine.conditions.to_sql.should == %{((to_tsvector('simple', \"records\".\"text\") @@ to_tsquery('simple', 'search')) OR (to_tsvector('simple', \"records\".\"text2\") @@ to_tsquery('simple', 'search')))}
+      end
 
-    it 'generates search condition with two columns, two terms and option "any_word" set to true ' do
-      search_statement1 = search_statement_class.new(['"records"."text"', '"records"."text2"'], engines: [:fulltext], any_word: true)
-      search_engine = search_engine_class.new({ pattern: 'search word' }, [search_statement1])
-      search_engine.conditions.to_sql.should == %{(((to_tsvector('simple', coalesce("records"."text", '')) || to_tsvector('simple', coalesce("records"."text2", ''))) @@ (to_tsquery('simple', 'search' || ' | ' || 'word'))))}
-    end
+      it 'generates search condition with two columns, two terms and no options' do
+        search_statement1 = search_statement_class.new(['"records"."text"', '"records"."text2"'], engines: [:fulltext])
+        search_engine = search_engine_class.new({ pattern: 'search word' }, [search_statement1])
+        search_engine.conditions.to_sql.should == %{((to_tsvector('simple', \"records\".\"text\") @@ to_tsquery('simple', 'search' || ' & ' || 'word')) OR (to_tsvector('simple', \"records\".\"text2\") @@ to_tsquery('simple', 'search' || ' & ' || 'word')))}
+      end
 
-    it 'generates search condition with two columns, two terms and option "any_word" set to true while escaping special characters' do
-      search_statement1 = search_statement_class.new(['"records"."text"', '"records"."text2"'], engines: [:fulltext], any_word: true)
-      search_engine = search_engine_class.new({ pattern: 'search word!(:&|) !' }, [search_statement1])
-      search_engine.conditions.to_sql.should == %{(((to_tsvector('simple', coalesce("records"."text", '')) || to_tsvector('simple', coalesce("records"."text2", ''))) @@ (to_tsquery('simple', 'search' || ' | ' || 'word'))))}
-    end
+      it 'generates search condition with two columns, two terms and option "any_word" set to true ' do
+        search_statement1 = search_statement_class.new(['"records"."text"', '"records"."text2"'], engines: [:fulltext], any_word: true)
+        search_engine = search_engine_class.new({ pattern: 'search word' }, [search_statement1])
+        search_engine.conditions.to_sql.should == %{((to_tsvector('simple', \"records\".\"text\") @@ to_tsquery('simple', 'search' || ' | ' || 'word')) OR (to_tsvector('simple', \"records\".\"text2\") @@ to_tsquery('simple', 'search' || ' | ' || 'word')))}
+      end
 
-    it 'generates search condition with two columns, two terms and option "ignore_accent" set to true ' do
-      search_statement1 = search_statement_class.new(['"records"."text"', '"records"."text2"'], engines: [:fulltext], ignore_accent: true)
-      search_engine = search_engine_class.new({ pattern: 'search word' }, [search_statement1])
-      search_engine.conditions.to_sql.should == %{(((to_tsvector('simple', unaccent(coalesce("records"."text", ''))) || to_tsvector('simple', unaccent(coalesce("records"."text2", '')))) @@ (to_tsquery('simple', unaccent('search') || ' & ' || unaccent('word')))))}
-    end
+      it 'generates search condition with two columns, two terms and option "any_word" set to true while escaping special characters' do
+        search_statement1 = search_statement_class.new(['"records"."text"', '"records"."text2"'], engines: [:fulltext], any_word: true)
+        search_engine = search_engine_class.new({ pattern: 'search word!(:&|) !' }, [search_statement1])
+        search_engine.conditions.to_sql.should == %{((to_tsvector('simple', \"records\".\"text\") @@ to_tsquery('simple', 'search' || ' | ' || 'word')) OR (to_tsvector('simple', \"records\".\"text2\") @@ to_tsquery('simple', 'search' || ' | ' || 'word')))}
+      end
 
-    it 'generates search condition with two columns, two terms and option "ignore_accent" and "ignore_case" set to true ' do
-      search_statement1 = search_statement_class.new(['"records"."text"', '"records"."text2"'], engines: [:fulltext], ignore_accent: true, ignore_case: true)
-      search_engine = search_engine_class.new({ pattern: 'search word' }, [search_statement1])
-      search_engine.conditions.to_sql.should == %{(((to_tsvector('simple', unaccent(lower(coalesce("records"."text", '')))) || to_tsvector('simple', unaccent(lower(coalesce("records"."text2", ''))))) @@ (to_tsquery('simple', unaccent(lower('search')) || ' & ' || unaccent(lower('word'))))))}
+      it 'generates search condition with two columns, two terms and option "ignore_accent" set to true ' do
+        search_statement1 = search_statement_class.new(['"records"."text"', '"records"."text2"'], engines: [:fulltext], ignore_accent: true)
+        search_engine = search_engine_class.new({ pattern: 'search word' }, [search_statement1])
+        search_engine.conditions.to_sql.should == %{((to_tsvector('simple', unaccent(\"records\".\"text\")) @@ to_tsquery('simple', unaccent('search') || ' & ' || unaccent('word'))) OR (to_tsvector('simple', unaccent(\"records\".\"text2\")) @@ to_tsquery('simple', unaccent('search') || ' & ' || unaccent('word'))))}
+      end
+
+      context 'when unaccent set only on query' do
+        it 'generates search condition with two columns, two terms and option "ignore_accent" set to be used on query ' do
+          search_statement1 = search_statement_class.new(['"records"."text"', '"records"."text2"'], engines: [:fulltext], ignore_accent: {query: true})
+          search_engine = search_engine_class.new({ pattern: 'search word' }, [search_statement1])
+          search_engine.conditions.to_sql.should == %{((to_tsvector('simple', \"records\".\"text\") @@ to_tsquery('simple', unaccent('search') || ' & ' || unaccent('word'))) OR (to_tsvector('simple', \"records\".\"text2\") @@ to_tsquery('simple', unaccent('search') || ' & ' || unaccent('word'))))}
+        end
+      end
+
+      it 'generates search condition with two columns, two terms and option "ignore_accent" and "ignore_case" set to true ' do
+        search_statement1 = search_statement_class.new(['"records"."text"', '"records"."text2"'], engines: [:fulltext], ignore_accent: true, ignore_case: true)
+        search_engine = search_engine_class.new({ pattern: 'search word' }, [search_statement1])
+        search_engine.conditions.to_sql.should == %{((to_tsvector('simple', unaccent(lower(\"records\".\"text\"))) @@ to_tsquery('simple', unaccent(lower('search')) || ' & ' || unaccent(lower('word')))) OR (to_tsvector('simple', unaccent(lower(\"records\".\"text2\"))) @@ to_tsquery('simple', unaccent(lower('search')) || ' & ' || unaccent(lower('word')))))}
+      end
     end
 
     it 'generates search condition with one column, one term and option "dictionary" set to :english' do
       search_statement1 = search_statement_class.new(['"records"."text"'], engines: [:fulltext], dictionary: :english)
       search_engine = search_engine_class.new({ pattern: 'search' }, [search_statement1])
-      search_engine.conditions.to_sql.should == %{(((to_tsvector('english', coalesce("records"."text", ''))) @@ (to_tsquery('english', 'search'))))}
+      search_engine.conditions.to_sql.should == %{((to_tsvector('english', "records"."text") @@ to_tsquery('english', 'search')))}
     end
 
     it 'generates search condition with two search statements one column, one term and no options' do
       search_statement1 = search_statement_class.new(['"records"."text"'], engines: [:fulltext])
       search_statement2 = search_statement_class.new(['"records"."text2"'], engines: [:fulltext])
       search_engine = search_engine_class.new({ pattern: 'search' }, [search_statement1, search_statement2])
-      search_engine.conditions.to_sql.should == %{(((to_tsvector('simple', coalesce("records"."text", ''))) @@ (to_tsquery('simple', 'search'))) OR ((to_tsvector('simple', coalesce("records"."text2", ''))) @@ (to_tsquery('simple', 'search'))))}
+      search_engine.conditions.to_sql.should == %{((to_tsvector('simple', "records"."text") @@ to_tsquery('simple', 'search')) OR (to_tsvector('simple', "records"."text2") @@ to_tsquery('simple', 'search')))}
     end
 
     it 'generates search condition with one column, one term, two statements and no options' do
       search_statement1 = search_statement_class.new(['"records"."text"'], engines: [:fulltext])
       search_statement2 = search_statement_class.new(['"records"."text2"'], engines: [:fulltext])
       search_engine = search_engine_class.new({ pattern: 'search' }, [search_statement1, search_statement2])
-      search_engine.conditions.to_sql.should == %{(((to_tsvector('simple', coalesce("records"."text", ''))) @@ (to_tsquery('simple', 'search'))) OR ((to_tsvector('simple', coalesce("records"."text2", ''))) @@ (to_tsquery('simple', 'search'))))}
+      search_engine.conditions.to_sql.should == %{((to_tsvector('simple', \"records\".\"text\") @@ to_tsquery('simple', 'search')) OR (to_tsvector('simple', \"records\".\"text2\") @@ to_tsquery('simple', 'search')))}
     end
 
     it 'generates search condition with one column, one term, two statements and "param_name" option set to "s"' do
       search_statement1 = search_statement_class.new(['"records"."text"'], engines: [:fulltext])
       search_statement2 = search_statement_class.new(['"records"."text2"'], engines: [:fulltext], param_name: 's')
       search_engine = search_engine_class.new({ pattern: 'search', s: 'word' }, [search_statement1, search_statement2])
-      search_engine.conditions.to_sql.should == %{(((to_tsvector('simple', coalesce("records"."text", ''))) @@ (to_tsquery('simple', 'search'))) OR ((to_tsvector('simple', coalesce("records"."text2", ''))) @@ (to_tsquery('simple', 'word'))))}
+      search_engine.conditions.to_sql.should == %{((to_tsvector('simple', \"records\".\"text\") @@ to_tsquery('simple', 'search')) OR (to_tsvector('simple', \"records\".\"text2\") @@ to_tsquery('simple', 'word')))}
     end
   end
 

data/spec/lib/mincer/processors/pg_search/search_engines/trigram_spec.rb

@@ -31,7 +31,7 @@ describe ::Mincer::PgSearch::SearchEngines::Trigram do
     it 'generates search condition with one column, one term and no options' do
       search_statement1 = search_statement_class.new(['"records"."text"'], engines: [:trigram])
       search_engine = search_engine_class.new({ pattern: 'search' }, [search_statement1])
-      search_engine.conditions.to_sql.should == %{((similarity("records"."text", 'search') >= 0.3))}
+      search_engine.conditions.to_sql.should == %{(("records"."text" % 'search'))}
     end
 
     it 'generates search condition with one column, one term and "threshold" option set to 0.5' do
@@ -43,33 +43,33 @@ describe ::Mincer::PgSearch::SearchEngines::Trigram do
     it 'generates search condition with two columns, one term and no options' do
       search_statement1 = search_statement_class.new(['"records"."text"', '"records"."text2"'], engines: [:trigram])
       search_engine = search_engine_class.new({ pattern: 'search' }, [search_statement1])
-      search_engine.conditions.to_sql.should == %{((similarity("records"."text", 'search') >= 0.3) OR (similarity("records"."text2", 'search') >= 0.3))}
+      search_engine.conditions.to_sql.should == %{(("records"."text" % 'search') OR ("records"."text2" % 'search'))}
     end
 
     it 'generates search condition with two columns, two terms and no options' do
       search_statement1 = search_statement_class.new(['"records"."text"', '"records"."text2"'], engines: [:trigram])
       search_engine = search_engine_class.new({ pattern: 'search word' }, [search_statement1])
-      search_engine.conditions.to_sql.should == %{((similarity("records"."text", 'search word') >= 0.3) OR (similarity("records"."text2", 'search word') >= 0.3))}
+      search_engine.conditions.to_sql.should == %{(("records"."text" % 'search word') OR ("records"."text2" % 'search word'))}
     end
 
     it 'generates search condition with two columns, two terms and option "ignore_accent" set to true ' do
       search_statement1 = search_statement_class.new(['"records"."text"', '"records"."text2"'], engines: [:trigram], ignore_accent: true)
       search_engine = search_engine_class.new({ pattern: 'search word' }, [search_statement1])
-      search_engine.conditions.to_sql.should == %{((similarity(unaccent("records"."text"), unaccent('search word')) >= 0.3) OR (similarity(unaccent("records"."text2"), unaccent('search word')) >= 0.3))}
+      search_engine.conditions.to_sql.should == %{((unaccent("records"."text") % unaccent('search word')) OR (unaccent("records"."text2") % unaccent('search word')))}
     end
 
     it 'generates search condition with one column, one term, two statements and no options' do
       search_statement1 = search_statement_class.new(['"records"."text"'], engines: [:trigram])
       search_statement2 = search_statement_class.new(['"records"."text2"'], engines: [:trigram])
       search_engine = search_engine_class.new({ pattern: 'search' }, [search_statement1, search_statement2])
-      search_engine.conditions.to_sql.should == %{((similarity("records"."text", 'search') >= 0.3) OR (similarity("records"."text2", 'search') >= 0.3))}
+      search_engine.conditions.to_sql.should == %{(("records"."text" % 'search') OR ("records"."text2" % 'search'))}
     end
 
     it 'generates search condition with one column, one term, two statements and "param_name" option set to "s"' do
       search_statement1 = search_statement_class.new(['"records"."text"'], engines: [:trigram])
       search_statement2 = search_statement_class.new(['"records"."text2"'], engines: [:trigram], param_name: 's')
       search_engine = search_engine_class.new({ pattern: 'search', s: 'word' }, [search_statement1, search_statement2])
-      search_engine.conditions.to_sql.should == %{((similarity("records"."text", 'search') >= 0.3) OR (similarity("records"."text2", 'word') >= 0.3))}
+      search_engine.conditions.to_sql.should == %{(("records"."text" % 'search') OR ("records"."text2" % 'word'))}
     end
 
   end

data/spec/lib/mincer/processors/pg_search/search_statement_spec.rb

@@ -0,0 +1,55 @@
+require "spec_helper"
+
+describe Mincer::Processors::PgSearch::SearchStatement do
+  describe '.sanitizers' do
+    let(:search_statement_class) { Mincer::Processors::PgSearch::SearchStatement }
+
+    it 'returns sanitizers that has true in options' do
+      search_statement = search_statement_class.new('text', {"ignore_accent"=>true, "any_word"=>false, "dictionary"=>:simple, "ignore_case"=>false, "engines"=>[:fulltext]} )
+      search_statement.sanitizers.should == [:ignore_accent]
+    end
+
+    context 'when key "document" is given' do
+      it 'returns only sanitizers with true value in options' do
+        search_statement = search_statement_class.new('text', {"ignore_accent"=>true, "any_word"=>false, "dictionary"=>:simple, "ignore_case"=>false, "engines"=>[:fulltext]} )
+        search_statement.sanitizers(:document).should == [:ignore_accent]
+      end
+
+      it 'returns sanitizers when sanitizer set as hash with type set to true in options' do
+        search_statement = search_statement_class.new('text', {"ignore_accent"=>true, "any_word"=>false, "dictionary"=>:simple, "ignore_case"=> { :document => true}, "engines"=>[:fulltext]} )
+        search_statement.sanitizers(:document).size.should == 2
+        search_statement.sanitizers(:document).should include(:ignore_accent)
+        search_statement.sanitizers(:document).should include(:ignore_case)
+      end
+
+      it 'returns sanitizers when sanitizer set as hash with type set to false in options' do
+        search_statement = search_statement_class.new('text', {"ignore_accent"=>true, "any_word"=>false, "dictionary"=>:simple, "ignore_case"=> { :query => true}, "engines"=>[:fulltext]} )
+        search_statement.sanitizers(:document).size.should == 1
+        search_statement.sanitizers(:document).should == [:ignore_accent]
+      end
+    end
+
+    context 'when key "query" is given' do
+      it 'returns only sanitizers with true value in options' do
+        search_statement = search_statement_class.new('text', {"ignore_accent"=>true, "any_word"=>false, "dictionary"=>:simple, "ignore_case"=>false, "engines"=>[:fulltext]} )
+        search_statement.sanitizers(:query).should == [:ignore_accent]
+      end
+
+      it 'returns sanitizers when sanitizer set as hash with type set to true in options' do
+        search_statement = search_statement_class.new('text', {"ignore_accent"=>true, "any_word"=>false, "dictionary"=>:simple, "ignore_case"=> { :query => true}, "engines"=>[:fulltext]} )
+        search_statement.sanitizers(:query).size.should == 2
+        search_statement.sanitizers(:query).should include(:ignore_accent)
+        search_statement.sanitizers(:query).should include(:ignore_case)
+      end
+
+      it 'returns sanitizers when sanitizer set as hash with type set to false in options' do
+        search_statement = search_statement_class.new('text', {"ignore_accent"=>true, "any_word"=>false, "dictionary"=>:simple, "ignore_case"=> { :document => true}, "engines"=>[:fulltext]} )
+        search_statement.sanitizers(:query).size.should == 1
+        search_statement.sanitizers(:query).should == [:ignore_accent]
+      end
+
+    end
+
+
+  end
+end

data/spec/spec_helper.rb

@@ -37,6 +37,8 @@ require 'mincer'
 require 'support/postgres_adapter'
 require 'support/sqlite3_adapter'
 
+require 'generator_spec'
+
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true

data/spec/support/postgres_adapter.rb

@@ -13,6 +13,7 @@ def setup_postgres_table(columns = [['id', 'SERIAL PRIMARY KEY'], ['text', 'TEXT
   columns_sql = columns.map {|column| column.join(' ') }.join(',')
   ActiveRecord::Base.connection.execute("CREATE TABLE IF NOT EXISTS active_record_models (#{columns_sql})")
   ActiveRecord::Base.connection.execute('CREATE EXTENSION IF NOT EXISTS unaccent')
+  ActiveRecord::Base.connection.execute('CREATE EXTENSION IF NOT EXISTS pg_trgm')
   ActiveRecord::Base.connection.execute('CREATE EXTENSION IF NOT EXISTS pgcrypto')
   ActiveRecordModel.reset_column_information
 end

metadata

@@ -1,111 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: mincer
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Alex Krasinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-18 00:00:00.000000000 Z
+date: 2014-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: generator_spec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Add pagination, cache_digest, order, json generation with postgres, simple
@@ -116,12 +130,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- lib/generators/mincer/query_generator.rb
+- lib/generators/mincer/templates/query.rb
 - lib/mincer.rb
 - lib/mincer/action_view/sort_helper.rb
 - lib/mincer/base.rb
@@ -142,6 +158,7 @@ files:
 - lib/mincer/version.rb
 - mincer.gemspec
 - spec/database.yml.example
+- spec/generators/query/query_generator_spec.rb
 - spec/lib/mincer/action_view/sort_helper_spec.rb
 - spec/lib/mincer/base_spec.rb
 - spec/lib/mincer/config_spec.rb
@@ -153,6 +170,7 @@ files:
 - spec/lib/mincer/processors/pg_search/search_engines/array_spec.rb
 - spec/lib/mincer/processors/pg_search/search_engines/fulltext_spec.rb
 - spec/lib/mincer/processors/pg_search/search_engines/trigram_spec.rb
+- spec/lib/mincer/processors/pg_search/search_statement_spec.rb
 - spec/lib/mincer/processors/sorting/processor_spec.rb
 - spec/mincer_config.rb
 - spec/spec_helper.rb
@@ -168,23 +186,24 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: ActiveRecord::Relation wrapper for pagination, order, json, search, cache_digest
   support
 test_files:
 - spec/database.yml.example
+- spec/generators/query/query_generator_spec.rb
 - spec/lib/mincer/action_view/sort_helper_spec.rb
 - spec/lib/mincer/base_spec.rb
 - spec/lib/mincer/config_spec.rb
@@ -196,6 +215,7 @@ test_files:
 - spec/lib/mincer/processors/pg_search/search_engines/array_spec.rb
 - spec/lib/mincer/processors/pg_search/search_engines/fulltext_spec.rb
 - spec/lib/mincer/processors/pg_search/search_engines/trigram_spec.rb
+- spec/lib/mincer/processors/pg_search/search_statement_spec.rb
 - spec/lib/mincer/processors/sorting/processor_spec.rb
 - spec/mincer_config.rb
 - spec/spec_helper.rb