ransack 1.6.6 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d0f75469674a840fd6677c3e2cea940c84e4438
-  data.tar.gz: 6ab05dd928c897263c629de60c06dfb10fc74ea5
+  metadata.gz: 1a62534d07f2b79f6ac71228f7b8884c2f97891f
+  data.tar.gz: 983a58938313d8b5ded1e13ff182f0ee1c27ee48
 SHA512:
-  metadata.gz: a46b017f203b3581ba2349417891e6f3733f3a49aa2c843daa748d69fd1b9a6f7f0daf0ec7ad72ae56e6f8b724b3c886447fdc532f2a79254b2651353d148ed0
-  data.tar.gz: a835c33713bcc0dd9269c12e1dbe80f20a922ca8ceaf2e5ce3955b360f80c4a42a478d0e72de9d7df9bc2f0b34f29853eb6fb75c919a64ecfdad9eb41d678612
+  metadata.gz: eb11af400660331859ddeeb11819d14849fd398ffe3b00368c860ee47baeeace67cb29116d15b46dcad92f1466bb19d6f9e85070baea384ef49500ad1aa1e3a1
+  data.tar.gz: 5ed69b32c4bd6a65b60e8dd2cccb5c634738b8fe3a3a7266ccc5c6a67ab2b720b016afbfcd8e7740c0ed76dea0c00d46db0c8a61b545b7e7ff66d324bd1057d3

data/.travis.yml

@@ -5,7 +5,7 @@ language: ruby
 sudo: false
 
 rvm:
-  - 2.2.1
+  - 2.2.3
   - 2.1
   - 2.0
   - 1.9
@@ -35,31 +35,35 @@ env:
 
 matrix:
   include:
-    - rvm: 2.2
+    - rvm: 2.2.3
       env: RAILS=master DB=sqlite3
-    - rvm: 2.2
+    - rvm: 2.2.3
       env: RAILS=master DB=mysql
-    - rvm: 2.2
+    - rvm: 2.2.3
       env: RAILS=master DB=postgres
   exclude:
-    - rvm: 2.2
+    - rvm: 2.2.3
       env: RAILS=3-1-stable DB=sqlite
-    - rvm: 2.2
+    - rvm: 2.2.3
       env: RAILS=3-1-stable DB=mysql
-    - rvm: 2.2
+    - rvm: 2.2.3
       env: RAILS=3-1-stable DB=postgres
   allow_failures:
     - env: RAILS=master DB=sqlite3
     - env: RAILS=master DB=mysql
     - env: RAILS=master DB=postgres
-    - rvm: 2.2
+    - rvm: 2.2.3
       env: RAILS=3-2-stable DB=sqlite
-    - rvm: 2.2
+    - rvm: 2.2.3
       env: RAILS=3-2-stable DB=mysql
-    - rvm: 2.2
+    - rvm: 2.2.3
       env: RAILS=3-2-stable 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%";'
   - psql -c 'create database ransack;' -U postgres
+
+addons:
+  code_climate:
+    repo_token: 8b701c4364d51a0217105e08c06922d600cec3d9e60d546a89e3ddfe46e0664e

data/CHANGELOG.md

@@ -1,9 +1,98 @@
 # Change Log
 
