lookup_by 0.10.9 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 355a248ab95bea93cf3a8699d345152225be7c4f
-  data.tar.gz: ce156dc5c175049034b04de0e4cee2ba4a080aea
+  metadata.gz: ecd1d5a836f7058b70e524c02a5ae22072ddcacf
+  data.tar.gz: 2cbc2fd59837ca832f04e17f20bdcf13326e2f8b
 SHA512:
-  metadata.gz: 30288404d1e8b43cb885caaeb83a71ac6cb8d557fecce56cb54ee76cc5c2e9372cc1a525384032d411bf61b1c75b228cd1f1cd41cb11f6c3c7d8422be3378cdc
-  data.tar.gz: 7186d2cfa8894e8f20ebd299eaf3f558f52efb5590b161859160fd8601e6f8381abfb3521f8cb39bc7c3243afed8f65922bcc1d06c0b5c3a12afebed2da9cbea
+  metadata.gz: 79b99b92afb52b979310de7202dec4ec171a21541606144fc36349c65db1a33b58afa1f870dff45dd61df51bff76cdc512f76ee5685742bb65281834b26e4587
+  data.tar.gz: 34468ee2bd864940cdd7e63cbc17a020a91f5afdfa6c561330e84092cd3239f34d43e19b614edd3503c53fab304aca43b66dead993a1ffe27ef78f86066fe895

data/.ruby-version

@@ -1 +1 @@
-ruby-2.3.0
+ruby-2.3.3

data/.travis.yml

@@ -1,16 +1,24 @@
 language: ruby
+
+cache:
+  bundler: true
+
 rvm:
-  - 1.9.3-p551
-  - 2.0.0
-  - 2.1.8
-  - 2.2.4
-  - 2.3.0
-  - rbx-3.19
+  - 2.2.2
+  - 2.2.5
+  - 2.3.1
+
 services:
   - postgresql
-before_script:
-  - psql -c 'create database lookup_by_test' -U postgres
+
+# Travis defaults to PostgreSQL 9.1
+addons:
+  postgresql: "9.4"
+
 script:
-  - bundle exec rake app:db:test:prepare
   - bundle exec appraisal install
   - bundle exec appraisal rake
+
+general:
+  artifacts:
+    - coverage

data/Appraisals

@@ -1,7 +1,3 @@
-appraise 'rails-4.0' do
-  gem 'rails', '~> 4.0.0'
-end
-
 appraise 'rails-4.1' do
   gem 'rails', '~> 4.1.0'
 end
@@ -9,3 +5,7 @@ end
 appraise 'rails-4.2' do
   gem 'rails', '~> 4.2.0'
 end
+
+appraise 'rails-5.0' do
+  gem 'rails', '~> 5.0.0'
+end

data/Gemfile

@@ -8,12 +8,14 @@ gemspec
 group :development, :test do
   gem 'appraisal', '~> 2.1.0', require: false
 
+  gem 'combustion'
+
   gem 'rspec'
   gem 'rspec-its'
   gem 'rspec-rails'
 
   gem "pg", platform: :ruby
-  gem "activerecord-jdbcpostgresql-adapter", platform: :jruby
+  # gem "activerecord-jdbcpostgresql-adapter", platform: :jruby
 
   gem "simplecov", require: false
   gem 'coveralls', require: false

data/README.md

@@ -19,15 +19,15 @@
 LookupBy is a thread-safe lookup table cache for ActiveRecord that reduces normalization pains.
 
 * Configurable lookup column
-* Caching (read-through, write-through, least recently used (LRU))
+* Caching (read-through, write-through, least-recently used (LRU))
 * Symbolized values
 * Normalized values, _e.g. canonicalizing UTF-8 before lookup_
 
 ### Dependencies
 
-* 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, 2.3 and Rubinius 3.19_)
-* PostgreSQL
+* Rails 4.1+ (_tested on Rails 4.1, 4.2, and 5.0_)
+* Ruby 2.2+ (_tested on Ruby 2.2, 2.3 and Rubinius 3.45_)
+* PostgreSQL 9.2+
 
 ### Development
 
@@ -41,7 +41,7 @@ LookupBy is a thread-safe lookup table cache for ActiveRecord that reduces norma
 
 Please create [Issues][] to submit bug reports and feature requests. However, I ask that you'd kindly review [these bug reporting guidelines](https://github.com/companygardener/lookup_by/wiki/Bug-Reports) first.
 
-_If you find a security bug, **_do not_** use the public issue tracker. Instead, send an email to: thecompanygardener@gmail.com._
+_If you find a security bug, **do not** use the public issue tracker. Instead, send an email to: thecompanygardener@gmail.com._
 
 # Installation
 
@@ -223,11 +223,10 @@ lookup_by :column_name
 # Cache all
 #   Use for a small finite list (e.g. status codes, US states)
 #
-#   Defaults to no read-through
-#     options[:find] = false
+#   Defaults to no read-through, e.g. options[:find] = false
 lookup_by :column_name, cache: true
 
-# Cache N (with LRU eviction)
+# Cache N records, evicting the least-recently used (LRU)
 #   Use for large sets with uneven distribution (e.g. email domain, city)
 #
 #   Requires read-through
@@ -290,7 +289,7 @@ lookup_by :column_name, cache: true, find: true, raise: true
 
 ```ruby
 # Normalize
-#   Run through the your attribute's setter
+#   Call the attribute's setter
 lookup_by :column_name, normalize: true
 ```
 
@@ -306,14 +305,11 @@ lookup_by :column_name, allow_blank: true
 
 ### Threadsafety
 
-Force the LRU to be threadsafe (used to test the SafeLRU).
-
-With Rails 4, the Safe LRU is selected automatically in production-like environments.
+Disable threadsafety using the `:safe` option.
 
 ```ruby
-# Safe
-#   Use threadsafe cache
-lookup_by :column_name, cache: 10, safe: true
+# Default: true
+lookup_by :column_name, cache: 10, safe: false
 ```
 
 # Integration

data/Rakefile

@@ -5,12 +5,30 @@ rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
 
-APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
-load 'rails/tasks/engine.rake'
+require 'combustion'
 
 Bundler::GemHelper.install_tasks
 
 require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec)
 
+desc 'Start a console'
+task :console do
+  Combustion.initialize! :active_record
+
+  ARGV.clear
+
+  ActiveRecord::Base.logger = Logger.new(STDOUT)
+
+  require 'pry'
+  Pry.start
+end
+
+namespace :db do
+  desc 'Setup db'
+  task :setup do
+    Combustion.initialize! :active_record
+  end
+end
+
 task :default => :spec

data/circle.yml

@@ -2,8 +2,10 @@ dependencies:
   post:
     - bundle exec appraisal install
 
+database:
+  override:
+    - echo "Skipping default"
+
 test:
-  pre:
-    - bundle exec rake app:db:test:prepare
   override:
     - bundle exec appraisal rake

data/gemfiles/rails_4.1.gemfile

@@ -6,11 +6,11 @@ gem "rails", "~> 4.1.0"
 
 group :development, :test do
   gem "appraisal", "~> 2.1.0", :require => false
+  gem "combustion"
   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

data/gemfiles/rails_4.2.gemfile

@@ -6,11 +6,11 @@ gem "rails", "~> 4.2.0"
 
 group :development, :test do
   gem "appraisal", "~> 2.1.0", :require => false
+  gem "combustion"
   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

data/gemfiles/{rails_4.0.gemfile → rails_5.0.gemfile}

@@ -2,15 +2,15 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 4.0.0"
+gem "rails", "~> 5.0.0"
 
 group :development, :test do
   gem "appraisal", "~> 2.1.0", :require => false
+  gem "combustion"
   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

data/lib/lookup_by.rb

@@ -1,6 +1,8 @@
 require "lookup_by/version"
 require "lookup_by/railtie" if defined? Rails
 
+require 'active_support'
+
 module LookupBy
   class Error < StandardError; end
 

data/lib/lookup_by/cache.rb

@@ -1,6 +1,7 @@
 module LookupBy
   class Cache
     attr_reader   :cache, :field, :stats
+
     attr_accessor :testing
 
     def initialize(klass, options = {})
@@ -18,7 +19,7 @@ module LookupBy
       @raise_on_miss    = options[:raise] || false
       @testing          = false
       @enabled          = true
