ransack 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a6333c22fc3b35aec6fea8a410ec2705e570031
-  data.tar.gz: ae8c1df141e8944b0509ba07d2e50d19b9c14c66
+  metadata.gz: 0000005ab1d9a09827cede9e9d949a7b87308f75
+  data.tar.gz: 72f3bddda6c78c9014b6a4fb1c6e49a622c9e7f2
 SHA512:
-  metadata.gz: d6ed3d7bc6024116ac43c27888dc98b77ce265bab21046c7ac9dd0cb98a12077d7cf8ded176b073f825d11c92cbd02433b29ee5224b858bd5208e1a3edb19724
-  data.tar.gz: 9a6a06c4ee47b701e2ba2f6f29007c5dd00b16a34f7bbb57f9bada3d787a1caf2b6db8107dfaf5cdc0ac433665bc03e86a3e21c15a9e30daff509df5ea043c8d
+  metadata.gz: 0fcba1e08c4c8a1096182999c56da5765c9acb8adbb6ccc1e15870b436c9420baafb755ae5988568e14dee0212a062c6cc519e9d8e9eb4e4ee8776c8b1c9912d
+  data.tar.gz: 9d77b3d4de15b392e621d9ad11e546d933f2963075eac390414066dc5957a674c3dad7ccf105a669eaa2c329dae02b2d7d08dbe11666b16ced46c019a39187a3

data/CHANGELOG.md

@@ -1,5 +1,39 @@
 # Change Log
 
