bootstrap3_autocomplete_input 0.2.0 → 0.2.1

data/lib/bootstrap3_autocomplete_input.rb

@@ -1,24 +1,24 @@
-module Bootstrap3AutocompleteInput
-  #
-  require 'bootstrap3_autocomplete_input/rails/engine'
-end
-
-# orm
-require 'bootstrap3_autocomplete_input/orm'
-
-
-
-# extend controller
-require 'bootstrap3_autocomplete_input/controllers/autocomplete'
-
-class ActionController::Base
-  include Bootstrap3AutocompleteInput::Controllers::Autocomplete
-end
-
-# simple_form
-begin
-  require 'simple_form'
-  require 'bootstrap3_autocomplete_input/simple_form_inputs'
-
-rescue LoadError
+module Bootstrap3AutocompleteInput
+  #
+  require 'bootstrap3_autocomplete_input/rails/engine'
+end
+
+# orm
+require 'bootstrap3_autocomplete_input/orm'
+
+
+
+# extend controller
+require 'bootstrap3_autocomplete_input/controllers/autocomplete'
+
+class ActionController::Base
+  include Bootstrap3AutocompleteInput::Controllers::Autocomplete
+end
+
+# simple_form
+begin
+  require 'simple_form'
+  require 'bootstrap3_autocomplete_input/simple_form_inputs'
+
+rescue LoadError
 end

data/lib/bootstrap3_autocomplete_input/controllers/autocomplete.rb

@@ -1,73 +1,73 @@
-#require 'orm/active_record'
-
-module Bootstrap3AutocompleteInput
-  module Controllers
-
-    module Autocomplete
-      def self.included(target)
-        target.extend Bootstrap3AutocompleteInput::Controllers::Autocomplete::ClassMethods
-
-        if defined?(Mongoid::Document)
-          target.send :include, Bootstrap3AutocompleteInput::Orm::Mongoid
-        elsif defined?(MongoMapper::Document)
-          target.send :include, Bootstrap3AutocompleteInput::Orm::MongoMapper
-        else
-          target.send :include, Bootstrap3AutocompleteInput::Orm::ActiveRecord
-        end
-      end
-
-
-      module ClassMethods
-
-        def autocomplete(object, method, options = {})
-          define_method("autocomplete_#{object}_#{method}") do
-            # model
-            class_name = options[:class_name] || object
-            model = get_object(class_name)
-
-            term = '' # return ALL
-            q = params[:q]
-            q = '' if q.nil?
-
-            #
-            items = get_autocomplete_items(:model => model, :method=>method, :options => options, :q => q)
-
-            #
-            method_display_value = options[:display_value] if options.has_key?(:display_value)
-            method_display_value ||= method
-
-            method_display_id = options[:display_id] if options.has_key?(:display_id)
-            method_display_id ||= model.primary_key
-
-            data = items_to_json(items, method_display_id, method_display_value)
-            render :json => data.to_json
-          end
-        end
-      end
-
-
-      def autocomplete_option_limit(options)
-        options[:limit] ||= 10
-      end
-
-
-      # Returns parameter model_sym as a constant
-      def get_object(model_sym)
-        object = model_sym.to_s.camelize.constantize
-      end
-
-      #
-      # Returns an array of [id, name]
-      #
-      def items_to_json(items, method_display_id, method_display_value)
-        items.collect do |item|
-          v = item.send(method_display_value)
-          id = item.send(method_display_id)
-
-          [id.to_s, v.to_s]
-        end
-      end
-    end
-
-  end
-end
+#require 'orm/active_record'
+
+module Bootstrap3AutocompleteInput
+  module Controllers
+
+    module Autocomplete
+      def self.included(target)
+        target.extend Bootstrap3AutocompleteInput::Controllers::Autocomplete::ClassMethods
+
+        if defined?(Mongoid::Document)
+          target.send :include, Bootstrap3AutocompleteInput::Orm::Mongoid
+        elsif defined?(MongoMapper::Document)
+          target.send :include, Bootstrap3AutocompleteInput::Orm::MongoMapper
+        else
+          target.send :include, Bootstrap3AutocompleteInput::Orm::ActiveRecord
+        end
+      end
+
+
+      module ClassMethods
+
+        def autocomplete(object, method, options = {})
+          define_method("autocomplete_#{object}_#{method}") do
+            # model
+            class_name = options[:class_name] || object
+            model = get_object(class_name)
+
+            term = '' # return ALL
+            q = params[:q]
+            q = '' if q.nil?
+
+            #
+            items = get_autocomplete_items(:model => model, :method=>method, :options => options, :q => q)
+
+            #
+            method_display_value = options[:display_value] if options.has_key?(:display_value)
+            method_display_value ||= method
+
+            method_display_id = options[:display_id] if options.has_key?(:display_id)
+            method_display_id ||= model.primary_key
+
+            data = items_to_json(items, method_display_id, method_display_value)
+            render :json => data.to_json
+          end
+        end
+      end
+
+
+      def autocomplete_option_limit(options)
+        options[:limit] ||= 10
+      end
+
+
+      # Returns parameter model_sym as a constant
+      def get_object(model_sym)
+        object = model_sym.to_s.camelize.constantize
+      end
+
+      #
+      # Returns an array of [id, name]
+      #
+      def items_to_json(items, method_display_id, method_display_value)
+        items.collect do |item|
+          v = item.send(method_display_value)
+          id = item.send(method_display_id)
+
+          [id.to_s, v.to_s]
+        end
+      end
+    end
+
+  end
+end

