auto_select2 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9fa47b66a59a070e74887952d34731a09e92e98
-  data.tar.gz: 0b6f22ea5f73d56b4e8428745a641c90888dc9e0
+  metadata.gz: 4f1c055e2012182da247df66908f6fdf0e6f951a
+  data.tar.gz: f44e5ae3cce3f1a19d5b522ad25b738552e03df2
 SHA512:
-  metadata.gz: 3c4a681e0dbc73ee2ae09eb2314edb0fc4706eec0186bdf4ad8a9b310afb264f9a4e8b766f5284b5a358b060c396e74d7a1491b9411943207ce70f8014840ebb
-  data.tar.gz: 53846bfbc7bfd9f5c649a197248adae98bf1735128304f01204077e74b4e91df237b232602c417d071815cfc82b457b6e6d817e30d34f5a1b20b677ef6738d1c
+  metadata.gz: 022f35da345225b0559ccfbc85490df14f858fa76a20690e044fd7d3090f6b6d66b0a180134856f807711f25656a105c482d1f30287160b05d4d7d2ba4d75a25
+  data.tar.gz: 115d3fd414588db14f967cb5395206c68cca1b163efda0454780918ac5e43c4fc8e26fd5e2a1250e2abec5c12e4daae80e6bcac249945bc365aa9eb515bb3d9b

data/lib/auto_select2/engine.rb

@@ -6,7 +6,8 @@ module AutoSelect2
       app.config.assets.precompile +=
           %w(auto_select2/ajax_select2.js
              auto_select2/multi_ajax_select2_value_parser.js
-             auto_select2/static_select2.js)
+             auto_select2/static_select2.js
+             auto_select2/custom_select2.js)
     end
   end
 end

data/lib/auto_select2/helpers/select2_helpers.rb

@@ -15,6 +15,13 @@ module AutoSelect2
       end
     end
 
+    def custom_select2_init_header_tags
+      unless @select2_custom_script_included
+        @select2_custom_script_included = true
+        javascript_include_tag('auto_select2/custom_select2')
+      end
+    end
+
     def static_select2_init_header_tags
       unless @select2_static_script_included
         @select2_static_script_included = true

data/lib/auto_select2/select2_search_adapter/base.rb

@@ -19,7 +19,11 @@ module AutoSelect2
 
         def default_finder(searched_class, term, options)
           columns = options[:column].present? ? options[:column] : 'name'
-          conditions = default_search_conditions(term, options[:basic_conditions], columns)
+          conditions =
+              default_search_conditions(term,
+                                        options[:basic_conditions],
+                                        columns,
+                                        options.slice(:case_sensitive))
           if term.nil?
             [ searched_class.where(options[:basic_conditions]) ]
           else
@@ -35,14 +39,18 @@ module AutoSelect2
         end
 
         def default_count(searched_class, term, options = {})
-          conditions = default_search_conditions(term, options[:basic_conditions], options[:column] || 'name')
+          conditions =
+              default_search_conditions(term,
+                                        options[:basic_conditions],
+                                        options[:column] || 'name',
+                                        options.slice(:case_sensitive))
           query = searched_class.where(conditions)
           query = query.select(options[:select]) if options[:select].present?
           query = options[:uniq] ? query.uniq : query
           query.count
         end
 
-        def default_search_conditions(term, basic_conditions, columns)
+        def default_search_conditions(term, basic_conditions, columns, options = {})
           term_filter = ''
           conditions = []
           unless columns.is_a?(Array)
@@ -50,13 +58,20 @@ module AutoSelect2
           end
           unless term.nil?
             words = term.split(' ')
+            # @ todo: needs to create arrays with conditions for words and columns and concatenate them in a properly way
             words.each_with_index do |word, index|
               term_filter += ' AND ' if index > 0
+              term_filter += '( ' if columns.any?
               columns.each_with_index do |column, idx|
                 term_filter += ' OR ' if idx > 0
-                term_filter +=  "#{column} LIKE ?"
+                if options[:case_sensitive]
+                  term_filter += "#{column} LIKE ?"
+                else
+                  term_filter += "LOWER(#{column}) LIKE LOWER(?)"
+                end
                 conditions << "%#{word}%"
               end
+              term_filter += ' )' if columns.any?
             end
             term_filter = term_filter.empty? ? nil : "(#{term_filter})"
             basic_conditions_part = basic_conditions.present? ? "(#{basic_conditions }) " : nil

data/lib/auto_select2/select2_search_adapter/default.rb

@@ -3,12 +3,21 @@ module AutoSelect2
     class Default < Base
       class << self
         def search_default(term, page, options)
-          if @searchable_class.blank? || @id_column.blank? || @text_columns.blank?
+          if !@searchable_class || @id_column.blank? || @text_columns.blank?
             raise_not_implemented
           end
           if options[:init].nil?
