recordselect 4.0.1 → 4.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65ad43872bf90ddfbc045b05d0504aba6146e244e381742c10c7d105959fd222
-  data.tar.gz: 1d10b16c74f2a695cf4c8f8cb07419440b19ccb47ba122c92eb29dea941fbda7
+  metadata.gz: 989e8ccab3b2a8123cba1e96bc4afae3038ff5091cf7c35c883435ce12ecea82
+  data.tar.gz: 96a8a2072f8e3dce451abade379580ae53ac8077c5aa1d4e681b955cae6a36fb
 SHA512:
-  metadata.gz: 074faf7c0a581eeea7a2ccbc85b7caf185a3e900f13f60ab4ab2334e802b6ccb766d8083eb4a367989f92b453459dc78925d98bb6ce0c63e1ca48f57c914ac9a
-  data.tar.gz: ea4f0c7baf85455cd755ec83ec22abbf8855301335de39530b5ad310ca5bd2a710b325a863e91936ab06a9adedcdcae1df1c41cfc3f7ba908ce4c30d4f656a75
+  metadata.gz: 21dddd73eb6dec6530ba21899f94a5e690e81fb5bd13669e4deb1ee7e81b355db0ba5f66a9444d06a9f749ac8ab43dca556edb4f1ea6c1f27e27d332cb4e6c7e
+  data.tar.gz: b694520b3b5b295e57a9c274f2e4c13924df79bc0d1b8164e35a6689be8f63a14ecee3981941a92f248aae3de8b08b5b6c4114e7e665de1487ef9cad8862d15a

data/README

@@ -45,7 +45,3 @@ Either using assets pipeline or importmap, it will be loaded when requiring or i
 
 = DEPENDENCIES
 This depends on the excellent Paginator gem by Bruce Williams. This simple gem is available at paginator.rubyforge.org.
-
-It should autoselect js framework, but you can select :jquery or :prototype framework with config/initializer file:
-RecordSelect::Config.js_framework = :jquery
-RecordSelect::Config.js_framework = :prototype

data/app/assets/javascripts/record_select.js