data/lib/bootstrap3_autocomplete_input/orm.rb

@@ -1,7 +1,7 @@
-module Bootstrap3AutocompleteInput
-  module Orm
-    autoload :ActiveRecord , 'bootstrap3_autocomplete_input/orm/active_record'
-    autoload :Mongoid , 'bootstrap3_autocomplete_input/orm/mongoid'
-    autoload :MongoMapper , 'bootstrap3_autocomplete_input/orm/mongo_mapper'
-  end
+module Bootstrap3AutocompleteInput
+  module Orm
+    autoload :ActiveRecord , 'bootstrap3_autocomplete_input/orm/active_record'
+    autoload :Mongoid , 'bootstrap3_autocomplete_input/orm/mongoid'
+    autoload :MongoMapper , 'bootstrap3_autocomplete_input/orm/mongo_mapper'
+  end
 end

data/lib/bootstrap3_autocomplete_input/orm/active_record.rb

@@ -1,62 +1,90 @@
-module Bootstrap3AutocompleteInput
-  module Orm
-    module ActiveRecord
-      def get_autocomplete_order(column_name, options, model=nil)
-        order = options[:order]
-
-        table_prefix = model ? "#{model.table_name}." : ""
-        order || "#{table_prefix}#{column_name} ASC"
-      end
-
-      def get_autocomplete_items(parameters)
-        model   = parameters[:model]
-        term    = parameters[:q] || parameters[:term]
-
-
-        options = parameters[:options]
-
-        extra_columns = (options[:extra_columns] || []).map{|c| c.to_sym}
-        #column_name  = options[:column_name]
-        column_name = parameters[:method]
-
-        #
-        scopes  = Array(options[:scopes])
-        where   = options[:where]
-        limit   = autocomplete_option_limit(options)
-        order   = get_autocomplete_order(column_name, options, model)
-
-        items = model.all
-
-        scopes.each { |scope| items = items.send(scope) } unless scopes.empty?
-
-        items = items.select(get_autocomplete_select_clause(model, column_name, extra_columns, options)) unless options[:full_model]
-        items = items.where(get_autocomplete_where_clause(model, term, column_name, options)).
-            limit(limit).order(order)
-        items = items.where(where) unless where.blank?
-
-        items
-      end
-
-      def get_autocomplete_select_clause(model, column_name, extra_columns, options)
-        table_name = model.table_name
-        #cols = ([model.primary_key, column_name]+extra_columns).reject { |c| c.nil? || c.blank? || c.empty? }
-        cols = ([model.primary_key, column_name]).reject { |c| c.nil? || c.blank? || c.empty? }
-
-        #(["#{table_name}.#{model.primary_key}", "#{table_name}.#{column_name}"] + (options[:extra_data].blank? ? [] : options[:extra_data]))
-        cols.map{|c| "#{table_name}.#{c}"} + (options[:extra_data].blank? ? [] : options[:extra_data])
-      end
-
-      def get_autocomplete_where_clause(model, term, column_name, options)
-        table_name = model.table_name
-        is_full_search = options[:full]
-        like_clause = (postgres?(model) ? 'ILIKE' : 'LIKE')
-        ["LOWER(#{table_name}.#{column_name}) #{like_clause} ?", "#{(is_full_search ? '%' : '')}#{term.downcase}%"]
-      end
-
-      def postgres?(model)
-        # Figure out if this particular model uses the PostgreSQL adapter
-        model.connection.class.to_s.match(/PostgreSQLAdapter/)
-      end
-    end
-  end
-end
+module Bootstrap3AutocompleteInput
+  module Orm
+    module ActiveRecord
+      def get_autocomplete_order(column_name, options, model=nil)
+        order = options[:order]
+
+        table_prefix = model ? "#{model.table_name}." : ""
+        order || "#{table_prefix}#{column_name} ASC"
+      end
+
+      def get_autocomplete_items(parameters)
+        model   = parameters[:model]
+        term    = parameters[:q] || parameters[:term]
+
+
+        options = parameters[:options]
+
+        extra_columns = (options[:extra_columns] || []).map{|c| c.to_sym}
+        #column_name  = options[:column_name]
+        column_name = parameters[:method]
+
+        #
+        items = model.all
+        unless options[:full_model]
+          items = items.select(get_autocomplete_select_clause(model, column_name, extra_columns, options))
+        end
+
+        # basic where
+        items = items.where(get_autocomplete_where_clause(model, term, column_name, options))
+
+
+        # additional where
+        scopes  = Array(options[:scopes])
+        where   = options[:where]
+        where_method   = options[:where_method]
+
+        unless scopes.empty?
+          scopes.each { |scope| items = items.send(scope) }
+        end
+
+        unless where.blank?
+          items = items.where(where)
+        end
+
+
+        unless where_method.nil?
+          if respond_to?(where_method)
+            w = send(where_method)
+            if w
+              items = items.where(w)
+            end
+          end
+        end
+
+
+        # order, limit
+        limit   = autocomplete_option_limit(options)
+        order   = get_autocomplete_order(column_name, options, model)
+
+        items = items.limit(limit).order(order)
+
+        #
+        items
+      end
+
+      def get_autocomplete_select_clause(model, column_name, extra_columns, options)
+        table_name = model.table_name
+        #cols = ([model.primary_key, column_name]+extra_columns).reject { |c| c.nil? || c.blank? || c.empty? }
+        cols = ([model.primary_key, column_name]).reject { |c| c.nil? || c.blank? || c.empty? }
+
+        #(["#{table_name}.#{model.primary_key}", "#{table_name}.#{column_name}"] + (options[:extra_data].blank? ? [] : options[:extra_data]))
+        cols.map{|c| "#{table_name}.#{c}"} + (options[:extra_data].blank? ? [] : options[:extra_data])
+      end
+
+      def get_autocomplete_where_clause(model, term, column_name, options)
+        table_name = model.table_name
+
+        # basic search
+        is_full_search = options[:full]
+        like_clause = (postgres?(model) ? 'ILIKE' : 'LIKE')
+        ["LOWER(#{table_name}.#{column_name}) #{like_clause} ?", "#{(is_full_search ? '%' : '')}#{term.downcase}%"]
+      end
+
+      def postgres?(model)
+        # Figure out if this particular model uses the PostgreSQL adapter
+        model.connection.class.to_s.match(/PostgreSQLAdapter/)
+      end
+    end
+  end
+end

