recordselect 3.10.6 → 3.10.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a803f4cce0feb7095d6ab279c96c7c21c000c4793a18ecf31ba853201d7a657e
-  data.tar.gz: '09a46eba1ccd474a57f85fc5898a8bb189933921ad966fc0c13f82ec8b30dab5'
+  metadata.gz: bc773464f9b5721d1a6e205ab3cb7ae67f746fb9fb53747dcf0ddffe0b5cfd58
+  data.tar.gz: c4571682e737bf1ddc478f1c1ab78519856751d47a28990a3dc3614f1cc49f2d
 SHA512:
-  metadata.gz: b71316cb9333e52790f6f73ef953c356254ccaa2cb92a8b18efa1a34fbb644e507d41b325687e6d71cae3386673f44520db16a29fee5d7007cf163c72e25f785
-  data.tar.gz: 0dff189b2e67a6a41c03946513ada59ffa901dfd48192c68b0c590e89b82fca3005ae4a50f9040169894be3b3103e2baa39290311ab2d060ea442e9c338fb87c
+  metadata.gz: c9051ef714a6ce7eb6f52a8cf1b88ae90ad1cbbc1f5988c1873efd448f840a55bb18f1691fd9e205ca6b27744e33185b798edab0679cef8233eb1ad4bbf1a313
+  data.tar.gz: 115b9546c262baff6f6d27b1ab0b83ff129d0664e4450334b89d38290983868ee3c2e7426a08a2a7f7911cbef3186d7a905d20d31b0ec3159c2ea93761d6313f

data/README

@@ -5,7 +5,7 @@ RecordSelect
 
 RecordSelect is a Rails widget to help you pick one record out of many. I designed it as a more usable and performant alternative to generating a massive dropdown list. It relies on AJAX for the cooler uses (all the provided view helpers rely on JavaScript?) but can also function in a pure-http fashion (although multi-select support is provided in a pure-JavaScript implementation).
 
-Please see the ActionView::Helpers::RecordSelectHelpers for the most common API. More documentation (and HOWTOs) can be found online at http://code.google.com/p/recordselect, and a demo application is available at http://recordselect.googlecode.com/svn/demo.
+Please see the ActionView::Helpers::RecordSelectHelpers for the most common API. More documentation (and HOWTOs) can be found online at the wiki.
 
 = DEPENDENCIES
 This depends on the excellent Paginator gem by Bruce Williams. This simple gem is available at paginator.rubyforge.org.

data/app/assets/javascripts/jquery/record_select.js

@@ -143,6 +143,9 @@ jQuery(document).ready(function() {
     if (jQuery(event.target).val()) $clear_button.addClass('enabled');
     else $clear_button.removeClass('enabled');
   });
+  jQuery(document).on('ajax:beforeSend', 'a.rs-mode', function() {
+    $(this).closest('.record-select').find('form input[name="rs_mode"]').val($(this).data('value'));
+  });
 });
 
 var RecordSelect = new Object();

data/app/assets/stylesheets/record_select.css.scss

@@ -55,6 +55,10 @@
   padding: 2px 4px;
 }
 
+.record-select ol a.rs-mode {
+  display: inline;
+}
+
 .record-select ol .even {
   background-color: #ffffff;
 }

data/app/views/record_select/_browse.html.erb

@@ -3,9 +3,9 @@ controller ||= params[:controller]
 record_select_id = record_select_id(controller)
 -%>
 <div class="record-select" id="<%= record_select_id -%>">
-  <%= render_record_select :partial => 'search', :locals => {:controller => controller, :record_select_id => record_select_id} %>
-  <%= render_record_select :partial => 'list', :locals => {:controller => controller, :page => @page, :record_select_id => record_select_id} %>
+  <%= render_record_select partial: 'search', locals: {controller: controller, record_select_id: record_select_id} %>
+  <%= render_record_select partial: 'list', locals: {controller: controller, page: @page, record_select_id: record_select_id} %>
 </div>
 <%= javascript_tag do %>
-  <%= render_record_select(:partial => 'highlight', :formats => [:js]) %>
+  <%= render_record_select(partial: 'highlight', formats: [:js]) %>
 <% end %>

data/app/views/record_select/_list.html.erb

@@ -2,19 +2,26 @@
 controller ||= params[:controller]
 
 permit_fields = [:search] + (permit_rs_browse_params || [])
-pagination_url_params = params.permit(*permit_fields).merge(:controller => controller, :action => :browse, :search => params[:search], :update => 1)
-prev_url = url_for(pagination_url_params.merge(:page => page.prev.number)) if page.prev?
-next_url = url_for(pagination_url_params.merge(:page => page.next.number)) if page.next?
+permit_fields << :rs_mode if record_select_config.toggle_search_mode?
+pagination_url_params = params.permit(*permit_fields).merge(controller: controller, action: :browse, search: params[:search], update: 1)
+prev_url = url_for(pagination_url_params.merge(page: page.prev.number)) if page.prev?
+next_url = url_for(pagination_url_params.merge(page: page.next.number)) if page.next?
 -%>
-<%= content_tag :ol, :class => ('scrollable' unless record_select_config.pagination?) do %>
-  <%= content_tag :li, rs_(:records_found, :count => page.pager.count,
-:model => record_select_config.model.model_name.human(:count => page.pager.count).downcase), class: 'found', data: {searching: rs_(:searching)} %>
+<%= content_tag :ol, class: ('scrollable' unless record_select_config.pagination?) do %>
+  <%= content_tag :li, class: 'found', data: {searching: rs_(:searching)} do %>
+    <%= rs_(:records_found,
+            count: page.pager.count,
+            model: record_select_config.model.model_name.human(:count => page.pager.count).downcase) %>
+    <% if record_select_config.toggle_search_mode? %>
+      <% rs_mode = full_text_search? ? 'begins' : 'contains' %>
+      <%= link_to rs_(rs_mode), pagination_url_params.merge(rs_mode: rs_mode),
+                  class: 'rs-mode', method: :get, remote: true, data: {value: rs_mode} %>
+    <% end %>
+  <% end %>
   <% if page.prev? -%>
   <li class="pagination previous">
-    <%= link_to image_tag('record_select/previous.gif', :alt => rs_(:previous)) + " " + rs_(:previous_items,
-:count => page.pager.per_page),
-                      {:url => prev_url},
-                      {:href => prev_url, :method => :get, :remote => true} %>
+    <%= link_to image_tag('record_select/previous.gif', alt: rs_(:previous)) + " " + rs_(:previous_items, count: page.pager.per_page),
+                prev_url, method: :get, remote: true %>
   </li>
   <% end -%>
   <% page.items.each do |record| -%>
@@ -24,9 +31,8 @@ next_url = url_for(pagination_url_params.merge(:page => page.next.number)) if pa
   <% end -%>
   <% if record_select_config.pagination? && page.next? -%>
   <li class="pagination next">
-  <%= link_to (rs_(:next_items, :count => page.pager.per_page) + " " + image_tag('record_select/next.gif', :alt => rs_(:next))).html_safe,
-                        {:url => next_url},
-                        {:href => next_url, :method => :get, :remote => true} %>
+  <%= link_to safe_join([rs_(:next_items, count: page.pager.per_page), image_tag('record_select/next.gif', alt: rs_(:next))], ' '),
+              next_url, method: :get, remote: true %>
   </li>
   <% end -%>
 <% end %>

data/app/views/record_select/_search.html.erb

@@ -1,8 +1,9 @@
 <%
 permit_fields = [:search] + (permit_rs_browse_params || [])
-url_options = params.permit(*permit_fields).merge(:controller => controller, :action => :browse, :page => 1, :update => 1)
+url_options = params.permit(*permit_fields).merge(controller: controller, action: :browse, page: 1, update: 1)
 -%>
-<%= form_tag url_options, {:method => :get, :remote => true, :id => record_select_search_id}  -%>
-  <%= text_field_tag 'search', params[:search], :autocomplete => 'off', :class => 'text-input' %>
-  <%= submit_tag 'search', :class => "search_submit" %>
+<%= 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] %>
+  <%= submit_tag 'search', class: "search_submit" %>
 </form>

data/app/views/record_select/browse.js.erb