-      @safe             = options[:safe] || concurrent?
+      @safe             = options.fetch(:safe, true)
       @mutex            = Mutex.new if @safe
 
       @stats            = { db: Hash.new(0), cache: Hash.new(0) }
@@ -51,36 +52,35 @@ module LookupBy
       end
     end
 
-    def reload
+    def load
       return unless @type == :all
 
-      clear
-
       ::ActiveRecord::Base.connection.send :log, "", "#{@klass.name} Load Cache All" do
-        @klass.order(@order).each do |object|
+        @klass.order(@order).readonly.each do |object|
           cache_write(object)
         end
       end
     end
 
+    def reload
+      clear
+      load
+    end
+
     def clear
       @cache.clear
     end
 
     def create(*args, &block)
-      created = @klass.create(*args, &block)
-
-      cache_write(created) if cache?
-
-      created
+      @klass.create(*args, &block).tap do |created|
+        cache_write(created) if cache?
+      end
     end
 
     def create!(*args, &block)
-      created = @klass.create!(*args, &block)
-
-      cache_write(created) if cache?
-
-      created
+      @klass.create!(*args, &block).tap do |created|
+        cache_write(created) if cache?
+      end
     end
 
     def seed(*values)
@@ -154,11 +154,6 @@ module LookupBy
 
   private
 
-    # RAILS_ENV=test will not use the SafeLRU
-    def concurrent?
-      Rails.configuration.cache_classes && Rails.configuration.eager_load
-    end
-
     def primary_key?(value)
       case @primary_key_type
       when :integer

data/lib/lookup_by/caching/safe_lru.rb

@@ -1,4 +1,4 @@
-# TODO: Evaluate using ThreadSafe::Hash and ThreadSafe::Array.
+# @todo: Evaluate using ThreadSafe::Hash and ThreadSafe::Array.
 
 require "mutex_m"
 

data/lib/lookup_by/lookup.rb

@@ -55,7 +55,7 @@ module LookupBy
           end
 
           @lookup = Cache.new(self, options.merge(field: field))
-          @lookup.reload
+          @lookup.load
         end
 
         LookupBy.register self
@@ -63,22 +63,36 @@ module LookupBy
     end
 
     module ClassMethods
-      # TODO: Rails 4 needs to return a proxy object here
-      def all(*args)
-        return super if Rails::VERSION::MAJOR >= 4
+      # Rails 4.1, 4.2, 5.0
+      def all
+        return super if current_scope
+
         return super if @lookup.read_through?
+        return super if @lookup.cache.empty?
         return super if @lookup.disabled?
-        return super if args.any?
 
-        @lookup.cache.values
+        relation.tap do |rel|
+          rel.instance_variable_set(:@records, @lookup.cache.values)
+          rel.instance_variable_set(:@loaded, true)
+        end
       end
 
-      def count(column_name = nil, options = {})
-        return super if @lookup.read_through?
-        return super if @lookup.disabled?
-        return super if column_name
+      if Rails::VERSION::MAJOR <= 4
+        # Rails 4.1, 4.2
+        def count(column_name = nil, options = {})
+          return super if @lookup.read_through?
+          return super if column_name
 
-        @lookup.cache.size
+          @lookup.cache.size
+        end
+      else
+        # Rails 5.0
+        def count(column_name = nil)
+          return super if @lookup.read_through?
+          return super if column_name
+
+          @lookup.cache.size
+        end
       end
 
       def pluck(*column_names)
@@ -103,7 +117,7 @@ module LookupBy
           when self    then arg
           else raise TypeError, "#{name}[*args]: args must be at least one String, Symbol, Integer, IPAddr, nil, or #{name}"
           end
-        else return args.map { |arg| self[arg] } 
+        else return args.map { |arg| self[arg] }
         end
       end
 

data/lib/lookup_by/version.rb

@@ -1,3 +1,3 @@
 module LookupBy
-  VERSION = "0.10.9"
+  VERSION = "0.11.1"
 end

data/lookup_by.gemspec

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

data/spec/association_spec.rb

@@ -113,6 +113,7 @@ describe LookupBy::Association do
     end
   end
 
+  # spec/internal/lib/missing.rb
   context "Missing.lookup_for :city" do
     it "does not raise foreign key error when table hasn't been created" do
       expect { require "missing" }.to_not raise_error