autocomplete_for 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 241fb40f402bc7ad2f4fe37998e0f14ae6fbf2e3
-  data.tar.gz: 91cd4c2ce2217629c3d633bd4ec5ac551287f3be
+SHA256:
+  metadata.gz: 488cda3ef4a488f04d649f1b5fd539c65959c09093b6cac6d0409e103fc92b77
+  data.tar.gz: 61b17c4dfa2672dbf7d2681959227c28d244a8d0d48c719e7d6f421604ceea54
 SHA512:
-  metadata.gz: 2db0d664093235bf45a1288e8ca86a69a61cf81957379ac8a2a8f332f930a24172f24821777fbea06f352ec1856dea74b077397e4b737f5c40d991dc558bb57e
-  data.tar.gz: b6fd4d779346879ff4364da51ee8c81993e252b17f23041d2f43cc5cb9720df901ebe3993d3f45a1069d559eb695c70a35403c785cd13fc33ec690dd65079712
+  metadata.gz: 59a5b77031868f7de641229e20ffdb169d0f87ebc3f2fe3932e368e7763598b4f6da8117beddc177d41eed3a1c8d661cb9cfe973ccd11d01a42fd0d9a2d08f82
+  data.tar.gz: 495885e901b101bf93f6e7db78b4f4196d9a9005c2f48b259c189601c916fadffd0be86375cd4450b66b93856db3d14a1e3e3efeca2250bc02db78051d7cb064

data/Gemfile.lock

@@ -1,33 +1,131 @@
 PATH
   remote: .
   specs:
-    autocomplete_for (1.0.0)
-      activerecord (~> 5.0)
+    autocomplete_for (1.0.1)
+      activerecord (~> 5.0.1)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (5.2.0)
-      activesupport (= 5.2.0)
-    activerecord (5.2.0)
-      activemodel (= 5.2.0)
-      activesupport (= 5.2.0)
-      arel (>= 9.0)
-    activesupport (5.2.0)
+    actioncable (5.0.7)
+      actionpack (= 5.0.7)
+      nio4r (>= 1.2, < 3.0)
+      websocket-driver (~> 0.6.1)
+    actionmailer (5.0.7)
+      actionpack (= 5.0.7)
+      actionview (= 5.0.7)
+      activejob (= 5.0.7)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.0.7)
+      actionview (= 5.0.7)
+      activesupport (= 5.0.7)
+      rack (~> 2.0)
+      rack-test (~> 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.0.7)
+      activesupport (= 5.0.7)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.0.7)
+      activesupport (= 5.0.7)
+      globalid (>= 0.3.6)
+    activemodel (5.0.7)
+      activesupport (= 5.0.7)
+    activerecord (5.0.7)
+      activemodel (= 5.0.7)
+      activesupport (= 5.0.7)
+      arel (~> 7.0)
+    activesupport (5.0.7)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    arel (9.0.0)
+    arel (7.1.4)
+    builder (3.2.3)
     concurrent-ruby (1.0.5)
-    i18n (1.0.1)
+    crass (1.0.4)
+    diff-lcs (1.3)
+    erubis (2.7.0)
+    globalid (0.4.1)
+      activesupport (>= 4.2.0)
+    i18n (1.1.0)
       concurrent-ruby (~> 1.0)
+    loofah (2.2.2)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.0)
+      mini_mime (>= 0.1.1)
+    method_source (0.9.0)
+    mini_mime (1.0.1)
+    mini_portile2 (2.3.0)
     minitest (5.11.3)
-    pg (1.0.0)
+    nio4r (2.3.1)
+    nokogiri (1.8.4)
+      mini_portile2 (~> 2.3.0)
+    pg (1.1.3)
+    rack (2.0.5)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails (5.0.7)
+      actioncable (= 5.0.7)
+      actionmailer (= 5.0.7)
+      actionpack (= 5.0.7)
+      actionview (= 5.0.7)
+      activejob (= 5.0.7)
+      activemodel (= 5.0.7)
+      activerecord (= 5.0.7)
+      activesupport (= 5.0.7)
+      bundler (>= 1.3.0)
+      railties (= 5.0.7)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (5.0.7)
+      actionpack (= 5.0.7)
+      activesupport (= 5.0.7)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
     rake (12.3.1)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.8.0)
+    rspec-rails (3.8.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
+    sprockets (3.7.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.3.13)
+    thor (0.20.0)
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
+    websocket-driver (0.6.5)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.3)
 
 PLATFORMS
   ruby
@@ -35,7 +133,10 @@ PLATFORMS
 DEPENDENCIES
   autocomplete_for!
   pg
+  rails (~> 5.0.1)
   rake
+  rspec-rails (~> 3.8)
+  sqlite3 (~> 1.3)
 
 BUNDLED WITH
    1.16.2

data/README.markdown

@@ -1,4 +1,7 @@
 ## Current Version
+
+[![Build Status](https://travis-ci.org/nulogy/autocomplete_for.svg?branch=master)](https://travis-ci.org/nulogy/autocomplete_for)
+
 This version was introduced to support Rails 5. It depends on activerecord ~> 5.0 and contains several large gem upgrades.
 This is not a backwards compatible upgrade, and introduces many breaking changes if there is no gem compatibility.
 
@@ -47,4 +50,4 @@ Errors are generated automatically if the given information does not correspond
 You can run the unit tests using `bundle exec rake test`; it assumes you have a Postgres database
 configured as per `test/database.yml` (e.g. credentials are valid, database exists).
 
-Copyright (c) 2010 Nulogy Corporation, released under the MIT license
+Copyright (c) 2018 Nulogy Corporation, released under the MIT license

data/autocomplete_for.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "autocomplete_for"
-  s.version = "1.0.0"
+  s.version = "1.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sean Kirby"]
@@ -23,12 +23,7 @@ Gem::Specification.new do |s|
     "Rakefile",
     "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"
+    "lib/autocomplete_for/autocomplete_for.rb"
   ]
   s.homepage = "http://github.com/nulogy/autocomplete_for"
   s.require_paths = ["lib"]
@@ -42,16 +37,20 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<pg>, [">= 0"])
       s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_runtime_dependency(%q<activerecord>, ["~> 5.0"])
+      s.add_runtime_dependency(%q<activerecord>, ["~> 5.0.1"])
     else
       s.add_dependency(%q<pg>, [">= 0"])
       s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<activerecord>, ["~> 5.0"])
+      s.add_dependency(%q<activerecord>, ["~> 5.0.1"])
     end
   else
     s.add_dependency(%q<pg>, [">= 0"])
     s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<activerecord>, ["~> 5.0"])
+    s.add_dependency(%q<activerecord>, ["~> 5.0.1"])
   end
+
+  s.add_development_dependency("rails", "~> 5.0.1")
+  s.add_development_dependency("rspec-rails", "~> 3.8")
+  s.add_development_dependency("sqlite3", "~> 1.3")
 end
 

data/lib/autocomplete_for/autocomplete_for.rb

@@ -22,7 +22,7 @@ module AutocompleteFor
       # def customer_name
       #   self.customer_to.name : @customer_name
       # end
-      define_method(:"#{association}_#{field}") do 
+      define_method(:"#{association}_#{field}") do
         send(association.to_sym) ? send(association.to_sym).send(field.to_sym) : instance_variable_get(:"@#{association}_#{field}")
       end
 
@@ -30,12 +30,12 @@ module AutocompleteFor
       # def validate_customer_by_name
       #   return unless @customer_name
       #   return if self.customer
-      #   return if @@customer_name_allow_nil && @customer_name == "" 
+      #   return if @@customer_name_allow_nil && @customer_name == ""
       #
-      #   self.errors.add :customer_name, "#{@customer_name} does not exist" 
+      #   self.errors.add :customer_name, "#{@customer_name} does not exist"
       # end
