lookup_by 0.10.9 → 0.12.0

data/spec/internal/config/database.yml

@@ -0,0 +1,8 @@
+development:
+  adapter: postgresql
+  database: lookup_by_development
+
+# Combustion uses the "test" config even when Rails.env.development?
+test:
+  adapter: postgresql
+  database: lookup_by_<%= Rails.env %>

data/spec/internal/db/schema.rb

@@ -0,0 +1,49 @@
+ActiveRecord::Schema.define do
+  enable_extension "plpgsql"
+  enable_extension "uuid-ossp"
+  enable_extension "pgcrypto"
+
+  create_lookup_tables :cities, :states, :postal_codes, :streets, :countries
+
+  create_lookup_table :user_agents
+  create_lookup_table :email_addresses
+
+
+  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
+
+  create_lookup_table :raisins
+  create_lookup_table :read_through_raisins
+
+  create_lookup_table :unsynchronizables
+
+  enable_extension 'uuid-ossp'
+
+  execute 'CREATE SCHEMA traffic;'
+
+  create_lookup_table :paths, schema: 'traffic', id: :uuid
+
+  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
+    t.belongs_to :street
+    t.belongs_to :country
+  end
+end
+
+print 'Seeding db...'
+
+State.lookup.create(name: 'AL')
+
+puts 'done'

data/spec/internal/log/.gitignore

@@ -0,0 +1 @@
+*.log

data/spec/lookup_by_spec.rb

@@ -22,7 +22,10 @@ describe LookupBy do
   describe ".clear" do
     it "clears all lookup caches" do
       Path.lookup.cache[1] = "remove-this"
-      expect { LookupBy.clear }.to change { Path.lookup.cache.size }
+      Path.lookup.reverse["remove-this"] = "remove-this"
+
+      expect { LookupBy.clear }.to change { Path.lookup.cache.size }.
+        and change { Path.lookup.reverse.size }
     end
   end
 
@@ -75,16 +78,29 @@ describe LookupBy::Lookup::ClassMethods do
     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
+      expect(City.pluck(:city)).to eq(['Chicago'])
     end
   end
 end
 
 describe LookupBy::Lookup do
+  describe "#clear" do
+    it "clears the cache" do
+      expect(State.lookup.cache).to be_present
+      State.lookup.clear
+      expect(State.lookup.cache).to be_empty
+    end
+  end
+
+  describe "#load" do
+    it "populates the cache" do
+      State.lookup.clear
+      expect(State.lookup.cache).to be_empty
+      State.lookup.load
+      expect(State.lookup.cache).to be_present
+    end
+  end
+
   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(ArgumentError)

data/spec/rails_helper.rb

@@ -1,27 +1,20 @@
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV["RAILS_ENV"] ||= 'test'
+
+require 'combustion'
+
+Combustion.initialize! :active_record
+
 require 'spec_helper'
 
 if ENV["COVERAGE"]
   require 'simplecov'
-  require 'coveralls'
-
-  SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-    Coveralls::SimpleCov::Formatter,
-    SimpleCov::Formatter::HTMLFormatter
-  ]
 
+  SimpleCov.formatter = SimpleCov::Formatter::HTMLFormatter
   SimpleCov.start
 end
 
-begin
-  require File.expand_path("../../config/environment", __FILE__)
-rescue LoadError
-  require File.expand_path("../dummy/config/environment", __FILE__)
-end
-
 require 'pry'
-require 'rspec/its'
 require 'rspec/rails'
 
 # Requires supporting ruby files with custom matchers and macros, etc, in

data/spec/support/shared_examples_for_a_lookup.rb

@@ -8,6 +8,25 @@ shared_examples "a lookup" do
     expect(subject.is_a_lookup?).to be true
   end
 
+  it "seeds a single value" do
+    subject.seed "Missing"
+
+    expect(subject.pluck(subject.lookup.field)).to include('Missing')
+  end
+
+  it "seeds multiple values" do
+    subject.seed "New 1", "New 2"
+
+    expect(subject.pluck(subject.lookup.field)).to include('New 1', 'New 2')
+  end
+
+  it "seeds without duplicates" do
+    subject.seed "Missing", "Missing"
+    subject.seed "Missing"
+
+    expect(subject.pluck(subject.lookup.field)).to include('Missing')
+  end
+
   it "raises with no args" do
     expect { subject[] }.to raise_error ArgumentError
   end
@@ -39,6 +58,14 @@ shared_examples "a lookup" do
   it "proxies create!" do
     expect { subject.lookup.create!(name: "add to cache") }.to change(subject, :count).by(1)
   end
+
+  it "doesn't break first_or_create! called on a scope" do
+    subject.where(subject.lookup.field => "Missing").first_or_create!
+
+    subject.lookup.reload
+
+    expect(subject.pluck(subject.lookup.field)).to include("Missing")
+  end
 end
 
 shared_examples "a proxy" do
