ransack_ui 1.4.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac84bded42933bf2a64def821e3698e5182047397d2e8bb6f0321d6b38051d21
-  data.tar.gz: abdc1d7d87b36deb0648b320b7e65e4511a046e35455b0f7887bb22c60a75b19
+  metadata.gz: c76bc56f01efed6de571cb9a79a094095af122c6a35f46abb9bf6567de74b275
+  data.tar.gz: 26367f813d7dd0851ede9a027aea951ff307fd9e2f7d1380abe72eb5afc762f0
 SHA512:
-  metadata.gz: 70fa91e7584802f51d68c0990e4a27acbfc928954cc48d6833258507287826b9b71a9c066f11c06c5b44449a72025367d61cf69f572f57d105ab4f55e86778b8
-  data.tar.gz: 7356459d70de3031278ec4ef61b1197d7c533b221ec1d2966e3e1e32072778f260f06e50970525fef732e6e6b0d8be8aa0a880af5e0472cc3e64bbce1bca5d00
+  metadata.gz: 06223a0eee0aa80c48b987aea5271aae10d4d2921265cd70725b9731615fbae62270684d23069502df922618e0f6d65e7b163291fb4fa8f9a0c63b3695fb5cce
+  data.tar.gz: 664bb6c97c1a9fd16b4bc461de11cb466e5236297551ad3932816c1122b5e65f5442730bbee135f4f19fd07cadbb1fe752779916794d533af2cd33b6572ec4d8

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/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:

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/ransack_overrides/helpers/form_builder.rb

@@ -180,16 +180,16 @@ module Ransack
           foreign_klass = attribute_data[:foreign_klass]
 
           if foreign_klass
-            # If field is a foreign key, set up 'data-ajax-*' attributes for auto-complete
+            # 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)
+            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
 
           [

data/lib/ransack_ui/version.rb

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

data/lib/ransack_ui/view_helpers.rb

@@ -11,11 +11,11 @@ module RansackUI
       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.to_s 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.to_s
+        link_to name, nil, :class => 'add_fields', 'data-field-type' => type, 'data-content' => "#{fields}"
       end
     end
 

data/ransack_ui.gemspec

@@ -18,5 +18,5 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
 
   gem.add_dependency 'ransack_chronic', '>= 1.1.0'
-  gem.add_dependency 'ransack', '~> 2.0'
+  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.4.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Nathan Broadbent
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-28 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: '2.0'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4'
 description: Framework for building a search UI with Ransack
 email:
 - nathan.f77@gmail.com
@@ -47,6 +47,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rubocop_todo.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -84,7 +85,7 @@ homepage: https://github.com/ndbroadbent/ransack_ui
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -99,8 +100,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.5.9
+signing_key:
 specification_version: 4
 summary: UI Builder for Ransack
 test_files: []