rails3-jquery-autocomplete 1.0.0 → 1.0.1

data/{README.markdown → README.md}

@@ -56,7 +56,7 @@ Just add it to your app/assets/javascripts/application.js file
 
     //= require jquery
     //= require jquery_ujs
-    //= require autocomplete
+    //= require autocomplete-rails
 
 ## Upgrading from older versions
 

data/lib/rails3-jquery-autocomplete.rb

@@ -3,7 +3,6 @@ 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'
@@ -14,16 +13,7 @@ class ActionController::Base
   include Rails3JQueryAutocomplete::Autocomplete
 end
 
-#
-# Load the formtastic plugin if using Formtastic
-# TODO: Better way to load plugins
-begin
-  require 'formtastic'
-  class Formtastic::FormBuilder < ActionView::Helpers::FormBuilder
-    include Rails3JQueryAutocomplete::FormtasticPlugin
-  end
-rescue LoadError
-end
+require 'rails3-jquery-autocomplete/formtastic'
 
 begin
   require 'simple_form'

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

@@ -0,0 +1,21 @@
+#
+# 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 <<
+              builder.autocomplete_field(method, options.delete(:url), input_html_options)
+          end
+        end
+      end
+    end
+  end
+rescue LoadError
+end

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails3-jquery-autocomplete
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-09-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70272998070460 !ruby/object:Gem::Requirement
+  requirement: &70213560903440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70272998070460
+  version_requirements: *70213560903440
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &70272998069940 !ruby/object:Gem::Requirement
+  requirement: &70213560903020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70272998069940
+  version_requirements: *70213560903020
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70272998069320 !ruby/object:Gem::Requirement
+  requirement: &70213560902380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *70272998069320
+  version_requirements: *70213560902380
 - !ruby/object:Gem::Dependency
   name: mongo_mapper
-  requirement: &70272998068800 !ruby/object:Gem::Requirement
+  requirement: &70213560901800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70272998068800
+  version_requirements: *70213560901800
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70272998068200 !ruby/object:Gem::Requirement
+  requirement: &70213560901280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *70272998068200
+  version_requirements: *70213560901280
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70272998067700 !ruby/object:Gem::Requirement
+  requirement: &70213560900720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 2.11.1
   type: :development
   prerelease: false
-  version_requirements: *70272998067700
+  version_requirements: *70213560900720
 - !ruby/object:Gem::Dependency
   name: uglifier
-  requirement: &70272998067300 !ruby/object:Gem::Requirement
+  requirement: &70213560900300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70272998067300
+  version_requirements: *70213560900300
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &70272998066840 !ruby/object:Gem::Requirement
+  requirement: &70213560899820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70272998066840
+  version_requirements: *70213560899820
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70272998047460 !ruby/object:Gem::Requirement
+  requirement: &70213560899400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70272998047460
+  version_requirements: *70213560899400
 description: Use jQuery's autocomplete plugin with Rails 3.
 email: david.padilla@crowdint.com
 executables: []
@@ -123,7 +123,7 @@ files:
 - lib/generators/autocomplete/uncompressed_generator.rb
 - lib/rails3-jquery-autocomplete/autocomplete.rb
 - lib/rails3-jquery-autocomplete/form_helper.rb
-- lib/rails3-jquery-autocomplete/formtastic_plugin.rb
+- lib/rails3-jquery-autocomplete/formtastic.rb
 - lib/rails3-jquery-autocomplete/orm/active_record.rb
 - lib/rails3-jquery-autocomplete/orm/mongo_mapper.rb
 - lib/rails3-jquery-autocomplete/orm/mongoid.rb
@@ -135,7 +135,7 @@ files:
 - lib/steak/autocomplete.rb
 - CHANGELOG.md
 - LICENSE
-- README.markdown
+- README.md
 - Rakefile
 - test/form_helper_test.rb
 - test/generators/autocomplete/install_generator_test.rb

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

@@ -1,41 +0,0 @@
-module Rails3JQueryAutocomplete
-  module FormtasticPlugin
-    def autocompleted_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[: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
-
-
-    protected
-    def autocompleted_string_input(method, options)
-      self.label(method, options_for_label(options)) << autocomplete_field(method, options.delete(:url), options)
-    end
-  end
-end