recordselect 4.0.2 → 4.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e5ff734695b0b0234dd6ee6307440e1de3a3a72f87798026b18b0e0739e26b1
-  data.tar.gz: a12a0c135cc28dcc72121be2361233b347c0915c8590f31aab566d97b28467fa
+  metadata.gz: 362f542dfd84f4252b0a550c0f9200f3aa956c6ca43a1b939636decae08a805d
+  data.tar.gz: 84e8d713f19e301b23193bd7fb103bcb639f9155d6262c8057658abb88d2e8b4
 SHA512:
-  metadata.gz: 2149f1cfa9f94456836fd71d3c5a3f6d4e636c01d8fb3b0c9ea2138b785f902513ec9824c9e9f489099dde7cd544356aa55c93d710a8ba510a8490fe7135a6d2
-  data.tar.gz: ea348566bafb9430145039802fcdd8c7bb7053f025e0bde06520a79a1974b6d7dbb7b72c0af3005696149e8ff56a2be6cd7bee236b8ffd96e884d015b2c7eb9f
+  metadata.gz: bdba6822301d47fe4976bbf65c0c361c459a750914d477ed16cd4609a4eed2997a4e8c1c01058fd3580a977b1cd7b8ae3cb090069ac489618f8152f3ea4d17bc
+  data.tar.gz: 2993c28d98c8da784d9646dd55b29f1c43cb1e698d2c3481a465adeb7c6f990327cf04cdde489dcbcc9e30e3fbe66366e94d34f3431a79b3a3529d06c41c4e0f

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/views/record_select/_search.html.erb

@@ -4,6 +4,6 @@ url_options = params.permit(*permit_fields).merge(controller: controller, action
 -%>
 <%= form_tag url_options, {method: :get, remote: true, id: record_select_search_id}  -%>
   <%= text_field_tag 'search', params[:search], autocomplete: 'off', class: 'text-input' %>
-  <%= hidden_field_tag 'rs_mode', params[:rs_mode] %>
+  <%= hidden_field_tag 'rs_mode', params[:rs_mode] if record_select_config.toggle_search_mode? %>
   <%= submit_tag 'search', class: "search_submit" %>
 </form>

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/version.rb

@@ -2,7 +2,7 @@ module RecordSelect
   module Version
     MAJOR = 4
     MINOR = 0
-    PATCH = 2
+    PATCH = 4
 
     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.2
+  version: 4.0.4
 platform: ruby
 authors:
 - Sergio Cambra
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-15 00:00:00.000000000 Z
+date: 2025-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler