mincer 0.2.15 → 0.2.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f22e8f584ffd32b05cbf70b9e8dd5fe41ed7e9ba
-  data.tar.gz: 356141e6b9aedfcd17932f0e7384373e44dbd5e5
+SHA256:
+  metadata.gz: 57615c10653f4eee6875661054d63fbb089e19578d9b23f518eb181f1325c2ae
+  data.tar.gz: '09833041518630ceaf52321fbfe20624ac9b2bc205404215d528abfab9a32ce0'
 SHA512:
-  metadata.gz: 94af085a7d14e719218f240ff468200ed742074f68622d9e8ebda69ef3b6f3493fc3e73fc0949d649dd05296581a2c9f76f760651f803266d0ab140bf4fd1e58
-  data.tar.gz: 07d17eddcc5e834a27211fec0702b29e3c3daad2af2ec672cc37192d48d18fdfb1915f11177f7d602af0b18639c34dbc0b7ef11edb06990589b0cc84cea7fb04
+  metadata.gz: 8f05956a84834da93f1119cb71e593da3997dcf93099983d64b2d98b0b0b758947573987eccb7a34544eddd1513fb4f2531336c737d605d8300c659b14e39d61
+  data.tar.gz: 962e4462917b40105df7243d30bf8459cfa44951644de57ee550e80e1b50c064e7a61915bf5fa4fd653cf2c622d58a63f694f7d1340abe8b27d84d3c3747873e

data/README.md

@@ -218,7 +218,11 @@ 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.
+If you set `prefix_matching` attribute to true - lexemes in a tsquery can will be labeled with * to specify prefix matching.
+
+    pg_search [{ :columns => %w{employees.full_name companies.name} }, :prefix_matching => true ]
+
+Options like `unaccent`, `any_word`, `ignore_case`, `prefix_matching` 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} ]
 

data/lib/mincer.rb

@@ -1,6 +1,5 @@
 require 'ostruct'
 require 'mincer/version'
-require 'mincer/core_ext/string'
 require 'mincer/config'
 require 'mincer/base'
 
@@ -10,7 +9,7 @@ module Mincer
   end
 
   def self.postgres?
-    self.connection.is_a?(::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter) rescue false
+    self.connection.adapter_name == 'PostgreSQL' rescue false
   end
 
   def self.connection

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

@@ -13,7 +13,7 @@ module Mincer
 
         def to_json
           if dump_supported?
-            result = Mincer.connection.execute(json_query).first['json']
+            result = Mincer.connection.select_all(json_query).first['json']
             return result unless @options[:singularize]
             return (result[1..-2].presence || '{}') unless @options[:root]
             (result.sub('[', '').sub(/(\])}$/, '}').presence || '{}')
@@ -43,6 +43,9 @@ module Mincer
         # Query for basic json generation. Ex: [{'id': 1}, {...}]
         def basic_json_query(root = 'json', meta = false)
           meta_sql = if meta
+            if meta.is_a?(Hash) && meta[:total_count]
+              @mincer.relation.instance_variable_set(:@total_count, meta[:total_count])
+            end
             ", #{@mincer.total_pages} AS total_pages, #{@mincer.total_count} AS total_count, #{@mincer.current_page} AS current_page, #{@mincer.limit_value} AS per_page"
           else
             ''

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

@@ -47,7 +47,7 @@ module Mincer
             join_expressions(conditions, :+)
           end.compact
           rank = join_expressions(search_statements_conditions, :+).try(:to_sql)
-          "#{rank} DESC" if rank.present?
+          Arel.sql("#{rank} DESC") if rank.present?
         end
 
         def pg_search_engines(args, search_statement)

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

@@ -53,8 +53,11 @@ module Mincer
 
         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(:query)).to_sql }.join(" || ' #{terms_delimiter} ' || "))
-          Arel::Nodes::NamedFunction.new('to_tsquery', [quote(search_statement.dictionary), tsquery_sql])
+          tsquery = search_statement.terms.map do |term|
+            _term = search_statement.options[:prefix_matching] ? "#{term}:*" : term
+            sanitize_string_quoted(_term, search_statement.sanitizers(:query)).to_sql
+          end.join(" || ' #{terms_delimiter} ' || ")
+          Arel::Nodes::NamedFunction.new('to_tsquery', [quote(search_statement.dictionary), Arel.sql(tsquery)])
         end
       end
 

data/lib/mincer/version.rb

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

data/mincer.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'pg'
+  spec.add_development_dependency 'pg'#, '~> 0.18'
   spec.add_development_dependency 'sqlite3'
   spec.add_development_dependency 'kaminari'
   spec.add_development_dependency 'will_paginate'

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

@@ -15,7 +15,7 @@ describe ::Mincer::Processors::PgJsonDumper::Processor do
 
       it 'dumps data via postgres' do
         query = subject.new(ActiveRecordModel)
-        ActiveRecord::Base.connection.should_receive(:execute).and_call_original
+        ActiveRecord::Base.connection.should_receive(:select_all).and_call_original
         json_string = query.to_json
         json_string.should be_a(String)
         json_hash = JSON.parse(json_string)
@@ -29,7 +29,7 @@ describe ::Mincer::Processors::PgJsonDumper::Processor do
       context 'when root option is passed' do
         it 'puts responce inside under root key' do
           query = subject.new(ActiveRecordModel)
-          ActiveRecord::Base.connection.should_receive(:execute).and_call_original
+          ActiveRecord::Base.connection.should_receive(:select_all).and_call_original
           json_string = query.to_json(root: 'items')
           json_string.should be_a(String)
           json_hash = JSON.parse(json_string)
@@ -56,7 +56,7 @@ describe ::Mincer::Processors::PgJsonDumper::Processor do
 
     it 'dumps data via calling super' do
       query = subject.new(ActiveRecordModel)
-      ActiveRecord::Base.connection.should_not_receive(:execute)
+      ActiveRecord::Base.connection.should_not_receive(:select_all)
       json_string = query.to_json
       json_string.should be_nil
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mincer
 version: !ruby/object:Gem::Version
-  version: 0.2.15
+  version: 0.2.20
 platform: ruby
 authors:
 - Alex Krasinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-02 00:00:00.000000000 Z
+date: 2021-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -142,7 +142,6 @@ files:
 - lib/mincer/action_view/sort_helper.rb
 - lib/mincer/base.rb
 - lib/mincer/config.rb
-- lib/mincer/core_ext/string.rb
 - lib/mincer/processors/cache_digest/processor.rb
 - lib/mincer/processors/helpers.rb
 - lib/mincer/processors/pagination/processor.rb
@@ -195,8 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: ActiveRecord::Relation wrapper for pagination, order, json, search, cache_digest

data/lib/mincer/core_ext/string.rb

@@ -1,5 +0,0 @@
-class String
-  def to_sql
-    self.to_s
-  end
-end