lookup_by 0.9.1 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f743786ef23e1404d94ab4e182d9fc4e56ebf02b
-  data.tar.gz: 544619c07c7172702cba5729e8a8c1bb80783ddf
+  metadata.gz: b7b482a9755de8d24837b3555d53cc416b77ac87
+  data.tar.gz: 087b776e7ad8c89b4fcb90a63769820c6279d81e
 SHA512:
-  metadata.gz: c5e44713f89aaca0651af41331620efec4fd7e42a9dbf2d72b2617ddb95ee77d96b8f1bcb17832a31d65365aa62af4820ed29c6b23fc84e99c262446c875af59
-  data.tar.gz: 46803218755acd5241351f1ae535a6a71b41f8adfbd0fe9d53897ea677cd11358318a134c14a5ddf61487c4f823cd9eab7a6123d36c6a5ee3b2d1e211ad7577c
+  metadata.gz: 2d728f55c1da30eb53de8d33397bb4b6fbe1c1d1b9003d03f11db296d34455c65d5a0f16058f904b298b9050cc5b86ee69d88223cb942c6ff9419dadf34e2501
+  data.tar.gz: 62479abc739d5125a2feffa8589236f4e1f83fd9a391b343bb5f49ac3510dd05293c221cb4b3521362a659804a021ce7a114556d045fc2644a223faa88a7afd9

data/.ruby-version

@@ -1 +1 @@
-ruby-2.1.2
+ruby-2.2.0

data/.travis.yml

@@ -1,9 +1,10 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.2
-  - rbx-2.2.10
+  - 1.9.3-p551
+  - 2.0.0-p598
+  - 2.1.5
+  - 2.2.0
+  - rbx-2.5.2
 services:
   - postgresql
 before_script:

data/.yardopts

@@ -0,0 +1 @@
+--markup markdown

data/Appraisals

@@ -1,7 +1,3 @@
-appraise 'rails-3.2' do
-  gem 'rails', '~> 3.2.0'
-end
-
 appraise 'rails-4.0' do
   gem 'rails', '~> 4.0.0'
 end
@@ -11,5 +7,5 @@ appraise 'rails-4.1' do
 end
 
 appraise 'rails-4.2' do
-  gem 'rails', '~> 4.2.0.beta1'
+  gem 'rails', '~> 4.2.0'
 end

data/Gemfile

@@ -6,7 +6,7 @@ source "https://rubygems.org"
 gemspec
 
 group :development, :test do
-  gem 'appraisal', '~> 1.0', require: false
+  gem 'appraisal', '~> 1.0.0', require: false
 
   gem 'rspec'
   gem 'rspec-its'

data/README.md

@@ -25,7 +25,8 @@ LookupBy is a thread-safe lookup table cache for ActiveRecord that reduces norma
 
 ### Dependencies
 
-* Rails 3.2+, _tested on Rails 3.2, 4.0, 4.1, and 4.2_
+* Rails 4.0+, _tested on Rails 4.0, 4.1, and 4.2_
+* Ruby 1.9.3+, _tested on Ruby 1.9.3, 2.0, 2.1, 2.2 and Rubinius 1.5.2_
 * PostgreSQL
 
 ### Development
@@ -64,12 +65,16 @@ Or install it manually:
 LookupBy adds two "macro" methods to `ActiveRecord::Base`
 
 ```ruby
-lookup_by :column_name
-# Defines .[], .lookup, and .is_a_lookup? class methods.
-
-lookup_for :status
-# Defines #status and #status= instance methods that transparently reference the lookup table.
-# Defines .with_status(*names) and .without_status(*names) scopes on the model.
+class ExampleLookup < ActiveRecord::Base
+  lookup_by :column_name
+  # Defines .[], .lookup, .is_a_lookup?, and .seed class methods.
+end
+  
+class ExampleObject < ActiveRecord::Base
+  lookup_for :status
+  # Defines #status and #status= instance methods that transparently reference the lookup table.
+  # Defines .with_status(*names) and .without_status(*names) scopes on the model.
+end
 ```
 
 ### Define the lookup model
@@ -98,6 +103,9 @@ class Status < ActiveRecord::Base
   lookup_by :status
 end
 
