auto_awesomplete 0.0.3 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40cc0f7e3e197e8de6d6bf81f35e886ff23a3d08
-  data.tar.gz: 05d0162800498929f5782d13fca7d35db58b2ec7
+  metadata.gz: de1d19e8705e57a160f1f213468a5b0de061b499
+  data.tar.gz: 042048a03ad6ae8b610b18e45115a472c0d5e9f1
 SHA512:
-  metadata.gz: 2dc960a1e442f20cd2d884fe69a544a527caba43ce971e0e017c1ec1b1babd693d35ecf5ff6d106d0e1fa63561cf412839ad2f935700b0ce8f2c89d51e5e3ff1
-  data.tar.gz: f31bd30434aafb95c2dffd8259599fe5c535aee00b4ec5bc3674f8b1fecdfecd24ad0db45a977347c0b4de945130cc4ff3891a0a9b3ea08f9432ce3c88192228
+  metadata.gz: c8521ce8c9f2b4c2eddfe9cd1bfe244fe8eaed5d7d764e5f89f60ca8da66d98f01073f3653542fedb91858cd348cfd4189456546280175230ead7fbf41323484
+  data.tar.gz: 7c59d0ef7ff7b1d2effd07e5da4741705e10b055b16f50c1d8bcda082de2c7347284128dbff4f7c9c25b3ebea2e5b6c04eb7f0193905cfc20eed6cf06588bf04

data/lib/auto_awesomplete/search_adapter/base.rb

@@ -17,8 +17,14 @@ module AutoAwesomplete
       private
 
         def default_finder(searched_class, term, options)
-          columns = options[:column].present? ? options[:column] : 'name'
-          conditions = default_search_conditions(term, options[:basic_conditions], columns)
+          columns = options[:columns].present? ? options[:columns] : 'name'
+          conditions =
+              default_search_conditions(
+                  term,
+                  options[:basic_conditions],
+                  columns,
+                  options.slice(:case_sensitive)
+              )
 
           if term.nil?
             [ searched_class.where(options[:basic_conditions]) ]
@@ -30,7 +36,7 @@ module AutoAwesomplete
           end
         end
 
-        def default_search_conditions(term, basic_conditions, columns)
+        def default_search_conditions(term, basic_conditions, columns, options = {})
           term_filter = ''
           conditions = []
 
@@ -45,7 +51,13 @@ module AutoAwesomplete
 
               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
             end
@@ -58,12 +70,15 @@ module AutoAwesomplete
 
         def get_awesomplete_label(item, options)
           label_method = options[:label_method]
-          text_column = options[:default_text_column]
+          text_columns = options[:default_text_columns]
+          if text_columns.is_a?(String)
+            text_columns = text_columns.split(',').map(&:squish)
+          end
 
           if label_method.present? && item.respond_to?(label_method)
             item.public_send(label_method)
-          elsif text_column.present? && text_column.is_a?(String)
-            item.attributes[text_column]
+          elsif text_columns.present?
+            text_columns.map { |attr| item.attributes[attr.to_s] }.join(' ')
           else
             item.to_s
           end

data/lib/auto_awesomplete/search_adapter/default.rb

@@ -3,17 +3,49 @@ module AutoAwesomplete
     class Default < Base
       class << self
         def search_default(term, page, options)
-          begin
-            default_arel = options[:default_class_name].camelize.constantize
-          rescue NameError
-            return {error: "not found class '#{options[:default_class_name]}'"}
+          if !@searchable || @text_columns.blank?
+            raise_not_implemented
           end
 
-          default_values = default_finder(default_arel, term, page: page, column: options[:default_text_column])
+          default_values =
+              default_finder(
+                  @searchable,
+                  term,
+                  page: page,
+                  columns: @text_columns,
+                  case_sensitive: @case_sensitive.nil? ? options[:case_sensitive] : @case_sensitive
+              )
           default_values.map do |default_value|
-            get_awesomplete_label(default_value, options)
+            get_awesomplete_label(
+                default_value,
+                default_text_columns: @text_columns,
+                label_method: @label_method
+            )
           end
         end
+
+        private
+
+        def searchable(class_or_relation)
+          @searchable = class_or_relation
+        end
+
+        def text_columns(*column_names)
+          @text_columns = column_names
+        end
+
+        def label_method(method_sym)
+          @label_method = method_sym
+        end
+
+        def case_sensitive(casi)
+          @case_sensitive = casi
+        end
+
+        def raise_not_implemented
+          raise NotImplementedError,
+                'You should implement your own SearchAdapter. Use: `rails generate auto_awesomplete:search_adapter`'
+        end
       end
     end
   end

data/lib/auto_awesomplete/version.rb

@@ -1,3 +1,3 @@
 module AutoAwesomplete
-  VERSION = '0.0.3'
+  VERSION = '0.1.0'
 end

data/lib/generators/auto_awesomplete/search_adapter_generator.rb

@@ -0,0 +1,52 @@
+module AutoAwesomplete
+  module Generators
+    class SearchAdapterGenerator < Rails::Generators::NamedBase
+      source_root File.expand_path('../templates', __FILE__)
+
+      class_option :destination_path,
+                   type: :string,
+                   default: 'app/awesomplete_search_adapters',
+                   desc: 'Path for storing SearchAdapter classes',
+                   banner: 'lib/search_adapters'
+      class_option :text_columns,
+                   type: :array,
+                   desc: 'Column for searching by',
+                   banner: 'lastname firstname',
+                   required: true
+      class_option :label_method,
+                   type: :string,
+                   desc: 'Instance method of model for converting into Hash for transporting into awesomplete',
+                   banner: 'to_awesomplete'
+      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
+        template 'search_adapter.rb.erb',
+                 "#{options[:destination_path]}/#{class_path.push(file_name).join('/')}_search_adapter.rb"
+      end
+
+      private
+
+      def text_columns
+        options[:text_columns].map do |c|
+          if c.underscore == c
+            ":#{c}"
+          else
+            "\"#{c}\""
+          end
+        end
+      end
+
+      def label_method
+        options[:label_method]
+      end
+
+      def case_sensitive
+        options[:case_sensitive]
+      end
+    end
+  end
+end

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

@@ -0,0 +1,6 @@
+class <%= name.classify %>SearchAdapter < AutoAwesomplete::SearchAdapter::Default
+  searchable <%= name.classify %>
+  text_columns <%= text_columns.join(', ') %>
+  <% if label_method.present? %>label_method :<%= label_method %><% end %>
+  <% if case_sensitive.present? %>case_sensitive <%= case_sensitive %><% end %>
+end

data/vendor/assets/javascripts/auto_awesomplete/ajax.js.coffee

@@ -32,7 +32,7 @@
 jQuery ($) ->
   autoAwesomplete.ajaxInit()
 
-  $body = $('body')
+  $body = $(document)
   $body.on 'ajaxSuccess', ->
     autoAwesomplete.ajaxInit()
     return

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: auto_awesomplete
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Dmitry Lisichkin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-07 00:00:00.000000000 Z
+date: 2016-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -93,6 +93,8 @@ files:
 - lib/auto_awesomplete/search_adapter/base.rb
 - lib/auto_awesomplete/search_adapter/default.rb
 - lib/auto_awesomplete/version.rb
+- lib/generators/auto_awesomplete/search_adapter_generator.rb
+- lib/generators/auto_awesomplete/templates/search_adapter.rb.erb
 - vendor/assets/javascripts/auto_awesomplete/ajax.js.coffee
 homepage: https://github.com/Tab10id/auto_awesomplete
 licenses: