autocomplete_for 0.1.0 → 0.2.0

data/Gemfile

@@ -0,0 +1,7 @@
+source :gemcutter
+
+gem 'activerecord', '~> 3.0.10'
+gem 'pg'
+gem 'rake'
+gem 'jeweler'
+gem 'gemcutter'

data/Gemfile.lock

@@ -0,0 +1,35 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.0.10)
+      activesupport (= 3.0.10)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.10)
+      activemodel (= 3.0.10)
+      activesupport (= 3.0.10)
+      arel (~> 2.0.10)
+      tzinfo (~> 0.3.23)
+    activesupport (3.0.10)
+    arel (2.0.10)
+    builder (2.1.2)
+    gemcutter (0.7.0)
+    git (1.2.5)
+    i18n (0.5.0)
+    jeweler (1.6.4)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+    pg (0.11.0)
+    rake (0.8.7)
+    tzinfo (0.3.30)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 3.0.10)
+  gemcutter
+  jeweler
+  pg
+  rake

data/Rakefile

@@ -12,12 +12,13 @@ begin
     s.homepage = "http://github.com/sskirby/autocomplete_for"
     s.rubyforge_project = 'autocomplete_for'
     s.authors = ["Sean Kirby"]
-    s.add_dependency('activerecord', '~> 2.3.4')
+    s.add_dependency('activerecord', '~> 3.0.0')
     s.add_development_dependency('pg')
   end
+  Jeweler::GemcutterTasks.new
 
 rescue LoadError
-  puts "Jeweler not available. Install it with: gem install jeweler"
+  puts "Jeweler or Gemcutter not available. Install it with: gem install jeweler gemcutter"
 end
 
 desc 'Default: run unit tests.'

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/autocomplete_for.gemspec

@@ -1,60 +1,70 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{autocomplete_for}
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sean Kirby"]
-  s.date = %q{2010-09-24}
+  s.date = %q{2011-10-13}
   s.description = %q{Model-side logic for autocompleting belongs_to associations}
   s.email = %q{sskirby@gmail.com}
   s.extra_rdoc_files = [
     "README.markdown"
   ]
   s.files = [
-    ".gitignore",
-     "MIT-LICENSE",
-     "README.markdown",
-     "Rakefile",
-     "VERSION",
-     "autocomplete_for.gemspec",
-     "lib/autocomplete_for.rb",
-     "lib/autocomplete_for/autocomplete_for.rb",
-     "rails/init.rb",
-     "test/autocomplete_for_test.rb",
-     "test/database.yml",
-     "test/schema.rb",
-     "test/test_helper.rb"
+    "Gemfile",
+    "Gemfile.lock",
+    "MIT-LICENSE",
+    "README.markdown",
+    "Rakefile",
+    "VERSION",
+    "autocomplete_for.gemspec",
+    "lib/autocomplete_for.rb",
+    "lib/autocomplete_for/autocomplete_for.rb",
+    "rails/init.rb",
+    "test/autocomplete_for_test.rb",
+    "test/database.yml",
+    "test/schema.rb",
+    "test/test_helper.rb"
   ]
   s.homepage = %q{http://github.com/sskirby/autocomplete_for}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{autocomplete_for}
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Model-side logic for autocompleting belongs_to associations}
-  s.test_files = [
-    "test/schema.rb",
-     "test/autocomplete_for_test.rb",
-     "test/test_helper.rb"
-  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activerecord>, ["~> 2.3.4"])
+      s.add_runtime_dependency(%q<activerecord>, ["~> 3.0.10"])
+      s.add_runtime_dependency(%q<pg>, [">= 0"])
+      s.add_runtime_dependency(%q<rake>, [">= 0"])
+      s.add_runtime_dependency(%q<jeweler>, [">= 0"])
+      s.add_runtime_dependency(%q<gemcutter>, [">= 0"])
+      s.add_runtime_dependency(%q<activerecord>, ["~> 3.0.0"])
       s.add_development_dependency(%q<pg>, [">= 0"])
     else
-      s.add_dependency(%q<activerecord>, ["~> 2.3.4"])
+      s.add_dependency(%q<activerecord>, ["~> 3.0.10"])
+      s.add_dependency(%q<pg>, [">= 0"])
+      s.add_dependency(%q<rake>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<gemcutter>, [">= 0"])
+      s.add_dependency(%q<activerecord>, ["~> 3.0.0"])
       s.add_dependency(%q<pg>, [">= 0"])
     end
   else