+# Seed some values
+Status.seed *%w[unpaid paid shipped]
+
 # Aliases :name to the lookup attribute
 Status.new(name: "paid")
 ```
@@ -140,6 +148,29 @@ Order.column_names
 => ["order_id", "status_id"]
 ```
 
+### Seed the lookup table
+
+```ruby
+# Find or create each argument
+Status.seed *%w[unpaid paid shipped returned]
+```
+
+### Manage lookups globally
+
+```ruby
+# Clear all caches
+LookupBy.clear
+
+# Disable all
+LookupBy.disable
+
+# Enable all, this will reload the caches
+LookupBy.enable
+
+# Reload all caches
+LookupBy.reload
+```
+
 # Configuration
 
 ### Symbolize
@@ -239,7 +270,7 @@ lookup_by :column_name
 lookup_by :column_name, cache: 20, find_or_create: true
 ```
 
-### Raise on Miss
+### Raise on miss
 
 Configure cache misses to raise a `LookupBy::RecordNotFound` error.
 

data/gemfiles/rails_4.0.gemfile

@@ -5,7 +5,7 @@ source "https://rubygems.org"
 gem "rails", "~> 4.0.0"
 
 group :development, :test do
-  gem "appraisal", "~> 1.0", :require => false
+  gem "appraisal", "~> 1.0.0", :require => false
   gem "rspec"
   gem "rspec-its"
   gem "rspec-rails"

data/gemfiles/rails_4.1.gemfile

@@ -5,7 +5,7 @@ source "https://rubygems.org"
 gem "rails", "~> 4.1.0"
 
 group :development, :test do
-  gem "appraisal", "~> 1.0", :require => false
+  gem "appraisal", "~> 1.0.0", :require => false
   gem "rspec"
   gem "rspec-its"
   gem "rspec-rails"

data/gemfiles/rails_4.2.gemfile

@@ -2,10 +2,10 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 4.2.0.beta1"
+gem "rails", "~> 4.2.0"
 
 group :development, :test do
-  gem "appraisal", "~> 1.0", :require => false
+  gem "appraisal", "~> 1.0.0", :require => false
   gem "rspec"
   gem "rspec-its"
   gem "rspec-rails"

data/lib/lookup_by/association.rb

@@ -13,6 +13,7 @@
 module LookupBy
   module Association
     module MacroMethods
+      # @see https://practicingruby.com/articles/closures-are-complicated
       def lookup_for field, options = {}
         begin
           return unless table_exists?
@@ -116,24 +117,32 @@ module LookupBy
           end
 
           def #{field}=(arg)
-            value = case arg
+            result = case arg
             when nil
               nil
             when String, Integer, IPAddr
-              #{class_name}[arg].try(:id)
+              #{class_name}[arg]
             when Symbol
               #{%Q(raise ArgumentError, "#{foreign_key}=(Symbol): use `lookup_for :column, symbolize: true` to allow symbols") unless options[:symbolize]}
-              #{class_name}[arg].try(:id)
+              #{class_name}[arg]
             when #{class_name}
-              raise ArgumentError, "self.#{foreign_key}=(#{class_name}): must be saved" unless arg.id
-              arg.id
+              raise ArgumentError, "self.#{foreign_key}=(#{class_name}): must be saved" unless arg.persisted?
+              arg
             else
               raise TypeError, "#{foreign_key}=(arg): arg must be a String, Symbol, Integer, IPAddr, nil, or #{class_name}"
             end
 
-            #{%Q(raise LookupBy::Error, "\#{arg.inspect} is not in the <#{class_name}> lookup cache" if arg.present? && value.nil?) if strict}
+            #{ %Q(raise LookupBy::Error, "\#{arg.inspect} is not in the <#{class_name}> lookup cache" if arg.present? && result.nil?) if strict }
 
-            self.#{foreign_key} = value
+            if result.blank?
+              self.#{foreign_key} = nil
+            elsif result.persisted?
+              self.#{foreign_key} = result.id
+            elsif lookup_errors = result.errors[:#{lookup_field}]
+              lookup_errors.each do |msg|
+                errors.add :#{field}, msg
+              end
+            end
           end
         METHODS
       end

data/lib/lookup_by/cache.rb

@@ -9,6 +9,7 @@ module LookupBy
       @primary_key_type = klass.columns_hash[@primary_key].type
       @field            = options[:field].to_sym
       @cache            = {}
+      @reverse          = {}
       @order            = options[:order] || @field
       @read             = options[:find_or_create] || options[:find]
       @write            = options[:find_or_create]
@@ -18,11 +19,13 @@ module LookupBy
       @testing          = false
       @enabled          = true
       @safe             = options[:safe] || concurrent?
+      @mutex            = Mutex.new if @safe
 
       @stats            = { db: Hash.new(0), cache: Hash.new(0) }
 
       raise ArgumentError, %Q(unknown attribute "#{@field}" for <#{klass}>) unless klass.column_names.include?(@field.to_s)
 
+      # Order matters here, some instance variables depend on prior assignments.
       case options[:cache]
       when true
         @type    = :all
@@ -35,6 +38,7 @@ module LookupBy
         @type    = :lru
         @limit   = options[:cache]
         @cache   = @safe ? Caching::SafeLRU.new(@limit) : Caching::LRU.new(@limit)
+        @reverse = @safe ? Caching::SafeLRU.new(@limit) : Caching::LRU.new(@limit)
         @read    = true
         @write ||= false
         @testing = true if Rails.env.test? && @write
@@ -53,8 +57,8 @@ module LookupBy
       clear
 
       ::ActiveRecord::Base.connection.send :log, "", "#{@klass.name} Load Cache All" do
-        @klass.order(@order).each do |i|
-          @cache[i.id] = i
+        @klass.order(@order).each do |object|
+          cache_write(object)
         end
       end
     end
@@ -65,19 +69,23 @@ module LookupBy
 
     def create(*args, &block)
       created = @klass.create(*args, &block)
-      @cache[created.id] = created if created && cache?
+
+      cache_write(created) if cache?
+
       created
     end
 
     def create!(*args, &block)
       created = @klass.create!(*args, &block)
-      @cache[created.id] = created if cache?
+
+      cache_write(created) if cache?
+
       created
     end
 
     def seed(*values)
       @klass.transaction(requires_new: true) do
-        values.each { |value| create!(@field => value) }
+        values.map { |value| @klass.where(@field => value).first_or_create! }
       end
     end
 
@@ -89,7 +97,7 @@ module LookupBy
       found = cache_read(value) if cache?
       found ||= db_read(value)  if @read || !@enabled
 
-      @cache[found.id] = found  if found && cache?
+      cache_write(found) if cache?
 
       found ||= db_write(value) if @write
 
@@ -132,13 +140,9 @@ module LookupBy
 
   private
 
+    # RAILS_ENV=test will not use the SafeLRU
     def concurrent?
-      case Rails::VERSION::MAJOR
-      when 4 then Rails.configuration.cache_classes && Rails.configuration.eager_load
-      when 3 then Rails.configuration.allow_concurrency
-      else
-        true
-      end
+      Rails.configuration.cache_classes && Rails.configuration.eager_load
     end
 
     def primary_key?(value)
@@ -154,26 +158,61 @@ module LookupBy
       @klass.new(@field => value).send(@field)
     end
 
-    def cache_read(value)
-      if primary_key?(value)
-        found = @cache[value]
-      else
-        found = @cache.values.detect { |o| o.send(@field) == value }
+
+    if Rails.env.production?
+      def cache_read(value)
+        if primary_key?(value)
+          @cache[value]
+        else
+          @reverse[value]
+        end
       end
+    else
+      def cache_read(value)
+        found = if primary_key?(value)
+          @cache[value]
+        else
+          @reverse[value]
+        end
 
-      increment :cache, found ? :hit : :miss
+        increment :cache, found ? :hit : :miss
 
-      found
+        found
+      end
     end
 
-    def db_read(value)
-      increment :db, :get
+    if Rails.env.production?
+      def db_read(value)
+        @klass.where(column_for(value) => value).first
+      end
+    else
+      def db_read(value)
+        increment :db, :get
 
-      found = @klass.where(column_for(value) => value).first
+        found = @klass.where(column_for(value) => value).first
 
-      increment :db, found ? :hit : :miss
+        increment :db, found ? :hit : :miss
 
-      found
+        found
+      end
+    end
+
+    if @safe
+      def cache_write(object)
+        return unless object
+
+        @mutex.synchronize do
+          @cache[object.id] = object
+          @reverse[object.send(@field)] = object
+        end
+      end
+    else
+      def cache_write(object)
+        return unless object
+
+        @cache[object.id] = object
+        @reverse[object.send(@field)] = object
+      end
     end
 
     def db_write(value)
@@ -182,7 +221,7 @@ module LookupBy
       return if column == @primary_key
 
       @klass.transaction(requires_new: true) do
-        @klass.create!(column => value)
+        @klass.create(column => value)
       end
     rescue ActiveRecord::RecordNotUnique
       db_read(value)

data/lib/lookup_by/lookup.rb

@@ -32,8 +32,8 @@ module LookupBy
         options.assert_valid_keys :allow_blank, :order, :cache, :normalize, :find, :find_or_create, :raise, :safe
 
         raise "#{self} already called lookup_by" if is_a? Lookup::ClassMethods
-        raise "#{self} responds_to :[], needed for lookup_by"     if respond_to? :[]
-        raise "#{self} responds_to :lookup, needed for lookup_by" if respond_to? :lookup
+        raise "#{self} responds_to .[], needed for lookup_by"     if respond_to? :[]
+        raise "#{self} responds_to .lookup, needed for lookup_by" if respond_to? :lookup
 
         extend ClassMethods
 
@@ -57,13 +57,15 @@ module LookupBy
           @lookup = Cache.new(self, options.merge(field: field))
           @lookup.reload
         end
+
+        LookupBy.register self
       end
     end
 
     module ClassMethods
       # TODO: Rails 4 needs to return a proxy object here
       def all(*args)
-        return super if Rails::VERSION::MAJOR > 3
+        return super if Rails::VERSION::MAJOR >= 4
         return super if @lookup.read_through?
         return super if args.any?
 
@@ -77,10 +79,11 @@ module LookupBy
         @lookup.cache.size
       end
 
-      def pluck(column_name)
+      def pluck(*column_names)
         return super if @lookup.read_through?
+        return super if column_names.size > 1
 
-        @lookup.cache.values.map { |o| o.send(column_name) }
+        @lookup.cache.values.map { |o| o.send(column_names.first) }
       end
 
       def [](*args)
@@ -100,6 +103,12 @@ module LookupBy
         else return args.map { |arg| self[arg] } 
         end
       end
+
+      def seed(*args)
+        super if defined?(super)
+
+        @lookup.seed *args
+      end
     end
 
     module InstanceMethods
@@ -116,6 +125,21 @@ module LookupBy
     end
 
     module SchemaMethods
+      # Create a lookup table.
+      #
+      # @example
+      #   create_lookup_table :statuses, schema: "custom", small: true
+      #
+      #   create_lookup_table :companies do |t|
+      #     t.string :short_name
+      #   end
+      #
+      # @param [Symbol] name
+      # @param [Hash] options
+      # @option options [Symbol] lookup_column Name of the lookup column.
+      # @option options [Symbol] lookup_type   Type of the lookup column, _e.g. :text, :uuid, or :inet_.
+      # @option options [String] primary_key   Name of the primary key.
+      # @option options [String] schema
       def create_lookup_table(name, options = {})
         options.symbolize_keys!
 

data/lib/lookup_by/version.rb

@@ -1,3 +1,3 @@
 module LookupBy
-  VERSION = "0.9.1"
+  VERSION = "0.10.0"
 end

data/lib/lookup_by.rb

@@ -4,6 +4,12 @@ require "lookup_by/railtie" if defined? Rails
 module LookupBy
   class Error < StandardError; end
 
+  mattr_accessor :classes
+  self.classes = []
+
+  mattr_accessor :mutex
+  self.mutex = Mutex.new
+
   UUID_REGEX    = /\A\h{8}-\h{4}-\h{4}-\h{4}-\h{12}\Z/
   UUID_REGEX_V4 = /\A\h{8}-\h{4}-4\h{3}-[89aAbB]\h{3}-\h{12}\Z/
 
@@ -16,6 +22,34 @@ module LookupBy
     autoload :LRU,       "lookup_by/caching/lru"
     autoload :SafeLRU,   "lookup_by/caching/safe_lru"
   end
+
+  class << self
+    def register(klass)
+      mutex.synchronize do
+        self.classes << klass unless classes.include?(klass)
+      end
+    end
+
+    def lookups
+      classes.map { |klass| klass.lookup }
+    end
+
+    def clear
+      lookups.each { |lookup| lookup.clear }
+    end
+
+    def disable
+      lookups.each { |lookup| lookup.disable! }
+    end
+
+    def enable
+      lookups.each { |lookup| lookup.enable! }
+    end
+
+    def reload
+      lookups.each { |lookup| lookup.reload }
+    end
+  end
 end
 
 begin

data/lookup_by.gemspec

@@ -22,8 +22,8 @@ Gem::Specification.new do |gem|
   gem.test_files     = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "rails", ">= 3.2.0"
+  gem.add_dependency "rails", ">= 4.0.0"
 
-  gem.add_development_dependency "bundler", "~> 1.3"
+  gem.add_development_dependency "bundler", ">= 1.7.0"
   gem.add_development_dependency "rake"
 end

data/spec/association_spec.rb

@@ -62,12 +62,12 @@ describe LookupBy::Association do
     it_behaves_like "a lookup for", :city
 
     it "accepts Integers" do
-      subject.city = City.where(city: "New York").first.id
+      subject.city = City["New York"].id
       expect(subject.city).to eq "New York"
     end
 
     it "rejects symbols" do
-      expect { subject.city = :'New York' }.to raise_error ArgumentError
+      expect { subject.city = :invalid }.to raise_error ArgumentError
     end
 
     it "returns strings" do
@@ -100,6 +100,8 @@ describe LookupBy::Association do
   end
 
   context "Address.lookup_for :street" do
+    it_behaves_like "a lookup for", :street
+
     it "accepts write-through values" do
       expect { subject.street = "Dearborn Street" }.to change(Street, :count)
     end
@@ -192,3 +194,18 @@ describe LookupBy::Association, 'scopes' do
     end
   end
 end
+
+context 'validation' do
+  subject { Account.new(phone_number: "invalid") }
+
+  # it { is_expected.to have(2).errors_on(:phone_number) }
+  # it { expect(subject).to have(2).errors_on(:phone_number) }
+
+  # it 'bubbles errors' do
+  #   expect(subject).to have(2).errors_on(:phone_number)
+  # end
+
+  it 'bubbles errors' do
+    expect(subject.errors[:phone_number].size).to eq(2)
+  end
+end

data/spec/dummy/app/models/account.rb

@@ -1,3 +1,5 @@
 class Account < ActiveRecord::Base
-  lookup_by :account, cache: true, find: true
+  lookup_by  :account, cache: true, find: true
+
+  lookup_for :phone_number
 end

data/spec/dummy/app/models/country.rb

@@ -1,2 +1,3 @@
 class Country < ActiveRecord::Base
+  # Empty intentionally
 end

data/spec/dummy/app/models/phone_number.rb

@@ -0,0 +1,5 @@
+class PhoneNumber < ActiveRecord::Base
+  lookup_by :phone_number, find_or_create: true, allow_blank: false
+
+  validates :phone_number, format: /\d{3}-\d{3}-\d{4}/, length: 10..11
+end

data/spec/dummy/config/application.rb

@@ -1,7 +1,5 @@
 require File.expand_path('../boot', __FILE__)
 
-# require "rails/all"
-
 require 'active_record/railtie'
 
 # Require the gems listed in Gemfile, including any gems

data/spec/dummy/config/database.yml

@@ -42,11 +42,3 @@ test:
   adapter: postgresql
   database: lookup_by_test
   username: postgres
-
-production:
-  adapter: postgresql
-  encoding: unicode
-  database: dummy_production
-  pool: 5
-  username: dummy
-  password:

data/spec/dummy/db/migrate/20121019040009_create_tables.rb

@@ -5,11 +5,13 @@ class CreateTables < ActiveRecord::Migration
     create_lookup_table :user_agents
     create_lookup_table :email_addresses
 
-    create_lookup_table :accounts
+
     create_lookup_table :statuses, small: true
 
     create_lookup_table :ip_addresses, lookup_type: :inet
 
+    create_lookup_table :phone_numbers
+
     create_lookup_table :uncacheables
     create_lookup_table :unfindables
 
@@ -24,7 +26,11 @@ class CreateTables < ActiveRecord::Migration
 
     create_lookup_table :paths, schema: 'traffic', id: :uuid
 
-    create_table :addresses, primary_key: "address_id" do |t|
+    create_lookup_table :accounts do |t|
+      t.belongs_to :phone_number
+    end
+
+    create_lookup_table :addresses do |t|
       t.belongs_to :city
       t.belongs_to :state
       t.belongs_to :postal_code

data/spec/dummy/db/structure.sql

@@ -56,7 +56,8 @@ SET default_with_oids = false;
 
 CREATE TABLE accounts (
     account_id integer NOT NULL,
-    account text NOT NULL
+    account text NOT NULL,
+    phone_number_id integer
 );
 
 
@@ -85,6 +86,7 @@ ALTER SEQUENCE accounts_account_id_seq OWNED BY accounts.account_id;
 
 CREATE TABLE addresses (
     address_id integer NOT NULL,
+    address text NOT NULL,
     city_id integer,
     state_id integer,
     postal_code_id integer,
@@ -228,6 +230,35 @@ CREATE SEQUENCE ip_addresses_ip_address_id_seq
 ALTER SEQUENCE ip_addresses_ip_address_id_seq OWNED BY ip_addresses.ip_address_id;
 
 
+--
+-- Name: phone_numbers; Type: TABLE; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE TABLE phone_numbers (
+    phone_number_id integer NOT NULL,
+    phone_number text NOT NULL
+);
+
+
+--
+-- Name: phone_numbers_phone_number_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE phone_numbers_phone_number_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+--
+-- Name: phone_numbers_phone_number_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
+--
+
+ALTER SEQUENCE phone_numbers_phone_number_id_seq OWNED BY phone_numbers.phone_number_id;
+
+
 --
 -- Name: postal_codes; Type: TABLE; Schema: public; Owner: -; Tablespace: 
 --
@@ -583,6 +614,13 @@ ALTER TABLE ONLY email_addresses ALTER COLUMN email_address_id SET DEFAULT nextv
 ALTER TABLE ONLY ip_addresses ALTER COLUMN ip_address_id SET DEFAULT nextval('ip_addresses_ip_address_id_seq'::regclass);
 
 
+--
+-- Name: phone_number_id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY phone_numbers ALTER COLUMN phone_number_id SET DEFAULT nextval('phone_numbers_phone_number_id_seq'::regclass);
+
+
 --
 -- Name: postal_code_id; Type: DEFAULT; Schema: public; Owner: -
 --
@@ -701,6 +739,14 @@ ALTER TABLE ONLY ip_addresses
     ADD CONSTRAINT ip_addresses_pkey PRIMARY KEY (ip_address_id);
 
 
+--
+-- Name: phone_numbers_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: 
+--
+
+ALTER TABLE ONLY phone_numbers
+    ADD CONSTRAINT phone_numbers_pkey PRIMARY KEY (phone_number_id);
+
+
 --
 -- Name: postal_codes_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: 
 --
@@ -800,6 +846,13 @@ SET search_path = public, pg_catalog;
 CREATE UNIQUE INDEX accounts__u_account ON accounts USING btree (account);
 
 
+--
+-- Name: addresses__u_address; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE UNIQUE INDEX addresses__u_address ON addresses USING btree (address);
+
+
 --
 -- Name: cities__u_city; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --
@@ -828,6 +881,13 @@ CREATE UNIQUE INDEX email_addresses__u_email_address ON email_addresses USING bt
 CREATE UNIQUE INDEX ip_addresses__u_ip_address ON ip_addresses USING btree (ip_address);
 
 
+--
+-- Name: phone_numbers__u_phone_number; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE UNIQUE INDEX phone_numbers__u_phone_number ON phone_numbers USING btree (phone_number);
+
+
 --
 -- Name: postal_codes__u_postal_code; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --

data/spec/lookup_by_spec.rb

@@ -1,6 +1,42 @@
 require "rails_helper"
 require "lookup_by"
 
+describe LookupBy do
+  describe ".register" do
+    it "adds its argument to .lookups" do
+      LookupBy.register(Array)
+      expect(LookupBy.classes).to include(Array)
+      LookupBy.classes.delete(Array)
+    end
+
+    it "doesn't register classes twice" do
+      LookupBy.register(Array)
+      LookupBy.register(Array)
+
+      expect(LookupBy.classes.select { |l| l == Array }.size).to eq(1)
+
+      LookupBy.classes.delete(Array)
+    end
+  end
+
+  describe ".clear" do
+    it "clears all lookup caches" do
+      Path.lookup.cache[1] = "remove-this"
+      expect { LookupBy.clear }.to change { Path.lookup.cache.size }
+    end
+  end
+
+  describe ".disable and .enable" do
+    it "affects all lookups" do
+      expect(City.lookup.enabled?).to eq(true)
+      LookupBy.disable
+      expect(City.lookup.enabled?).to eq(false)
+      LookupBy.enable
+      expect(City.lookup.enabled?).to eq(true)
+    end
+  end
+end
+
 describe ::ActiveRecord::Base do
   describe "macro methods" do
     subject { described_class }
@@ -9,26 +45,50 @@ describe ::ActiveRecord::Base do
     it { is_expected.to respond_to :is_a_lookup? }
   end
 
+  describe ".lookup_by" do
+    class CityTest < ActiveRecord::Base
+      self.table_name = "cities"
+      lookup_by :city
+    end
+
+    it "registers lookup models" do
+      expect(LookupBy.classes).to include(CityTest)
+    end
+  end
+
   describe "instance methods" do
     subject { Status.new }
 
     it { is_expected.to respond_to :name }
   end
-
 end
 
-describe LookupBy::Lookup do
-  describe "cache" do
-    it "seeds values" do
-      City.lookup.seed 'Boston'
-      City.lookup.seed 'Chicago', 'New York City'
+describe LookupBy::Lookup::ClassMethods do
+  describe "#seed" do
+    it "accepts multiple values" do
+      City.seed 'Boston'
+      City.seed 'Chicago', 'New York City'
 
-      names = City.all.map(&:name).sort
-      expect(names.sort).to eq(['Boston', 'Chicago', 'New York City'])
-      City.lookup.clear
+      expect(City.pluck(:city).sort).to eq(['Boston', 'Chicago', 'New York City'])
+    end
+
+    it "accepts duplicates" do
+      expect { City.seed 'Chicago', 'Chicago' }.not_to raise_error
+
+      if Rails::VERSION::MAJOR == 4 && Rails::VERSION::MINOR == 0
+        expect(City.pluck(:city)).to eq(['Chicago'])
+      else
+        expect(City.pluck(:name)).to eq(['Chicago'])
+      end
+    end
+
+    it "returns objects" do
+      expect(City.seed 'Chicago').to eq(City.all)
     end
   end
+end
 
+describe LookupBy::Lookup do
   context "Uncacheable.lookup_by :column, cache: true, find_or_create: true" do
     it "fails when trying to cache and write-through" do
       expect { Uncacheable }.to raise_error
@@ -83,7 +143,12 @@ describe LookupBy::Lookup do
     it_behaves_like "a strict cache"
 
     it "preloads the cache" do
-      expect(subject.lookup.cache).not_to be_empty
+      class StateTest < ActiveRecord::Base
+        self.table_name = "states"
+        lookup_by :state, cache: true
+      end
+
+      expect(StateTest.lookup.cache).not_to be_empty
     end
   end
 

data/spec/rails_helper.rb

@@ -39,8 +39,6 @@ Dir[Rails.root.join(  "../support/**/*.rb")].each { |f| require f }
 # If you are not using ActiveRecord, you can remove this line.
 ActiveRecord::Migration.maintain_test_schema! if ActiveRecord::Migration.respond_to?(:maintain_test_schema!)
 
-# ActiveRecord::Migration.maintain_test_schema! if defined?(ActiveRecord::Migration) && ActiveRecord::Migration.respond_to?(:maintain_test_schema!)
-
 RSpec.configure do |config|
   config.use_transactional_fixtures = true
 

data/spec/spec_helper.rb

@@ -15,6 +15,32 @@
 #
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
+  config.expect_with :rspec do |expectations|
+    # Enable only the newer, non-monkey-patching expect syntax.
+    # For more details, see:
+    #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
+    expectations.syntax = :expect
+  end
+
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec do |mocks|
+    # Enable only the newer, non-monkey-patching expect syntax.
+    # For more details, see:
+    #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+    mocks.syntax = :expect
+
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended.
+    mocks.verify_partial_doubles = true
+  end
+
+  # The settings below are suggested to provide a good initial experience
+  # with RSpec, but feel free to customize to your heart's content.
+
   # These two settings work together to allow you to limit a spec run
   # to individual examples or groups you care about by tagging them with
   # `:focus` metadata. When nothing is tagged with `:focus`, all examples
@@ -49,26 +75,11 @@ RSpec.configure do |config|
   # as the one that triggered the failure.
   Kernel.srand config.seed
 
-  # rspec-expectations config goes here. You can use an alternate
-  # assertion/expectation library such as wrong or the stdlib/minitest
-  # assertions if you prefer.
-  config.expect_with :rspec do |expectations|
-    # Enable only the newer, non-monkey-patching expect syntax.
-    # For more details, see:
-    #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
-    expectations.syntax = :expect
+  config.before(:each) do
+    LookupBy.reload
   end
 
-  # rspec-mocks config goes here. You can use an alternate test double
-  # library (such as bogus or mocha) by changing the `mock_with` option here.
-  config.mock_with :rspec do |mocks|
-    # Enable only the newer, non-monkey-patching expect syntax.
-    # For more details, see:
-    #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
-    mocks.syntax = :expect
-
-    # Prevents you from mocking or stubbing a method that does not exist on
-    # a real object. This is generally recommended.
-    mocks.verify_partial_doubles = true
+  config.after(:each) do
+    LookupBy.clear
   end
 end

data/spec/support/shared_examples_for_a_lookup.rb

@@ -204,7 +204,7 @@ shared_examples "a lookup for" do |field|
   end
 
   it "converts empty strings to nil" do
-    subject.send "#{field}=",  ""
+    subject.send "#{field}=", ""
     expect(subject.send(field)).to be_nil
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lookup_by
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.10.0
 platform: ruby
 authors:
 - Erik Peterson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-21 00:00:00.000000000 Z
+date: 2015-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -62,13 +62,13 @@ files:
 - ".gitignore"
 - ".ruby-version"
 - ".travis.yml"
+- ".yardopts"
 - Appraisals
 - Gemfile
 - MIT-LICENSE
 - README.md
 - Rakefile
 - TODO.md
-- gemfiles/rails_3.2.gemfile
 - gemfiles/rails_4.0.gemfile
 - gemfiles/rails_4.1.gemfile
 - gemfiles/rails_4.2.gemfile
@@ -96,6 +96,7 @@ files:
 - spec/dummy/app/models/email_address.rb
 - spec/dummy/app/models/ip_address.rb
 - spec/dummy/app/models/path.rb
+- spec/dummy/app/models/phone_number.rb
 - spec/dummy/app/models/postal_code.rb
 - spec/dummy/app/models/raisin.rb
 - spec/dummy/app/models/read_through_raisin.rb
@@ -151,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A thread-safe lookup table cache for ActiveRecord
@@ -167,6 +168,7 @@ test_files:
 - spec/dummy/app/models/email_address.rb
 - spec/dummy/app/models/ip_address.rb
 - spec/dummy/app/models/path.rb
+- spec/dummy/app/models/phone_number.rb
 - spec/dummy/app/models/postal_code.rb
 - spec/dummy/app/models/raisin.rb
 - spec/dummy/app/models/read_through_raisin.rb

data/gemfiles/rails_3.2.gemfile

@@ -1,22 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 3.2.0"
-
-group :development, :test do
-  gem "appraisal", "~> 1.0", :require => false
-  gem "rspec"
-  gem "rspec-its"
-  gem "rspec-rails"
-  gem "pg", :platform => :ruby
-  gem "activerecord-jdbcpostgresql-adapter", :platform => :jruby
-  gem "simplecov", :require => false
-  gem "coveralls", :require => false
-  gem "pry", :require => false
-  gem "colored", :require => false
-  gem "racc"
-  gem "json"
-end
-
-gemspec :path => "../"