@@ -108,17 +135,11 @@ shared_examples "a strict cache" do
     expect { subject.create(name: "new") }.to_not change(subject, :count)
   end
 
-  xit "does cache .all" do
+  it "caches .all" do
     new = subject.create(name: 'add')
     expect(subject.all.to_a).not_to include(new)
   end
 
-  xit "reloads .all when called with args" do
-    new = subject.create(name: "new")
-    expect(subject.all.to_a).not_to include(new)
-    expect(subject.all({}).to_a).to include(new)
-  end
-
   it "caches .pluck" do
     subject.create(name: "pluck this")
     expect(subject.pluck(:name)).not_to include("pluck this")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lookup_by
 version: !ruby/object:Gem::Version
-  version: 0.10.9
+  version: 0.12.0
 platform: ruby
 authors:
 - Erik Peterson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-11-28 00:00:00.000000000 Z
+date: 2022-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 2.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 2.3.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -64,15 +64,16 @@ files:
 - ".travis.yml"
 - ".yardopts"
 - Appraisals
+- CHANGELOG.md
 - Gemfile
 - MIT-LICENSE
 - README.md
 - Rakefile
 - TODO.md
 - circle.yml
-- gemfiles/rails_4.0.gemfile
-- gemfiles/rails_4.1.gemfile
-- gemfiles/rails_4.2.gemfile
+- gemfiles/rails_6.0.gemfile
+- gemfiles/rails_6.1.gemfile
+- gemfiles/rails_7.0.gemfile
 - lib/lookup_by.rb
 - lib/lookup_by/association.rb
 - lib/lookup_by/cache.rb
@@ -90,46 +91,28 @@ files:
 - spec/association_spec.rb
 - spec/cache_spec.rb
 - spec/caching/lru_spec.rb
-- spec/dummy/Rakefile
-- spec/dummy/app/models/.gitkeep
-- spec/dummy/app/models/account.rb
-- spec/dummy/app/models/address.rb
-- spec/dummy/app/models/city.rb
-- spec/dummy/app/models/country.rb
-- 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
-- spec/dummy/app/models/state.rb
-- spec/dummy/app/models/status.rb
-- spec/dummy/app/models/street.rb
-- spec/dummy/app/models/uncacheable.rb
-- spec/dummy/app/models/unfindable.rb
-- spec/dummy/app/models/unsynchronizable.rb
-- spec/dummy/app/models/user_agent.rb
-- spec/dummy/bin/bundle
-- spec/dummy/bin/rails
-- spec/dummy/bin/rake
-- spec/dummy/config.ru
-- spec/dummy/config/application.rb
-- spec/dummy/config/boot.rb
-- spec/dummy/config/database.yml
-- spec/dummy/config/environment.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/filter_parameter_logging.rb
-- spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/db/migrate/20121019040009_create_tables.rb
-- spec/dummy/db/seeds.rb
-- spec/dummy/db/structure.sql
-- spec/dummy/lib/missing.rb
-- spec/dummy/log/.gitkeep
-- spec/dummy/script/rails
+- spec/internal/app/models/account.rb
+- spec/internal/app/models/address.rb
+- spec/internal/app/models/city.rb
+- spec/internal/app/models/country.rb
+- spec/internal/app/models/email_address.rb
+- spec/internal/app/models/ip_address.rb
+- spec/internal/app/models/path.rb
+- spec/internal/app/models/phone_number.rb
+- spec/internal/app/models/postal_code.rb
+- spec/internal/app/models/raisin.rb
+- spec/internal/app/models/read_through_raisin.rb
+- spec/internal/app/models/state.rb
+- spec/internal/app/models/status.rb
+- spec/internal/app/models/street.rb
+- spec/internal/app/models/uncacheable.rb
+- spec/internal/app/models/unfindable.rb
+- spec/internal/app/models/unsynchronizable.rb
+- spec/internal/app/models/user_agent.rb
+- spec/internal/config/database.yml
+- spec/internal/db/schema.rb
+- spec/internal/lib/missing.rb
+- spec/internal/log/.gitignore
 - spec/lookup_by_spec.rb
 - spec/rails_helper.rb
 - spec/rubinius_helper.rb
@@ -139,7 +122,7 @@ homepage: https://www.github.com/companygardener/lookup_by
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -154,55 +137,36 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
-signing_key: 
+rubygems_version: 3.3.11
+signing_key:
 specification_version: 4
 summary: A thread-safe lookup table cache for ActiveRecord
 test_files:
 - spec/association_spec.rb
 - spec/cache_spec.rb
 - spec/caching/lru_spec.rb