-    s.add_dependency(%q<activerecord>, ["~> 2.3.4"])
+    s.add_dependency(%q<activerecord>, ["~> 3.0.10"])
+    s.add_dependency(%q<pg>, [">= 0"])
+    s.add_dependency(%q<rake>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<gemcutter>, [">= 0"])
+    s.add_dependency(%q<activerecord>, ["~> 3.0.0"])
     s.add_dependency(%q<pg>, [">= 0"])
   end
 end

data/lib/autocomplete_for/autocomplete_for.rb

@@ -79,18 +79,17 @@ module AutocompleteFor
       unless allow_nil 
         # we must make sure that the validate_by_customer validation runs
         # after ALL validations on autocomplete fields
-        # see rails/activesupport/lib/active_support/callbacks.rb line #208
-        # probably won't work in Rails 3
-        @validate_callbacks.delete(:"validate_by_#{association}")
-        validate :"validate_by_#{association}" 
-        
+        #skip_callback :validate, :by, :"#{association}"
+
+        validate :"validate_by_#{association}"
+
         unless instance_methods.include?("validate_by_#{association}")
 
           # def validate_by_customer
           #   self.errors.add_on_blank(:customer) unless @@customer_autocompolete_error_fields.any? {|ef| self.errors[ef]}
           # end
           define_method(:"validate_by_#{association}") do
-            self.errors.add_on_blank(:"#{association}") unless self.class.instance_variable_get(error_fields_name).any? {|ef| self.errors[ef]}
+            self.errors.add_on_blank(:"#{association}") unless self.class.instance_variable_get(error_fields_name).any? {|ef| self.errors[ef].any? }
           end
         end
       end

data/test/autocomplete_for_test.rb

@@ -49,27 +49,27 @@ class AutocompleteForTest < ActiveSupport::TestCase
     @autocomplete_for_vendor.update_attributes :vendor_name => "Not a Vendor Name"
 
     assert_nil @autocomplete_for_vendor.vendor
-    assert @autocomplete_for_vendor.errors.on(:vendor_name)
-    assert_nil @autocomplete_for_vendor.errors.on(:vendor_code)
-    assert_nil @autocomplete_for_vendor.errors.on(:vendor)
+    assert @autocomplete_for_vendor.errors[:vendor_name].any?
+    assert @autocomplete_for_vendor.errors[:vendor_code].empty?
+    assert @autocomplete_for_vendor.errors[:vendor].empty?
   end
 
   test "with blank name" do
     @autocomplete_for_vendor.update_attributes :vendor_name => ""
 
     assert_nil @autocomplete_for_vendor.vendor
-    assert @autocomplete_for_vendor.errors.on(:vendor_name)
-    assert_nil @autocomplete_for_vendor.errors.on(:vendor_code)
-    assert_nil @autocomplete_for_vendor.errors.on(:vendor)
+    assert @autocomplete_for_vendor.errors[:vendor_name].any?
+    assert @autocomplete_for_vendor.errors[:vendor_code].empty?
+    assert @autocomplete_for_vendor.errors[:vendor].empty?
   end
 
   test "with nil name" do
     @autocomplete_for_vendor.update_attributes :vendor_name => nil 
 
     assert_nil @autocomplete_for_vendor.vendor
-    assert @autocomplete_for_vendor.errors.on(:vendor)
-    assert_nil @autocomplete_for_vendor.errors.on(:vendor_code)
-    assert_nil @autocomplete_for_vendor.errors.on(:vendor_name)
+    assert_equal 1, @autocomplete_for_vendor.errors[:vendor].size, @autocomplete_for_vendor.errors[:vendor]
+    assert @autocomplete_for_vendor.errors[:vendor_code].empty?
+    assert @autocomplete_for_vendor.errors[:vendor_name].empty?
   end
 
   test "should clear existing association" do
@@ -78,10 +78,10 @@ class AutocompleteForTest < ActiveSupport::TestCase
 
     @autocomplete_for_vendor.update_attributes :vendor_name => ""
     assert_nil @autocomplete_for_vendor.vendor
-    assert @autocomplete_for_vendor.errors.on(:vendor_name)
+    assert @autocomplete_for_vendor.errors[:vendor_name].any?
 
