auto_select2 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1959785b4c590ab8a899b2ae4d04ae92877bff2d
-  data.tar.gz: ec11ae6b9ab6bea151a90327d444e9a1188283ea
+  metadata.gz: e3d6624af9d5f131eafc59d8ecfde5a5e9a9d558
+  data.tar.gz: d821780986f28b65b2de8c77ed95e47f937f14b8
 SHA512:
-  metadata.gz: c51d13d9a225ccbff420e2aefacbafeb2ed86db076af426a701f75f5d4bd309c2744d556f356e38ceae2c3c1eda1f03f57a7180daa7cdee349dcdabfa3fa22c2
-  data.tar.gz: a9de852f51f7573b7ae71d7c20ec17a7007cd49f0820659153cb674b3c1b2a8aefe6299a8f37829fe216da68d1d5e6d295d80ddbe2c481e7d9fcf46c9c64046a
+  metadata.gz: 36ff5e67ac0dafd10e88dcad6015badfa87a634266c357ba2e2cba4aac2ae965200bebb3f5f9533071999c26c0fd0b55ca80e6861df1d0e514cc46e41e9eb79a
+  data.tar.gz: f5250c998ddde7236c7c0047fcb3c71d81d2c4b5252c215639d81feebc831e2b0058709a5052e9786dca1fdd623993994766f41e85fe311c2b58f9768dd1ff7b

data/app/controllers/select2_autocompletes_controller.rb

@@ -3,9 +3,7 @@ class Select2AutocompletesController < ApplicationController
     begin
       if params[:class_name].present?
         adapter = "::#{params[:class_name].camelize}SearchAdapter".constantize
-      elsif params[:default_class_name].present? &&
-          params[:default_text_column].present? &&
-          params[:default_id_column].present?
+      elsif params[:default_class_name].present?
         adapter = ::AutoSelect2::Select2SearchAdapter::Default
       else
         render json: {error: "not enough search parameters'"}.to_json,

data/lib/auto_select2/select2_search_adapter/base.rb

@@ -18,8 +18,8 @@ module AutoSelect2
       private
 
         def default_finder(searched_class, term, options)
-          column = options[:column].present? ? options[:column] : 'name'
-          conditions = default_search_conditions(term, options[:basic_conditions], column)
+          columns = options[:column].present? ? options[:column] : 'name'
+          conditions = default_search_conditions(term, options[:basic_conditions], columns)
           if term.nil?
             [ searched_class.where(options[:basic_conditions]) ]
           else
@@ -28,7 +28,7 @@ module AutoSelect2
               page = options[:page].to_i > 0 ? options[:page].to_i : 1
               skip_count = limit * ( page - 1 )
             end
-            query = searched_class.where( conditions ).limit( limit ).offset(skip_count).order(column)
+            query = searched_class.where( conditions ).limit( limit ).offset(skip_count).order(columns)
             query = query.select(options[:select]) if options[:select].present?
             options[:uniq] ? query.uniq : query
           end
@@ -45,7 +45,9 @@ module AutoSelect2
         def default_search_conditions(term, basic_conditions, columns)
           term_filter = ''
           conditions = []
-          columns = [columns] unless columns.is_a?(Array)
+          unless columns.is_a?(Array)
+            columns = columns.split(/[\s,]+/)
+          end
           unless term.nil?
             words = term.split(' ')
             words.each_with_index do |word, index|
@@ -63,32 +65,42 @@ module AutoSelect2
         end
 
         def get_init_values(searched_class, ids, options = {})
-          title_method = options[:title_method]
-          id_column = options[:id_column] || searched_class.primary_key
+          hash_method = options[:hash_method]
+          text_columns = options[:default_text_column]
+          id_column = options[:default_id_column] || searched_class.primary_key
           ids = ids.split(',')
           if ids.size > 1
             result = []
             ids.each do |id|
               item = searched_class.where(id_column => id).first
               if item.present?
-                result << get_select2_hash(item, title_method, id)
+                result << get_select2_hash(item, hash_method, id_column, text_columns)
               end
             end
             result
           elsif ids.size == 1
             item = searched_class.where(id_column => ids[0]).first
-            get_select2_hash(item, title_method, ids[0]) if item.present?
+            get_select2_hash(item, hash_method, id_column, text_columns) if item.present?
           else
             nil
           end
         end
 
