ransack 1.8.4 → 1.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8e6d1b7f6033421d1b31eff646ed9a001e372a3
-  data.tar.gz: 9a2736272f385849dc81f3a5f915c40ccde4d74e
+  metadata.gz: f251a5a3d39a780d575f8f18abd01de4a9096caa
+  data.tar.gz: 8846114332ef60596d2fc18b52cdb5715928e425
 SHA512:
-  metadata.gz: 701f44cf5ed1ffa5c4c28ddf7267270161affdc70e6c5feffa1cd73e6fca16ab1438b836476337b41e25f67cfa71c5c4a51943f7848ea65150aeda5dd9ad2b8b
-  data.tar.gz: 221fc344c558b0c152363ecee786b9be06bb2d45460af5c0942485f56d36856d465c4ca039e248c9d879b8d6d44ebbff8b22e43d0e6ab66fef94293cfe1c6561
+  metadata.gz: 86d509ea419bfe2bb1d43096e670f0736826c996a36f5fac74c650eaeb081a77832f8ff7edba63beaae0ad17ae2d4d8211aa99e5d003d259dff5fcb127187514
+  data.tar.gz: 705778bb578589bd055606eedfbe1ec10fdc01ab26508695fc0386d276f233c0bcdb767220331cf2b6b6b8b352d8b9c60edd9ef1c303e66ea4ea6cdb86725cb5

data/.gitignore