-      define_method(:"validate_#{association}_by_#{field}") do 
-        return unless instance_variable_get(:"@#{association}_#{field}") 
+      define_method(:"validate_#{association}_by_#{field}") do
+        return unless instance_variable_get(:"@#{association}_#{field}")
         return if send(association.to_sym)
         return if self.class.instance_variable_get(:"@#{association}_#{field}_allow_nil") && instance_variable_get(:"@#{association}_#{field}") == ""
         self.errors.add(:"#{association}_#{field}", :does_not_exist)
@@ -76,7 +76,7 @@ module AutocompleteFor
 
       instance_variable_set(error_fields_name, error_fields)
 
-      unless allow_nil 
+      unless allow_nil
         # we must make sure that the validate_by_customer validation runs
         # after ALL validations on autocomplete fields
         #skip_callback :validate, :by, :"#{association}"
@@ -89,7 +89,9 @@ module AutocompleteFor
           #   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].any? }
+            return if self.class.instance_variable_get(error_fields_name).any? {|ef| self.errors[ef].any? }
+            return unless self.send(:read_attribute_for_validation, association.to_sym).blank?
+            self.errors.add(association.to_sym, :blank, options)
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autocomplete_for
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Sean Kirby
@@ -44,14 +44,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.0.1
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.0.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.0.1
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.8'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 description: Model-side logic for autocompleting belongs_to associations
 email: sskirby@gmail.com
 executables: []
@@ -67,11 +109,6 @@ files:
 - 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
 homepage: http://github.com/nulogy/autocomplete_for
 licenses: []
 metadata: {}
@@ -91,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: autocomplete_for
-rubygems_version: 2.6.14
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 3
 summary: Model-side logic for autocompleting belongs_to associations

data/rails/init.rb

@@ -1 +0,0 @@
-require 'autocomplete_for'

data/test/autocomplete_for_test.rb

@@ -1,149 +0,0 @@
-require 'test_helper'
-
-class AutocompleteForTest < ActiveSupport::TestCase
-  load_schema
-
-  class Vendor < ActiveRecord::Base; end
-  class Customer < ActiveRecord::Base; end
-
-  class AutoCompleteForCustomerTestModel < ActiveRecord::Base
-    belongs_to :customer
-
-    autocomplete_for :customer, :name, :allow_nil => true do
-      self.customer = Customer.find(:first, :conditions => {:name => @customer_name})
-    end
-    autocomplete_for :customer, :code, :allow_nil => true do
-      self.customer = Customer.find(:first, :conditions => {:code => @customer_code})
-    end
-  end
-
-  class AutoCompleteForVendorTestModel < ActiveRecord::Base
-    belongs_to :vendor
-
-    autocomplete_for :vendor, :name do
-      self.vendor = Vendor.find(:first, :conditions => {:name => @vendor_name})
-    end
-    autocomplete_for :vendor, :code do
-      self.vendor = Vendor.find(:first, :conditions => {:code => @vendor_code})
-    end
-  end
-
-  def setup
-    Vendor.destroy_all
-    Customer.destroy_all
-    @vendor_nil_code = Vendor.create! :name => "Nil Code"
-    @vendor = Vendor.create! :name => "Vendor Name", :code => "Vendor Code"
-    @autocomplete_for_vendor = AutoCompleteForVendorTestModel.new
-
-    @customer = Customer.create! :name => "Customer Name", :code => "Customer Code"
-    @autocomplete_for_customer = AutoCompleteForCustomerTestModel.new
-  end
-
-  test "with valid name" do
-    @autocomplete_for_vendor.update_attributes! :vendor_name => @vendor.name 
-
-    assert_equal @vendor, @autocomplete_for_vendor.vendor
-  end
-  
-  test "with invalid name" do
-    @autocomplete_for_vendor.update_attributes :vendor_name => "Not a Vendor Name"
-
-    assert_nil @autocomplete_for_vendor.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[: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_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
-    @autocomplete_for_vendor.update_attributes! :vendor => @vendor
-    assert_equal @vendor, @autocomplete_for_vendor.vendor
-
-    @autocomplete_for_vendor.update_attributes :vendor_name => ""
-    assert_nil @autocomplete_for_vendor.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 "should not clear existing association" do
-    @autocomplete_for_vendor.update_attributes! :vendor => @vendor
-    assert_equal @vendor, @autocomplete_for_vendor.vendor
-
-    @autocomplete_for_vendor.update_attributes! :vendor_name => nil
-    assert_equal @vendor, @autocomplete_for_vendor.vendor
-  end
-
-  test "should clear existing association using field that can be nil" do
-    @autocomplete_for_vendor.update_attributes! :vendor => @vendor
-    assert_equal @vendor, @autocomplete_for_vendor.vendor
-
-    @autocomplete_for_vendor.update_attributes :vendor_code => ""
-    assert_nil @autocomplete_for_vendor.vendor
-    assert @autocomplete_for_vendor.errors[:vendor_code].any?
-
-    assert @autocomplete_for_vendor.errors[:vendor_name].empty?
-    assert @autocomplete_for_vendor.errors[:vendor].empty?
-  end
-
-  test "allow_nil with valid name" do
-    @autocomplete_for_customer.update_attributes! :customer_name => @customer.name 
-
-    assert_equal @customer, @autocomplete_for_customer.customer
-  end
-  
-  test "allow_nil with invalid name" do
-    @autocomplete_for_customer.update_attributes :customer_name => "Not A Customer Name" 
-
-    assert_nil @autocomplete_for_customer.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
-    @autocomplete_for_customer.update_attributes! :customer_name => "" 
-
-    assert_nil @autocomplete_for_customer.customer
-  end
-
-  test "allow_nil with nil name" do
-    @autocomplete_for_customer.update_attributes! :customer_name => nil 
-
-    assert_nil @autocomplete_for_customer.customer
-  end
-
-  test "allow_nil should clear existing association" do
-    @autocomplete_for_customer.update_attributes! :customer => @customer
-    assert_equal @customer, @autocomplete_for_customer.customer
-
-    @autocomplete_for_customer.update_attributes! :customer_name => ""
-    assert_nil @autocomplete_for_customer.customer
-  end
-
-  test "allow_nil should not clear existing association" do
-    @autocomplete_for_customer.update_attributes! :customer => @customer
-    assert_equal @customer, @autocomplete_for_customer.customer
-
-    @autocomplete_for_customer.update_attributes! :customer_name => nil
-    assert_equal @customer, @autocomplete_for_customer.customer
-  end
-end

data/test/database.yml

@@ -1,6 +0,0 @@
-postgresql:
-  adapter: postgresql
-  database: autocomplete_for_plugin_test
-  username: test
-  password: pass 
-  host: localhost

data/test/schema.rb

@@ -1,16 +0,0 @@
-ActiveRecord::Schema.define(:version => 0) do  
-  create_table :customers, :force => true do |t| 
-    t.string :name, :unique => true  
-    t.string :code, :unique => true
-  end  
-  create_table :vendors, :force => true do |t| 
-    t.string :name, :unique => true  
-    t.string :code, :unique => true
-  end  
-  create_table :auto_complete_for_customer_test_models, :force => true do |t| 
-    t.integer :customer_id  
-  end  
-  create_table :auto_complete_for_vendor_test_models, :force => true do |t| 
-    t.integer :vendor_id  
-  end  
-end 

data/test/test_helper.rb

@@ -1,21 +0,0 @@
-require 'rubygems'
-require 'active_support'
-require 'active_support/core_ext'
-require 'active_support/test_case'
-require 'yaml'
-require 'minitest' 
-require 'active_record'
-
-def load_schema 
-  config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))  
-  ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")  
-  db_adapter = ENV['DB'] || 'postgresql'
-  
-  if config[db_adapter].nil? 
-    raise "DB Adapter #{db_adapter} has no entries in database.yml."  
-  end  
-  
-  ActiveRecord::Base.establish_connection(config[db_adapter])  
-  load(File.dirname(__FILE__) + "/schema.rb")  
-  require File.dirname(__FILE__) + '/../rails/init' 
-end