-        def get_select2_hash(item, title_method, id)
-          if item.respond_to?(:to_select2) && title_method.blank?
-            item.to_select2
+        def get_select2_hash(item, hash_method, id_column, text_columns)
+          if hash_method.present? && item.respond_to?(hash_method)
+            item.public_send(hash_method)
           else
-            title_method ||= :name
-            { text: item.public_send(title_method), id: id }
+            if item.respond_to?(:to_select2)
+              item.to_select2
+            else
+              label_method = text_columns.split(/[\s,]+/).first
+              label_method ||= :name
+              if item.respond_to?(label_method)
+                { text: item.public_send(label_method), id: item.public_send(id_column) }
+              else
+                return { error: 'not found label method' }
+              end
+            end
           end
         end
       end

data/lib/auto_select2/select2_search_adapter/default.rb

@@ -15,13 +15,21 @@ module AutoSelect2
             default_count = default_count(default_arel, term, column: options[:default_text_column])
             {
                 items: default_values.map do |default_value|
-                  { text: default_value.public_send(options[:default_text_column]),
-                    id: default_value.public_send(options[:default_id_column]) }
+                  get_select2_hash(
+                      default_value,
+                      options[:hash_method],
+                      options[:default_id_column],
+                      options[:default_text_column]
+                  )
                 end,
                 total: default_count
             }
           else
-            get_init_values(default_arel, options[:item_ids], id_column: options[:default_id_column])
+            get_init_values(
+                default_arel,
+                options[:item_ids],
+                options
+            )
           end
         end
       end

data/lib/auto_select2/version.rb

@@ -1,3 +1,3 @@
 module AutoSelect2
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/vendor/assets/javascripts/auto_select2/ajax_select2.js.coffee

@@ -1,9 +1,40 @@
 jQuery ($) ->
-  format = (item)->
+  itemResultCssClass = (item)->
+    cssClass = ''
+    if item.class_name != undefined
+      cssClass = item.class_name
+    cssClass
+
+  itemSelectionCssClass = (item)->
+    cssClass = ''
+    if item != null && item.selection_class_name != undefined
+      cssClass = item.selection_class_name
+    else if item != null
+      cssClass = itemResultCssClass(item)
+    cssClass
+
+  formatResult = (item)->
     result = item.text
     if item.class_name != undefined
-      result = '<span class="'+item.class_name+'">'+item.text+'</span>'
+      classes = item.class_name.split(' ')
+      classes = classes.map (origClass)->
+        'in-' + origClass
+      result = '<span class="'+classes.join(' ')+'">'+item.text+'</span>'
     result
+
+  formatSelection = (item)->
+    result = item.text
+    classes = item.selection_class_name
+    if classes == undefined
+      classes = item.class_name
+    if classes != undefined
+      classes = classes.split(' ')
+#      INFO: Turn on this if formatSelectionCssClass enabled
+#      classes = classes.map (origClass)->
+#        'in-' + origClass
+      result = '<span class="'+classes.join(' ')+'">'+item.text+'</span>'
+    result
+
   window.initAutoAjaxSelect2 = ->
     $inputs = $('input.auto-ajax-select2').not('.select2-offscreen')
     $inputs.each ->
@@ -13,8 +44,11 @@ jQuery ($) ->
       s2DefaultOptions = {
         allowClear: true
         multiple: false
-        formatSelection: format
-        formatResult: format
+        formatSelection: formatSelection
+        formatResult: formatResult
+#        INFO: Not documented feature of select2 library, worked very well, but not clearing classes after item removing
+#        formatSelectionCssClass: itemSelectionCssClass
+        formatResultCssClass: itemResultCssClass
         ajax: {
           url: path,
           dataType: 'json',
@@ -44,11 +78,13 @@ jQuery ($) ->
           id = $element.val()
           initText = $element.data('init-text')
           initClassName = $element.data('init-class-name')
+          initSelectionClassName = $element.data('init-selection-class-name')
           if (id != '')
             if initText != undefined
               params = { id: id, text: initText }
               if initClassName != undefined
                 params.class_name = initClassName
+                params.selection_class_name = initSelectionClassName
               callback(params)
             else
               $.ajax(path, {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: auto_select2
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Dmitriy Lisichkin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-01 00:00:00.000000000 Z
+date: 2014-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties