ransack 1.8.7 → 1.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a68f79e9c101613e0af4423267942f4d38007d19
-  data.tar.gz: ae51bdebc41d71f0902c29aeafd570e8057ad59b
+SHA256:
+  metadata.gz: f61f4b16a29defa380a26e7c29e3470bb61eb98fee71fb2b506b1b7c377f4995
+  data.tar.gz: a08063d09eae00edf1f62dfdcb9df19db195fded6d951a0ddb6ff0dd63885095
 SHA512:
-  metadata.gz: 39361cd28cb1002386b506a28c4a4065448bb82c23bb3d989c7038ffa33dba628d170f8a2daca58ed3665707de833fe9f8d325884be8a1812dbc07c6e7abce8a
-  data.tar.gz: 1d71cb39bd5524cb9c53313cbd6abf971f248b0c5978b376d3049bfb5ab684e7b6937c7785d0033ba534c52e700559c1c3faa093f368952743e5dd7d41db4f87
+  metadata.gz: 7075b5593e9931a4f5df153e04e2069dbb3b7e65f6463941b5dcfed0abfe6c5eba685b6db246755a98c8268e412d8088855495d14badcb75630c9c9eec86bb81
+  data.tar.gz: 5243186d40445ea7e1087cf1e655139718eca9089b3de1a52780b4aee71a200f7ac241d27c93821703bbe17872f05e740f12669be8cf129d3f1869967f04e2e2

data/.travis.yml

@@ -3,10 +3,8 @@ language: ruby
 sudo: false
 
 rvm:
-  - 2.3.3
-  - 2.2.6
-  - 2.1.10
-  - 2.0
+  - 2.5
+  - 2.2
 
 env:
   - RAILS=5-2-stable DB=sqlite3
@@ -21,79 +19,6 @@ env:
   - RAILS=4-2-stable DB=mysql
   - RAILS=4-2-stable DB=postgres
 
-  - RAILS=4-1-stable DB=sqlite3
-  - RAILS=4-1-stable DB=mysql
-  - RAILS=4-1-stable DB=postgres
-
-  - RAILS=4-0-stable DB=sqlite3
-  - RAILS=4-0-stable DB=mysql
-  - RAILS=4-0-stable DB=postgres
-
-  - RAILS=3-2-stable DB=sqlite
-  - RAILS=3-2-stable DB=mysql
-  - RAILS=3-2-stable DB=postgres
-
-  - RAILS=3-1-stable DB=sqlite
-  - RAILS=3-1-stable DB=mysql
-  - RAILS=3-1-stable DB=postgres
-
-matrix:
-  exclude:
-    - rvm: 2.1.10
-      env: RAILS=5-2-stable DB=sqlite3
-    - rvm: 2.1.10
-      env: RAILS=5-2-stable DB=mysql
-    - rvm: 2.1.10
-      env: RAILS=5-2-stable DB=postgres
-
-    - rvm: 2.1.10
-      env: RAILS=5-0-stable DB=sqlite3
-    - rvm: 2.1.10
-      env: RAILS=5-0-stable DB=mysql
-    - rvm: 2.1.10
-      env: RAILS=5-0-stable DB=postgres
-
-    - rvm: 2.0
-      env: RAILS=5-2-stable DB=sqlite3
-    - rvm: 2.0
-      env: RAILS=5-2-stable DB=mysql
-    - rvm: 2.0
-      env: RAILS=5-2-stable DB=postgres
-
-    - rvm: 2.0
-      env: RAILS=5-0-stable DB=sqlite3
-    - rvm: 2.0
-      env: RAILS=5-0-stable DB=mysql
-    - rvm: 2.0
-      env: RAILS=5-0-stable DB=postgres
-
-    - rvm: 2.0
-      env: RAILS=4-2-stable DB=sqlite3
-    - rvm: 2.0
-      env: RAILS=4-2-stable DB=mysql
-    - rvm: 2.0
-      env: RAILS=4-2-stable DB=postgres
-
-  include:
-    - rvm: 2.3.3
-      env: RAILS=master DB=sqlite3
-    - rvm: 2.3.3
-      env: RAILS=master DB=mysql
-    - rvm: 2.3.3
-      env: RAILS=master DB=postgres
-
-    - rvm: 2.2.6
-      env: RAILS=master DB=sqlite3
-    - rvm: 2.2.6
-      env: RAILS=master DB=mysql
-    - rvm: 2.2.6
-      env: RAILS=master DB=postgres
-
-  allow_failures:
-    - env: RAILS=master DB=sqlite3
-    - env: RAILS=master DB=mysql
-    - env: RAILS=master DB=postgres
-
 before_script:
   - mysql -e 'create database ransack collate utf8_general_ci;'
   - mysql -e 'use ransack;show variables like "%character%";show variables like "%collation%";'