@@ -2,3 +2,4 @@
 .bundle
 Gemfile.lock
 pkg/*
+coverage/*

data/CHANGELOG.md

@@ -1,5 +1,47 @@
 # Change Log
 
+## Version 1.8.6 - 2018-01-23
+
+### Added
+
+* Improve memory usage
+  PR [#820](https://github.com/activerecord-hackery/ransack/pull/820)
+
+* Bump Polyamorous version to 1.3.2
+  PR [#858](https://github.com/activerecord-hackery/ransack/pull/858)
+
+## Version 1.8.5
+
+### Added  
+
+* Added Turkish Translations
+  PR [#835](https://github.com/activerecord-hackery/ransack/issues/835).
+
+## Version 1.8.4 - 2017-10-09
+
+### Added
+
+*   Added italian translations.
+    PR [#833](https://github.com/activerecord-hackery/ransack/pull/833).
+
+*   Add an optional default arrow for unsorted fields.
+    PR [#816](https://github.com/activerecord-hackery/ransack/pull/816/files).
+
+### Fixed
+
+*   Cast Postgres money type to float.
+    PR [#823](https://github.com/activerecord-hackery/ransack/pull/823).
+
+*   Fix the bug in sort_link, which causes the multiple fields option to be
+    ignored when block parameter is specified.
+    PR [#818](https://github.com/activerecord-hackery/ransack/pull/818).
+
+*   No need pass some arugments to JoinAssociation#join_constraints in Rails 5.1.
+    PR [#814](https://github.com/activerecord-hackery/ransack/pull/814).
+    Fixes [#807](https://github.com/activerecord-hackery/ransack/issues/807).
+    Reference [rails/rails#28267](https://github.com/rails/rails/pull/28267)
+    and [rails/rails#27851](https://github.com/rails/rails/pull/27851).
+
 ## Version 1.8.3 - 2017-06-15
 
 ### Added

data/Gemfile

@@ -51,4 +51,5 @@ end
 group :test do
   # TestUnit was removed from Ruby 2.2 but still needed for testing Rails 3.x.
   gem 'test-unit', '~> 3.0' if RUBY_VERSION >= '2.2'
+  gem 'simplecov', :require => false
 end

data/lib/ransack.rb

@@ -26,4 +26,6 @@ require 'ransack/translate'
 
 Ransack::Adapters.object_mapper.require_adapter
 
-ActionController::Base.helper Ransack::Helpers::FormHelper
+ActiveSupport.on_load(:action_controller) do
+  ActionController::Base.helper Ransack::Helpers::FormHelper
+end

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

@@ -44,7 +44,7 @@ module Ransack
 
           if ransackable_attribute?(str, klass)
             exists = true
-          elsif (segments = str.split(/_/)).size > 1
+          elsif (segments = str.split(Constants::UNDERSCORE)).size > 1
             remainder = []
             found_assoc = nil
             while !found_assoc && remainder.unshift(segments.pop) &&
@@ -98,7 +98,7 @@ module Ransack
 
           if ransackable_attribute?(str, klassify(parent))
             attr_name = str
-          elsif (segments = str.split(/_/)).size > 1
+          elsif (segments = str.split(Constants::UNDERSCORE)).size > 1
             remainder = []
             found_assoc = nil
             while remainder.unshift(segments.pop) && segments.size > 0 &&

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

@@ -38,7 +38,7 @@ module Ransack
 
           if ransackable_attribute?(str, klass)
             exists = true
-          elsif (segments = str.split(/_/)).size > 1
+          elsif (segments = str.split(Constants::UNDERSCORE)).size > 1
             remainder = []
             found_assoc = nil
             while !found_assoc && remainder.unshift(segments.pop) &&
@@ -105,7 +105,7 @@ module Ransack
 
           if ransackable_attribute?(str, klassify(parent))
             attr_name = str
-          elsif (segments = str.split(/_/)).size > 1
+          elsif (segments = str.split(Constants::UNDERSCORE)).size > 1
             remainder = []
             found_assoc = nil
             while remainder.unshift(segments.pop) && segments.size > 0 &&

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

@@ -32,7 +32,7 @@ module Ransack
         # For overriding with a whitelist array of strings.
         #
         def ransackable_attributes(auth_object = nil)
-          if Ransack::SUPPORTS_ATTRIBUTE_ALIAS
+          @ransackable_attributes ||= if Ransack::SUPPORTS_ATTRIBUTE_ALIAS
             column_names + _ransackers.keys + _ransack_aliases.keys +
             attribute_aliases.keys
           else
@@ -45,7 +45,7 @@ module Ransack
         # For overriding with a whitelist array of strings.
         #
         def ransackable_associations(auth_object = nil)
-          reflect_on_all_associations.map { |a| a.name.to_s }
+          @ransackable_associations ||= reflect_on_all_associations.map { |a| a.name.to_s }
         end
 
         # Ransortable_attributes, by default, returns the names

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

@@ -45,7 +45,7 @@ module Ransack
           exists = false
           if ransackable_attribute?(str, klass)
             exists = true
-          elsif (segments = str.split(/_/)).size > 1
+          elsif (segments = str.split(Constants::UNDERSCORE)).size > 1
             remainder = []
             found_assoc = nil
             while !found_assoc && remainder.unshift(segments.pop) &&
@@ -268,7 +268,8 @@ module Ransack
           association_joins         = buckets[:association_join]
           stashed_association_joins = buckets[:stashed_join]
           join_nodes                = buckets[:join_node].uniq
-          string_joins              = buckets[:string_join].map(&:strip).uniq
+          string_joins              = buckets[:string_join].map(&:strip)
+          string_joins.uniq!
 
           join_list =
             if ::ActiveRecord::VERSION::MAJOR >= 5
@@ -295,10 +296,9 @@ module Ransack
         end
 
         def convert_join_strings_to_ast(table, joins)
+          joins.map! { |join| table.create_string_join(Arel.sql(join)) unless join.blank? }
+          joins.compact!
           joins
-          .flatten
-          .reject(&:blank?)
-          .map { |join| table.create_string_join(Arel.sql(join)) }
         end
 
         def build_or_find_association(name, parent = @base, klass = nil)

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

@@ -37,15 +37,14 @@ module Ransack
         @base = @join_dependency.join_base
         @engine = @base.arel_engine
       end
+    end
 
-      @default_table = Arel::Table.new(
-        @base.table_name, as: @base.aliased_table_name, type_caster: self
-        )
-      @bind_pairs = Hash.new do |hash, key|
-        parent, attr_name = get_parent_and_attribute_name(key)
-        if parent && attr_name
-          hash[key] = [parent, attr_name]
-        end
+    def bind_pair_for(key)
+      @bind_pairs ||= {}
+
+      @bind_pairs[key] ||= begin
+        parent, attr_name = get_parent_and_attribute_name(key.to_s)
+        [parent, attr_name] if parent && attr_name
       end
     end
 

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

@@ -34,7 +34,7 @@ module Ransack
 
           name = '_id' if name == 'id'
 
-          t = object.klass.fields[name].try(:type) || @bind_pairs[attr.name].first.fields[name].type
+          t = object.klass.fields[name].try(:type) || bind_pair_for(attr.name).first.fields[name].type
 
           t.to_s.demodulize.underscore.to_sym
         end
@@ -61,7 +61,7 @@ module Ransack
           exists = false
           if ransackable_attribute?(str, klass)
             exists = true
-          elsif (segments = str.split(/_/)).size > 1
+          elsif (segments = str.split(Constants::UNDERSCORE)).size > 1
             remainder = []
             found_assoc = nil
             while !found_assoc && remainder.unshift(
@@ -111,7 +111,7 @@ module Ransack
 
           if ransackable_attribute?(str, klassify(parent))
             attr_name = str
-          elsif (segments = str.split(/_/)).size > 1
+          elsif (segments = str.split(Constants::UNDERSCORE)).size > 1
             remainder = []
             found_assoc = nil
             while remainder.unshift(

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

@@ -30,15 +30,14 @@ module Ransack
 
       @base = @object.klass
       # @engine = @base.arel_engine
+    end
+
+    def bind_pair_for(key)
+      @bind_pairs ||= {}
 
-      # @default_table = Arel::Table.new(
-      #   @base.table_name, :as => @base.aliased_table_name, :engine => @engine
-      #   )
-      @bind_pairs = Hash.new do |hash, key|
+      @bind_pairs[key] ||= begin
         parent, attr_name = get_parent_and_attribute_name(key.to_s)
-        if parent && attr_name
-          hash[key] = [parent, attr_name]
-        end
+        [parent, attr_name] if parent && attr_name
       end
     end
 

data/lib/ransack/configuration.rb

@@ -5,7 +5,27 @@ module Ransack
   module Configuration
 
     mattr_accessor :predicates, :options
-    self.predicates = {}
+
+    class PredicateCollection
+      attr_reader :sorted_names_with_underscores
+
+      def initialize
+        @collection = {}
+        @sorted_names_with_underscores = []
+      end
+
+      delegate :[], :keys, :has_key?, to: :@collection
+
+      def []=(key, value)
+        @sorted_names_with_underscores << [key, '_' + key]
+        @sorted_names_with_underscores.sort! { |(a, _), (b, _)| b.length <=> a.length }
+
+        @collection[key] = value
+      end
+    end
+
+    self.predicates = PredicateCollection.new
+
     self.options = {
       :search_key => :q,
       :ignore_unknown_conditions => true,

data/lib/ransack/context.rb

@@ -40,7 +40,7 @@ module Ransack
     # Convert a string representing a chain of associations and an attribute
     # into the attribute itself
     def contextualize(str)
-      parent, attr_name = @bind_pairs[str]
+      parent, attr_name = bind_pair_for(str)
       table_for(parent)[attr_name]
     end
 
@@ -59,24 +59,24 @@ module Ransack
 
     def bind(object, str)
       return nil unless str
-      object.parent, object.attr_name = @bind_pairs[str]
+      object.parent, object.attr_name = bind_pair_for(str)
     end
 
     def traverse(str, base = @base)
       str ||= ''.freeze
 
-      if (segments = str.split(/_/)).size > 0
+      if (segments = str.split(Constants::UNDERSCORE)).size > 0
         remainder = []
         found_assoc = nil
         while !found_assoc && segments.size > 0 do
           # Strip the _of_Model_type text from the association name, but hold
           # onto it in klass, for use as the next base
           assoc, klass = unpolymorphize_association(
-            segments.join('_'.freeze)
+            segments.join(Constants::UNDERSCORE)
             )
           if found_assoc = get_association(assoc, base)
             base = traverse(
-              remainder.join('_'.freeze), klass || found_assoc.klass
+              remainder.join(Constants::UNDERSCORE), klass || found_assoc.klass
               )
           end
 
@@ -93,9 +93,9 @@ module Ransack
       base = klassify(base)
       str ||= ''.freeze
       path = []
-      segments = str.split(/_/)
+      segments = str.split(Constants::UNDERSCORE)
       association_parts = []
-      if (segments = str.split(/_/)).size > 0
+      if (segments = str.split(Constants::UNDERSCORE)).size > 0
         while segments.size > 0 &&
         !base.columns_hash[segments.join(Constants::UNDERSCORE)] &&
         association_parts << segments.shift do
@@ -135,7 +135,7 @@ module Ransack
     end
 
     def ransackable_scope?(str, klass)
-      klass.ransackable_scopes(auth_object).any? { |s| s.to_s == str }
+      klass.ransackable_scopes(auth_object).any? { |s| s.to_sym == str.to_sym }
     end
 
     def searchable_attributes(str = ''.freeze)

data/lib/ransack/locale/tr.yml

@@ -0,0 +1,70 @@
+tr:
+  ransack:
+    search: "ara"
+    predicate: "doğrula"
+    and: "ve"
+    or: "veya"
+    any: "herhangi"
+    all: "hepsi"
+    combinator: "birleştirici"
+    attribute: "nitelik"
+    value: "değer"
+    condition: "şart"
+    sort: "sırala"
+    asc: "artan"
+    desc: "azalan"
+    predicates:
+      eq: "eşit"
+      eq_any: "herhangi birine eşit"
+      eq_all: "hepsine eşit"
+      not_eq: "eşit değil"
+      not_eq_any: "herhangi birine eşit değil"
+      not_eq_all: "hiçbirine eşit değil"
+      matches: "eşleşen"
+      matches_any: "herhangi biri ile eşleşen"
+      matches_all: "hepsi ile eşleşen"
+      does_not_match: "eşleşmeyen"
+      does_not_match_any: "herhangi biri ile eşleşmeyen"
+      does_not_match_all: "hiçbiri ile eşleşmeyen"
+      lt: "daha küçük"
+      lt_any: "herhangi birinden küçük"
+      lt_all: "hepsinden küçük"
+      lteq: "daha küçük veya eşit"
+      lteq_any: "daha küçük veya herhangi birine eşit"
+      lteq_all: "daha küçük veya hepsine eşit"
+      gt: "daha büyük "
+      gt_any: "herhangi birinden daha büyük"
+      gt_all: "hepsinden daha büyük"
+      gteq: "daha büyük veya eşit"
+      gteq_any: "daha büyük veya herhangi birine eşit"
+      gteq_all: "daha büyük veya hepsine eşit"
+      in: "içinde"
+      in_any: "herhangi birinde"
+      in_all: "hepsinde"
+      not_in: "içinde değil"
+      not_in_any: "herhangi birinde değil"
+      not_in_all: "hiçbirinde değil"
+      cont: "içeren"
+      cont_any: "herhangi birini içeren"
+      cont_all: "hepsini içeren"
+      not_cont: "içermeyen"
+      not_cont_any: "herhangi birini içermeyen"
+      not_cont_all: "hiçbirini birini içermeyen"
+      start: "ile başlayan"
+      start_any: "herhangi biriyle başlayan"
+      start_all: "hepsiyle başlayan"
+      not_start: "ile başlamayan"
+      not_start_any: "herhangi biriyle başlamayan"
+      not_start_all: "hiçbiriyle başlamayan"
+      end: "ile biten"
+      end_any: "herhangi biriyle biten"
+      end_all: "hepsi ile biten"
+      not_end: "ile bitmeyen"
+      not_end_any: "herhangi biriyle bitmeyen"
+      not_end_all: "hiçbiriyle bitmeyen"
+      'true': "doğru"
+      'false': "yanlış"
+      present: "mevcut"
+      blank: "boş"
+      'null': "geçersiz"
+      not_null: "geçerli"

data/lib/ransack/nodes/grouping.rb

@@ -191,7 +191,7 @@ module Ransack
       end
 
       def strip_predicate_and_index(str)
-        string = str.split(/\(/).first
+        string = str[/(.+?)\(/, 1] || str.dup
         Predicate.detect_and_strip_from_string!(string)
         string
       end

data/lib/ransack/predicate.rb

@@ -9,34 +9,26 @@ module Ransack
         Ransack.predicates.keys
       end
 
-      def names_by_decreasing_length
-        names.sort { |a, b| b.length <=> a.length }
-      end
-
       def named(name)
         Ransack.predicates[name.to_s]
       end
 
       def detect_and_strip_from_string!(str)
-        if p = detect_from_string(str)
-          str.sub! /_#{p}$/, ''.freeze
-          p
-        end
+        detect_from_string str, chomp: true
       end
 
-      def detect_from_string(str)
-        names_by_decreasing_length.detect { |p| str.end_with?("_#{p}") }
-      end
+      def detect_from_string(str, chomp: false)
+        return unless str
 
-#      def name_from_attribute_name(attribute_name)
-#        names_by_decreasing_length.detect {
-#          |p| attribute_name.to_s.match(/_#{p}$/)
-#        }
-#      end
+        Ransack.predicates.sorted_names_with_underscores.each do |predicate, underscored|
+          if str.end_with? underscored
+            str.chomp! underscored if chomp
+            return predicate
+          end
+        end
 
-#      def for_attribute_name(attribute_name)
-#        self.named(detect_from_string(attribute_name.to_s))
-#      end
+        nil
+      end
 
     end
 

data/lib/ransack/translate.rb

@@ -24,8 +24,8 @@ module Ransack
       base_ancestors = base_class.ancestors.select {
         |x| x.respond_to?(:model_name)
       }
-      predicate = Predicate.detect_from_string(original_name)
-      attributes_str = original_name.sub(/_#{predicate}$/, ''.freeze)
+      attributes_str = original_name.dup # will be modified by ⬇
+      predicate = Predicate.detect_and_strip_from_string!(attributes_str)
       attribute_names = attributes_str.split(/_and_|_or_/)
       combinator = attributes_str.match(/_and_/) ? :and : :or
       defaults = base_ancestors.map do |klass|

data/lib/ransack/version.rb

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

data/ransack.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   s.name        = "ransack"
   s.version     = Ransack::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Ernie Miller", "Ryan Bigg", "Jon Atack"]
-  s.email       = ["ernie@erniemiller.org", "radarlistener@gmail.com", "jonnyatack@gmail.com"]
+  s.authors     = ["Ernie Miller", "Ryan Bigg", "Jon Atack","Sean Carroll"]
+  s.email       = ["ernie@erniemiller.org", "radarlistener@gmail.com", "jonnyatack@gmail.com","sfcarroll@gmail.com"]
   s.homepage    = "https://github.com/activerecord-hackery/ransack"
   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.}
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'activerecord', '>= 3.0'
   s.add_dependency 'activesupport', '>= 3.0'
   s.add_dependency 'i18n'
-  s.add_dependency 'polyamorous', '~> 1.3'
+  s.add_dependency 'polyamorous', '~> 1.3.2'
   s.add_development_dependency 'rspec', '~> 3'
   s.add_development_dependency 'machinist', '~> 1.0.6'
   s.add_development_dependency 'faker', '~> 0.9.5'

data/spec/spec_helper.rb

@@ -3,7 +3,9 @@ require 'sham'
 require 'faker'
 require 'ransack'
 require 'pry'
+require 'simplecov'
 
+SimpleCov.start
 I18n.enforce_available_locales = false
 Time.zone = 'Eastern Time (US & Canada)'
 I18n.load_path += Dir[File.join(File.dirname(__FILE__), 'support', '*.yml')]

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: ransack
 version: !ruby/object:Gem::Version
-  version: 1.8.4
+  version: 1.8.6
 platform: ruby
 authors:
 - Ernie Miller
 - Ryan Bigg
 - Jon Atack
+- Sean Carroll
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-09 00:00:00.000000000 Z
+date: 2018-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -74,14 +75,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.3.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -186,6 +187,7 @@ email:
 - ernie@erniemiller.org
 - radarlistener@gmail.com
 - jonnyatack@gmail.com
+- sfcarroll@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -246,6 +248,7 @@ files:
 - lib/ransack/locale/nl.yml
 - lib/ransack/locale/pt-BR.yml
 - lib/ransack/locale/ro.yml
+- lib/ransack/locale/tr.yml
 - lib/ransack/locale/zh-CN.yml
 - lib/ransack/locale/zh-TW.yml
 - lib/ransack/naming.rb