simple_autocomplete 0.3.0 → 0.3.1

data/README.markdown

@@ -10,8 +10,7 @@ As Rails plugin:
 Or As Gem:
     sudo gem install simple_autocomplete
 
-Then
-    copy javascripts/css from [example folder](http://github.com/grosser/simple_auto_complete/tree/master/example_js/) OR use your own
+Then copy javascripts/css from [example folder](http://github.com/grosser/simple_auto_complete/tree/master/example_js/) OR use your own
 
 
 Examples

data/Rakefile

@@ -15,5 +15,5 @@ begin
 
   Jeweler::GemcutterTasks.new
 rescue LoadError
-  puts "Jeweler, or one of its dependencies, is not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+  puts "Jeweler, or one of its dependencies, is not available. Install it with: sudo gem install jeweler"
 end

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/simple_autocomplete.rb

@@ -57,38 +57,33 @@ end
 # -> Post has autocomplete_for('user','name')
 # -> User has find_by_autocomplete('name')
 class ActiveRecord::Base
-  def self.autocomplete_for(model, method, options={})
+  def self.autocomplete_for(model, attribute, options={})
     name = options[:name] || model.to_s.underscore
     name = name.to_s
     model = model.to_s.camelize.constantize
 
     # is the correct finder defined <-> warn users
-    finder = "find_by_autocomplete_#{method}"
+    finder = "find_by_autocomplete_#{attribute}"
     unless model.respond_to? finder
-      raise "#{model} does not respond to #{finder}, maybe you forgot to add auto_complete_for(:#{method}) to #{model}?"
+      raise "#{model} does not respond to #{finder}, maybe you forgot to add auto_complete_for(:#{attribute}) to #{model}?"
     end
 
     #auto_user_name= "Hans"
-    define_method("auto_#{name}_#{method}=") do |value|
-      found = model.send(finder, value)
-      send("#{name}=", found)
+    define_method "auto_#{name}_#{attribute}=" do |value|
+      send "#{name}=", model.send(finder, value)
     end
 
     #auto_user_name
-    define_method("auto_#{name}_#{method}") do
-      send(name) ? send(name).send(method) : ""
+    define_method "auto_#{name}_#{attribute}" do
+      send(name).try(:send, attribute).to_s
     end
   end
 
   def self.find_by_autocomplete(attr)
-    class_eval <<-end_eval
-      def self.find_by_autocomplete_#{attr}(value)
-        return nil if value.blank?
-        self.find(
-         :first,
-         :conditions => [ "LOWER(#{attr}) = ?", value.to_s.downcase ]
-        )
-      end
-    end_eval
+    metaclass = (class << self; self; end)
+    metaclass.send(:define_method, "find_by_autocomplete_#{attr}") do |value|
+      return if value.blank?
+      self.first(:conditions => [ "LOWER(#{attr}) = ?", value.to_s.downcase ])
+    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.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2009-12-23}
+  s.date = %q{2010-03-23}
   s.email = %q{grosser.michael@gmail.com}
   s.extra_rdoc_files = [
     "README.markdown"
@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/grosser/simple_autocomplete}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Rails: Simple, customizable, unobstrusive - auto complete}
   s.test_files = [
     "spec/spec_helper.rb",

data/spec/simple_autocomplete_spec.rb

@@ -65,10 +65,16 @@ describe 'Controller extensions' do
     end
     
     it "passes found items to the block" do
+      User.delete_all
+      u1 = User.create!(:name => 'xxx')
+      User.create!(:name => 'zzz')
+      u3 = User.create!(:name => 'xxx')
+
       UsersController.autocomplete_for(:user, :name) do |items|
-        items.should == ['xx']
+        items.to_a.should =~ [u1, u3]
       end
-      User.should_receive(:find).and_return ['xx']
+
+      @c.stub!(:params).and_return :q=>'xxx'
       @c.autocomplete_for_user_name
     end
     
@@ -126,4 +132,19 @@ describe 'Model extensions' do
       p.author.should == @pete
     end
   end
+
+  describe "find_by_autocomplete_{attribute}" do
+    before do
+      Author.delete_all
+      @author = Author.create!(:name => 'john')
+    end
+
+    it "finds when possible" do
+      Author.find_by_autocomplete_name('john').should == @author
+    end
+
+    it "returns nil when nothing was found" do
+      Author.find_by_autocomplete_name('bob').should == nil
+    end
+  end
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: simple_autocomplete
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Michael Grosser
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-23 00:00:00 +01:00
+date: 2010-03-23 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -49,18 +54,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: "Rails: Simple, customizable, unobstrusive - auto complete"