ransack 1.8.3 → 1.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d068e0ef0efe6ce1a4afdb11cc36361f94bbcf68
-  data.tar.gz: 2ab905dd3037f405cfc262e2440cbfa557c5a799
+  metadata.gz: c8e6d1b7f6033421d1b31eff646ed9a001e372a3
+  data.tar.gz: 9a2736272f385849dc81f3a5f915c40ccde4d74e
 SHA512:
-  metadata.gz: 354a8a5fc605f5efb7da6d1b78544f93780293418ac9a4578ae395fb608dbd69d301d5a129fbc6cf20c46427427fbeba04b0f7ea040b54771aaecbd31cf174ac
-  data.tar.gz: 388a7b733a5460acd980703c6d918077fc27e4777f8acf0b2f3c72b696664c1ef9997c477de74a772ea776eb56521d65cda03bb7f190441575801a4d65b479d6
+  metadata.gz: 701f44cf5ed1ffa5c4c28ddf7267270161affdc70e6c5feffa1cd73e6fca16ab1438b836476337b41e25f67cfa71c5c4a51943f7848ea65150aeda5dd9ad2b8b
+  data.tar.gz: 221fc344c558b0c152363ecee786b9be06bb2d45460af5c0942485f56d36856d465c4ca039e248c9d879b8d6d44ebbff8b22e43d0e6ab66fef94293cfe1c6561

data/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Change Log
 
-## Unreleased
+## Version 1.8.3 - 2017-06-15
 
 ### Added
 
@@ -141,30 +141,17 @@
 
     *Marcel Eeken*
 