+## Version 1.8.1 - 2016-07-27
+### Fixed
+
+*   Fix `rake console` to run a command-line console with ransack + seed data.
+    Commits
+    [2cc781e](https://github.com/activerecord-hackery/ransack/commit/2cc781e),
+    [f2e85ad](https://github.com/activerecord-hackery/ransack/commit/f2e85ad),
+    [6a059ba](https://github.com/activerecord-hackery/ransack/commit/6a059ba).
+
+    *Jon Atack*
+
+*   Fix returned value of `Ransack::Nodes::Condition#format_predicate`. PR
+    [#692](https://github.com/activerecord-hackery/ransack/pull/692).
+
+    *Masahiro Saito*
+
+*   Better test coverage on passing arrays to ransackers. Commit
+    [98df2c5](https://github.com/activerecord-hackery/ransack/commit/98df2c5).
+
+    *Jon Atack*
+
+*   Fix missing Ransack::Constants::ASC constant. Commit
+    [aece23c](https://github.com/activerecord-hackery/ransack/commit/aece23c).
+
+    *Jon Atack*
+
+### Changed
+
+*   Replace arrow constants with frozen strings in public methods. Commits
+    [c0dff33](https://github.com/activerecord-hackery/ransack/commit/c0dff33),
+    [e489ca7](https://github.com/activerecord-hackery/ransack/commit/e489ca7).
+
+    *Jon Atack*
+
 ## Version 1.8.0 - 2016-07-14
 ### Added
 
@@ -8,18 +42,18 @@
 
     *Josef Šimánek*
 
-*   Added optional block argument for the `sort_link` method. PR
+*   Add optional block argument for the `sort_link` method. PR
     [#604](https://github.com/activerecord-hackery/ransack/pull/604).
 
     *Andrea Dal Ponte*
 
-*   Added `ransack_alias` to allow users to customize the names for long
+*   Add `ransack_alias` to allow users to customize the names for long
     ransack field names. PR
     [#623](https://github.com/activerecord-hackery/ransack/pull/623).
 
     *Ray Zane*
 
-*   Added support for searching on attributes that have been added to
+*   Add support for searching on attributes that have been added to
     Active Record models with `alias_attribute` (Rails >= 4 only). PR
     [#592](https://github.com/activerecord-hackery/ransack/pull/592), commit
     [549342a](https://github.com/activerecord-hackery/ransack/commit/549342a).

data/README.md

@@ -29,7 +29,7 @@ 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.0).](https://github.com/activerecord-hackery/ransack/tree/v1.8.0)
+[View documentation for the last release (1.8.1).](https://github.com/activerecord-hackery/ransack/tree/v1.8.1)
 
 ## Getting started
 
@@ -56,9 +56,8 @@ branch:
 gem 'ransack', github: 'activerecord-hackery/ransack'
 ```
 
-September 2015 update: If you are using Rails 5 (master) and need pagination
-that works with Ransack, there is an
-[updated version of the `will_paginate` gem here](https://github.com/jonatack/will_paginate).
+If you are using Rails 5 or master and need pagination compatible with it and
+Ransack, there is a [Rails 5 version of the `will_paginate` gem here](https://github.com/jonatack/will_paginate).
 It is also optimized for Ruby 2.2+. To use it, in your Gemfile:
 `gem 'will_paginate', github: 'jonatack/will_paginate'`.
 

data/Rakefile

@@ -26,11 +26,10 @@ end
 
 desc "Open an irb session with Ransack and the sample data used in specs"
 task :console do
-  require 'irb'
-  require 'irb/completion'
-  require 'console'
+  require 'pry'
+  require File.expand_path('../spec/console.rb', __FILE__)
   ARGV.clear
-  IRB.start
+  Pry.start
 end
 
 desc "Open an irb session with Ransack, Mongoid and the sample data used in specs"

data/lib/ransack/adapters/active_record/ransack/nodes/condition.rb

@@ -26,17 +26,23 @@ module Ransack
           arel_pred = arel_predicate_for_attribute(attribute)
           arel_values = formatted_values_for_attribute(attribute)
           predicate = attribute.attr.public_send(arel_pred, arel_values)
-          if casted_array_with_in_predicate?(predicate)
-            predicate.right[0] = format_values_for(predicate.right[0])
+
+          if in_predicate?(predicate)
+            predicate.right = predicate.right.map do |predicate|
+              casted_array?(predicate) ? format_values_for(predicate) : predicate
+            end
           end
+
           predicate
         end
 
-        def casted_array_with_in_predicate?(predicate)
+        def in_predicate?(predicate)
           return unless defined?(Arel::Nodes::Casted)
-          predicate.class == Arel::Nodes::In &&
-          predicate.right[0].respond_to?(:val) &&
-          predicate.right[0].val.is_a?(Array)
+          predicate.class == Arel::Nodes::In
+        end
+
+        def casted_array?(predicate)
+          predicate.respond_to?(:val) && predicate.val.is_a?(Array)
         end
 
         def format_values_for(predicate)

data/lib/ransack/constants.rb

@@ -1,8 +1,5 @@
 module Ransack
   module Constants
-    ASC_ARROW           = '▲'.freeze
-    DESC_ARROW          = '▼'.freeze
-
     OR                  = 'or'.freeze
     AND                 = 'and'.freeze
 

data/lib/ransack/helpers/form_builder.rb

@@ -176,9 +176,9 @@ module Ransack
 
       def sort_array
         [
-          [Constants::ASC,  object.translate(Constants::ASC)],
-          [Constants::DESC, object.translate(Constants::DESC)]
-        ]
+          ['asc'.freeze,  object.translate('asc'.freeze)].freeze,
+          ['desc'.freeze, object.translate('desc'.freeze)].freeze
+        ].freeze
       end
 
       def combinator_choices

data/lib/ransack/helpers/form_helper.rb

@@ -97,6 +97,14 @@ module Ransack
           @default_order  = @options.delete :default_order
         end
 
+        def up_arrow
+          '▼'.freeze
+        end
+
+        def down_arrow
+          '▲'.freeze
+        end
+
         def name
           [ERB::Util.h(@label_text), order_indicator]
           .compact
@@ -190,16 +198,15 @@ module Ransack
 
           def order_indicator
             return if @hide_indicator || no_sort_direction_specified?
-            direction_arrow
+            if @current_dir == 'desc'.freeze
+              up_arrow
+            else
+              down_arrow
+            end
           end
 
           def no_sort_direction_specified?(dir = @current_dir)
-            !['asc'.freeze, 'desc'.freeze].freeze.include?(dir)
-          end
-
-          def direction_arrow
-            return Constants::DESC_ARROW if @current_dir == 'desc'.freeze
-            Constants::ASC_ARROW
+            dir != 'asc'.freeze && dir != 'desc'.freeze
           end
 
           def direction_text(dir)

data/lib/ransack/nodes/sort.rb

@@ -38,7 +38,7 @@ module Ransack
       def dir=(dir)
         dir = dir.downcase if dir
         @dir =
-          if ['asc'.freeze, 'desc'.freeze].freeze.include?(dir)
+          if dir == 'asc'.freeze || dir == 'desc'.freeze
             dir
           else
             'asc'.freeze

data/lib/ransack/version.rb

@@ -1,3 +1,3 @@
 module Ransack
-  VERSION = '1.8.0'
+  VERSION = '1.8.1'
 end

data/spec/console.rb

@@ -16,6 +16,10 @@ Sham.define do
   salary   { |index| 30000 + (index * 1000) }
   tag_name { Faker::Lorem.words(3).join(' ') }
   note     { Faker::Lorem.words(7).join(' ') }
+  only_admin  { Faker::Lorem.words(3).join(' ') }
+  only_search { Faker::Lorem.words(3).join(' ') }
+  only_sort   { Faker::Lorem.words(3).join(' ') }
+  notable_id  { |id| id }
 end
 
 Schema.create

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

@@ -314,14 +314,26 @@ module Ransack
 
           context 'searching on an `in` predicate with a ransacker' do
             it 'should function correctly when passing an array of ids' do
-              s = Person.ransack(array_users_in: true)
+              s = Person.ransack(array_people_ids_in: true)
               expect(s.result.count).to be > 0
+
+              s = Person.ransack(array_where_people_ids_in: [1, '2', 3])
+              expect(s.result.count).to be 3
+              expect(s.result.map(&:id)).to eq [3, 2, 1]
             end
 
             it 'should function correctly when passing an array of strings' do
-              Person.create!(name: Person.first.id.to_s)
-              s = Person.ransack(array_names_in: true)
+              a, b = Person.select(:id).order(:id).limit(2).map { |a| a.id.to_s }
+
+              Person.create!(name: a)
+              s = Person.ransack(array_people_names_in: true)
               expect(s.result.count).to be > 0
+              s = Person.ransack(array_where_people_names_in: a)
+              expect(s.result.count).to be 1
+
+              Person.create!(name: b)
+              s = Person.ransack(array_where_people_names_in: [a, b])
+              expect(s.result.count).to be 2
             end
 
             it 'should function correctly with an Arel SqlLiteral' do

data/spec/support/schema.rb

@@ -66,16 +66,26 @@ class Person < ActiveRecord::Base
     parent.table[:name]
   end
 
-  ransacker :array_users,
+  ransacker :array_people_ids,
     formatter: proc { |v| Person.first(2).map(&:id) } do |parent|
     parent.table[:id]
   end
 
-  ransacker :array_names,
+  ransacker :array_where_people_ids,
+    formatter: proc { |v| Person.where(id: v).map(&:id) } do |parent|
+    parent.table[:id]
+  end
+
+  ransacker :array_people_names,
     formatter: proc { |v| Person.first(2).map { |p| p.id.to_s } } do |parent|
     parent.table[:name]
   end
 
+  ransacker :array_where_people_names,
+    formatter: proc { |v| Person.where(id: v).map { |p| p.id.to_s } } do |parent|
+    parent.table[:name]
+  end
+
   ransacker :doubled_name do |parent|
     Arel::Nodes::InfixOperation.new(
       '||', parent.table[:name], parent.table[:name]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ransack
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors:
 - Ernie Miller
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-15 00:00:00.000000000 Z
+date: 2016-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack