rails3-jquery-autocomplete 1.0.1 → 1.0.2

data/CHANGELOG.md

@@ -1,5 +1,7 @@
 # Changelog
 
+* 1.0.2 Fixed issue #93, #94
+* 1.0.1 Formtastic 2.0 compatibility fix
 * 1.0.0 Rails 3.1 asset pipeline support
 * 0.9.1 Fixes issues #96 and #32
 * 0.9.0 Massive rewrite

data/lib/rails3-jquery-autocomplete.rb

@@ -3,6 +3,7 @@ require 'rails3-jquery-autocomplete/autocomplete'
 
 module Rails3JQueryAutocomplete
   autoload :Orm              , 'rails3-jquery-autocomplete/orm'
+  autoload :FormtasticPlugin , 'rails3-jquery-autocomplete/formtastic_plugin'
 
   unless ::Rails.version < "3.1"
     require 'rails3-jquery-autocomplete/rails/engine'

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

@@ -2,20 +2,37 @@
 # Load the formtastic plugin if using Formtastic
 begin
   require 'formtastic'
-  module Formtastic
-    module Inputs
-      class AutocompleteInput
-        include Base
-        include Base::Stringish
 
-        def to_html
-          input_wrapping do
-            label_html <<
+  if Formtastic.constants.include?(:VERSION)
+
+    #
+    # Formtastic 2.0
+    #
+
+
+    module Formtastic
+      module Inputs
+        class AutocompleteInput
+          include Base
+          include Base::Stringish
+
+          def to_html
+            input_wrapping do
+              label_html <<
               builder.autocomplete_field(method, options.delete(:url), input_html_options)
+            end
           end
         end
       end
     end
+  else
+
+    #
+    # Formtastic 1.x
+    #
+    class Formtastic::SemanticFormBuilder < ActionView::Helpers::FormBuilder
+      include Rails3JQueryAutocomplete::FormtasticPlugin
+    end
   end
 rescue LoadError
 end

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

@@ -0,0 +1,44 @@
+module Rails3JQueryAutocomplete
+  module FormtasticPlugin
+    def autocomplete_input(method, options = {})
+      if options.key?(:selected) || options.key?(:checked) || options.key?(:default)
+        ::ActiveSupport::Deprecation.warn(
+        "The :selected, :checked (and :default) options are deprecated in Formtastic and will be removed from 1.0. " <<
+        "Please set default values in your models (using an after_initialize callback) or in your controller set-up. " <<
+        "See http://api.rubyonrails.org/classes/ActiveRecord/Callbacks.html for more information.", caller)
+      end
+
+      options[:required] = method_required?(method) unless options.key?(:required)
+      options[:as]     ||= "autocompleted_string"
+
+      html_class = [ options[:as], (options[:required] ? :required : :optional) ]
+      html_class << 'error' if @object && @object.respond_to?(:errors) && !@object.errors[method.to_sym].blank?
+
+      wrapper_html = options.delete(:wrapper_html) || {}
+      wrapper_html[:id]  ||= generate_html_id(method)
+      wrapper_html[:class] = (html_class << wrapper_html[:class]).flatten.compact.join(' ')
+
+      if options[:input_html] && options[:input_html][:id]
+        options[:label_html] ||= {}
+        options[:label_html][:for] ||= options[:input_html][:id]
+      end
+
+      input_parts = self.class.inline_order.dup
+      input_parts = input_parts - [:errors, :hints] if options[:as] == :hidden
+
+      list_item_content = input_parts.map do |type|
+        send(:"inline_#{type}_for", method, options)
+      end.compact.join("\n")
+
+      return template.content_tag(:li, Formtastic::Util.html_safe(list_item_content), wrapper_html)
+    end
+
+    alias_method :autocompleted_input, :autocomplete_input
+
+
+    protected
+    def autocompleted_string_input(method, options)
+      self.label(method, options_for_label(options)) << autocomplete_field(method, options.delete(:url), options)
+    end
+  end
+end

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

@@ -40,7 +40,7 @@ module Rails3JQueryAutocomplete
       end
 
       def postgres?
-        defined?(PGConn)
+        defined?(PGconn)
       end
     end
   end

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

@@ -1,3 +1,3 @@
 module Rails3JQueryAutocomplete
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

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

@@ -1,130 +1,130 @@
 require 'test_helper'
 
 module Rails3JQueryAutocomplete