@@ -163,8 +163,9 @@
     RecordSelect.document_loaded = false;
 
     RecordSelect.from_attributes = function(item) {
+      if (item.prop('disabled')) return;
       var rs_class = RecordSelect[item.data('rs-type')];
-      new rs_class(item.data('rs-id'), item.data('rs-url'), item.data('rs-options'));
+      new rs_class(item.data('rs-id') || item, item.data('rs-url'), item.data('rs-options'));
     }
 
     RecordSelect.select_item = function(item) {
@@ -337,7 +338,7 @@
        * returns true/false for whether the recordselect is open
        */
       is_open: function() {
-        return jQuery.trim(this.container.html()).length != 0;
+        return this.container.children().length != 0;
       },
 
       /**

data/lib/record_select/actions.rb

@@ -3,12 +3,7 @@ module RecordSelect
     # :method => :get
     # params => [:page, :search]
     def browse
-      conditions = record_select_conditions
-      user_includes = record_select_includes
-      query = conditions.inject(record_select_model.includes(user_includes)) do |query, cond|
-        query.where(cond)
-      end
-      query = query.references(user_includes) if Rails::VERSION::MAJOR >= 4 && user_includes.present?
+      query = record_select_query
       @count = query.count if record_select_config.pagination?
       @count = @count.length if @count.is_a? Hash
       pager = ::Paginator.new(@count, record_select_config.per_page) do |offset, per_page|
@@ -67,6 +62,15 @@ module RecordSelect
 
     private
 
+    def record_select_query
+      query = record_select_model
+      user_includes = record_select_includes
+      query = query.includes(user_includes).references(user_includes) if user_includes.present?
+      query = query.joins(record_select_config.joins).distinct if record_select_config.joins.present?
+      query = query.left_joins(record_select_config.left_joins) if record_select_config.left_joins.present?
+      record_select_conditions.inject(query) { |query, cond| query.where(cond) }
+    end
+
     def record_select_views_path
       "record_select"
     end

data/lib/record_select/conditions.rb

@@ -7,8 +7,6 @@ module RecordSelect
     # * intelligent url params (e.g. params[:first_name] if first_name is a model column)
     # * specific conditions supplied by the developer
     def record_select_conditions
-      conditions = []
-
       [
         record_select_conditions_from_search,
         *record_select_conditions_from_params,

data/lib/record_select/config.rb

@@ -9,11 +9,15 @@ module RecordSelect
       @order_by = options[:order_by]
       @full_text_search = options[:full_text_search]
       @label = options[:label]
+      @joins = options[:joins]
+      @left_joins = options[:left_joins]
       @include = options[:include]
       @pagination = options.include?(:pagination) ? options[:pagination] : true
       @toggle_search_mode = options[:toggle_search_mode]
     end
 
+    attr_reader :include, :joins, :left_joins
+
     def pagination?
       @pagination
     end
@@ -52,10 +56,6 @@ module RecordSelect
       @toggle_search_mode ? true : false
     end
 
-    def include
-      @include
-    end
-
     # If a proc, must accept the record as an argument and return a descriptive string.
     #
     # If a symbol or string, must name a partial that renders a representation of the

data/lib/record_select/helpers/record_select_helper.rb

@@ -21,15 +21,16 @@ module RecordSelectHelper
     options[:onselect] = "(function(id, label) {#{options[:onselect]}})" if options[:onselect]
     options[:html] ||= {}
     options[:html][:id] ||= "rs_#{rand(9999)}"
+    js = options.include?(:js) ? options[:js] : request.xhr?
 
     controller = assert_controller_responds(options[:params][:controller])
     record_select_options = {id: record_select_id(controller.controller_path), onselect: options[:onselect] || ''}
     record_select_options.merge! options[:rs] if options[:rs]
 
     rs_data = {type: 'Dialog', id: options[:html][:id], url: url_for(options[:params]), options: record_select_options}
-    options[:html][:data] = rs_data.transform_keys { |k| "rs_#{k}" } unless request.xhr?
+    options[:html][:data] = rs_data.transform_keys { |k| "rs_#{k}" } unless js
     html = link_to(name, '#', options[:html])
-    html << record_select_js(**rs_data) if request.xhr?
+    html << record_select_js(**rs_data) if js
 
     html
   end
@@ -53,6 +54,7 @@ module RecordSelectHelper
     options[:class] ||= ''
     options[:class] << ' recordselect'
     options[:clear_button] = true unless options.include? :clear_button
+    js = options.include?(:js) ? options.delete(:js) : request.xhr?
 
     controller = assert_controller_responds(options.delete(:controller))
     params = options.delete(:params)
@@ -70,10 +72,10 @@ module RecordSelectHelper
     options.merge!(autocomplete: 'off', onfocus: "this.focused=true", onblur: "this.focused=false")
     url = url_for({action: :browse, controller: controller.controller_path}.merge(params))
     rs_data = {type: 'Single', id: options[:id], url: url, options: record_select_options}
-    options[:data] = rs_data.transform_keys { |k| "rs_#{k}" } unless request.xhr?
+    options[:data] = rs_data.transform_keys { |k| "rs_#{k}" } unless js
     html = text_field_tag(name, nil, options)
     html << button_tag('x', type: :button, class: clear_button_class, aria_label: 'Clear input', title: 'Clear input') if clear_button
-    html << record_select_js(**rs_data) if request.xhr?
+    html << record_select_js(**rs_data) if js
 
     html
   end
@@ -95,6 +97,7 @@ module RecordSelectHelper
     options[:id] ||= name.gsub(/[\[\]]/, '_')
     options[:class] ||= ''
     options[:class] << ' recordselect'
+    js = options.include?(:js) ? options.delete(:js) : request.xhr?
 
     controller = assert_controller_responds(options.delete(:controller))
     params = options.delete(:params)
@@ -107,9 +110,9 @@ module RecordSelectHelper
     options.merge!(autocomplete: 'off', onfocus: "this.focused=true", onblur: "this.focused=false")
     url = url_for({action: :browse, controller: controller.controller_path}.merge(params))
     rs_data = {type: 'Autocomplete', id: options[:id], url: url, options: record_select_options}
-    options[:data] = rs_data.transform_keys { |k| "rs_#{k}" } unless request.xhr?
+    options[:data] = rs_data.transform_keys { |k| "rs_#{k}" } unless js
     html = text_field_tag(name, nil, options)
-    html << record_select_js(**rs_data) if request.xhr?
+    html << record_select_js(**rs_data) if js
 
     html
   end
@@ -132,6 +135,7 @@ module RecordSelectHelper
     options[:class] ||= ''
     options[:class] << ' recordselect'
     options.delete(:name)
+    js = options.include?(:js) ? options.delete(:js) : request.xhr?
 
     controller = assert_controller_responds(options.delete(:controller))
     params = options.delete(:params)
@@ -142,11 +146,11 @@ module RecordSelectHelper
     options.merge!(autocomplete: 'off', onfocus: "this.focused=true", onblur: "this.focused=false")
     url = url_for({action: :browse, controller: controller.controller_path}.merge(params))
     rs_data = {type: 'Multiple', id: options[:id], url: url, options: record_select_options}
-    options[:data] = rs_data.transform_keys { |k| "rs_#{k}" } unless request.xhr?
+    options[:data] = rs_data.transform_keys { |k| "rs_#{k}" } unless js
     html = text_field_tag("#{name}[]", nil, options)
     html << hidden_field_tag("#{name}[]", '', id: nil)
     html << content_tag(:ul, '', class: 'record-select-list')
-    html << record_select_js(**rs_data) if request.xhr?
+    html << record_select_js(**rs_data) if js
 
     html
   end

data/lib/record_select/version.rb

@@ -2,7 +2,7 @@ module RecordSelect
   module Version
     MAJOR = 4
     MINOR = 0
-    PATCH = 1
+    PATCH = 3
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: recordselect
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.3
 platform: ruby
 authors:
 - Sergio Cambra
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-29 00:00:00.000000000 Z
+date: 2025-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.6
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: RecordSelect widget as a replacement for massive drop down lists