data/lib/bootstrap3_autocomplete_input/orm/mongo_mapper.rb

@@ -1,30 +1,30 @@
-module Bootstrap3AutocompleteInput
-	module Orm
-		module MongoMapper
-			def get_autocomplete_order(method, options, model=nil)
-        order = options[:order]
-        if order
-          order.split(',').collect do |fields|
-            sfields = fields.split
-            [sfields[0].downcase.to_sym, sfields[1].downcase.to_sym]
-          end
-        else
-          [[method.to_sym, :asc]]
-        end
-			end
-
-			def get_autocomplete_items(parameters)
-        model          = parameters[:model]
-        method         = parameters[:method]
-        options        = parameters[:options]
-        is_full_search = options[:full]
-        term           = parameters[:term]
-        limit          = autocomplete_option_limit(options)
-        order          = get_autocomplete_order(method, options)
-
-        search = (is_full_search ? '.*' : '^') + term + '.*'
-				items  = model.where(method.to_sym => /#{search}/i).limit(limit).sort(order)
-			end
-		end	
-	end
-end
+module Bootstrap3AutocompleteInput
+	module Orm
+		module MongoMapper
+			def get_autocomplete_order(method, options, model=nil)
+        order = options[:order]
+        if order
+          order.split(',').collect do |fields|
+            sfields = fields.split
+            [sfields[0].downcase.to_sym, sfields[1].downcase.to_sym]
+          end
+        else
+          [[method.to_sym, :asc]]
+        end
+			end
+
+			def get_autocomplete_items(parameters)
+        model          = parameters[:model]
+        method         = parameters[:method]
+        options        = parameters[:options]
+        is_full_search = options[:full]
+        term           = parameters[:term]
+        limit          = autocomplete_option_limit(options)
+        order          = get_autocomplete_order(method, options)
+
+        search = (is_full_search ? '.*' : '^') + term + '.*'
+				items  = model.where(method.to_sym => /#{search}/i).limit(limit).sort(order)
+			end
+		end	
+	end
+end

data/lib/bootstrap3_autocomplete_input/orm/mongoid.rb

@@ -1,44 +1,44 @@
-module Bootstrap3AutocompleteInput
-  module Orm
-    module Mongoid
-      def get_autocomplete_order(method, options, model=nil)
-        order = options[:order]
-        if order
-          order.split(',').collect do |fields|
-            sfields = fields.split
-            [sfields[0].downcase.to_sym, sfields[1].downcase.to_sym]
-          end
-        else
-          [[method.to_sym, :asc]]
-        end
-      end
-
-      def get_autocomplete_items(parameters)
-        model          = parameters[:model]
-        method         = parameters[:method]
-        options        = parameters[:options]
-        scopes         = options[:scopes]
-        is_full_search = options[:full]
-        term           = parameters[:term]
-        limit          = autocomplete_option_limit(options)
-        order          = get_autocomplete_order(method, options)
-
-        if is_full_search
-          search = '.*' + Regexp.escape(term) + '.*'
-        else
-          search = '^' + Regexp.escape(term)
-        end
-
-        items = model.where(method.to_sym => /#{search}/i).limit(limit).order_by(order)
-
-        case scopes
-          when Symbol then
-            items = items.send(scopes)
-          when Array then
-            scopes.each { |scope| items = items.send(scope) } unless scopes.empty?
-        end
-        items
-      end
-    end
-  end
-end
+module Bootstrap3AutocompleteInput
+  module Orm
+    module Mongoid
+      def get_autocomplete_order(method, options, model=nil)
+        order = options[:order]
+        if order
+          order.split(',').collect do |fields|
+            sfields = fields.split
+            [sfields[0].downcase.to_sym, sfields[1].downcase.to_sym]
+          end
+        else
+          [[method.to_sym, :asc]]
+        end
+      end
+
+      def get_autocomplete_items(parameters)
+        model          = parameters[:model]
+        method         = parameters[:method]
+        options        = parameters[:options]
+        scopes         = options[:scopes]
+        is_full_search = options[:full]
+        term           = parameters[:term]
+        limit          = autocomplete_option_limit(options)
+        order          = get_autocomplete_order(method, options)
+
+        if is_full_search
+          search = '.*' + Regexp.escape(term) + '.*'
+        else
+          search = '^' + Regexp.escape(term)
+        end
+
+        items = model.where(method.to_sym => /#{search}/i).limit(limit).order_by(order)
+
+        case scopes
+          when Symbol then
+            items = items.send(scopes)
+          when Array then
+            scopes.each { |scope| items = items.send(scope) } unless scopes.empty?
+        end
+        items
+      end
+    end
+  end
+end