recordselect 3.3.9 → 3.4.0

data/lib/record_select/conditions.rb

@@ -37,25 +37,25 @@ module RecordSelect
     # generate conditions from params[:search]
     # override this if you want to customize the search routine
     def record_select_conditions_from_search
-      search_pattern = record_select_config.full_text_search? ? '%?%' : '?%'
-
-      if params[:search] and !params[:search].strip.empty?
+      if params[:search] && !params[:search].strip.empty?
         if record_select_config.full_text_search?
           tokens = params[:search].strip.split(' ')
         else
-          tokens = []
-          tokens << params[:search].strip
+          tokens = [params[:search].strip]
         end
-
-        where_clauses = record_select_config.search_on.collect { |sql| "#{sql} #{record_select_like_operator} ?" }
-        phrase = "(#{where_clauses.join(' OR ')})"
-
-        sql = ([phrase] * tokens.length).join(' AND ')
-        tokens = tokens.collect{ |value| [search_pattern.sub('?', value)] * record_select_config.search_on.length }.flatten
-
-        conditions = [sql, *tokens]
+        search_pattern = record_select_config.full_text_search? ? '%?%' : '?%'
+        build_record_select_conditions(tokens, record_select_like_operator, search_pattern)
       end
     end
+    
+    def build_record_select_conditions(tokens, operator, search_pattern)
+      where_clauses = record_select_config.search_on.collect { |sql| "#{sql} #{operator} ?" }
+      phrase = "(#{where_clauses.join(' OR ')})"
+      sql = ([phrase] * tokens.length).join(' AND ')
+      
+      tokens = tokens.collect { |token| [search_pattern.sub('?', token)] * record_select_config.search_on.length }.flatten
+      [sql, *tokens]
+    end
 
     # generate conditions from the url parameters (e.g. users/browse?group_id=5)
     def record_select_conditions_from_params

data/lib/record_select/helpers/record_select_helper.rb

@@ -169,7 +169,7 @@ module RecordSelectHelper
       # just return the string
       render_record_from_config(record, renderer)
     end
-    description.match(/<label[^>]*>(.*)<\/label>/)[1]
+    description.match(/<label[^>]*>(.*)<\/label>/){ |match| match[1] } || description if description
   end
 
   def assert_controller_responds(controller_name)

data/lib/record_select/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: recordselect
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 3
-  - 3
-  - 9
-  version: 3.3.9
+  - 4
+  - 0
+  version: 3.4.0
 platform: ruby
 authors: 
 - Sergio Cambra
@@ -117,10 +117,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 49
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 9
+      - 1
+      version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: