ransack_ui 1.3.4 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 450cbf63ff25b9609e853303c1772d2ddd87b479
-  data.tar.gz: 4135fc35e6a6e29275ad04857459e9dc9489abcb
+SHA256:
+  metadata.gz: c76bc56f01efed6de571cb9a79a094095af122c6a35f46abb9bf6567de74b275
+  data.tar.gz: 26367f813d7dd0851ede9a027aea951ff307fd9e2f7d1380abe72eb5afc762f0
 SHA512:
-  metadata.gz: ecf779eea45d25fa69ceea221335f12509cf12106fb021b168cc3c7c60117553ca12124a120df361b30de851383e4bd78d8aab1c16d8d1f64174de6d0ea2cddc
-  data.tar.gz: 621623bc8377f1e43aca92a2f826689131674e0d495865768d1edfe14f0bcb92bdfd1999b80c886db4c46dfbd2d65c60de8bdf336fd52881f3bad4468f6e33dd
+  metadata.gz: 06223a0eee0aa80c48b987aea5271aae10d4d2921265cd70725b9731615fbae62270684d23069502df922618e0f6d65e7b163291fb4fa8f9a0c63b3695fb5cce
+  data.tar.gz: 664bb6c97c1a9fd16b4bc461de11cb466e5236297551ad3932816c1122b5e65f5442730bbee135f4f19fd07cadbb1fe752779916794d533af2cd33b6572ec4d8

data/.rubocop_todo.yml

@@ -0,0 +1,129 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2019-11-08 16:20:08 +1030 using RuboCop version 0.76.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: TreatCommentsAsGroupSeparators, Include.
+# Include: **/*.gemspec
+Gemspec/OrderedDependencies:
+  Exclude:
+    - 'ransack_ui.gemspec'
+
+# Offense count: 5
+# Cop supports --auto-correct.
+# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods.
+Lint/UnusedMethodArgument:
+  Exclude:
+    - 'lib/ransack_ui/adapters/active_record/base.rb'
+    - 'lib/ransack_ui/ransack_overrides/adapters/active_record/base.rb'
+    - 'lib/ransack_ui/view_helpers.rb'
+
+# Offense count: 6
+Metrics/AbcSize:
+  Max: 53
+
+# Offense count: 2
+# Configuration parameters: CountComments, ExcludedMethods.
+# ExcludedMethods: refine
+Metrics/BlockLength:
+  Max: 200
+
+# Offense count: 1
+# Configuration parameters: CountBlocks.
+Metrics/BlockNesting:
+  Max: 5
+
+# Offense count: 3
+Metrics/CyclomaticComplexity:
+  Max: 12
+
+# Offense count: 7
+# Configuration parameters: CountComments, ExcludedMethods.
+Metrics/MethodLength:
+  Max: 46
+
+# Offense count: 1
+# Configuration parameters: CountComments.
+Metrics/ModuleLength:
+  Max: 202
+
+# Offense count: 3
+Metrics/PerceivedComplexity:
+  Max: 13
+
+# Offense count: 2
+# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist, MethodDefinitionMacros.
+# NamePrefix: is_, has_, have_
+# NamePrefixBlacklist: is_, has_, have_
+# NameWhitelist: is_a?
+# MethodDefinitionMacros: define_method, define_singleton_method
+Naming/PredicateName:
+  Exclude:
+    - 'spec/**/*'
+    - 'lib/ransack_ui/adapters/active_record/base.rb'
+    - 'lib/ransack_ui/ransack_overrides/adapters/active_record/base.rb'
+
+# Offense count: 2
+# Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
+# AllowedNames: io, id, to, by, on, in, at, ip, db, os
+Naming/UncommunicativeMethodParamName:
+  Exclude:
+    - 'lib/ransack_ui/view_helpers.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SingleLineConditionsOnly, IncludeTernaryExpressions.
+# SupportedStyles: assign_to_condition, assign_inside_condition
+Style/ConditionalAssignment:
+  Exclude:
+    - 'lib/ransack_ui/ransack_overrides/helpers/form_builder.rb'
+
+# Offense count: 11
+Style/Documentation:
+  Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'
+    - 'lib/ransack_ui/adapters/active_record/base.rb'
+    - 'lib/ransack_ui/controller_helpers.rb'
+    - 'lib/ransack_ui/rails/engine.rb'
+    - 'lib/ransack_ui/ransack_overrides/adapters/active_record/base.rb'
+    - 'lib/ransack_ui/ransack_overrides/configuration.rb'
+    - 'lib/ransack_ui/ransack_overrides/context.rb'
+    - 'lib/ransack_ui/ransack_overrides/helpers/form_builder.rb'
+    - 'lib/ransack_ui/ransack_overrides/nodes/attribute.rb'
+    - 'lib/ransack_ui/ransack_overrides/nodes/condition.rb'
+    - 'lib/ransack_ui/ransack_overrides/nodes/grouping.rb'
+    - 'lib/ransack_ui/view_helpers.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/EachWithObject:
+  Exclude:
+    - 'lib/ransack_ui/ransack_overrides/helpers/form_builder.rb'
+
+# Offense count: 17
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: always, never
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: use_perl_names, use_english_names
+Style/SpecialGlobalVars:
+  Exclude:
+    - 'ransack_ui.gemspec'
+
+# Offense count: 43
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 144