+## Unreleased
+
+
+## Version 1.7.0 - 2015-08-20
+### Fixed
+
+*   Fix
+    [#499](https://github.com/activerecord-hackery/ransack/issues/499) and
+    [#549](https://github.com/activerecord-hackery/ransack/issues/549).
+    Ransack now loads only Active Record if both Active Record and Mongoid are
+    running to avoid the two adapters overriding each other. This clarifies
+    that Ransack currently knows how to work with only one database adapter
+    active at a time. PR
+    [#541](https://github.com/activerecord-hackery/ransack/pull/541).
+
+    *ASnow (Большов Андрей)*
+
+*   Fix [#299](https://github.com/activerecord-hackery/ransack/issues/299)
+    `attribute_method?` parsing for attribute names containing `_and_`
+    and `_or_`. Attributes named like `foo_and_bar` or `foo_or_bar` are
+    recognized now instead of running failing checks for `foo` and `bar`.
+    PR [#562](https://github.com/activerecord-hackery/ransack/pull/562).
+
+    *Ryohei Hoshi*
+
+*   Fix a time-dependent test failure. When the database has
+    `default_timezone = :local` (system time) and the `Time.zone` is set to
+    elsewhere, then `Date.current` does not match what the query produces for
+    the stored timestamps. Resolved by setting everything to UTC. PR
+    [#561](https://github.com/activerecord-hackery/ransack/pull/561).
+
+    *Andrew Vit*
+
+*   Avoid overwriting association conditions with default scope in Rails 3.
+    When a model with default scope was associated with conditions
+    (`has_many :x, conditions: ...`), the default scope would overwrite the
+    association conditions. This patch ensures that both sources of conditions
+    are applied. Avoid selecting records from joins that would normally be
+    filtered out if they were selected from the base table. Only applies to
+    Rails 3, as this issue was fixed since Rails 4. PR
+    [#560](https://github.com/activerecord-hackery/ransack/pull/560).
+
+    *Andrew Vit*
+
+*   Fix RSpec `its` method deprecation warning: 'Use of rspec-core's `its`
+    method is deprecated. Use the rspec-its gem instead
+    ([c09aa17](https://github.com/activerecord-hackery/ransack/commit/c09aa17)).
+
+*   Fix deprecated RSpec syntax in `grouping_spec.rb`
+    ([ba92a0b](https://github.com/activerecord-hackery/ransack/commit/ba92a0b)).
+
+    *Jon Atack*
+
+### Added
+
+*   Add Mongoid support for referenced/embedded relations. PR
+    [#498](https://github.com/activerecord-hackery/ransack/pull/498).
+    TODO: Missing spec coverage! Add documentation!
+
+    *Penn Su*
+
+*   Add German locale file (de.yml). PR
+    [#537](https://github.com/activerecord-hackery/ransack/pull/537).
+
+    *Philipp Weissensteiner*
+
+### Changed
+
+*   Upgrade gemspec dependencies: MySQL2 from '0.3.14' to '0.3.18', and RSpec
+    from '~> 2.14.0' to '~> 2' which loads 2.99
+    ([000cd2](https://github.com/activerecord-hackery/ransack/commit/000cd2)).
+
+*   Upgrade spec suite to RSpec 3 `expect` syntax backward compatible with
+    RSpec 2.9
+    ([87cd36d](https://github.com/activerecord-hackery/ransack/commit/87cd36d)
+    and
+    [d296caa](https://github.com/activerecord-hackery/ransack/commit/d296caa)).
+
+*   Various FormHelper refactorings
+    ([17dd97a](https://github.com/activerecord-hackery/ransack/commit/17dd97a)
+    and
+    [29a73b9](https://github.com/activerecord-hackery/ransack/commit/29a73b9)).
+
+*   Various documentation updates.
+
+    *Jon Atack*
+
+
 ## Version 1.6.6 - 2015-04-05
 ### Changed
 
-*   Upgrade Polyamorous dependency to version 1.2.0, which uses Module#prepend instead of monkey-patching for hooking into Active Record (with Ruby 2.x).
+*   Upgrade Polyamorous dependency to version 1.2.0, which uses `Module#prepend`
+    instead of `alias_method` for hooking into Active Record (with Ruby 2.x).
 
     *Jon Atack*
 

data/CONTRIBUTING.md

@@ -1,16 +1,20 @@
 # Contributing to Ransack
 
-Please take a moment to review this document in order to make the contribution
-process easy and effective for everyone involved!
+Please take a moment to review this document to make contributing easy and
+effective for everyone involved!
 
 Ransack is an open source project and we encourage contributions.
 
 ## Filing an issue
 
-A bug is a _demonstrable problem_ that is caused by the code in the repository.
-Good bug reports are extremely helpful! Please do not use the issue tracker for personal support requests.
+Good issue reports are extremely helpful!  Please only open an issue if a bug
+is caused by Ransack, is new (has not already been reported), and can be
+reproduced from the information you provide.
 
-Guidelines for bug reports:
+Please do not use the issue tracker personal support requests. Stack Overflow
+is a better place for that where a wider community can help you.
+
+Steps:
 
 1. **Use the GitHub issue search** — check if the issue has already been
    reported.
@@ -23,13 +27,13 @@ Guidelines for bug reports:
 
 When filing an issue, please provide these details:
 
-* A comprehensive list of steps to reproduce the issue, or - far better - **a failing spec**.
-* The version (and branch) of Ransack *and* the versions of Rails, Ruby, and your operating system.
+* A comprehensive list of steps to reproduce the issue :smiley: or even better, a failing spec!
+* The versions of Ruby, Rails, Ransack and your operating system and database.
 * Any relevant stack traces ("Full trace" preferred).
 
 Any issue that is open for 14 days without actionable information or activity
 will be marked as "stalled" and then closed. Stalled issues can be re-opened
-if the information requested is provided.
+if actionable information to reproduce the issue is provided.
 
 ## Pull requests
 
@@ -107,11 +111,11 @@ Syntax:
 * 80 characters per line.
 * No trailing whitespace. Blank lines should not have any space.
 * Prefer `&&`/`||` over `and`/`or`.
-* `MyClass.my_method(my_arg)` not `my_method( my_arg )` or my_method my_arg.
+* `MyClass.my_method(my_arg)` not `my_method( my_arg )` or `my_method my_arg`.
 * `a = b` and not `a=b`.
 * `a_method { |block| ... }` and not `a_method { | block | ... }` or
 `a_method{|block| ...}`.
 * Prefer simplicity, readability, and maintainability over terseness.
 * Follow the conventions you see used in the code already.
 
-And in case we didn't emphasize it enough: we love tests!
+And in case we didn't emphasize it enough: We love tests!

data/README.md

@@ -29,18 +29,19 @@ 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.6.6).]
-(https://github.com/activerecord-hackery/ransack/tree/v1.6.6)
+[View documentation for the last release (1.7.0).](https://github.com/activerecord-hackery/ransack/tree/v1.7.0)
 
 ## Getting started
 
-Ransack is compatible with Rails 3 and 4 (including 4.2.1) on Ruby 1.9 and
-later (Ruby 2.2 recommended). Ransack currently works with Rails master (5.0.0)
-too! If you are using Ruby 1.8, you can use an earlier version of Ransack up to
-1.3.0.
+Ransack is compatible with Rails 3 and 4 on Ruby 1.9 and later (Ruby 2.2
+recommended). JRuby 9 ought to work as well (see
+[this](https://github.com/activerecord-hackery/polyamorous/issues/17)).
+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.
 
-Ransack works out-of-the-box with Active Record and also features experimental
-support for Mongoid 4.0 (without associations, further details below).
+Ransack works out-of-the-box with Active Record and also features limited
+support for Mongoid 4.0 (without associations, further details
+[below](https://github.com/activerecord-hackery/ransack#mongoid)).
 
 In your Gemfile, for the last officially released gem:
 
@@ -54,6 +55,12 @@ Or, if you would like to use the latest updates, use the `master` branch:
 gem 'ransack', github: 'activerecord-hackery/ransack'
 ```
 
+## Issues tracker
+
+* Before filing an issue, please read the [Contributing Guide](CONTRIBUTING.md).
+* File an issue if a bug is caused by Ransack, is new (has not already been reported), and _can be reproduced from the information you provide_.
+* Contributions are welcome, but please do not add "+1" comments to issues or pull requests :smiley:
+
 ## Usage
 
 Ransack can be used in one of two modes, simple or advanced.
@@ -655,6 +662,17 @@ called on a `ransack` search returns a `Mongoid::Criteria` object:
   @people = @q.result.active.order_by(updated_at: -1).limit(10)
 ```
 
+_NOTE: Ransack currently works with either Active Record or Mongoid, but not
+both in the same application. If both are present, Ransack will default to
+Active Record only. Here is the code containing the logic:_
+
+```ruby
+  @current_adapters ||= {
+    :active_record => defined?(::ActiveRecord::Base),
+    :mongoid => defined?(::Mongoid) && !defined?(::ActiveRecord::Base)
+  }
+```
+
 ## Semantic Versioning
 
 Ransack attempts to follow semantic versioning in the format of `x.y.z`, where:

data/Rakefile

@@ -1,15 +1,11 @@
 require 'bundler'
 require 'rspec/core/rake_task'
-require 'active_record'
 
 Bundler::GemHelper.install_tasks
 
 RSpec::Core::RakeTask.new(:spec) do |rspec|
   ENV['SPEC'] = 'spec/ransack/**/*_spec.rb'
-  if ActiveRecord::VERSION::MAJOR >= 4 || RUBY_VERSION < '2.2'
-    # Raises `invalid option: --backtrace` with Rails 3.x on Ruby 2.2
-    rspec.rspec_opts = ['--backtrace']
-  end
+  rspec.rspec_opts = ['--backtrace']
 end
 
 RSpec::Core::RakeTask.new(:mongoid) do |rspec|

data/lib/ransack.rb

@@ -2,15 +2,11 @@ require 'active_support/core_ext'
 
 require 'ransack/configuration'
 
-if defined?(::Mongoid)
-  require 'ransack/adapters/mongoid/ransack/constants'
-else
-  require 'ransack/adapters/active_record/ransack/constants'
-end
+require 'ransack/adapters'
+Ransack::Adapters.require_constants
 
 module Ransack
   extend Configuration
-
   class UntraversableAssociationError < StandardError; end;
 end
 
@@ -18,20 +14,18 @@ Ransack.configure do |config|
   Ransack::Constants::AREL_PREDICATES.each do |name|
     config.add_predicate name, :arel_predicate => name
   end
-
   Ransack::Constants::DERIVED_PREDICATES.each do |args|
     config.add_predicate *args
   end
 end
 
-require 'ransack/translate'
-require 'ransack/adapters/active_record/ransack/translate' if defined?(::ActiveRecord::Base)
-require 'ransack/adapters/mongoid/ransack/translate' if defined?(::Mongoid)
 require 'ransack/search'
 require 'ransack/ransacker'
-require 'ransack/adapters/active_record' if defined?(::ActiveRecord::Base)
-require 'ransack/adapters/mongoid' if defined?(::Mongoid)
 require 'ransack/helpers'
 require 'action_controller'
 
+require 'ransack/translate'
+
+Ransack::Adapters.require_adapter
+
 ActionController::Base.helper Ransack::Helpers::FormHelper

data/lib/ransack/adapters.rb

@@ -0,0 +1,42 @@
+module Ransack
+  module Adapters
+
+    def self.current_adapters
+      @current_adapters ||= {
+        :active_record => defined?(::ActiveRecord::Base),
+        :mongoid => defined?(::Mongoid) && !defined?(::ActiveRecord::Base)
+      }
+    end
+    def self.require_constants
+      require 'ransack/adapters/mongoid/ransack/constants' if current_adapters[:mongoid]
+      require 'ransack/adapters/active_record/ransack/constants' if current_adapters[:active_record]
+    end
+
+    def self.require_adapter
+      if current_adapters[:active_record]
+        require 'ransack/adapters/active_record/ransack/translate'
+        require 'ransack/adapters/active_record'
+      end
+
+      if current_adapters[:mongoid]
+        require 'ransack/adapters/mongoid/ransack/translate'
+        require 'ransack/adapters/mongoid'
+      end
+    end
+
+    def self.require_context
+      require 'ransack/adapters/active_record/ransack/visitor' if current_adapters[:active_record]
+      require 'ransack/adapters/mongoid/ransack/visitor' if current_adapters[:mongoid]
+    end
+
+    def self.require_nodes
+      require 'ransack/adapters/active_record/ransack/nodes/condition' if current_adapters[:active_record]
+      require 'ransack/adapters/mongoid/ransack/nodes/condition' if current_adapters[:mongoid]
+    end
+
+    def self.require_search
+      require 'ransack/adapters/active_record/ransack/context' if current_adapters[:active_record]
+      require 'ransack/adapters/mongoid/ransack/context' if current_adapters[:mongoid]
+    end
+  end
+end

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

@@ -182,23 +182,19 @@ module Ransack
               :build, Polyamorous::Join.new(name, @join_type, klass), parent
               )
             found_association = @join_dependency.join_associations.last
-            apply_default_conditions(found_association)
+
+            default_conditions = found_association.active_record.scoped.arel.constraints
+            if default_conditions.any?
+              and_default_conditions = "AND #{default_conditions.reduce(&:and).to_sql}"
+            end
+
             # Leverage the stashed association functionality in AR
-            @object = @object.joins(found_association)
+            @object = @object.joins(found_association).joins(and_default_conditions)
           end
 
           found_association
         end
 
-        def apply_default_conditions(join_association)
-          reflection = join_association.reflection
-          default_scope = join_association.active_record.scoped
-          default_conditions = default_scope.arel.where_clauses
-          if default_conditions.any?
-            reflection.options[:conditions] = default_conditions
-          end
-        end
-
       end
     end
   end

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

@@ -90,8 +90,8 @@ module Ransack
         #
         def join_sources
           base = Arel::SelectManager.new(@object.engine, @object.table)
-          joins = @object.joins_values
-          joins.each do |assoc|
+          @object.joins_values.each do |assoc|
+            next unless assoc.is_a?(JoinDependency::JoinAssociation)
             assoc.join_to(base)
           end
           base.join_sources
@@ -151,7 +151,7 @@ module Ransack
               Constants::STRING_JOIN
             when Hash, Symbol, Array
               Constants::ASSOCIATION_JOIN
-            when ::ActiveRecord::Associations::JoinDependency::JoinAssociation
+            when JoinDependency::JoinAssociation
               Constants::STASHED_JOIN
             when Arel::Nodes::Join
               Constants::JOIN_NODE
@@ -196,23 +196,19 @@ module Ransack
               :build, Polyamorous::Join.new(name, @join_type, klass), parent
               )
             found_association = @join_dependency.join_associations.last
-            apply_default_conditions(found_association)
+
+            default_conditions = found_association.active_record.scoped.arel.constraints
+            if default_conditions.any?
+              and_default_conditions = "AND #{default_conditions.reduce(&:and).to_sql}"
+            end
+
             # Leverage the stashed association functionality in AR
-            @object = @object.joins(found_association)
+            @object = @object.joins(found_association).joins(and_default_conditions)
           end
 
           found_association
         end
 
-        def apply_default_conditions(join_association)
-          reflection = join_association.reflection
-          default_scope = join_association.active_record.scoped
-          default_conditions = default_scope.arel.where_clauses
-          if default_conditions.any?
-            reflection.options[:conditions] = default_conditions
-          end
-        end
-
       end
     end
   end

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

@@ -35,7 +35,7 @@ module Ransack
         def format_predicate(predicate)
           predicate.tap do
             if casted_array_with_in_predicate?(predicate)
-              predicate.right[0] = predicate.right[0].val.map { |v| format(v) }
+              predicate.right[0] = format_values_for(predicate.right[0])
             end
           end
         end
@@ -47,12 +47,9 @@ module Ransack
           predicate.right[0].val.is_a?(Array)
         end
 
-        # Necessary for Arel >= 6.0 (Rails >= 4.2)
-        def format(value)
-          if value.is_a?(String)
-            Arel::Nodes.build_quoted(value)
-          else
-            value
+        def format_values_for(predicate)
+          predicate.val.map do |value|
+            value.is_a?(String) ? Arel::Nodes.build_quoted(value) : value
           end
         end
 

data/lib/ransack/adapters/mongoid/base.rb

@@ -73,7 +73,7 @@ module Ransack
           end
 
           def reflect_on_all_associations_all
-            reflect_on_all_associations(:belongs_to, :has_one, :has_many)
+            reflect_on_all_associations(:belongs_to, :has_one, :has_many, :embeds_many, :embedded_in)
           end
 
           # For overriding with a whitelist of symbols
@@ -87,6 +87,10 @@ module Ransack
             []
           end
 
+          def custom_join_ast *args
+            []
+          end
+
           def first(*args)
             if args.size == 0
               super

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

@@ -21,7 +21,7 @@ module Ransack
 
         def type_for(attr)
           return nil unless attr && attr.valid?
-          name    = attr.arel_attribute.name.to_s
+          name    = attr.arel_attribute.name.to_s.split('.').last
           # table   = attr.arel_attribute.relation.table_name
 
           # schema_cache = @engine.connection.schema_cache
@@ -38,7 +38,7 @@ module Ransack
 
           name = '_id' if name == 'id'
 
-          t = object.klass.fields[name].type
+          t = object.klass.fields[name].try(:type) || @bind_pairs[attr.name].first.fields[name].type
 
           t.to_s.demodulize.underscore.to_sym
         end
@@ -114,10 +114,10 @@ module Ransack
               segments.pop) && segments.size > 0 && !found_assoc do
               assoc, klass = unpolymorphize_association(segments.join('_'))
               if found_assoc = get_association(assoc, parent)
-                join = build_or_find_association(found_assoc.name, parent, klass)
                 parent, attr_name = get_parent_and_attribute_name(
-                  remainder.join('_'), join
+                  remainder.join('_'), found_assoc.klass
                   )
+                attr_name = "#{segments.join('_')}.#{attr_name}"
               end
             end
           end

data/lib/ransack/context.rb

@@ -1,12 +1,5 @@
 require 'ransack/visitor'
-
-if defined?(::ActiveRecord::Base)
-  require 'ransack/adapters/active_record/ransack/visitor'
-end
-
-if defined?(::Mongoid)
-  require 'ransack/adapters/mongoid/ransack/visitor'
-end
+Ransack::Adapters.require_context
 
 module Ransack
   class Context

data/lib/ransack/helpers/form_helper.rb

@@ -15,8 +15,7 @@ module Ransack
         elsif record.is_a?(Array) &&
         (search = record.detect { |o| o.is_a?(Ransack::Search) })
           options[:url] ||= polymorphic_path(
-            record.map { |o| o.is_a?(Ransack::Search) ? o.klass : o },
-            format: options.delete(:format)
+            options_for(record), format: options.delete(:format)
             )
         else
           raise ArgumentError,
@@ -24,13 +23,9 @@ module Ransack
         end
         options[:html] ||= {}
         html_options = {
-          :class => options[:class].present? ?
-            "#{options[:class]}" :
-            "#{search.klass.to_s.underscore}_search",
-          :id => options[:id].present? ?
-            "#{options[:id]}" :
-            "#{search.klass.to_s.underscore}_search",
-          :method => :get
+          class:  html_option_for(options[:class], search),
+          id:     html_option_for(options[:id], search),
+          method: :get
         }
         options[:as] ||= Ransack.options[:search_key]
         options[:html].reverse_merge!(html_options)
@@ -54,6 +49,26 @@ module Ransack
 
       private
 
+        def options_for(record)
+          record.map &method(:parse_record)
+        end
+
+        def parse_record(object)
+          if object.is_a?(Ransack::Search)
+            object.klass
+          else
+            object
+          end
+        end
+
+        def html_option_for(option, search)
+          if option.present?
+            option.to_s
+          else
+            "#{search.klass.to_s.underscore}_search"
+          end
+        end
+
         def extract_search_and_routing_proxy(search)
           if search.is_a? Array
             [search.second, search.first]
@@ -75,14 +90,12 @@ module Ransack
           @search         = search
           @params         = params
           @field          = attribute.to_s
-          sort_fields     = extract_sort_fields_and_mutate_args!(args).compact
+          @sort_fields    = extract_sort_fields_and_mutate_args!(args).compact
           @current_dir    = existing_sort_direction
           @label_text     = extract_label_and_mutate_args!(args)
           @options        = extract_options_and_mutate_args!(args)
           @hide_indicator = @options.delete :hide_indicator
           @default_order  = @options.delete :default_order
-          @sort_params    = build_sort(sort_fields)
-          @sort_params    = @sort_params.first if @sort_params.size == 1
         end
 
         def name
@@ -100,10 +113,10 @@ module Ransack
 
         def html_options(args)
           html_options = extract_options_and_mutate_args!(args)
-          html_options.merge(class:
-            [[Constants::SORT_LINK, @current_dir], html_options[:class]]
-            .compact.join(Constants::SPACE)
-            )
+          html_options.merge(
+            class: [[Constants::SORT_LINK, @current_dir], html_options[:class]]
+                   .compact.join(Constants::SPACE)
+          )
         end
 
         private
@@ -120,7 +133,7 @@ module Ransack
             if args.first.is_a? String
               args.shift
             else
-              Translate.attribute(@field, :context => @search.context)
+              Translate.attribute(@field, context: @search.context)
             end
           end
 
@@ -133,16 +146,25 @@ module Ransack
           end
 
           def search_and_sort_params
-            search_params.merge(:s => @sort_params)
+            search_params.merge(s: sort_params)
           end
 
           def search_params
             @params[@search.context.search_key].presence || {}
           end
 
-          def build_sort(fields)
+          def sort_params
+            sort_array = recursive_sort_params_build(@sort_fields)
+            if sort_array.size == 1
+              sort_array.first
+            else
+              sort_array
+            end
+          end
+
+          def recursive_sort_params_build(fields)
             return [] if fields.empty?
-            [parse_sort(fields[0])] + build_sort(fields.drop(1))
+            [parse_sort(fields[0])] + recursive_sort_params_build(fields.drop 1)
           end
 
           def parse_sort(field)
@@ -154,8 +176,7 @@ module Ransack
           end
 
           def detect_previous_sort_direction_and_invert_it(attr_name)
-            sort_dir = existing_sort_direction(attr_name)
-            if sort_dir
+            if sort_dir = existing_sort_direction(attr_name)
               direction_text(sort_dir)
             else
               default_sort_order(attr_name) || Constants::ASC
@@ -169,7 +190,11 @@ module Ransack
           end
 
           def default_sort_order(attr_name)
-            Hash === @default_order ? @default_order[attr_name] : @default_order
+            if Hash === @default_order
+              @default_order[attr_name]
+            else
+              @default_order
+            end
           end
 
           def order_indicator

data/lib/ransack/locale/de.yml

@@ -0,0 +1,70 @@
+de:
+  ransack:
+    search: "suchen"
+    predicate: "Eigenschaft"
+    and: "und"
+    or: "oder"
+    any: "beliebige"
+    all: "alle"
+    combinator: "Kombinator"
+    attribute: "Attribut"
+    value: "Wert"
+    condition: "Bedingung"
+    sort: "sortieren"
+    asc: "aufsteigend"
+    desc: "absteigend"
+    predicates:
+      eq: "gleicht"
+      eq_any: "gleicht beliebigen"
+      eq_all: "gleicht allen"
+      not_eq: "ungleich"
+      not_eq_any: "ungleich beliebigen"
+      not_eq_all: "ungleich allen"
+      matches: "entspricht"
+      matches_any: "stimmt überein mit einem beliebigen"
+      matches_all: "stimmt mit allen überein"
+      does_not_match: "stimmt nicht überein"
+      does_not_match_any: "erfüllt ein beliebiger/s nicht"
+      does_not_match_all: "stimmt nicht mit allen überein"
+      lt: "kleiner als"
+      lt_any: "kleiner als ein beliebiger/s"
+      lt_all: "kleiner als alle als alle"
+      lteq: "kleiner oder gleich"
+      lteq_any: "kleiner oder gleich beliebige"
+      lteq_all: "kleiner oder gleich allen"
+      gt: "größer als"
+      gt_any: "größer als ein beliebiger/s"
+      gt_all: "größer als alle"
+      gteq: "größer oder gleich"
+      gteq_any: "größer oder gleich als ein beliebiger/s"
+      gteq_all: "größer oder gleich alle"
+      in: "in"
+      in_any: "ist nicht in einem beliebigen"
+      in_all: "in allen"
+      not_in: "nicht in"
+      not_in_any: "nicht in beliebige"
+      not_in_all: "nicht in allen"
+      cont: "enthält"
+      cont_any: "enthält beliebige"
+      cont_all: "enthält alle"
+      not_cont: "enthält nicht"
+      not_cont_any: "enthält ein beliebiger/s nicht"
+      not_cont_all: "enthält keine/s"
+      start: "beginnt mit"
+      start_any: "beginnt mit beliebigen"
+      start_all: "beginnt mit allen"
+      not_start: "beginnt nicht mit"
+      not_start_any: "beginnt nicht mit beliebigen"
+      not_start_all: "beginnt nicht mit allen"
+      end: "endet mit"
+      end_any: "endet mit beliebigen"
+      end_all: "endet mit allen"
+      not_end: "endet nicht mit"
+      not_end_any: "endet nicht mit beliebigen"
+      not_end_all: "endet nicht mit allen"
+      'true': "ist wahr"
+      'false': "ist falsch"
+      present: "ist vorhanden"
+      blank: "ist leer"
+      'null': "ist null"
+      not_null: "ist nicht null"

data/lib/ransack/nodes.rb

@@ -3,7 +3,6 @@ require 'ransack/nodes/node'
 require 'ransack/nodes/attribute'
 require 'ransack/nodes/value'
 require 'ransack/nodes/condition'
-require 'ransack/adapters/active_record/ransack/nodes/condition' if defined?(::ActiveRecord::Base)
-require 'ransack/adapters/mongoid/ransack/nodes/condition' if defined?(::Mongoid)
+Ransack::Adapters.require_nodes
 require 'ransack/nodes/sort'
-require 'ransack/nodes/grouping'
+require 'ransack/nodes/grouping'

data/lib/ransack/nodes/attribute.rb

@@ -22,7 +22,7 @@ module Ransack
       def valid?
         bound? && attr &&
         context.klassify(parent).ransackable_attributes(context.auth_object)
-        .include?(attr_name)
+        .include?(attr_name.split('.').last)
       end
 
       def type

data/lib/ransack/nodes/condition.rb

@@ -9,7 +9,7 @@ module Ransack
 
       class << self
         def extract(context, key, values)
-          attributes, predicate = extract_attributes_and_predicate(key)
+          attributes, predicate = extract_attributes_and_predicate(key, context)
           if attributes.size > 0 && predicate
             combinator = key.match(/_(or|and)_/) ? $1 : nil
             condition = self.new(context)
@@ -31,14 +31,18 @@ module Ransack
 
         private
 
-        def extract_attributes_and_predicate(key)
+        def extract_attributes_and_predicate(key, context = nil)
           str = key.dup
           name = Predicate.detect_and_strip_from_string!(str)
           predicate = Predicate.named(name)
           unless predicate || Ransack.options[:ignore_unknown_conditions]
             raise ArgumentError, "No valid predicate for #{key}"
           end
-          attributes = str.split(/_and_|_or_/)
+          if context.present? && context.attribute_method?(str)
+            attributes = [str]
+          else
+            attributes = str.split(/_and_|_or_/)
+          end
           [attributes, predicate]
         end
       end

data/lib/ransack/search.rb

@@ -1,14 +1,6 @@
 require 'ransack/nodes'
 require 'ransack/context'
-
-if defined?(::ActiveRecord::Base)
-  require 'ransack/adapters/active_record/ransack/context'
-end
-
-if defined?(::Mongoid)
-  require 'ransack/adapters/mongoid/ransack/context'
-end
-
+Ransack::Adapters.require_search
 require 'ransack/naming'
 
 module Ransack

data/lib/ransack/version.rb

@@ -1,3 +1,3 @@
 module Ransack
-  VERSION = '1.6.6'
+  VERSION = '1.7.0'
 end

data/ransack.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.authors     = ["Ernie Miller", "Ryan Bigg", "Jon Atack"]
   s.email       = ["ernie@erniemiller.org", "radarlistener@gmail.com", "jonnyatack@gmail.com"]
   s.homepage    = "https://github.com/activerecord-hackery/ransack"
-  s.summary     = %q{Object-based searching for ActiveRecord (currently).}
+  s.summary     = %q{Object-based searching for Active Record and Mongoid (currently).}
   s.description = %q{Ransack is the successor to the MetaSearch gem. It improves and expands upon MetaSearch's functionality, but does not have a 100%-compatible API.}
   s.required_ruby_version = '>= 1.9'
   s.license     = 'MIT'
@@ -21,16 +21,15 @@ Gem::Specification.new do |s|
   s.add_dependency 'activesupport', '>= 3.0'
   s.add_dependency 'i18n'
   s.add_dependency 'polyamorous', '~> 1.2'
-  s.add_development_dependency 'rspec', '~> 2.14.0'
+  s.add_development_dependency 'rspec', '~> 2'
   s.add_development_dependency 'machinist', '~> 1.0.6'
   s.add_development_dependency 'faker', '~> 0.9.5'
   s.add_development_dependency 'sqlite3', '~> 1.3.3'
   s.add_development_dependency 'pg'
-  s.add_development_dependency 'mysql2', '0.3.14'
+  s.add_development_dependency 'mysql2', '0.3.18'
   s.add_development_dependency 'pry', '0.9.12.2'
 
-  s.files         = `git ls-files`
-                    .split("\n")
+  s.files         = `git ls-files`.split("\n")
 
   s.test_files    = `git ls-files -- {test,spec,features}/*`
                     .split("\n")

data/spec/mongoid/nodes/condition_spec.rb

@@ -26,7 +26,7 @@ module Ransack
             Ransack.configure { |config| config.ignore_unknown_conditions = true }
           end
 
-          specify { subject.should be_nil }
+          specify { expect(subject).to be_nil }
         end
       end
     end

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

@@ -25,48 +25,48 @@ module Ransack
 
             it "applies true scopes" do
               s = Person.ransack('active' => true)
-              s.result.to_sql.should include "active = 1"
+              expect(s.result.to_sql).to (include 'active = 1')
             end
 
             it "applies stringy true scopes" do
               s = Person.ransack('active' => 'true')
-              s.result.to_sql.should include "active = 1"
+              expect(s.result.to_sql).to (include 'active = 1')
             end
 
             it "applies stringy boolean scopes with true value in an array" do
               s = Person.ransack('of_age' => ['true'])
-              s.result.to_sql.should include "age >= 18"
+              expect(s.result.to_sql).to (include 'age >= 18')
             end
 
             it "applies stringy boolean scopes with false value in an array" do
               s = Person.ransack('of_age' => ['false'])
-              s.result.to_sql.should include "age < 18"
+              expect(s.result.to_sql).to (include 'age < 18')
             end
 
             it "ignores unlisted scopes" do
               s = Person.ransack('restricted' => true)
-              s.result.to_sql.should_not include "restricted"
+              expect(s.result.to_sql).to_not (include 'restricted')
             end
 
             it "ignores false scopes" do
               s = Person.ransack('active' => false)
-              s.result.to_sql.should_not include "active"
+              expect(s.result.to_sql).not_to (include 'active')
             end
 
             it "ignores stringy false scopes" do
               s = Person.ransack('active' => 'false')
-              s.result.to_sql.should_not include "active"
+              expect(s.result.to_sql).to_not (include 'active')
             end
 
             it "passes values to scopes" do
               s = Person.ransack('over_age' => 18)
-              s.result.to_sql.should include "age > 18"
+              expect(s.result.to_sql).to (include 'age > 18')
             end
 
             it "chains scopes" do
               s = Person.ransack('over_age' => 18, 'active' => true)
-              s.result.to_sql.should include "age > 18"
-              s.result.to_sql.should include "active = 1"
+              expect(s.result.to_sql).to (include 'age > 18')
+              expect(s.result.to_sql).to (include 'active = 1')
             end
           end
 
@@ -145,6 +145,9 @@ module Ransack
           end
 
           it "should function correctly with a multi-parameter attribute" do
+            ::ActiveRecord::Base.default_timezone = :utc
+            Time.zone = 'UTC'
+
             date = Date.current
             s = Person.ransack(
               { "created_at_gteq(1i)" => date.year,
@@ -228,14 +231,9 @@ module Ransack
           end
 
           it "should function correctly when an attribute name has 'and' in it" do
-          # FIXME: this test does not pass!
             p = Person.create!(:terms_and_conditions => true)
             s = Person.ransack(:terms_and_conditions_eq => true)
-          # search is not detecting the attribute
-            puts "
-            FIXME: Search not detecting the `terms_and_conditions` attribute in
-            base_spec.rb, line 178: #{s.result.to_sql}"
-          # expect(s.result.to_a).to eq [p]
+            expect(s.result.to_a).to eq [p]
           end
 
           it 'allows sort by "only_sort" field' do

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

@@ -9,10 +9,11 @@ module Ransack
       describe Context do
         subject { Context.new(Person) }
 
-        if AR_version >= "3.1"
-          its(:alias_tracker) {
-            should be_a ::ActiveRecord::Associations::AliasTracker
-          }
+        if AR_version >= '3.1'
+          it 'has an Active Record alias tracker method' do
+            expect(subject.alias_tracker)
+            .to be_an ::ActiveRecord::Associations::AliasTracker
+          end
         end
 
         describe '#relation_for' do

data/spec/ransack/dependencies_spec.rb

@@ -1,3 +1,4 @@
+=begin
 rails = ::ActiveRecord::VERSION::STRING.first(3)
 
 if %w(3.2 4.0 4.1).include?(rails) || rails == '3.1' && RUBY_VERSION < '2.2'
@@ -8,3 +9,4 @@ if %w(3.2 4.0 4.1).include?(rails) || rails == '3.1' && RUBY_VERSION < '2.2'
     end
   end
 end
+=end

data/spec/ransack/nodes/condition_spec.rb

@@ -34,7 +34,7 @@ module Ransack
             Ransack.configure { |c| c.ignore_unknown_conditions = true }
           end
 
-          specify { subject.should be_nil }
+          specify { expect(subject).to be_nil }
         end
       end
     end

data/spec/ransack/nodes/grouping_spec.rb

@@ -15,37 +15,37 @@ module Ransack
       describe '#attribute_method?' do
         context 'for attributes of the context' do
           it 'is true' do
-            expect(subject.attribute_method?('name')).to be_true
+            expect(subject.attribute_method?('name')).to be true
           end
 
           context "when the attribute contains '_and_'" do
             it 'is true' do
-              expect(subject.attribute_method?('terms_and_conditions')).to be_true
+              expect(subject.attribute_method?('terms_and_conditions')).to be true
             end
           end
 
           context "when the attribute contains '_or_'" do
             it 'is true' do
-              expect(subject.attribute_method?('true_or_false')).to be_true
+              expect(subject.attribute_method?('true_or_false')).to be true
             end
           end
 
           context "when the attribute ends with '_start'" do
             it 'is true' do
-              expect(subject.attribute_method?('life_start')).to be_true
+              expect(subject.attribute_method?('life_start')).to be true
             end
           end
 
           context "when the attribute ends with '_end'" do
             it 'is true' do
-              expect(subject.attribute_method?('stop_end')).to be_true
+              expect(subject.attribute_method?('stop_end')).to be true
             end
           end
         end
 
         context 'for unknown attributes' do
           it 'is false' do
-            expect(subject.attribute_method?('not_an_attribute')).to be_false
+            expect(subject.attribute_method?('not_an_attribute')).to be false
           end
         end
       end

data/spec/ransack/search_spec.rb

@@ -93,9 +93,10 @@ module Ransack
         expect(condition.value).to eq 'Ernie'
       end
 
-      it 'preserves default scope conditions for associations' do
-        search = Search.new(Person, articles_title_eq: 'Test')
+      it 'preserves default scope and conditions for associations' do
+        search = Search.new(Person, published_articles_title_eq: 'Test')
         expect(search.result.to_sql).to include 'default_scope'
+        expect(search.result.to_sql).to include 'published'
       end
 
       it 'discards empty conditions' do

data/spec/support/schema.rb

@@ -33,6 +33,11 @@ class Person < ActiveRecord::Base
   belongs_to :parent, :class_name => 'Person', :foreign_key => :parent_id
   has_many   :children, :class_name => 'Person', :foreign_key => :parent_id
   has_many   :articles
+  if ActiveRecord::VERSION::MAJOR == 3
+    has_many :published_articles, conditions: { published: true }, class_name: "Article"
+  else
+    has_many :published_articles, ->{ where(published: true) }, class_name: "Article"
+  end
   has_many   :comments
   has_many   :authored_article_comments, :through => :articles,
              :source => :comments, :foreign_key => :person_id
@@ -171,6 +176,7 @@ module Schema
         t.string   :title
         t.text     :subject_header
         t.text     :body
+        t.boolean  :published, default: true
       end
 
       create_table :comments, :force => true do |t|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ransack
 version: !ruby/object:Gem::Version
-  version: 1.6.6
+  version: 1.7.0
 platform: ruby
 authors:
 - Ernie Miller
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-05 00:00:00.000000000 Z
+date: 2015-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -88,14 +88,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: machinist
   requirement: !ruby/object:Gem::Requirement
@@ -158,14 +158,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.14
+        version: 0.3.18
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.14
+        version: 0.3.18
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -199,6 +199,7 @@ files:
 - README.md
 - Rakefile
 - lib/ransack.rb
+- lib/ransack/adapters.rb
 - lib/ransack/adapters/active_record.rb
 - lib/ransack/adapters/active_record/3.0/compat.rb
 - lib/ransack/adapters/active_record/3.0/context.rb
@@ -233,6 +234,7 @@ files:
 - lib/ransack/helpers/form_builder.rb
 - lib/ransack/helpers/form_helper.rb
 - lib/ransack/locale/cs.yml
+- lib/ransack/locale/de.yml
 - lib/ransack/locale/en.yml
 - lib/ransack/locale/es.yml
 - lib/ransack/locale/fr.yml
@@ -310,10 +312,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: ransack
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: Object-based searching for ActiveRecord (currently).
+summary: Object-based searching for Active Record and Mongoid (currently).
 test_files:
 - spec/blueprints/articles.rb
 - spec/blueprints/comments.rb