-- spec/dummy/Rakefile
-- spec/dummy/app/models/.gitkeep
-- spec/dummy/app/models/account.rb
-- spec/dummy/app/models/address.rb
-- spec/dummy/app/models/city.rb
-- spec/dummy/app/models/country.rb
-- 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
-- spec/dummy/app/models/state.rb
-- spec/dummy/app/models/status.rb
-- spec/dummy/app/models/street.rb
-- spec/dummy/app/models/uncacheable.rb
-- spec/dummy/app/models/unfindable.rb
-- spec/dummy/app/models/unsynchronizable.rb
-- spec/dummy/app/models/user_agent.rb
-- spec/dummy/bin/bundle
-- spec/dummy/bin/rails
-- spec/dummy/bin/rake
-- spec/dummy/config.ru
-- spec/dummy/config/application.rb
-- spec/dummy/config/boot.rb
-- spec/dummy/config/database.yml
-- spec/dummy/config/environment.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/filter_parameter_logging.rb
-- spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/db/migrate/20121019040009_create_tables.rb
-- spec/dummy/db/seeds.rb
-- spec/dummy/db/structure.sql
-- spec/dummy/lib/missing.rb
-- spec/dummy/log/.gitkeep
-- spec/dummy/script/rails
+- spec/internal/app/models/account.rb
+- spec/internal/app/models/address.rb
+- spec/internal/app/models/city.rb
+- spec/internal/app/models/country.rb
+- spec/internal/app/models/email_address.rb
+- spec/internal/app/models/ip_address.rb
+- spec/internal/app/models/path.rb
+- spec/internal/app/models/phone_number.rb
+- spec/internal/app/models/postal_code.rb
+- spec/internal/app/models/raisin.rb
+- spec/internal/app/models/read_through_raisin.rb
+- spec/internal/app/models/state.rb
+- spec/internal/app/models/status.rb
+- spec/internal/app/models/street.rb
+- spec/internal/app/models/uncacheable.rb
+- spec/internal/app/models/unfindable.rb
+- spec/internal/app/models/unsynchronizable.rb
+- spec/internal/app/models/user_agent.rb
+- spec/internal/config/database.yml
+- spec/internal/db/schema.rb
+- spec/internal/lib/missing.rb
+- spec/internal/log/.gitignore
 - spec/lookup_by_spec.rb
 - spec/rails_helper.rb
 - spec/rubinius_helper.rb

data/gemfiles/rails_4.0.gemfile

@@ -1,22 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 4.0.0"
-
-group :development, :test do
-  gem "appraisal", "~> 2.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 => "../"

data/gemfiles/rails_4.1.gemfile

@@ -1,22 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 4.1.0"
-
-group :development, :test do
-  gem "appraisal", "~> 2.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 => "../"

data/gemfiles/rails_4.2.gemfile

@@ -1,22 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "rails", "~> 4.2.0"
-
-group :development, :test do
-  gem "appraisal", "~> 2.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 => "../"

data/spec/dummy/Rakefile

@@ -1,22 +0,0 @@
-#!/usr/bin/env rake
-# Add your own tasks in files placed in lib/tasks ending in .rake,
-# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
-
-require File.expand_path('../config/application', __FILE__)
-
-Dummy::Application.load_tasks
-
-require "rspec/core/rake_task"
-RSpec::Core::RakeTask.new(:spec) do |config|
-  config.pattern = FileList["../**/*_spec.rb"]
-end
-
-task :default => :spec
-
-namespace :db do
-  namespace :test do
-    task :load_structure => :environment do
-      Rake::Task["db:seed"].invoke
-    end
-  end
-end

data/spec/dummy/bin/bundle

@@ -1,3 +0,0 @@
-#!/usr/bin/env ruby
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
-load Gem.bin_path('bundler', 'bundle')

data/spec/dummy/bin/rails

@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-APP_PATH = File.expand_path('../../config/application',  __FILE__)
-require_relative '../config/boot'
-require 'rails/commands'

data/spec/dummy/bin/rake

@@ -1,4 +0,0 @@
-#!/usr/bin/env ruby
-require_relative '../config/boot'
-require 'rake'
-Rake.application.run

data/spec/dummy/config/application.rb

@@ -1,28 +0,0 @@
-require File.expand_path('../boot', __FILE__)
-
-require 'active_record/railtie'
-
-# Require the gems listed in Gemfile, including any gems
-# you've limited to :test, :development, or :production.
-Bundler.require(:default, Rails.env)
-
-require "lookup_by"
-
-module Dummy
-  class Application < Rails::Application
-    # Settings in config/environments/* take precedence over those specified here.
-    # Application configuration should go into files in config/initializers
-    # -- all .rb files in that directory are automatically loaded.
-
-    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
-    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
-    # config.time_zone = 'Central Time (US & Canada)'
-
-    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    # config.i18n.default_locale = :de
-
-    config.active_record.schema_format = :sql
-  end
-end
-

data/spec/dummy/config/boot.rb

@@ -1,6 +0,0 @@
-# Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
-
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
-
-$:.unshift File.expand_path('../../../../lib', __FILE__)