data/CHANGELOG.md

@@ -0,0 +1,20 @@
+# Change Log
+
+## v2.0.0
+
+### 💥 Breaking Changes
+
+* Bumped minimum supported version of Select2 from V3 to V4 (Note: Select2 usage is entirely optional.)
+* Changed Ransack dependency requirement from ~> 2.0 to Ransack < 4
+
+### 🚀 Features
+
+* Moved project ownership from github.com:ndbroadbent/ransack_ui.git to github.com:fatfreecrm/ransack_ui.git
+
+### 🐛 Bug Fixes
+
+* Fixed html issue with "Add a filter" rendering
+
+### 📝  Documentation
+
+* Added CHANGELOG.md

data/Gemfile

@@ -1,7 +1,8 @@
 source 'https://rubygems.org'
 
 # Include rake in Gemfile so that `bundle exec rake` doesn't raise an error
-gem 'rake', :group => :test
+gem 'rake', group: :test
+gem 'rubocop', '~> 0.76.0'
 
 # Specify your gem's dependencies in ransack_ui.gemspec
 gemspec

data/README.md

@@ -3,8 +3,6 @@
 Provides HTML templates and JavaScript to build a fully functional
 advanced search form using Ransack.
 
-Please note: this project is still in *alpha* and the following instructions are not yet complete/fully working.
-
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -50,8 +48,9 @@ Now you can start playing with the results.
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
-## Credits / Acknowledgements
+## Acknowledgements
 