-*   Add Taiwanese Hokkien/Mandarin i18n locale file (`zh-TW.yml`). PR
-    [#674](https://github.com/activerecord-hackery/ransack/pull/674).
-
-    *Sibevin Wang*
-
-*   Add Danish i18n locale file (`da.yml`). PR
-    [#663](https://github.com/activerecord-hackery/ransack/pull/663).
-
-    *Kasper Johansen*
-
-*   Add Brazilian Portuguese i18n locale file (`pt-BR.yml`). PR
-    [#581](https://github.com/activerecord-hackery/ransack/pull/581).
-
-    *Diego Henrique Domingues*
-
-*   Add Indonesian (Bahasa) i18n locale file (`id.yml`). PR
-    [#612](https://github.com/activerecord-hackery/ransack/pull/612).
-
-    *Adam Pahlevi Baihaqi*
-
-*   Add Japanese i18n locale file (`ja.yml`). PR
-    [#622](https://github.com/activerecord-hackery/ransack/pull/622).
-
-    *Masanobu Mizutani*
+*   Add i18n locale files:
+  *   Taiwanese Hokkien/Mandarin (`zh-TW.yml`). PR
+    [#674](https://github.com/activerecord-hackery/ransack/pull/674). *Sibevin Wang*
+  *   Danish (`da.yml`). PR
+    [#663](https://github.com/activerecord-hackery/ransack/pull/663). *Kasper Johansen*
+  *   Brazilian Portuguese (`pt-BR.yml`). PR
+    [#581](https://github.com/activerecord-hackery/ransack/pull/581). *Diego Henrique Domingues*
+  *   Indonesian (Bahasa) (`id.yml`). PR
+    [#612](https://github.com/activerecord-hackery/ransack/pull/612). *Adam Pahlevi Baihaqi*
+  *   Japanese (`ja.yml`). PR
+    [#622](https://github.com/activerecord-hackery/ransack/pull/622). *Masanobu Mizutani*
 
 ### Fixed
 

data/README.md

@@ -1,11 +1,8 @@
 # Ransack
 
-[![Build Status](https://travis-ci.org/activerecord-hackery/ransack.svg)]
-(https://travis-ci.org/activerecord-hackery/ransack)
-[![Gem Version](https://badge.fury.io/rb/ransack.svg)]
-(http://badge.fury.io/rb/ransack)
-[![Code Climate](https://codeclimate.com/github/activerecord-hackery/ransack/badges/gpa.svg)]
-(https://codeclimate.com/github/activerecord-hackery/ransack)
+[![Build Status](https://travis-ci.org/activerecord-hackery/ransack.svg)](https://travis-ci.org/activerecord-hackery/ransack)
+[![Gem Version](https://badge.fury.io/rb/ransack.svg)](http://badge.fury.io/rb/ransack)
+[![Code Climate](https://codeclimate.com/github/activerecord-hackery/ransack/badges/gpa.svg)](https://codeclimate.com/github/activerecord-hackery/ransack)
 
 Ransack is a rewrite of [MetaSearch](https://github.com/activerecord-hackery/meta_search)
 created by [Ernie Miller](http://twitter.com/erniemiller)
@@ -203,13 +200,18 @@ initially sorting the `last_name` field by ascending order, and the
 
 The sort link order indicator arrows may be globally customized by setting a
 `custom_arrows` option in an initializer file like
-`config/initializers/ransack.rb`:
+`config/initializers/ransack.rb`.
+
+You can also enable a `default_arrow` which is displayed on all sortable fields
+which are not currently used in the sorting. This is disabled by default so
+nothing will be displayed:
 
 ```ruby
 Ransack.configure do |c|
   c.custom_arrows = {
     up_arrow: '<i class="custom-up-arrow-icon"></i>',
-    down_arrow: 'U+02193'
+    down_arrow: 'U+02193',
+    default_arrow: '<i class="default-arrow-icon"></i>'
   }
 end
 ```
@@ -495,6 +497,14 @@ def index
 end
 ```
 
+#### `PG::UndefinedFunction: ERROR: could not identify an equality operator for type json`
+
+If you get the above error while using `distinct: true` that means that
+one of the columns that Ransack is selecting is a `json` column.
+PostgreSQL does not provide comparison operators for the `json` type.  While
+it is possible to work around this, in practice it's much better to convert those
+to `jsonb`, as [recommended by the PostgreSQL documentation](https://www.postgresql.org/docs/9.6/static/datatype-json.html).
+
 ### Authorization (whitelisting/blacklisting)
 
 By default, searching and sorting are authorized on any column of your model

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

@@ -342,15 +342,25 @@ module Ransack
           def extract_joins(association)
             parent = @join_dependency.join_root
             reflection = association.reflection
-            join_constraints = association.join_constraints(
-              parent.table,
-              parent.base_klass,
-              association,
-              Arel::Nodes::OuterJoin,
-              association.tables,
-              reflection.scope_chain,
-              reflection.chain
-            )
+            join_constraints = if ::ActiveRecord::VERSION::STRING < Constants::RAILS_5_1
+                                 association.join_constraints(
+                                   parent.table,
+                                   parent.base_klass,
+                                   association,
+                                   Arel::Nodes::OuterJoin,
+                                   association.tables,
+                                   reflection.scope_chain,
+                                   reflection.chain
+                                 )
+                               else
+                                 association.join_constraints(
+                                   parent.table,
+                                   parent.base_klass,
+                                   Arel::Nodes::OuterJoin,
+                                   association.tables,
+                                   reflection.chain
+                                 )
+                               end
             join_constraints.to_a.flatten
           end
 

data/lib/ransack/configuration.rb

@@ -12,6 +12,7 @@ module Ransack
       :hide_sort_order_indicators => false,
       :up_arrow => '▼'.freeze,
       :down_arrow => '▲'.freeze,
+      :default_arrow => nil,
       :sanitize_scope_args => true
     }
 
@@ -83,20 +84,25 @@ module Ransack
     #   up_arrow:   '▼'
     #   down_arrow: '▲'
     #
-    # One or both defaults may be globally overridden in an initializer file
+    # There is also a default arrow which is displayed if a column is not sorted.
+    # By default this is nil so nothing will be displayed.
+    #
+    # Any of the defaults may be globally overridden in an initializer file
     # like `config/initializers/ransack.rb` as follows:
     #
     # Ransack.configure do |config|
-    #   # Globally set the up arrow to an icon and the down arrow to unicode.
+    #   # Globally set the up arrow to an icon, and the down and default arrows to unicode.
     #   config.custom_arrows = {
     #     up_arrow:   '<i class="fa fa-long-arrow-up"></i>',
-    #     down_arrow: 'U+02193'
+    #     down_arrow: 'U+02193',
+    #     default_arrow: 'U+11047'
     #   }
     # end
     #
     def custom_arrows=(opts = {})
       self.options[:up_arrow] = opts[:up_arrow].freeze if opts[:up_arrow]
       self.options[:down_arrow] = opts[:down_arrow].freeze if opts[:down_arrow]
+      self.options[:default_arrow] = opts[:default_arrow].freeze if opts[:default_arrow]
     end
 
     # Ransack sanitizes many values in your custom scopes into booleans.

data/lib/ransack/constants.rb

@@ -46,6 +46,7 @@ module Ransack
     CONT                = 'cont'.freeze
 
     RAILS_4_1           = '4.1'.freeze
+    RAILS_5_1           = '5.1'.freeze
 
     RANSACK_SLASH_SEARCHES = 'ransack/searches'.freeze
     RANSACK_SLASH_SEARCHES_SLASH_SEARCH = 'ransack/searches/search'.freeze

data/lib/ransack/helpers/form_helper.rb

@@ -49,7 +49,7 @@ module Ransack
         unless Search === search
           raise TypeError, 'First argument must be a Ransack::Search!'
         end
-        args.unshift(capture(&block)) if block_given?
+        args[args.first.is_a?(Array) ? 1 : 0, 0] = capture(&block) if block_given?
         s = SortLink.new(search, attribute, args, params, &block)
         link_to(s.name, url(routing_proxy, s.url_options), s.html_options(args))
       end
@@ -117,6 +117,10 @@ module Ransack
           Ransack.options[:down_arrow]
         end
 
+        def default_arrow
+          Ransack.options[:default_arrow]
+        end
+
         def name
           [ERB::Util.h(@label_text), order_indicator]
           .compact
@@ -209,7 +213,8 @@ module Ransack
           end
 
           def order_indicator
-            return if @hide_indicator || no_sort_direction_specified?
+            return if @hide_indicator
+            return default_arrow if no_sort_direction_specified?
             if @current_dir == 'desc'.freeze
               up_arrow
             else

data/lib/ransack/locale/it.yml

@@ -0,0 +1,70 @@
+it:
+  ransack:
+    search: "cerca"
+    predicate: "predicato"
+    and: "e"
+    or: "o"
+    any: "qualsiasi"
+    all: "tutti"
+    combinator: "combinatore"
+    attribute: "attributo"
+    value: "valore"
+    condition: "condizione"
+    sort: "ordinamento"
+    asc: "crescente"
+    desc: "decrescente"
+    predicates:
+      eq: "uguale a"
+      eq_any: "uguale ad almeno un"
+      eq_all: "uguale ad ognuno"
+      not_eq: "diverso da"
+      not_eq_any: "diverso da uno qualsiasi"
+      not_eq_all: "diverso da tutti"
+      matches: "combacia con"
+      matches_any: "combacia con almeno un"
+      matches_all: "combacia con tutti"
+      does_not_match: "non corrisponde"
+      does_not_match_any: "non corrisponde ad uno qualsiasi"
+      does_not_match_all: "non corrisponde con nessuno"
+      lt: "minore di"
+      lt_any: "minore di almeno un"
+      lt_all: "minore di tutti"
+      lteq: "minore o uguale a"
+      lteq_any: "minore o uguale ad almeno un"
+      lteq_all: "minore o uguale a tutti"
+      gt: "maggiore di"
+      gt_any: "maggiore di almeno un"
+      gt_all: "maggiore di tutti"
+      gteq: "maggiore o uguale a"
+      gteq_any: "maggiore o uguale ad almeno un"
+      gteq_all: "maggiore o uguale a tutti"
+      in: "in"
+      in_any: "in almeno un"
+      in_all: "in tutti"
+      not_in: "non in"
+      not_in_any: "non in almeno un"
+      not_in_all: "non in tutti"
+      cont: "contiene"
+      cont_any: "contiene almeno un"
+      cont_all: "contiene tutti"
+      not_cont: "non contiene"
+      not_cont_any: "non contiene un qualsiasi"
+      not_cont_all: "non contiene nessuno"
+      start: "inizia con"
+      start_any: "inizia con almeno un"
+      start_all: "inizia con tutti"
+      not_start: "non inizia con"
+      not_start_any: "non inizia con uno qualsiasi"
+      not_start_all: "non inizia con nessuno"
+      end: "finisce con"
+      end_any: "finisce con almeno un"
+      end_all: "finisce con tutti"
+      not_end: "non finisce con"
+      not_end_any: "non finisce con uno qualsiasi"
+      not_end_all: "non finisce con nessuno"
+      'true': "è vero"
+      'false': "è falso"
+      present: "è presente"
+      blank: "è vuoto"
+      'null': "è nullo"
+      not_null: "non è nullo"

data/lib/ransack/nodes/value.rb

@@ -23,87 +23,93 @@ module Ransack
       end
 
       def cast(type)
-         case type
-         when :date
-           cast_to_date(value)
-         when :datetime, :timestamp, :time
-           cast_to_time(value)
-         when :boolean
-           cast_to_boolean(value)
-         when :integer
-           cast_to_integer(value)
-         when :float
-           cast_to_float(value)
-         when :decimal
-           cast_to_decimal(value)
-         else
-           cast_to_string(value)
-         end
-       end
+        case type
+        when :date
+          cast_to_date(value)
+        when :datetime, :timestamp, :time
+          cast_to_time(value)
+        when :boolean
+          cast_to_boolean(value)
+        when :integer
+          cast_to_integer(value)
+        when :float
+          cast_to_float(value)
+        when :decimal
+          cast_to_decimal(value)
+        when :money
+          cast_to_money(value)
+        else
+          cast_to_string(value)
+        end
+      end
 
-       def cast_to_date(val)
-         if val.respond_to?(:to_date)
-           val.to_date rescue nil
-         else
-           y, m, d = *[val].flatten
-           m ||= 1
-           d ||= 1
-           Date.new(y,m,d) rescue nil
-         end
-       end
+      def cast_to_date(val)
+        if val.respond_to?(:to_date)
+          val.to_date rescue nil
+        else
+          y, m, d = *[val].flatten
+          m ||= 1
+          d ||= 1
+          Date.new(y,m,d) rescue nil
+        end
+      end
 
-       def cast_to_time(val)
-         if val.is_a?(Array)
-           Time.zone.local(*val) rescue nil
-         else
-           unless val.acts_like?(:time)
-             val = val.is_a?(String) ? Time.zone.parse(val) : val.to_time rescue val
-           end
-           val.in_time_zone rescue nil
-         end
-       end
+      def cast_to_time(val)
+        if val.is_a?(Array)
+          Time.zone.local(*val) rescue nil
+        else
+          unless val.acts_like?(:time)
+            val = val.is_a?(String) ? Time.zone.parse(val) : val.to_time rescue val
+          end
+          val.in_time_zone rescue nil
+        end
+      end
 
-       def cast_to_boolean(val)
-         if Constants::TRUE_VALUES.include?(val)
-           true
-         elsif Constants::FALSE_VALUES.include?(val)
-           false
-         else
-           nil
-         end
-       end
+      def cast_to_boolean(val)
+        if Constants::TRUE_VALUES.include?(val)
+          true
+        elsif Constants::FALSE_VALUES.include?(val)
+          false
+        else
+          nil
+        end
+      end
 
-       def cast_to_string(val)
-         val.respond_to?(:to_s) ? val.to_s : String.new(val)
-       end
+      def cast_to_string(val)
+        val.respond_to?(:to_s) ? val.to_s : String.new(val)
+      end
 
-       def cast_to_integer(val)
-         val.blank? ? nil : val.to_i
-       end
+      def cast_to_integer(val)
+        val.blank? ? nil : val.to_i
+      end
 
-       def cast_to_float(val)
-         val.blank? ? nil : val.to_f
-       end
+      def cast_to_float(val)
+        val.blank? ? nil : val.to_f
+      end
 
-       def cast_to_decimal(val)
-         if val.blank?
-           nil
-         elsif val.class == BigDecimal
-           val
-         elsif val.respond_to?(:to_d)
-           val.to_d
-         else
-           val.to_s.to_d
-         end
+      def cast_to_decimal(val)
+       if val.blank?
+         nil
+       elsif val.class == BigDecimal
+         val
+       elsif val.respond_to?(:to_d)
+         val.to_d
+       else
+         val.to_s.to_d
        end
+      end
+      
+      def cast_to_money(val)
+        val.blank? ? nil : val.to_f.to_s
+      end
 
       def inspect
         "Value <#{value}>"
       end
 
-       def array_of_arrays?(val)
-         Array === val && Array === val.first
-       end
+      def array_of_arrays?(val)
+        Array === val && Array === val.first
+      end
     end
   end
 end

data/lib/ransack/version.rb

@@ -1,3 +1,3 @@
 module Ransack
-  VERSION = '1.8.3'
+  VERSION = '1.8.4'
 end

data/spec/ransack/configuration_spec.rb

@@ -48,6 +48,7 @@ module Ransack
     it 'should have default values for arrows' do
       expect(Ransack.options[:up_arrow]).to eq '▼'
       expect(Ransack.options[:down_arrow]).to eq '▲'
+      expect(Ransack.options[:default_arrow]).to eq nil
     end
 
     it 'changes the default value for the up arrow only' do
@@ -72,17 +73,31 @@ module Ransack
       Ransack.options = default
     end
 
-    it 'changes the default value for both arrows' do
+    it 'changes the default value for the default arrow only' do
+      default, new_default_arrow  = Ransack.options.clone, '<i class="default"></i>'
+
+      Ransack.configure { |c| c.custom_arrows = { default_arrow: new_default_arrow } }
+
+      expect(Ransack.options[:up_arrow]).to eq default[:up_arrow]
+      expect(Ransack.options[:down_arrow]).to eq default[:down_arrow]
+      expect(Ransack.options[:default_arrow]).to eq new_default_arrow
+
+      Ransack.options = default
+    end
+
+    it 'changes the default value for all arrows' do
       default        = Ransack.options.clone
       new_up_arrow   = '<i class="fa fa-long-arrow-up"></i>'
       new_down_arrow = 'U+02193'
+      new_default_arrow = 'defaultarrow'
 
       Ransack.configure do |c|
-        c.custom_arrows = { up_arrow: new_up_arrow, down_arrow: new_down_arrow }
+        c.custom_arrows = { up_arrow: new_up_arrow, down_arrow: new_down_arrow, default_arrow: new_default_arrow }
       end
 
       expect(Ransack.options[:up_arrow]).to eq new_up_arrow
       expect(Ransack.options[:down_arrow]).to eq new_down_arrow
+      expect(Ransack.options[:default_arrow]).to eq new_default_arrow
 
       Ransack.options = default
     end

data/spec/ransack/helpers/form_helper_spec.rb

@@ -727,11 +727,36 @@ module Ransack
         it { should match /Full Name ▼/ }
       end
 
+      describe '#sort_link with config set to show arrows and a default arrow set' do
+        before do
+          Ransack.configure do |c|
+            c.hide_sort_order_indicators = false
+            c.custom_arrows = { default_arrow: "defaultarrow"}
+          end
+        end
+
+        after do
+          Ransack.configure do |c|
+            c.custom_arrows = { default_arrow: nil}
+          end
+        end
+
+        subject { @controller.view_context
+          .sort_link(
+            [:main_app, Person.search],
+            :name,
+            controller: 'people'
+          )
+        }
+
+        it { should match /Full Name defaultarrow/ }
+      end
+
       describe '#sort_link w/config to hide arrows + custom arrow, hides all' do
         before do
           Ransack.configure do |c|
             c.hide_sort_order_indicators = true
-            c.custom_arrows = { down_arrow: 'down' }
+            c.custom_arrows = { down_arrow: 'down', default_arrow: "defaultarrow" }
           end
         end
 
@@ -750,7 +775,7 @@ module Ransack
           )
         }
 
-        it { should_not match /▼|down/ }
+        it { should_not match /▼|down|defaultarrow/ }
       end
 
       describe '#sort_link with config set to show arrows + custom arrow' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ransack
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 1.8.4
 platform: ruby
 authors:
 - Ernie Miller
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-15 00:00:00.000000000 Z
+date: 2017-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -241,6 +241,7 @@ files:
 - lib/ransack/locale/fr.yml
 - lib/ransack/locale/hu.yml
 - lib/ransack/locale/id.yml
+- lib/ransack/locale/it.yml
 - lib/ransack/locale/ja.yml
 - lib/ransack/locale/nl.yml
 - lib/ransack/locale/pt-BR.yml
@@ -317,7 +318,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ransack
-rubygems_version: 2.5.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Object-based searching for Active Record and Mongoid (currently).