-    assert_nil @autocomplete_for_vendor.errors.on(:vendor_code)
-    assert_nil @autocomplete_for_vendor.errors.on(:vendor)
+    assert @autocomplete_for_vendor.errors[:vendor_code].empty?
+    assert @autocomplete_for_vendor.errors[:vendor].empty?
   end
 
   test "should not clear existing association" do
@@ -98,10 +98,10 @@ class AutocompleteForTest < ActiveSupport::TestCase
 
     @autocomplete_for_vendor.update_attributes :vendor_code => ""
     assert_nil @autocomplete_for_vendor.vendor
-    assert @autocomplete_for_vendor.errors.on(:vendor_code)
+    assert @autocomplete_for_vendor.errors[:vendor_code].any?
 
-    assert_nil @autocomplete_for_vendor.errors.on(:vendor_name)
-    assert_nil @autocomplete_for_vendor.errors.on(:vendor)
+    assert @autocomplete_for_vendor.errors[:vendor_name].empty?
+    assert @autocomplete_for_vendor.errors[:vendor].empty?
   end
 
   test "allow_nil with valid name" do
@@ -114,9 +114,9 @@ class AutocompleteForTest < ActiveSupport::TestCase
     @autocomplete_for_customer.update_attributes :customer_name => "Not A Customer Name" 
 
     assert_nil @autocomplete_for_customer.customer
-    assert @autocomplete_for_customer.errors.on(:customer_name)
-    assert_nil @autocomplete_for_customer.errors.on(:customer_code)
-    assert_nil @autocomplete_for_customer.errors.on(:customer)
+    assert @autocomplete_for_customer.errors[:customer_name].any?
+    assert @autocomplete_for_customer.errors[:customer_code].empty?
+    assert @autocomplete_for_customer.errors[:customer].empty?
   end
 
   test "allow_nil with blank name" do

data/test/test_helper.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-require 'active_support'
+require 'active_support/core_ext'
 require 'active_support/test_case'
 
 require 'test/unit' 

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: autocomplete_for
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  segments_generated: true
+  version: 0.2.0
 platform: ruby
 authors: 
 - Sean Kirby
@@ -15,29 +16,58 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-24 00:00:00 -04:00
+date: 2011-10-13 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activerecord
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 19
         segments: 
-        - 2
         - 3
-        - 4
-        version: 2.3.4
+        - 0
+        - 10
+        segments_generated: true
+        version: 3.0.10
+  requirement: *id001
+  prerelease: false
   type: :runtime
-  version_requirements: *id001
+  name: activerecord
 - !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        segments_generated: true
+        version: "0"
+  requirement: *id002
+  prerelease: false
+  type: :runtime
   name: pg
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        segments_generated: true
+        version: "0"
+  requirement: *id003
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :runtime
+  name: rake
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -45,9 +75,59 @@ dependencies:
         hash: 3
         segments: 
         - 0
+        segments_generated: true
         version: "0"
+  requirement: *id004
+  prerelease: false
+  type: :runtime
+  name: jeweler
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        segments_generated: true
+        version: "0"
+  requirement: *id005
+  prerelease: false
+  type: :runtime
+  name: gemcutter
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
+        segments_generated: true
+        version: 3.0.0
+  requirement: *id006
+  prerelease: false
+  type: :runtime
+  name: activerecord
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        segments_generated: true
+        version: "0"
+  requirement: *id007
+  prerelease: false
   type: :development
-  version_requirements: *id002
+  name: pg
 description: Model-side logic for autocompleting belongs_to associations
 email: sskirby@gmail.com
 executables: []
@@ -57,7 +137,8 @@ extensions: []
 extra_rdoc_files: 
 - README.markdown
 files: 
-- .gitignore
+- Gemfile
+- Gemfile.lock
 - MIT-LICENSE
 - README.markdown
 - Rakefile
@@ -75,8 +156,8 @@ homepage: http://github.com/sskirby/autocomplete_for
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -87,6 +168,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       hash: 3
       segments: 
       - 0
+      segments_generated: true
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
@@ -96,6 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       hash: 3
       segments: 
       - 0
+      segments_generated: true
       version: "0"
 requirements: []
 
@@ -104,7 +187,5 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Model-side logic for autocompleting belongs_to associations
-test_files: 
-- test/schema.rb
-- test/autocomplete_for_test.rb
-- test/test_helper.rb
+test_files: []
+

data/.gitignore

@@ -1,5 +0,0 @@
-*.log
-*.swp
-.rvmrc
-tags
-pkg