data/CHANGELOG.md

@@ -1,5 +1,29 @@
 # Change Log
 
+## Version 1.8.8 - 2018-03-16
+* Fix multiple database support
+  PR [#893](https://github.com/activerecord-hackery/ransack/pull/893)
+
+* Updated Dutch translations
+  PR [#887](https://github.com/activerecord-hackery/ransack/pull/887)
+
+* Fixed no method error 'asc' for Rails 4.2
+  PR [#885](https://github.com/activerecord-hackery/ransack/pull/885)
+
+
+## Version 1.8.7 - 2018-02-05
+
+* Rails 5.2 support
+  PR [#868](https://github.com/activerecord-hackery/ransack/pull/868)
+ 
+* Lock pg gem to 0.21 to support older releases
+
+* Warnings cleanup
+  PR [#867](https://github.com/activerecord-hackery/ransack/pull/867)
+
+* Wildcard escaping
+  PR [#866] 
+
 ## Version 1.8.6 - 2018-01-23
 
 ### Added

data/CONTRIBUTING.md

@@ -75,6 +75,15 @@ Here's a quick guide:
         $ DB=pg bundle exec rake spec (`DB=postgres` & `DB=postgresql` work too)
         $ DB=mysql bundle exec rake spec
 
+   For Postgres and MySQL, databases are expected to exist, called 'ransack'. To create use these commands (assuming OS X and Homebrew):
+
+   ### Postgres
+       $ createdb ransack 
+
+   ### MySQL
+       $ mysql -u root
+       mysql> create database ransack;     
+
    To run only the tests in a particular file: `rspec <path/to/filename>`
 
         $ rspec spec/ransack/search_spec.rb

data/README.md

@@ -27,13 +27,11 @@ instead.
 If you're viewing this at
 [github.com/activerecord-hackery/ransack](https://github.com/activerecord-hackery/ransack),
 you're reading the documentation for the master branch with the latest features.
-[View documentation for the last release (1.8.2).](https://github.com/activerecord-hackery/ransack/tree/v1.8.2)
+[View documentation for the last release (1.8.8).](https://github.com/activerecord-hackery/ransack/tree/v1.8.8)
 
 ## Getting started
 
-Ransack is compatible with Rails 3, 4 and 5 on Ruby 1.9 and later.
-JRuby 9 ought to work as well (see
-[this](https://github.com/activerecord-hackery/polyamorous/issues/17)).
+Ransack is compatible with Rails 4.2 and 5.0, 5.1 and 5.2 on Ruby 2.2 and later.
 If you are using Ruby 1.8 or an earlier JRuby and run into compatibility
 issues, you can use an earlier version of Ransack, say, up to 1.3.0.
 
@@ -412,28 +410,60 @@ query parameters in your URLs.
 
 List of all possible predicates
 
-* `*_eq` - equal
-* `*_not_eq` - not equal
-* `*_matches` - matches with `LIKE`, e.g. `q[email_matches]=%@gmail.com`
-* Also: `*_does_not_match`, `*_matches_any`, `*_matches_all`, `*_does_not_match_any`, `*_does_not_match_all`
-* `*_lt` - less than
-* `*_lteq` - less than or equal
-* `*_gt` - greater than
-* `*_gteq` - greater than or equal
-* `*_present` - not null and not empty, e.g. `q[name_present]=1` (SQL: `col is not null AND col != ''`)
-* `*_blank` - is null or empty. (SQL: `col is null OR col = ''`)
-* `*_null`, `*_not_null` - is null, is not null
-* `*_in` - match any values in array, e.g. `q[name_in][]=Alice&q[name_in][]=Bob`
-* `*_not_in` - match none of values in array
-* `*_lt_any`, `*_lteq_any`, `*_gt_any`, `*_gteq_any` - Compare to list of values, at least positive. (SQL: `col > value1 OR col > value2`)
-* `*_matches_any`, `*_does_not_match_any` - same as above but with `LIKE`
-* `*_lt_all`, `*_lteq_all`, `*_gt_all`, `*_gteq_all` - Compare to list of values, all positive. (SQL: `col > value1 AND col > value2`)
-* `*_matches_all`, `*_does_not_match_all` - same as above but with `LIKE`
-* `*_not_eq_all` - none of values in a set
-* `*_start`, `*_not_start`, `*_start_any`, `*_start_all`, `*_not_start_any`, `*_not_start_all` - start with, (SQL: `col LIKE 'value%'`)
-* `*_end`, `*_not_end`, `*_end_any`, `*_end_all`, `*_not_end_any`, `*_not_end_all` - end with, (SQL: `col LIKE '%value'`)
-* `*_cont`, `*_cont_any`, `*_cont_all`, `*_not_cont`, `*_not_cont_any`, `*_not_cont_all` - contains value, using `LIKE`
-* `*_true`, `*_false` - is true and is false
+
+| Predicate | Description | Notes |
+| ------------- | ------------- |-------- |
+| `*_eq`  | equal  | |
+| `*_not_eq` | not equal | |
+| `*_matches` | matches with `LIKE` | e.g. `q[email_matches]=%@gmail.com`|
+| `*_does_not_match` | does not match with `LIKE` | |
+| `*_matches_any` | Matches any | |
+| `*_matches_all` | Matches all  | |
+| `*_does_not_match_any` | Does not match any | |
+| `*_does_not_match_all` | Does not match all | |
+| `*_lt` | less than | |
+| `*_lteq` | less than or equal | |
+| `*_gt` | greater than | |
+| `*_gteq` | greater than or equal | |
+| `*_present` | not null and not empty | e.g. `q[name_present]=1` (SQL: `col is not null AND col != ''`) |
+| `*_blank` | is null or empty. | (SQL: `col is null OR col = ''`) |
+| `*_null` | is null | |
+| `*_not_null` | is not null | |
+| `*_in` | match any values in array | e.g. `q[name_in][]=Alice&q[name_in][]=Bob` |
+| `*_not_in` | match none of values in array | |
+| `*_lt_any` | Less than any |  SQL: `col < value1 OR col < value2` |
+| `*_lteq_any` | Less than or equal to any | |
+| `*_gt_any` | Greater than any | |
+| `*_gteq_any` | Greater than or equal to any | |
+| `*_matches_any` | `*_does_not_match_any` | same as above but with `LIKE` |
+| `*_lt_all` | Less than all | SQL: `col < value1 AND col < value2` |
+| `*_lteq_all` | Less than or equal to all | |
+| `*_gt_all` | Greater than all | |
+| `*_gteq_all` | Greater than or equal to all | |
+| `*_matches_all` | Matches all | same as above but with `LIKE` |
+| `*_does_not_match_all` | Does not match all | |
+| `*_not_eq_all` | none of values in a set | |
+| `*_start` | Starts with | SQL: `col LIKE 'value%'` |
+| `*_not_start` | Does not start with | |
+| `*_start_any` | Starts with any of | |
+| `*_start_all` | Starts with all of | |
+| `*_not_start_any` | Does not start with any of | |
+| `*_not_start_all` | Does not start with all of | |
+| `*_end` | Ends with | SQL: `col LIKE '%value'` |
+| `*_not_end` | Does not end with | |
+| `*_end_any` | Ends with any of | |
+| `*_end_all` | Ends with all of | |
+| `*_not_end_any` | | |
+| `*_not_end_all` | | |
+| `*_cont` | Contains value | uses `LIKE` |
+| `*_cont_any` | Contains any of | |
+| `*_cont_all` | Contains all of | |
+| `*_not_cont` | Does not contain |
+| `*_not_cont_any` | Does not contain any of | |
+| `*_not_cont_all` | Does not contain all of | |
+| `*_true` | is true | |
+| `*_false` | is false | |
+
 
 (See full list: https://github.com/activerecord-hackery/ransack/blob/master/lib/ransack/locale/en.yml#L15 and [wiki](https://github.com/activerecord-hackery/ransack/wiki/Basic-Searching))
 

data/lib/ransack/adapters.rb

@@ -10,6 +10,8 @@ module Ransack
         ActiveRecordAdapter.new
       elsif defined?(::Mongoid)
         MongoidAdapter.new
+      else
+        raise "Unsupported adapter"
       end
     end
 

data/lib/ransack/adapters/active_record/context.rb

@@ -27,11 +27,11 @@ module Ransack
           return nil unless attr && attr.valid?
           name         = attr.arel_attribute.name.to_s
           table        = attr.arel_attribute.relation.table_name
-          schema_cache = ::ActiveRecord::Base.connection.schema_cache
+          schema_cache = self.klass.connection.schema_cache
           unless schema_cache.send(database_table_exists?, table)
             raise "No table named #{table} exists."
           end
-          schema_cache.columns_hash(table)[name].type
+          attr.klass.columns.find { |column| column.name == name }.type
         end
 
         def evaluate(search, opts = {})
@@ -251,7 +251,10 @@ module Ransack
         # Checkout active_record/relation/query_methods.rb +build_joins+ for
         # reference. Lots of duplicated code maybe we can avoid it
         def build_joins(relation)
-          buckets = relation.joins_values.group_by do |join|
+          buckets = relation.joins_values
+          buckets += relation.left_outer_joins_values if ::ActiveRecord::VERSION::MAJOR >= 5
+
+          buckets = buckets.group_by do |join|
             case join
             when String
               :string_join
@@ -287,10 +290,10 @@ module Ransack
               join_dependency.send(:alias_tracker).aliases[join.left.name.downcase] = 1
             end
           else
-            alias_tracker = ::ActiveRecord::Associations::AliasTracker.create(::ActiveRecord::Base.connection, relation.table.name, join_list)
+            alias_tracker = ::ActiveRecord::Associations::AliasTracker.create(self.klass.connection, relation.table.name, join_list)
             join_dependency = JoinDependency.new(relation.klass, relation.table, association_joins, alias_tracker)
             join_nodes.each do |join|
-              join_dependency.alias_tracker.aliases[join.left.name.downcase] = 1
+              join_dependency.send(:alias_tracker).aliases[join.left.name.downcase] = 1
             end
           end
 
@@ -330,7 +333,7 @@ module Ransack
               )
               found_association = jd.join_root.children.last
             else
-              alias_tracker = ::ActiveRecord::Associations::AliasTracker.create(::ActiveRecord::Base.connection, parent.table.name, [])
+              alias_tracker = ::ActiveRecord::Associations::AliasTracker.create(self.klass.connection, parent.table.name, [])
               jd = JoinDependency.new(
                 parent.base_klass,
                 parent.base_klass.arel_table,

data/lib/ransack/adapters/active_record/ransack/visitor.rb

@@ -20,5 +20,24 @@ module Ransack
       end
     end
 
+    def visit_Ransack_Nodes_Sort(object)
+      return unless object.valid?
+      if object.attr.is_a?(Arel::Attributes::Attribute)
+        object.attr.send(object.dir)
+      else
+        ordered(object)
+      end
+    end
+
+    private
+
+      def ordered(object)
+        case object.dir
+        when 'asc'.freeze
+          Arel::Nodes::Ascending.new(object.attr)
+        when 'desc'.freeze
+          Arel::Nodes::Descending.new(object.attr)
+        end
+      end
   end
 end

data/lib/ransack/locale/nl.yml

@@ -35,9 +35,9 @@ nl:
       gt: "groter dan"
       gt_any: "groter dan enig"
       gt_all: "groter dan alle"
-      gteq: "groter dan or equal to"
-      gteq_any: "groter dan or equal to enig"
-      gteq_all: "groter dan or equal to alle"
+      gteq: "groter dan of gelijk aan"
+      gteq_any: "groter dan of gelijk aan enig"
+      gteq_all: "groter dan of gelijk aan alle"
       in: "in"
       in_any: "in enig"
       in_all: "in alle"
@@ -64,7 +64,7 @@ nl:
       not_end_all: "eindigt niet met alle"
       'true': "is waar"
       'false': "is niet waar"
-      present: "is present"
+      present: "is aanwezig"
       blank: "is afwezig"
       'null': "is null"
       not_null: "is niet null"

data/lib/ransack/version.rb

@@ -1,3 +1,3 @@
 module Ransack
-  VERSION = '1.8.7'
+  VERSION = '1.8.8'
 end

data/lib/ransack/visitor.rb

@@ -40,10 +40,6 @@ module Ransack
       end
     end
 
-    def visit_Ransack_Nodes_Sort(object)
-      object.attr.send(object.dir) if object.valid?
-    end
-
     def quoted?(object)
       raise "not implemented"
     end
@@ -57,6 +53,5 @@ module Ransack
         klass.name.gsub(Constants::TWO_COLONS, Constants::UNDERSCORE)
         }"
     end
-
   end
 end

data/spec/ransack/adapters/active_record/base_spec.rb

@@ -18,6 +18,13 @@ module Ransack
             expect(subject.object).to be_an ::ActiveRecord::Relation
           end
 
+          context "multiple database connection" do
+            it "does not raise error" do
+              expect { Person.ransack(name_cont: "test") }.not_to raise_error
+              expect { SubDB::OperationHistory.ransack(people_id_eq: 1) }.not_to raise_error
+            end
+          end
+
           context 'with scopes' do
             before do
               allow(Person)
@@ -505,6 +512,7 @@ module Ransack
             )
           end
 
+
           it 'should allow passing ransacker arguments to a ransacker' do
             s = Person.ransack(
               c: [{
@@ -544,6 +552,30 @@ module Ransack
               /BETWEEN 2 AND 6 GROUP BY articles.person_id \) DESC/
             )
           end
+
+          context 'case insensitive sorting' do
+            it 'allows sort by desc' do
+              search = Person.search(sorts: ['name_case_insensitive desc'])
+              expect(search.result.to_sql).to match /ORDER BY LOWER(.*) DESC/
+            end
+
+            it 'allows sort by asc' do
+              search = Person.search(sorts: ['name_case_insensitive asc'])
+              expect(search.result.to_sql).to match /ORDER BY LOWER(.*) ASC/
+            end
+          end
+
+          context 'regular sorting' do
+            it 'allows sort by desc' do
+              search = Person.search(sorts: ['name desc'])
+              expect(search.result.to_sql).to match /ORDER BY .* DESC/
+            end
+
+            it 'allows sort by asc' do
+              search = Person.search(sorts: ['name asc'])
+              expect(search.result.to_sql).to match /ORDER BY .* ASC/
+            end
+          end
         end
 
         describe '#ransackable_attributes' do

data/spec/spec_helper.rb

@@ -37,6 +37,7 @@ RSpec.configure do |config|
     line = '=' * message.length
     puts line, message, line
     Schema.create
+    SubDB::Schema.create
   end
 
   config.before(:all)   { Sham.reset(:before_all) }

data/spec/support/schema.rb

@@ -92,10 +92,15 @@ class Person < ActiveRecord::Base
       )
   end
 
+
   ransacker :sql_literal_id do
     Arel.sql('people.id')
   end
 
+  ransacker :name_case_insensitive, type: :string do
+    arel_table[:name].lower
+  end
+
   ransacker :with_arguments, args: [:parent, :ransacker_args] do |parent, args|
     min, max = args
     query = <<-SQL
@@ -110,6 +115,7 @@ class Person < ActiveRecord::Base
     Arel.sql(query)
   end
 
+
   def self.ransackable_attributes(auth_object = nil)
     if auth_object == :admin
       super - ['only_sort']
@@ -255,3 +261,30 @@ module Schema
     )
   end
 end
+
+module SubDB
+  class Base < ActiveRecord::Base
+    self.abstract_class = true
+    establish_connection(
+      adapter: 'sqlite3',
+      database: ':memory:'
+    )
+  end
+
+  class OperationHistory < Base
+  end
+
+  module Schema
+    def self.create
+      s = ::ActiveRecord::Schema.new
+      s.instance_variable_set(:@connection, SubDB::Base.connection)
+      s.verbose = false
+      s.define({}) do
+        create_table :operation_histories, force: true do |t|
+          t.string  :operation_type
+          t.integer :people_id
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ransack
 version: !ruby/object:Gem::Version
-  version: 1.8.7
+  version: 1.8.8
 platform: ruby
 authors:
 - Ernie Miller
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-05 00:00:00.000000000 Z
+date: 2018-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -321,7 +321,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ransack
-rubygems_version: 2.6.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Object-based searching for Active Record and Mongoid (currently).