-	module Orm
-		class ActiveRecordTest < Test::Unit::TestCase
-			include Rails3JQueryAutocomplete::Orm::ActiveRecord
-
-			context "#get_autocomplete_order" do
-				context 'order is specified' do
-					should 'returns that order option' do
-						assert_equal "field ASC", get_autocomplete_order(:field, {:order => 'field ASC'})
-					end
-				end
-
-				context 'no order is specified' do
-					should 'return the order clause by the field ASC' do
-						assert_equal "field ASC", get_autocomplete_order(:field, {})
-					end	
-
-					context 'a different model is specified' do
-						should 'return the order clause by the table_name.field ASC' do
-							model = Object.new
-							mock(model).table_name { 'table_name' }
-							assert_equal "table_name.field ASC", get_autocomplete_order(:field, {}, model)
-						end	
-					end
-				end
-			end
-
-			context '#get_autocomplete_items' do
-				should 'retrieve the items from ActiveRecord' do
-					class Dog ; end
-
-					model = Dog
-					scoped = []
-					whered = []
-					term = 'query'
-					method = :field
-
-					options = {
-						:model => model,
-						:term => term,
-						:method => method,
-						:options => {}
-					}
-
-					mock(self).get_autocomplete_limit(anything) { 10 }
-					mock(self).get_autocomplete_order(anything, anything, anything) { "order ASC" }
-					mock(self).get_autocomplete_select_clause(model, method, {}) { ["field"] }
-					mock(self).get_autocomplete_where_clause(model, term, method, {}) { ["WHERE something"] }
-					mock(model).table_name.times(any_times) { 'model_table_name' }
-
-					mock(model).scoped { model }
-					mock(model).select(["field"]) { model }
-					mock(model).where(["WHERE something"]).mock!.limit(10).mock!.
-							order("order ASC") { 1 }
-
-					assert_equal 1, get_autocomplete_items(options)
-				end
-			end
-
-			context '#get_autocomplete_select_clause' do
-				setup do
-					@model = Object.new
-					mock(@model).table_name  { 'table_name' }
-					mock(@model).primary_key { 'id' }
-				end
-
-				should 'create a select clause' do
-					assert_equal ["table_name.id", "table_name.method"],
-							get_autocomplete_select_clause(@model, :method, {})
-				end
-
-				context 'with extra options' do
-					should 'return those extra fields on the clause' do
-						options = {:extra_data => ['table_name.created_at']}
-
-						assert_equal ["table_name.id", "table_name.method", "table_name.created_at"],
-								get_autocomplete_select_clause(@model, :method, options)
-					end
-				end
-			end
-
-			context '#get_autocomplete_where_clause' do
-				setup do
-					@model = Object.new
-					mock(@model).table_name  { 'table_name' }
-
-					@term = 'query'
-					@options = {}
-					@method = :method
-				end
-
-				context 'Not Postgres' do
-					should 'return options for where' do
-						mock(self).postgres? { 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 }
-						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 }
-						@options[:full] = true
-						assert_equal ["LOWER(table_name.method) LIKE ?", "%query%"], get_autocomplete_where_clause(@model, @term, @method, @options)
-					end
-				end
-			end
-
-			context '#postgres?' do
-				should 'return nil if PGConn is not defined' do
-					assert_nil self.postgres?
-				end
-
-				should 'return true if PGConn is defined' do
-					class ::PGConn ; end
-
-					assert self.postgres?
-				end
-			end
-		end
-	end
+  module Orm
+    class ActiveRecordTest < Test::Unit::TestCase
+      include Rails3JQueryAutocomplete::Orm::ActiveRecord
+
+      context "#get_autocomplete_order" do
+        context 'order is specified' do
+          should 'returns that order option' do
+            assert_equal "field ASC", get_autocomplete_order(:field, {:order => 'field ASC'})
+          end
+        end
+
+        context 'no order is specified' do
+          should 'return the order clause by the field ASC' do
+            assert_equal "field ASC", get_autocomplete_order(:field, {})
+          end
+
+          context 'a different model is specified' do
+            should 'return the order clause by the table_name.field ASC' do
+              model = Object.new
+              mock(model).table_name { 'table_name' }
+              assert_equal "table_name.field ASC", get_autocomplete_order(:field, {}, model)
+            end
+          end
+        end
+      end
+
+      context '#get_autocomplete_items' do
+        should 'retrieve the items from ActiveRecord' do
+          class Dog ; end
+
+          model = Dog
+          scoped = []
+          whered = []
+          term = 'query'
+          method = :field
+
+          options = {
+            :model => model,
+            :term => term,
+            :method => method,
+            :options => {}
+          }
+
+          mock(self).get_autocomplete_limit(anything) { 10 }
+          mock(self).get_autocomplete_order(anything, anything, anything) { "order ASC" }
+          mock(self).get_autocomplete_select_clause(model, method, {}) { ["field"] }
+          mock(self).get_autocomplete_where_clause(model, term, method, {}) { ["WHERE something"] }
+          mock(model).table_name.times(any_times) { 'model_table_name' }
+
+          mock(model).scoped { model }
+          mock(model).select(["field"]) { model }
+          mock(model).where(["WHERE something"]).mock!.limit(10).mock!.
+              order("order ASC") { 1 }
+
+          assert_equal 1, get_autocomplete_items(options)
+        end
+      end
+
+      context '#get_autocomplete_select_clause' do
+        setup do
+          @model = Object.new
+          mock(@model).table_name  { 'table_name' }
+          mock(@model).primary_key { 'id' }
+        end
+
+        should 'create a select clause' do
+          assert_equal ["table_name.id", "table_name.method"],
+              get_autocomplete_select_clause(@model, :method, {})
+        end
+
+        context 'with extra options' do
+          should 'return those extra fields on the clause' do
+            options = {:extra_data => ['table_name.created_at']}
+
+            assert_equal ["table_name.id", "table_name.method", "table_name.created_at"],
+                get_autocomplete_select_clause(@model, :method, options)
+          end
+        end
+      end
+
+      context '#get_autocomplete_where_clause' do
+        setup do
+          @model = Object.new
+          mock(@model).table_name  { 'table_name' }
+
+          @term = 'query'
+          @options = {}
+          @method = :method
+        end
+
+        context 'Not Postgres' do
+          should 'return options for where' do
+            mock(self).postgres? { 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 }
+            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 }
+            @options[:full] = true
+            assert_equal ["LOWER(table_name.method) LIKE ?", "%query%"], get_autocomplete_where_clause(@model, @term, @method, @options)
+          end
+        end
+      end
+
+      context '#postgres?' do
+        should 'return nil if PGconn is not defined' do
+          assert_nil self.postgres?
+        end
+
+        should 'return true if PGconn is defined' do
+          class ::PGconn ; end
+
+          assert self.postgres?
+        end
+      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.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-20 00:00:00.000000000Z
+date: 2011-09-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70213560903440 !ruby/object:Gem::Requirement
+  requirement: &70313670337240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70213560903440
+  version_requirements: *70313670337240
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &70213560903020 !ruby/object:Gem::Requirement
+  requirement: &70313670336720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70213560903020
+  version_requirements: *70313670336720
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70213560902380 !ruby/object:Gem::Requirement
+  requirement: &70313670336120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *70213560902380
+  version_requirements: *70313670336120
 - !ruby/object:Gem::Dependency
   name: mongo_mapper
