mincer 0.2.9 → 0.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd01b7eba5a56472f7840a781735379e72aa6a9d
-  data.tar.gz: 5d7b4304379f67a8e26aea2b6e8de23cbe8935f4
+  metadata.gz: 75beab8a1ff5a1cb3050b90da354ff7f35015a2c
+  data.tar.gz: f21249f540044374eab84600f51d4a3aeb93fd55
 SHA512:
-  metadata.gz: 510c437475a7b9519bab079059b4c3a2e62c6bccf0bd6dedb2971b09686afb8f3d38ce9a938c656844ab7c1ecd11b9e8d10d641d778053ee1ceaf7e72bb982f3
-  data.tar.gz: 1196d1f63d793e851b6ae42e4fbcf16379b25b8613879def5f4e5622f675d4f004aec30bd5ef042125adf37772ff44f36473a3d8dd798b4bb7b027bd2102624f
+  metadata.gz: fb1fa9dd8f0feb642d7d670c6269de05429357be671ad5fef8f7af9af56d54912372f1caa917538166119ded1a030319553d49f3611985480d8e54198d80e13f
+  data.tar.gz: d4693f19a4c5718d2c3f71dfa8f8f686a7cafa463f049fc0a6355a4ecdeef0eeb37bf484e330bfd50b38c0ca53271c2646bb1a82ade179cf634f542ea31878c7

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

@@ -30,7 +30,7 @@ module Mincer
         end
 
         def per_page
-          @args[::Mincer.config.pagination.per_page_param_name]
+          @mincer.class.default_per_page || @args[::Mincer.config.pagination.per_page_param_name]
         end
       end
 
@@ -41,6 +41,14 @@ module Mincer
           def skip_pagination!
             active_processors.delete(Mincer::Processors::Pagination::Processor)
           end
+
+          def paginate_defaults(options = {})
+            @default_per_page = options[:per_page] if options[:per_page]
+          end
+
+          def default_per_page
+            @default_per_page
+          end
         end
       end
 

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

@@ -13,7 +13,8 @@ module Mincer
 
         def to_json
           if dump_supported?
-            Mincer.connection.execute(json_query).first['json']
+            result = Mincer.connection.execute(json_query).first['json']
+            @options[:singularize] ? (result[1..-2].presence || '{}') : result
           else
             warn 'To dump data to json with postgres you need to use postgres server version >= 9.2'
           end

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

@@ -19,7 +19,14 @@ module Mincer
 
         def apply_pg_search(relation, args)
           rel = relation.where(conditions(args))
-          (rank = rank(args)) ? rel.reorder(rank) : rel
+          rank = rank(args)
+          if rank.blank?
+            rel
+          elsif @mincer.default_sorting
+            rel.reorder(rank)
+          else
+            rel.order(rank)
+          end
         end
 
         def conditions(args)

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

@@ -19,9 +19,11 @@ module Mincer
         private
 
         def document_for(search_statement)
+          sanitizers = search_statement.sanitizers(:document)
           arel_group do
             documents = search_statement.columns.map do |search_column|
-              Arel.sql(search_column + '::text[]')
+              sanitized_term = sanitizers.any? ? sanitize_column("#{search_column}::text", sanitizers).to_sql : search_column
+              Arel.sql(sanitized_term + '::text[]')
             end
             join_expressions(documents, '||')
           end

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

@@ -9,7 +9,9 @@ module Mincer
         def apply
           sorting_sting = sort_string
           if sorting_sting.present?
-            @mincer.sort_attribute, @mincer.sort_order = sort_attr.to_s, order_attr.to_s
+            @mincer.sort_attribute = (sort_attr || default_sort).to_s
+            @mincer.sort_order = (order_attr || default_order).to_s
+            @mincer.default_sorting = sort_attr.blank? && order_attr.blank?
             @relation.order(sorting_sting)
           else
             @relation
@@ -21,11 +23,11 @@ module Mincer
         end
 
         def sort_attr
-          (@mincer.send(:allowed_sort_attributes).include?(sort) && sort) || default_sort
+          (@mincer.send(:allowed_sort_attributes).include?(sort) && sort)
         end
 
         def order_attr
-          (%w{asc desc}.include?(order.try(:downcase)) && order) || default_order
+          (%w{asc desc}.include?(order.try(:downcase)) && order)
         end
 
         def sort
@@ -52,7 +54,7 @@ module Mincer
 
         included do
           # Used in view helpers
-          attr_accessor :sort_attribute, :sort_order
+          attr_accessor :sort_attribute, :sort_order, :default_sorting
         end
 
         module ClassMethods

data/lib/mincer/version.rb

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

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

@@ -49,7 +49,7 @@ describe ::Mincer::PgSearch::SearchEngines::Array do
     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: [:array], ignore_accent: true)
       search_engine = search_engine_class.new({ pattern: 'search word' }, [search_statement1])
-      search_engine.conditions.to_sql.should == %{(("records"."text"::text[] || "records"."text2"::text[]) @> ARRAY[unaccent('search'),unaccent('word')])}
+      search_engine.conditions.to_sql.should == %{((unaccent("records"."text"::text)::text[] || unaccent("records"."text2"::text)::text[]) @> ARRAY[unaccent('search'),unaccent('word')])}
     end
 
     #TODO: sanitizer can not be set on array columns since we ned to unpack an reconstruct those arrays. Find a solution
@@ -62,7 +62,7 @@ describe ::Mincer::PgSearch::SearchEngines::Array do
     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: [:array], ignore_accent: true, ignore_case: true)
       search_engine = search_engine_class.new({ pattern: 'search word' }, [search_statement1])
-      search_engine.conditions.to_sql.should == %{(("records"."text"::text[] || "records"."text2"::text[]) @> ARRAY[unaccent(lower('search')),unaccent(lower('word'))])}
+      search_engine.conditions.to_sql.should == %{((unaccent(lower("records"."text"::text))::text[] || unaccent(lower("records"."text2"::text))::text[]) @> ARRAY[unaccent(lower('search')),unaccent(lower('word'))])}
     end
 
     it 'generates search condition with one column, one term, two statements and no options' do

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

@@ -58,6 +58,30 @@ describe ::Mincer::Processors::Sorting::Processor do
     end
   end
 
+  context 'when sort and order is not given in params' do
+    it 'sets @mincer.default_sorting to true' do
+      subject = Class.new(Mincer::Base)
+      query = subject.new(ActiveRecordModel, { })
+      expect(query.default_sorting).to eq(true)
+    end
+  end
+
+  context 'when sort is given in params' do
+    it 'sets @mincer.default_sorting to false' do
+      subject = Class.new(Mincer::Base)
+      query = subject.new(ActiveRecordModel, { 'sort' => 'text' })
+      expect(query.default_sorting).to eq(false)
+    end
+  end
+
+  context 'when order is given in params' do
+    it 'sets @mincer.default_sorting to false' do
+      subject = Class.new(Mincer::Base)
+      query = subject.new(ActiveRecordModel, { 'order' => 'asc' })
+      expect(query.default_sorting).to eq(false)
+    end
+  end
+
   describe 'sorting with basic model with defaults changed' do
     it 'sorts by default attributes(id) abd order(ASC) when nothing passed to args' do
       subject = Class.new(Mincer::Base) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mincer
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.2.11
 platform: ruby
 authors:
 - Alex Krasinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-29 00:00:00.000000000 Z
+date: 2017-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -196,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: ActiveRecord::Relation wrapper for pagination, order, json, search, cache_digest