rails3-jquery-autocomplete 1.0.5 → 1.0.6

data/CHANGELOG.md

@@ -1,5 +1,6 @@
 # Changelog
 
+* 1.0.6 Postgres or non-postgres queries are now determined at model level
 * 1.0.3 Fixed Formtastic 2.0 + Ruby 1.8.7 compat issue
 * 1.0.2 Fixed issue #93, #94
 * 1.0.1 Formtastic 2.0 compatibility fix

data/Rakefile

@@ -2,7 +2,6 @@ require 'bundler'
 Bundler::GemHelper.install_tasks
 
 require 'rake/testtask'
-require 'rcov/rcovtask'
 
 task :default => [:uglify, :test]
 
@@ -20,9 +19,3 @@ task :uglify do
   end
 end
 
-Rcov::RcovTask.new do |t|
-  t.libs << "test"
-  t.test_files = FileList['test/**/*_test.rb']
-  t.rcov_opts = %w{--exclude \/gems\/}
-  t.verbose = true
-end

data/lib/rails3-jquery-autocomplete/orm/active_record.rb

@@ -14,6 +14,7 @@ module Rails3JQueryAutocomplete
         method  = parameters[:method]
         options = parameters[:options]
         scopes  = Array(options[:scopes])
+        where   = options[:where]
         limit   = get_autocomplete_limit(options)
         order   = get_autocomplete_order(method, options, model)
 
@@ -25,6 +26,9 @@ module Rails3JQueryAutocomplete
         items = items.select(get_autocomplete_select_clause(model, method, options)) unless options[:full_model]
         items = items.where(get_autocomplete_where_clause(model, term, method, options)).
             limit(limit).order(order)
+        items = items.where(where) unless where.blank?
+
+        items
       end
 
       def get_autocomplete_select_clause(model, method, options)
@@ -35,12 +39,13 @@ module Rails3JQueryAutocomplete
       def get_autocomplete_where_clause(model, term, method, options)
         table_name = model.table_name
         is_full_search = options[:full]
-        like_clause = (postgres? ? 'ILIKE' : 'LIKE')
+        like_clause = (postgres?(model) ? 'ILIKE' : 'LIKE')
         ["LOWER(#{table_name}.#{method}) #{like_clause} ?", "#{(is_full_search ? '%' : '')}#{term.downcase}%"]
       end
 
-      def postgres?
-        defined?(PGconn)
+      def postgres?(model)
+        # Figure out if this particular model uses the PostgreSQL adapter
+        model.connection.class.to_s.match(/PostgreSQLAdapter/)
       end
     end
   end

data/lib/rails3-jquery-autocomplete/simple_form_plugin.rb

@@ -2,7 +2,7 @@ module SimpleForm
   module Inputs
     class AutocompleteInput < Base
       def input
-        @builder.autocomplete_field(attribute_name, options[:url], input_html_options)
+        @builder.autocomplete_field(attribute_name, options[:url], input_html_options.merge(update_elements(options[:update_elements])))
       end
 
     protected
@@ -14,6 +14,10 @@ module SimpleForm
       def has_placeholder?
         placeholder_present?
       end
+
+      def update_elements(elements)
+        {'data-update-elements' => elements.to_json}
+      end
     end
   end
 end

data/lib/rails3-jquery-autocomplete/version.rb

@@ -1,3 +1,3 @@
 module Rails3JQueryAutocomplete
-  VERSION = '1.0.5'
+  VERSION = '1.0.6'
 end

data/test/lib/rails3-jquery-autocomplete/orm/active_record_test.rb

@@ -84,7 +84,7 @@ module Rails3JQueryAutocomplete
       context '#get_autocomplete_where_clause' do
         setup do
           @model = Object.new
-          mock(@model).table_name  { 'table_name' }
+          mock(@model).table_name { 'table_name' }
 
           @term = 'query'
           @options = {}
@@ -93,21 +93,21 @@ module Rails3JQueryAutocomplete
 
         context 'Not Postgres' do
           should 'return options for where' do
-            mock(self).postgres? { false }
+            mock(self).postgres?(@model) { false }
             assert_equal ["LOWER(table_name.method) LIKE ?", "query%"], get_autocomplete_where_clause(@model, @term, @method, @options)
           end
         end
 
         context 'Postgres' do
           should 'return options for where with ILIKE' do
-            mock(self).postgres? { true }
+            mock(self).postgres?(@model) { true }
             assert_equal ["LOWER(table_name.method) ILIKE ?", "query%"], get_autocomplete_where_clause(@model, @term, @method, @options)
           end
         end
 
         context 'full search' do
           should 'return options for where with the term sourrounded by %%' do
-            mock(self).postgres? { false }
+            mock(self).postgres?(@model) { false }
             @options[:full] = true
             assert_equal ["LOWER(table_name.method) LIKE ?", "%query%"], get_autocomplete_where_clause(@model, @term, @method, @options)
           end
@@ -115,14 +115,29 @@ module Rails3JQueryAutocomplete
       end
 
       context '#postgres?' do
-        should 'return nil if PGconn is not defined' do
-          assert_nil self.postgres?
+        setup do
+          @model = stub
         end
 
-        should 'return true if PGconn is defined' do
-          class ::PGconn ; end
+        context 'the connection class is not postgres' do
+          setup do
+            mock(@model).connection { stub }
+          end
 
-          assert self.postgres?
+          should 'return nil if the connection class matches PostgreSQLAdapter' do
+            assert_nil self.postgres?(@model)
+          end
+        end
+
+        context 'the connection class matches PostgreSQLAdapter' do
+          setup do
+            class PostgreSQLAdapter; end
+            mock(@model).connection { PostgreSQLAdapter.new }
+          end
+
+          should 'return true' do
+            assert self.postgres?(@model)
+          end
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails3-jquery-autocomplete
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-16 00:00:00.000000000Z
+date: 2012-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70221319872760 !ruby/object:Gem::Requirement
+  requirement: &70131949113700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70221319872760
+  version_requirements: *70131949113700
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &70221319872200 !ruby/object:Gem::Requirement
+  requirement: &70131949113280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70221319872200
+  version_requirements: *70131949113280
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70221319871460 !ruby/object:Gem::Requirement
+  requirement: &70131949112740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *70221319871460
+  version_requirements: *70131949112740
 - !ruby/object:Gem::Dependency
   name: mongo_mapper
-  requirement: &70221319870780 !ruby/object:Gem::Requirement
+  requirement: &70131949112240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70221319870780
+  version_requirements: *70131949112240
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70221319870180 !ruby/object:Gem::Requirement
+  requirement: &70131949111780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *70221319870180
+  version_requirements: *70131949111780
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70221319869580 !ruby/object:Gem::Requirement
+  requirement: &70131949111320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 2.11.1
   type: :development
   prerelease: false
-  version_requirements: *70221319869580
+  version_requirements: *70131949111320
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &70221319869060 !ruby/object:Gem::Requirement
+  requirement: &70131949110940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70221319869060
+  version_requirements: *70131949110940
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &70221319858700 !ruby/object:Gem::Requirement
+  requirement: &70131949110480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,18 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70221319858700
-- !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &70221319858060 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70221319858060
+  version_requirements: *70131949110480
 description: Use jQuery's autocomplete plugin with Rails 3.
 email: david.padilla@crowdint.com
 executables: []
@@ -167,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Use jQuery's autocomplete plugin with Rails 3.