-  requirement: &70213560901800 !ruby/object:Gem::Requirement
+  requirement: &70313670335580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70213560901800
+  version_requirements: *70313670335580
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70213560901280 !ruby/object:Gem::Requirement
+  requirement: &70313670335000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *70213560901280
+  version_requirements: *70313670335000
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70213560900720 !ruby/object:Gem::Requirement
+  requirement: &70313670334440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 2.11.1
   type: :development
   prerelease: false
-  version_requirements: *70213560900720
+  version_requirements: *70313670334440
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &70213560900300 !ruby/object:Gem::Requirement
+  requirement: &70313670333940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70213560900300
+  version_requirements: *70313670333940
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &70213560899820 !ruby/object:Gem::Requirement
+  requirement: &70313670333420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70213560899820
+  version_requirements: *70313670333420
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70213560899400 !ruby/object:Gem::Requirement
+  requirement: &70313670333000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70213560899400
+  version_requirements: *70313670333000
 description: Use jQuery's autocomplete plugin with Rails 3.
 email: david.padilla@crowdint.com
 executables: []
@@ -124,6 +124,7 @@ files:
 - lib/rails3-jquery-autocomplete/autocomplete.rb
 - lib/rails3-jquery-autocomplete/form_helper.rb
 - lib/rails3-jquery-autocomplete/formtastic.rb
+- lib/rails3-jquery-autocomplete/formtastic_plugin.rb
 - lib/rails3-jquery-autocomplete/orm/active_record.rb
 - lib/rails3-jquery-autocomplete/orm/mongo_mapper.rb
 - lib/rails3-jquery-autocomplete/orm/mongoid.rb