-            default_values = default_finder(@searchable_class, term, page: page, column: @text_columns)
-            default_count = default_count(@searchable_class, term, column: @text_columns)
+            default_values =
+                default_finder(@searchable_class,
+                               term,
+                               page: page,
+                               column: @text_columns,
+                               case_sensitive: @case_sensitive.nil? ? options[:case_sensitive] : @case_sensitive)
+            total_count =
+                default_count(@searchable_class,
+                              term,
+                              column: @text_columns,
+                              case_sensitive: @case_sensitive.nil? ? options[:case_sensitive] : @case_sensitive)
             {
                 items: default_values.map do |default_value|
                   get_select2_hash(
@@ -18,7 +27,7 @@ module AutoSelect2
                       @text_columns
                   )
                 end,
-                total: default_count
+                total: total_count
             }
           else
             options[:id_column] = @id_column
@@ -49,6 +58,10 @@ module AutoSelect2
           @select2_hash_method = method_sym
         end
 
+        def case_sensitive(casi)
+          @case_sensitive = casi
+        end
+
         def raise_not_implemented
           raise NotImplementedError,
                 'You need to implement your own SearchAdapter. Use: `rails generate auto_select2:search_adapter`'

data/lib/auto_select2/version.rb

@@ -1,3 +1,3 @@
 module AutoSelect2
-  VERSION = '0.5.3'
+  VERSION = '0.5.4'
 end

data/lib/generators/auto_select2/search_adapter_generator.rb

@@ -22,6 +22,10 @@ module AutoSelect2
                    type: :string,
                    desc: 'Instance method of model for converting into Hash for transporting into select2',
                    banner: 'to_select2'
+      class_option :case_sensitive,
+                   type: :boolean,
+                   desc: 'Is adapter request case sensitive or not',
+                   banner: 'case_sensitive'
 
       desc 'Creates SearchAdapter classes for your models'
       def create_search_adapter
@@ -48,6 +52,10 @@ module AutoSelect2
       def hash_method
         options[:hash_method]
       end
+
+      def case_sensitive
+        options[:case_sensitive]
+      end
     end
   end
 end

data/lib/generators/auto_select2/templates/search_adapter.rb.erb

@@ -3,4 +3,5 @@ class <%= name.classify %>SearchAdapter < AutoSelect2::Select2SearchAdapter::Def
   id_column :<%= id_column %>
   text_columns <%= text_columns.join(', ') %>
   <% if hash_method.present? %>hash_method :<%= hash_method %><% end %>
+  <% if case_sensitive.present? %>case_sensitive <%= case_sensitive %><% end %>
 end

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

@@ -126,12 +126,12 @@ jQuery ($) ->
     return
   initAutoAjaxSelect2()
 
-  $body = $('body')
-  $body.on 'ajaxSuccess', ->
+  $document = $(document)
+  $document.on 'ajaxSuccess', ->
     initAutoAjaxSelect2()
     return
 
-  $body.on 'cocoon:after-insert', ->
+  $document.on 'cocoon:after-insert', ->
     initAutoAjaxSelect2()
     return
   return

data/vendor/assets/javascripts/auto_select2/custom_select2.coffee

@@ -0,0 +1,14 @@
+jQuery ($) ->
+  window.initAutoCustomSelect2 = ->
+    $('input.auto-custom-select2').not('.select2-offscreen').each ->
+      $input = $(this)
+
+      s2Options = $input.data("s2-options")
+      if s2Options != undefined
+        $input.select2(s2Options)
+      return
+    return
+
+  initAutoCustomSelect2()
+
+  return

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

@@ -18,12 +18,12 @@ jQuery ($) ->
   initAutoDataSelect2()
 
 
-  $body = $('body')
-  $body.on 'ajaxSuccess', ->
+  $document = $(document)
+  $document.on 'ajaxSuccess', ->
     initAutoDataSelect2()
     return
 
-  $body.on 'cocoon:after-insert', ->
+  $document.on 'cocoon:after-insert', ->
     initAutoDataSelect2()
     return
   return

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

@@ -19,12 +19,12 @@ jQuery ($) ->
     return
   initAutoStaticSelect2()
 
-  $body = $('body')
-  $body.on 'ajaxSuccess', ->
+  $document = $(document)
+  $document.on 'ajaxSuccess', ->
     initAutoStaticSelect2()
     return
 
-  $body.on 'cocoon:after-insert', ->
+  $document.on 'cocoon:after-insert', ->
     initAutoStaticSelect2()
     return
   return

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: auto_select2
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Dmitriy Lisichkin
@@ -9,90 +9,90 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-12 00:00:00.000000000 Z
+date: 2016-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: select2-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.12
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.12
 description: |2
@@ -106,8 +106,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .gitmodules
+- ".gitignore"
+- ".gitmodules"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -126,6 +126,7 @@ files:
 - lib/generators/auto_select2/search_adapter_generator.rb
 - lib/generators/auto_select2/templates/search_adapter.rb.erb
 - vendor/assets/javascripts/auto_select2/ajax_select2.js.coffee
+- vendor/assets/javascripts/auto_select2/custom_select2.coffee
 - vendor/assets/javascripts/auto_select2/data_select2.js.coffee
 - vendor/assets/javascripts/auto_select2/multi_ajax_select2_value_parser.js.coffee
 - vendor/assets/javascripts/auto_select2/static_select2.js.coffee
@@ -139,17 +140,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Base methods for wrapping a Select2 and easy initialize it.