-* Nathan Broadbent (ndbroadbent) - creator of ransack_ui code
-* Ernie Miller (ernie) for creating ransack - https://github.com/ernie/ransack
-* Steve Kenworthy (steveyken) - for tiny tweaks
+* Ernie Miller (@ernie) - Creator of ransack (https://github.com/ernie/ransack)
+* Nathan Broadbent (@ndbroadbent)
+* Steve Kenworthy (@steveyken)
+* Daniel O'Connor (@CloCkWeRX)

data/Rakefile

@@ -1 +1 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'

data/app/assets/javascripts/ransack/predicates.js.coffee

@@ -37,5 +37,5 @@ Ransack.predicate_inputs = {}
 Ransack.option_predicates = ['eq', 'eq_any', 'not_eq', 'not_eq_all', 'null', 'not_null']
 
 # Use a tags input for 'in' if Select2 is available
-if Select2?
+if $.fn.select2?
   Ransack.predicate_inputs.in = 'tags'

data/app/assets/javascripts/ransack_ui_jquery/search_form.js.coffee.erb

@@ -12,7 +12,7 @@
 
       # Store initial predicates and set up Select2 on select lists in .filters
       containers = el.find('.filters')
-      if Select2?
+      if $.fn.select2?
         @init_select2(containers)
       @store_initial_predicates(containers)
 
@@ -59,17 +59,17 @@
         @destroy_multi_input(multi_input, selected_attribute.val())
 
       # Handle association columns with AJAX autocomplete
-      if selected_attribute.data('ajax-url') and Select2?
+      if selected_attribute.data('ajax--url') and $.fn.select2?
         @set_option_predicates(base_id, available, column_type)
 
       # Handle columns with options detected from validates :inclusion
-      else if selected_attribute.data('select-options') and Select2?
+      else if selected_attribute.data('select-options') and $.fn.select2?
         @set_option_predicates(base_id, available, column_type, true)
 
       # Handle regular columns
       else
-        if Select2?
-          predicate_select2.select2("enable")
+        if $.fn.select2?
+          predicate_select2.prop('disabled', false)
 
           # If Select2 is on query input, remove and set defaults
           if query_select2.length > 0
@@ -102,11 +102,11 @@
             predicate_select.append $("<option value=#{predicate}>#{label}</option>")
 
         # Select first predicate if current selection is invalid
-        if Select2?
-          predicate_select.select2('val', previous_val)
+        if $.fn.select2?
+          predicate_select.val(previous_val)
 
       # Run predicate_changed callback
-      predicate_select.change()
+      predicate_select.trigger('change')
 
       return true
 
@@ -138,14 +138,14 @@
       # Hide query input when not needed
       if p in no_query_predicates
         # If Select2 is on query input, remove and set defaults
-        if Select2? && query_select2.length
+        if $.fn.select2? && query_select2.length
           query_input.select2('destroy')
 
         query_input.val("true")
         query_input.hide()
         query_input.parent().find('.ui-datepicker-trigger').hide()
 
-      if Select2?
+      if $.fn.select2?
         # Turn query input into Select2 tag list when query accepts multiple values
         if p in ["in", "not_in"] || p.match(/_(all|any)$/)
           # Add dummy 'multi' input for select2 if not already added
@@ -175,7 +175,7 @@
             query_input.css('display', '')
 
             # Handle association columns with AJAX autocomplete
-            if selected_attribute.data('ajax-url')
+            if selected_attribute.data('ajax--url')
               if query_select2.length
                 query_input.hide()
               else
@@ -193,7 +193,7 @@
         return if selected_attribute.data('select-options')
 
         # Don't show query input if ajax auto complete is present on selected attribute
-        unless p in ['eq', 'not_eq'] and selected_attribute.data('ajax-url')
+        unless p in ['eq', 'not_eq'] and selected_attribute.data('ajax--url')
           unless query_input.is(":visible")
             query_input.val('')
             #query_input.show()
@@ -226,7 +226,7 @@
           predicate_select.append $("<option value=#{predicate}>#{label}</option>")
 
       # Select first predicate if current selection is invalid
-      predicate_select.select2('val', previous_val)
+      predicate_select.val(previous_val)
 
     # Attempts to find a predicate translation for the specific column type,
     # or returns the default label.
@@ -288,12 +288,12 @@
       # Hide all query inputs
       inputs.hide()
 
-      if Select2?
+      if $.fn.select2?
         # Find newly created input and setup Select2
         multi_query = @element.find('#' + multi_id)
 
         # Handle association columns with AJAX autocomplete
-        if selected_attribute.data('ajax-url')
+        if selected_attribute.data('ajax--url')
           # Set label to single association label, if anything was selected
           if query_select2.length && query_input.select2('data')
             query_input_data = query_input.select2('data')
@@ -310,30 +310,31 @@
           else
             # Setup Select2 with tagging support (can create options)
             multi_query.select2
-              tags: []
+              data: [], tags: true
               tokenSeparators: [',']
-              formatNoMatches: (t) ->
-                "Add a search term"
+              language:
+                noMatches: (t) ->
+                  "Add a search term"
 
-        multi_query.select2('val', values)
+        multi_query.val(values)
 
     setup_select2_association: (query_input, selected_attribute, multiple = false) ->
       selected_attribute_val = selected_attribute.val()
       # Set up Select2 for query input
       query_input.select2
-        placeholder: "Search #{selected_attribute.data('ajax-entity')}"
+        placeholder: "Search #{selected_attribute.data('ajax--entity')}"
         minimumInputLength: 1
         allowClear: true
         multiple: multiple
         ajax:
-          url: selected_attribute.data('ajax-url')
+          url: selected_attribute.data('ajax--url')
           dataType: 'json'
-          type: selected_attribute.data('ajax-type')
-          data: (query, page) ->
+          type: selected_attribute.data('ajax--type')
+          data: (params) ->
             obj = {}
-            obj[selected_attribute.data('ajax-key')] = query
+            obj[selected_attribute.data('ajax--key')] = params
             obj
-          results: (data, page) ->
+          processResults: (data) ->
             {results: $.map(data, (text, id) -> {id: id, text: text}) }
         initSelection: (element, callback) ->
           data = []
@@ -348,7 +349,7 @@
             callback(multiple and data or data[0])
           else
             # If no label could be found, clear value
-            element.select2('val', '')
+            element.val('')
 
     setup_select2_options: (query_input, selected_attribute, multiple = false) ->
       query_input.select2
@@ -374,7 +375,7 @@
           if data.length
             callback(multiple and data or data[0])
           else
-            element.select2('val', '')
+            element.val('')
 
     add_query_input: (base_input, base_name, id, value) ->
       base_input.after $('<input name="'+base_name+'['+id+'][value]" '+
@@ -401,7 +402,7 @@
       target.before content.replace(regexp, new_id)
       prev_container = target.prev()
 
-      if Select2?
+      if $.fn.select2?
         @init_select2(prev_container)
 
       if $.ransack.button_group_select?
@@ -409,7 +410,7 @@
 
       @store_initial_predicates(prev_container)
       # Fire change event on any new selects.
-      prev_container.find("select").change()
+      prev_container.find("select").trigger('change')
       false
 
     remove_fields: (e) ->
@@ -441,11 +442,11 @@
         width: '230px'
         placeholder: "Select a Field"
         allowClear: true
-        formatSelection: (object, container) ->
+        templateSelection: (object) ->
           # If initializing and element is not present,
           # search for option element in original select tag
           if !object.element
-            this.element.find('option').each (i, option) ->
+            container.find('select option').each (i, option) ->
               if option.value == object.id
                 object.element = option
                 return false

data/app/views/ransack_ui/_condition_fields.html.erb

@@ -3,13 +3,13 @@
 
   <%= f.attribute_fields do |a| %>
     <span class="fields" data-object-name="<%= f.object_name %>">
-    <%= a.attribute_select({}, :class => 'ransack_attribute') %>
+    <%= a.attribute_select({}, class: 'ransack_attribute') %>
   <% end %>
 
-  <%= f.predicate_select({}, :class => 'ransack_predicate') %>
+  <%= f.predicate_select({}, class: 'ransack_predicate') %>
 
   <%= f.value_fields do |v| %>
     <span class="fields value" data-object-name="<%= f.object_name %>">
-    <%= v.text_field :value, :style => "width: 200px;", :class => "ransack_query" %>
+    <%= v.text_field :value, style: "width: 200px;", class: "ransack_query" %>
   <% end %>
 </div>

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

@@ -2,7 +2,6 @@ module RansackUI
   module Adapters
     module ActiveRecord
       module Base
-
         def self.extended(base)
           base.class_eval do
             class_attribute :_ransackable_associations
@@ -23,12 +22,12 @@ module RansackUI
         # Return array of attributes with [name, type]
         # (Default to :string type for ransackers)
         def ransackable_attributes(auth_object = nil)
-          columns.map{|c| [c.name, c.type] } +
-          _ransackers.keys.map {|k,v| [k, v.type || :string] }
+          columns.map { |c| [c.name, c.type] } +
+            _ransackers.keys.map { |k, v| [k, v.type || :string] }
         end
 
         def ransackable_associations(auth_object = nil)
-          all_associations = reflect_on_all_associations.map {|a| a.name.to_s}
+          all_associations = reflect_on_all_associations.map { |a| a.name.to_s }
           if self._ransackable_associations.any?
             # Return intersection of all associations, and associations defined on the model
             all_associations & self._ransackable_associations

data/lib/ransack_ui/controller_helpers.rb

@@ -10,7 +10,7 @@ module RansackUI
     #
     def load_ransack_search(klass = nil)
       klass ||= controller_path.classify.constantize
-      @ransack_search = klass.search(params[:q])
+      @ransack_search = klass.ransack(params[:q])
       @ransack_search.build_grouping if @ransack_search.groupings.empty?
       @ransack_search
     end

data/lib/ransack_ui/rails/engine.rb

@@ -4,17 +4,17 @@ require 'ransack_ui/controller_helpers'
 module RansackUI
   module Rails
     class Engine < ::Rails::Engine
-      initializer "ransack_ui.view_helpers" do
-        ActionView::Base.send :include, ViewHelpers
+      initializer 'ransack_ui.view_helpers' do
+        ActionView::Base.include ViewHelpers
       end
 
-      initializer "ransack_ui.controller_helpers" do
-        ActionController::Base.send :include, ControllerHelpers
+      initializer 'ransack_ui.controller_helpers' do
+        ActionController::Base.include ControllerHelpers
       end
 
       config.before_configuration do
         # Add images to be precompiled
-        ::Rails.application.config.assets.precompile += %w(ransack_ui/delete.png ransack_ui/calendar.png)
+        ::Rails.application.config.assets.precompile += %w[ransack_ui/delete.png ransack_ui/calendar.png]
       end
     end
   end

data/lib/ransack_ui/ransack_overrides/adapters/active_record/base.rb

@@ -7,12 +7,12 @@ module Ransack
         # Return array of attributes with [name, type]
         # (Default to :string type for ransackers)
         def ransackable_attributes(auth_object = nil)
-          columns.map{|c| [c.name, c.type] } +
-          _ransackers.map {|k,v| [k, v.type || :string] }
+          columns.map { |c| [c.name, c.type] } +
+            _ransackers.map { |k, v| [k, v.type || :string] }
         end
 
         def self.extended(base)
-          alias :search :ransack unless base.method_defined? :search
+          alias_method :search, :ransack unless base.method_defined? :search
           base.class_eval do
             class_attribute :_ransackers
             class_attribute :_ransackable_associations
@@ -32,7 +32,7 @@ module Ransack
         end
 
         def ransackable_associations(auth_object = nil)
-          all_associations = reflect_on_all_associations.map {|a| a.name.to_s}
+          all_associations = reflect_on_all_associations.map { |a| a.name.to_s }
           if self._ransackable_associations.any?
             # Return intersection of all associations, and associations defined on the model
             all_associations & self._ransackable_associations
@@ -40,7 +40,6 @@ module Ransack
             all_associations
           end
         end
-
       end
     end
   end

data/lib/ransack_ui/ransack_overrides/configuration.rb

@@ -12,4 +12,4 @@ module Ransack
       self.options[:ajax_options] = options
     end
   end
-end
+end

data/lib/ransack_ui/ransack_overrides/context.rb

@@ -6,4 +6,4 @@ module Ransack
       klass.ransackable_attributes(auth_object).map(&:first).include? str
     end
   end
-end
+end

data/lib/ransack_ui/ransack_overrides/helpers/form_builder.rb

@@ -7,13 +7,12 @@ module Ransack
       self.cached_searchable_attributes_for_base = {}
 
       def attribute_select(options = {}, html_options = {})
-        raise ArgumentError, "attribute_select must be called inside a search FormBuilder!" unless object.respond_to?(:context)
-        options[:include_blank] = true unless options.has_key?(:include_blank)
+        raise ArgumentError, 'attribute_select must be called inside a search FormBuilder!' unless object.respond_to?(:context)
+
+        options[:include_blank] = true unless options.key?(:include_blank)
 
         # Set default associations set on model with 'has_ransackable_associations'
-        if options[:associations].nil?
-          options[:associations] = object.context.klass.ransackable_associations
-        end
+        options[:associations] = object.context.klass.ransackable_associations if options[:associations].nil?
 
         bases = [''] + association_array(options[:associations])
         if bases.size > 1
@@ -31,32 +30,33 @@ module Ransack
       end
 
       def sort_select(options = {}, html_options = {})
-        raise ArgumentError, "sort_select must be called inside a search FormBuilder!" unless object.respond_to?(:context)
-        options[:include_blank] = true unless options.has_key?(:include_blank)
+        raise ArgumentError, 'sort_select must be called inside a search FormBuilder!' unless object.respond_to?(:context)
+
+        options[:include_blank] = true unless options.key?(:include_blank)
         bases = [''] + association_array(options[:associations])
         if bases.size > 1
           @template.select(
             @object_name, :name,
             @template.grouped_options_for_select(attribute_collection_for_bases(bases), object.name),
-            objectify_options(options), @default_options.merge({:class => 'ransack_sort'}).merge(html_options)
+            objectify_options(options), @default_options.merge(class: 'ransack_sort').merge(html_options)
           ) + @template.collection_select(
             @object_name, :dir, [['asc', object.translate('asc')], ['desc', object.translate('desc')]], :first, :last,
-            objectify_options(options.except(:include_blank)), @default_options.merge({:class => 'ransack_sort_order'}).merge(html_options)
+            objectify_options(options.except(:include_blank)), @default_options.merge(class: 'ransack_sort_order').merge(html_options)
           )
         else
           # searchable_attributes now returns [c, type]
-          collection = object.context.searchable_attributes(bases.first).map do |c, type|
+          collection = object.context.searchable_attributes(bases.first).map do |c, _type|
             [
               attr_from_base_and_column(bases.first, c),
-              Translate.attribute(attr_from_base_and_column(bases.first, c), :context => object.context)
+              Translate.attribute(attr_from_base_and_column(bases.first, c), context: object.context)
             ]
           end
           @template.collection_select(
             @object_name, :name, collection, :first, :last,
-            objectify_options(options), @default_options.merge({:class => 'ransack_sort'}).merge(html_options)
+            objectify_options(options), @default_options.merge(class: 'ransack_sort').merge(html_options)
           ) + @template.collection_select(
             @object_name, :dir, [['asc', object.translate('asc')], ['desc', object.translate('desc')]], :first, :last,
-            objectify_options(options.except(:include_blank)), @default_options.merge({:class => 'ransack_sort_order'}).merge(html_options)
+            objectify_options(options.except(:include_blank)), @default_options.merge(class: 'ransack_sort_order').merge(html_options)
           )
         end
       end
@@ -69,27 +69,27 @@ module Ransack
             condition.values.each do |value|
               # If value is present, and the attribute is an association,
               # load the selected record and include the record name as a data attribute
-              if value.value.present?
-                condition_attributes = condition.attributes
-                if condition_attributes.any?
-                  attribute = condition_attributes.first.name
-                  klass_name = foreign_klass_for_attribute(attribute)
-
-                  if klass_name
-                    klass = klass_name.constantize
-
-                    value_object = klass.find_by_id(value.value)
-                    if value_object
-                      labels[attribute] ||= {}
-
-                      if value_object.respond_to? :full_name
-                        labels[attribute][value.value] = value_object.full_name
-                      elsif value_object.respond_to? :name
-                        labels[attribute][value.value] = value_object.name
-                      end
-                    end
-                  end
-                end
+              next unless value.value.present?
+
+              condition_attributes = condition.attributes
+              next unless condition_attributes.any?
+
+              attribute = condition_attributes.first.name
+              klass_name = foreign_klass_for_attribute(attribute)
+
+              next unless klass_name
+
+              klass = klass_name.constantize
+
+              value_object = klass.find_by_id(value.value)
+              next unless value_object
+
+              labels[attribute] ||= {}
+
+              if value_object.respond_to? :full_name
+                labels[attribute][value.value] = value_object.full_name
+              elsif value_object.respond_to? :name
+                labels[attribute][value.value] = value_object.name
               end
             end
           end
@@ -98,18 +98,17 @@ module Ransack
         labels
       end
 
-
       def predicate_keys(options)
-        keys = options[:compounds] ? Predicate.names : Predicate.names.reject {|k| k.match(/_(any|all)$/)}
-        if only = options[:only]
+        keys = options[:compounds] ? Predicate.names : Predicate.names.reject { |k| k.match(/_(any|all)$/) }
+        if (only = options[:only])
           if only.respond_to? :call
-            keys = keys.select {|k| only.call(k)}
+            keys = keys.select { |k| only.call(k) }
           else
             only = Array.wrap(only).map(&:to_s)
             # Create compounds hash, e.g. {"eq" => ["eq", "eq_any", "eq_all"], "blank" => ["blank"]}
-            key_groups = keys.inject(Hash.new([])){ |h,k| h[k.sub(/_(any|all)$/, '')] += [k]; h }
+            key_groups = keys.inject(Hash.new([])) { |h, k| h[k.sub(/_(any|all)$/, '')] += [k]; h }
             # Order compounds hash by 'only' keys
-            keys = only.map {|k| key_groups[k] }.flatten.compact
+            keys = only.map { |k| key_groups[k] }.flatten.compact
           end
         end
         keys
@@ -124,19 +123,19 @@ module Ransack
         # then replace the default predicate with the first in the ordered list
         @object.predicate_name = keys.first if @object.default?
         @template.collection_select(
-          @object_name, :p, keys.map {|k| [k, Translate.predicate(k)]}, :first, :last,
+          @object_name, :p, keys.map { |k| [k, Translate.predicate(k)] }, :first, :last,
           objectify_options(options), @default_options.merge(html_options)
         )
       end
 
       def attribute_collection_for_bases(bases)
         bases.map do |base|
-          if collection = attribute_collection_for_base(base)
-            [
-              Translate.association(base, :context => object.context),
-              collection
-            ]
-          end
+          next unless (collection = attribute_collection_for_base(base))
+
+          [
+            Translate.association(base, context: object.context),
+            collection
+          ]
         end.compact
       end
 
@@ -146,21 +145,19 @@ module Ransack
 
         # Detect any inclusion validators to build list of options for a column
         column_select_options = klass.validators.each_with_object({}) do |v, hash|
-          if v.is_a? ActiveModel::Validations::InclusionValidator
-            v.attributes.each do |a|
-              # Try to translate options from activerecord.attribute_options.<model>.<attribute>
-              inclusions = v.send(:delimiter)
-              inclusions = inclusions.call if inclusions.respond_to?(:call) # handle lambda
-              hash[a.to_s] = inclusions.each_with_object({}) do |o, options|
-                options[o.to_s] = I18n.translate("activerecord.attribute_options.#{klass.to_s.downcase}.#{a}.#{o}", :default => o.to_s.titleize)
-              end
+          next unless v.is_a? ActiveModel::Validations::InclusionValidator
+
+          v.attributes.each do |a|
+            # Try to translate options from activerecord.attribute_options.<model>.<attribute>
+            inclusions = v.send(:delimiter)
+            inclusions = inclusions.call if inclusions.respond_to?(:call) # handle lambda
+            hash[a.to_s] = inclusions.each_with_object({}) do |o, options|
+              options[o.to_s] = I18n.translate("activerecord.attribute_options.#{klass.to_s.downcase}.#{a}.#{o}", default: o.to_s.titleize)
             end
           end
         end
 
-        if klass.respond_to?(:ransack_column_select_options)
-          column_select_options.merge!(klass.ransack_column_select_options)
-        end
+        column_select_options.merge!(klass.ransack_column_select_options) if klass.respond_to?(:ransack_column_select_options)
 
         searchable_attributes_for_base(base).map do |attribute_data|
           column = attribute_data[:column]
@@ -175,24 +172,24 @@ module Ransack
           # Set column options if detected from inclusion validator
           if column_select_options[column]
             # Format options as an array of hashes with id and text columns, for Select2
-            html_options[:'data-select-options'] = column_select_options[column].map {|id, text|
-              {:id => id, :text => text}
-            }.to_json
+            html_options[:'data-select-options'] = column_select_options[column].map do |id, text|
+              { id: id, text: text }
+            end.to_json
           end
 
           foreign_klass = attribute_data[:foreign_klass]
 
           if foreign_klass
-            # If field is a foreign key, set up 'data-ajax-*' attributes for auto-complete
-            controller = ActiveSupport::Inflector::tableize(foreign_klass.to_s)
-            html_options[:'data-ajax-entity'] = I18n.translate(controller, :default => controller)
+            # If field is a foreign key, set up 'data-ajax--*' attributes for auto-complete
+            controller = ActiveSupport::Inflector.tableize(foreign_klass.to_s)
+            html_options[:'data-ajax--entity'] = I18n.translate(controller, default: controller)
             if ajax_options[:url]
-              html_options[:'data-ajax-url'] = ajax_options[:url].sub(':controller', controller)
+              html_options[:'data-ajax--url'] = ajax_options[:url].sub(':controller', controller)
             else
-              html_options[:'data-ajax-url'] = "/#{controller}.json"
+              html_options[:'data-ajax--url'] = "/#{controller}.json"
             end
-            html_options[:'data-ajax-type'] = ajax_options[:type] || 'GET'
-            html_options[:'data-ajax-key']  = ajax_options[:key]  || 'query'
+            html_options[:'data-ajax--type'] = ajax_options[:type] || 'GET'
+            html_options[:'data-ajax--key']  = ajax_options[:key]  || 'query'
           end
 
           [
@@ -201,11 +198,10 @@ module Ransack
             html_options
           ]
         end
-      rescue UntraversableAssociationError => e
+      rescue UntraversableAssociationError
         nil
       end
 
-
       private
 
       def searchable_attributes_for_base(base)
@@ -214,22 +210,22 @@ module Ransack
 
         self.class.cached_searchable_attributes_for_base[cache_key] ||= object.context.searchable_attributes(base).map do |column, type|
           klass = object.context.traverse(base)
-          foreign_keys = klass.reflect_on_all_associations.select(&:belongs_to?).
-                           each_with_object({}) {|r, h| h[r.foreign_key.to_sym] = r.class_name }
+          foreign_keys = klass.reflect_on_all_associations.select(&:belongs_to?)
+                              .each_with_object({}) { |r, h| h[r.foreign_key.to_sym] = r.class_name }
 
           # Don't show 'id' column for base model
           next nil if base.blank? && column == 'id'
 
           attribute = attr_from_base_and_column(base, column)
-          attribute_label = Translate.attribute(attribute, :context => object.context)
+          attribute_label = Translate.attribute(attribute, context: object.context)
 
           # Set model name as label for 'id' column on that model's table.
           if column == 'id'
             foreign_klass = object.context.traverse(base).model_name
             # Check that model can autocomplete. If not, skip this id column.
-            next nil unless ActiveSupport::Inflector::constantize(foreign_klass.to_s)._ransack_can_autocomplete
+            next nil unless ActiveSupport::Inflector.constantize(foreign_klass.to_s)._ransack_can_autocomplete
 
-            attribute_label = I18n.translate(foreign_klass, :default => foreign_klass)
+            attribute_label = I18n.translate(foreign_klass, default: foreign_klass)
           else
             foreign_klass = foreign_keys[column.to_sym]
           end
@@ -251,9 +247,7 @@ module Ransack
 
         bases.each do |base|
           searchable_attributes_for_base(base).each do |attribute_data|
-            if attribute == attribute_data[:attribute]
-              return attribute_data[:foreign_klass]
-            end
+            return attribute_data[:foreign_klass] if attribute == attribute_data[:attribute]
           end
         end
       end

data/lib/ransack_ui/ransack_overrides/nodes/attribute.rb

@@ -5,8 +5,8 @@ module Ransack
     Attribute.class_eval do
       def valid?
         bound? && attr &&
-        context.klassify(parent).ransackable_attributes(context.auth_object)
-          .map(&:first).include?(attr_name)
+          context.klassify(parent).ransackable_attributes(context.auth_object)
+                 .map(&:first).include?(attr_name)
       end
     end
   end

data/lib/ransack_ui/ransack_overrides/nodes/condition.rb

@@ -10,4 +10,4 @@ module Ransack
       end
     end
   end
-end
+end

data/lib/ransack_ui/ransack_overrides/nodes/grouping.rb

@@ -3,7 +3,6 @@ require 'ransack/nodes/grouping'
 module Ransack
   module Nodes
     Grouping.class_eval do
-
       def new_condition(opts = {})
         attrs = opts[:attributes] || 1
         vals = opts[:values] || 1
@@ -14,7 +13,6 @@ module Ransack
         vals.times { condition.build_value }
         condition
       end
-
     end
   end
-end
+end

data/lib/ransack_ui/version.rb

@@ -1,3 +1,3 @@
 module RansackUI
-  VERSION = "1.3.4"
+  VERSION = '2.0.0'.freeze
 end

data/lib/ransack_ui/view_helpers.rb

@@ -1,29 +1,29 @@
 module RansackUI
   module ViewHelpers
     def ransack_ui_search(options = {})
-      render 'ransack_ui/search', :options => options
+      render 'ransack_ui/search', options: options
     end
 
     def link_to_add_fields(name, f, type, options)
       new_object = f.object.send "build_#{type}"
-      fields = f.send("#{type}_fields", new_object, :child_index => "new_#{type}") do |builder|
-        render "ransack_ui/#{type.to_s}_fields", :f => builder, :options => options
+      fields = f.send("#{type}_fields", new_object, child_index: "new_#{type}") do |builder|
+        render "ransack_ui/#{type}_fields", f: builder, options: options
       end
 
       if options[:theme].to_s == 'bootstrap'
-        link_to nil, :class => "add_fields btn btn-small btn-primary", "data-field-type" => type, "data-content" => "#{fields}" do
+        link_to nil, :class => 'add_fields btn btn-small btn-primary', 'data-field-type' => type, 'data-content' => "#{fields}" do
           "<i class=\"icon-plus icon-white\"></i><span>#{name}</span>".html_safe
         end
       else
-        link_to name, nil, :class => "add_fields", "data-field-type" => type, "data-content" => "#{fields}"
+        link_to name, nil, :class => 'add_fields', 'data-field-type' => type, 'data-content' => "#{fields}"
       end
     end
 
     def link_to_remove_fields(name, f, options)
       if options[:theme].to_s == 'bootstrap'
-        link_to '<i class="icon-remove icon-white"></i>'.html_safe, nil, :class => "remove_fields btn btn-mini btn-danger"
+        link_to '<i class="icon-remove icon-white"></i>'.html_safe, nil, class: 'remove_fields btn btn-mini btn-danger'
       else
-        link_to image_tag('ransack_ui/delete.png', :size => '16x16', :alt => name), nil, :class => "remove_fields"
+        link_to image_tag('ransack_ui/delete.png', size: '16x16', alt: name), nil, class: 'remove_fields'
       end
     end
   end

data/lib/ransack_ui.rb

@@ -1,9 +1,9 @@
-require "ransack_ui/version"
-require "ransack_ui/rails/engine"
-require "ransack_chronic"
+require 'ransack_ui/version'
+require 'ransack_ui/rails/engine'
+require 'ransack_chronic'
 
 # Require ransack overrides
 require 'ransack_ui/adapters/active_record'
-Dir.glob(File.expand_path('../ransack_ui/ransack_overrides/**/*.rb', __FILE__)) {|f| require f }
+Dir.glob(File.expand_path('ransack_ui/ransack_overrides/**/*.rb', __dir__)) { |f| require f }
 
-require "ransack"
+require 'ransack'

data/ransack_ui.gemspec

@@ -1,23 +1,22 @@
-# -*- encoding: utf-8 -*-
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'ransack_ui/version'
 
 Gem::Specification.new do |gem|
-  gem.name          = "ransack_ui"
+  gem.name          = 'ransack_ui'
   gem.version       = RansackUI::VERSION
-  gem.authors       = ["Nathan Broadbent"]
-  gem.email         = ["nathan.f77@gmail.com"]
-  gem.description   = "Framework for building a search UI with Ransack"
-  gem.summary       = "UI Builder for Ransack"
-  gem.homepage      = "https://github.com/ndbroadbent/ransack_ui"
-  gem.license       = "MIT"
+  gem.authors       = ['Nathan Broadbent']
+  gem.email         = ['nathan.f77@gmail.com']
+  gem.description   = 'Framework for building a search UI with Ransack'
+  gem.summary       = 'UI Builder for Ransack'
+  gem.homepage      = 'https://github.com/ndbroadbent/ransack_ui'
+  gem.license       = 'MIT'
 
   gem.files         = `git ls-files`.split($/)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ["lib"]
+  gem.require_paths = ['lib']
 
   gem.add_dependency 'ransack_chronic', '>= 1.1.0'
-  gem.add_dependency 'ransack'
+  gem.add_dependency 'ransack', '< 4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ransack_ui
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 2.0.0
 platform: ruby
 authors:
 - Nathan Broadbent
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-09-02 00:00:00.000000000 Z
+date: 2024-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ransack_chronic
@@ -28,16 +28,16 @@ dependencies:
   name: ransack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4'
 description: Framework for building a search UI with Ransack
 email:
 - nathan.f77@gmail.com
@@ -46,6 +46,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop_todo.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -83,7 +85,7 @@ homepage: https://github.com/ndbroadbent/ransack_ui
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -98,9 +100,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.3
-signing_key: 
+rubygems_version: 3.5.9
+signing_key:
 specification_version: 4
 summary: UI Builder for Ransack
 test_files: []