@@ -1,2 +1,2 @@
-RecordSelect.render_page('<%= record_select_id %>', '<%= escape_javascript(render_record_select(:partial => 'list', :locals => {:page => @page})) %>');
-<%= render_record_select(:partial => 'highlight', :formats => [:js]) %>
+RecordSelect.render_page('<%= record_select_id %>', '<%= escape_javascript(render_record_select(partial: 'list', locals: {page: @page})) %>');
+<%= render_record_select(partial: 'highlight', formats: [:js]) %>

data/config/locales/en.yml

@@ -8,3 +8,5 @@ en:
     records_found:
       one: "1 %{model} found"
       other: "%{count} %{model} found"
+    contains: "Contains search"
+    begins: "Begins search"

data/config/locales/es.yml

@@ -12,3 +12,5 @@ es:
     records_found:
       one: "1 %{model} encontrado"
       other: "%{count} %{model} encontrados"
+    contains: "Buscar contiene"
+    begins: "Buscar empieza por"

data/lib/record_select/conditions.rb

@@ -38,15 +38,20 @@ module RecordSelect
     # override this if you want to customize the search routine
     def record_select_conditions_from_search
       if params[:search] && !params[:search].strip.empty?
-        if record_select_config.full_text_search?
+        if full_text_search?
           tokens = params[:search].strip.split(' ')
+          search_pattern = '%?%'
         else
           tokens = [params[:search].strip]
+          search_pattern = '?%'
         end
-        search_pattern = record_select_config.full_text_search? ? '%?%' : '?%'
         build_record_select_conditions(tokens, record_select_like_operator, search_pattern)
       end
     end
+
+    def full_text_search?
+      record_select_config.full_text_search? && params[:rs_mode].blank? || params[:rs_mode] == 'contains'
+    end
     
     def build_record_select_conditions(tokens, operator, search_pattern)
       where_clauses = record_select_config.search_on.collect { |sql| "#{sql} #{operator} ?" }

data/lib/record_select/config.rb

@@ -11,6 +11,7 @@ module RecordSelect
       @label = options[:label]
       @include = options[:include]
       @pagination = options.include?(:pagination) ? options[:pagination] : true
+      @toggle_search_mode = options[:toggle_search_mode]
     end
     
     def self.js_framework=(framework)
@@ -59,6 +60,10 @@ module RecordSelect
       @full_text_search ? true : false
     end
 
+    def toggle_search_mode?
+      @toggle_search_mode ? true : false
+    end
+
     def include
       @include
     end

data/lib/record_select/engine.rb

@@ -1,5 +1,20 @@
 module RecordSelect
   class Engine < Rails::Engine
-    config.assets.precompile << 'record_select/next.gif' << 'record_select/previous.gif' if Rails::VERSION::MAJOR >= 4
+    initializer 'active_scaffold.action_controller' do
+      ActiveSupport.on_load :action_controller do
+        include RecordSelect
+      end
+    end
+
+    initializer 'record_select.action_view' do
+      ActiveSupport.on_load :action_view do
+        include RecordSelectHelper
+        ActionView::Helpers::FormBuilder.send(:include, RecordSelect::FormBuilder)
+      end
+    end
+
+    initializer 'record_select.assets' do
+      config.assets.precompile << 'record_select/next.gif' << 'record_select/previous.gif'
+    end
   end
 end

data/lib/record_select/helpers/record_select_helper.rb

@@ -148,6 +148,10 @@ module RecordSelectHelper
     controller.send :record_select_config
   end
 
+  def full_text_search?
+    controller.send :full_text_search?
+  end
+
   # The id of the RecordSelect widget for the given controller.
   def record_select_id(controller = nil) #:nodoc:
     controller ||= params[:controller]

data/lib/record_select/version.rb

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

data/lib/recordselect.rb

@@ -8,7 +8,3 @@ require 'record_select/config'
 require 'record_select/form_builder'
 require 'record_select/helpers/record_select_helper'
 require 'record_select/engine'
-
-ActionController::Base.send(:include, RecordSelect)
-ActionView::Base.send(:include, RecordSelectHelper)
-ActionView::Helpers::FormBuilder.send(:include, RecordSelect::FormBuilder)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: recordselect
 version: !ruby/object:Gem::Version
-  version: 3.10.6
+  version: 3.10.7
 platform: ruby
 authors:
 - Sergio Cambra
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-21 00:00:00.000000000 Z
+date: 2024-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler