simple_autocomplete 0.3.4 → 0.3.5

data/README.markdown

@@ -29,11 +29,17 @@ and sorts by the autocomplete field.
 `autocomplete_for` takes a third parameter, an options hash which is used in the find:
 
     autocomplete_for :user, :name, :limit => 15, :order => 'created_at DESC'
-      
-With a block you can generate any output you need (passed into render :inline):
+
+With :match option you can filter for different columns
+
+    # find and order with firstname/lastname
+    # return full_name of records for auto-completion
+    autocomplete_for :user, :full_name, :match => [:firstname, :lastname]
+
+With a block you can generate any output you need (ERB allowed):
 
     autocomplete_for :post, :title do |items|
-      items.map{|item| "#{item.title} -- #{item.id}"}.join("\n")
+      items.map{|item| "#{item.title} -- #{item.id} <%= Time.now %>"}.join("\n")
     end
 
 The items passed into the block is an ActiveRecord scope allowing further scopes to be chained:
@@ -91,8 +97,9 @@ Authors
 Inspired by DHH`s 'obstrusive' autocomplete_plugin.
 
 ###Contributors (alphabetical)
- - [Bryan Ash](http://bryan-ash.blogspot.com/)
+ - [Bryan Ash](http://bryan-ash.blogspot.com)
  - [David Leal](http://github.com/david)
+ - [mlessard](http://github.com/mlessard)
  - [Splendeo](http://www.splendeo.es)
 
 [Michael Grosser](http://pragmatig.wordpress.com)  

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.5

data/lib/simple_autocomplete.rb

@@ -2,40 +2,20 @@ module SimpleAutocomplete
   VERSION = File.read( File.join(File.dirname(__FILE__),'..','VERSION') ).strip
 end
 
-#Example:
-#
-#  # Controller
-#  class BlogController < ApplicationController
-#    autocomplete_for :post, :title
-#  end
-#
-#  # View
-#  <%= text_field :post, title, :class => 'autocomplete', 'data-autocomplete-url'=>autocomplete_for_post_title_posts_path %>
-#
-#  #routes.rb
-#  map.resources :users, :collection => { :autocomplete_for_user_name => :get}
-#
-#  # Options
-#  By default, autocomplete_for limits the results to 10 entries,
-#  and sorts by the given field.
-#
-#  autocomplete_for takes a third parameter, an options hash to
-#  the find method used to search for the records:
-#
-#    autocomplete_for :post, :title, :limit => 15, :order => 'created_at DESC'
-#
-#  # Block
-#  with a block you can generate any output you need(passed into render :inline):
-#    autocomplete_for :post, :title do |items|
-#      items.map{|item| "#{item.title} -- #{item.id}"}.join("\n")
-#    end
+# see Readme for details
 class ActionController::Base
   def self.autocomplete_for(object, method, options = {}, &block)
+    options = options.dup
     define_method("autocomplete_for_#{object}_#{method}") do
+      methods = options.delete(:match) || [*method]
+      condition = methods.map{|m| "LOWER(#{m}) LIKE ?"} * " OR "
+      values = methods.map{|m| "%#{params[:q].to_s.downcase}%"}
+      conditions = [condition, *values]
+
       model = object.to_s.camelize.constantize
       find_options = {
-        :conditions => [ "LOWER(#{method}) LIKE ?", '%'+params[:q].to_s.downcase + '%' ],
-        :order => "#{method} ASC",
+        :conditions => conditions,
+        :order => "#{methods.first} ASC",
         :limit => 10
         }.merge!(options)
 
@@ -44,7 +24,7 @@ class ActionController::Base
       out = if block_given?
         instance_exec @items, &block
       else
-        %Q[<%= @items.map {|item| h(item.#{method})}.uniq.join("\n")%>]
+        %Q[<%= @items.map {|item| h(item.#{methods.first})}.uniq.join("\n")%>]
       end
       render :inline => out
     end
@@ -56,6 +36,7 @@ end
 # -> the auto_user_name field will be resolved to a User, using User.find_by_autocomplete_name(value)
 # -> Post has autocomplete_for('user','name')
 # -> User has find_by_autocomplete('name')
+# see Readme for more details
 class ActiveRecord::Base
   def self.autocomplete_for(model, attribute, options={})
     name = options[:name] || model.to_s.underscore
@@ -86,4 +67,4 @@ class ActiveRecord::Base
       self.first(:conditions => [ "LOWER(#{attr}) = ?", value.to_s.downcase ])
     end
   end
-end
+end

data/simple_autocomplete.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{simple_autocomplete}
-  s.version = "0.3.4"
+  s.version = "0.3.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2010-05-08}
+  s.date = %q{2010-05-12}
   s.email = %q{grosser.michael@gmail.com}
   s.extra_rdoc_files = [
     "README.markdown"

data/spec/simple_autocomplete_spec.rb

@@ -24,11 +24,7 @@ describe 'Controller extensions' do
       class UserAddress < ActiveRecord::Base
         set_table_name :users
       end
-
-      UserAddress.should_receive(:scoped).with do |options|
-        options[:conditions] == ['LOWER(full_name) LIKE ?','%hans%']
-      end
-      
+      UserAddress.should_receive(:scoped).with hash_including(:conditions => ['LOWER(full_name) LIKE ?','%hans%'])
       @c.stub!(:params).and_return :q=>'Hans'
       UsersController.autocomplete_for(:user_address,:full_name)
       @c.autocomplete_for_user_address_full_name
@@ -56,6 +52,28 @@ describe 'Controller extensions' do
       @c.autocomplete_for_user_name
     end
   end
+
+  describe "autocomplete with :match" do
+    before do
+      UsersController.autocomplete_for(:user, :name, :match => [:full_name, :name])
+    end
+
+    it "renders the items inline with method" do
+      @c.should_receive(:render).with {|hash| hash[:inline] =~ /@items.map \{|item| h(item.full_name)\}.uniq.join(\'\n\')/}
+      @c.autocomplete_for_user_name(:match => [:full_name, :name])
+    end
+
+    it "orders ASC by match" do
+      User.should_receive(:scoped).with(hash_including(:order => 'full_name ASC'))
+      @c.autocomplete_for_user_name(:match => [:full_name, :name])
+    end
+
+    it "finds by match" do
+      @c.stub!(:params).and_return :q=>'Hans'
+      User.should_receive(:scoped).with(hash_including(:conditions => ["LOWER(full_name) LIKE ? OR LOWER(name) LIKE ?", "%hans%", "%hans%"]))
+      @c.autocomplete_for_user_name(:match => [:full_name, :name])
+    end
+  end
   
   describe "autocomplete using blocks" do
     it "evaluates the block" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 4
-  version: 0.3.4
+  - 5
+  version: 0.3.5
 platform: ruby
 authors: 
 - Michael Grosser
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-08 00:00:00 +02:00
+date: 2010-05-12 00:00:00 +02:00
 default_executable: 
 dependencies: []