lookup_by 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03729b904ce688e312634ce27fc0378510189a06
-  data.tar.gz: 1da87c9243ce001671e57a92084f82a01c0ccba7
+  metadata.gz: 7084212f990738a1e6338e73961ef7f34e3c9670
+  data.tar.gz: 2fa840e2f6e16219f66457381d92b1cc2c918a69
 SHA512:
-  metadata.gz: 940795913611bb0a21b97c15a79b847fbb1bf62c79447765991aa8d5d389bc763f242510c03a3cb9548b8db3fec36d877df60b71c6b3901a03d2323800da0939
-  data.tar.gz: e00e0708e39fe04352ea4e1f19799643e1efc9946467d3d63e86fde83225f8cff5e7ed2cef980da84b8db3450ae49a7596f28a9a7e63923be771b14c408bcd24
+  metadata.gz: 352deedc590d022c51433522225cf9237207019890fff5994be08e2492e3b4f8dedb867b9adf131716f993c5cd5b4c2bad895b3be0a91caf2f049979322c48f2
+  data.tar.gz: 4fab5916ae92cbfc4e9d89d8fc2b75742687e25e2a92eeed6d4275cccbd320ebc96da5406cf6ce25df2785334034ea55496cf2157bf8cccd61c9e193da4d05be

data/.gitignore

@@ -9,4 +9,5 @@ spec/dummy/tmp/
 spec/dummy/.sass-cache
 coverage/
 Gemfile.lock
+gemfiles/*.lock
 tags

data/.travis.yml

@@ -10,4 +10,5 @@ before_script:
   - psql -c 'create database lookup_by_test' -U postgres
 script:
   - bundle exec rake app:db:test:prepare
-  - bundle exec rake
+  - bundle exec appraisal install
+  - bundle exec appraisal rake

data/Appraisals

@@ -0,0 +1,11 @@
+appraise 'rails-3.2' do
+  gem 'rails', '~> 3.2.0'
+end
+
+appraise 'rails-4.0' do
+  gem 'rails', '~> 4.0.0'
+end
+
+appraise 'rails-4.1' do
+  gem 'rails', '~> 4.1.0'
+end

data/Gemfile

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

data/README.md

@@ -74,7 +74,7 @@ lookup_by :column_name
 
 lookup_for :status
 # Defines #status and #status= instance methods that transparently reference the lookup table.
-# Defines .with_status(name) and .with_statuses(*names) scopes on the model.
+# Defines .with_status(*names) and .without_status(*names) scopes on the model.
 ```
 
 ### Define the lookup model
@@ -244,6 +244,23 @@ lookup_by :column_name
 lookup_by :column_name, cache: 20, find_or_create: true
 ```
 
+### Raise on Miss
+
+You can configure cache misses to raise a `LookupBy::RecordNotFound` error.
+
+```ruby
+# Return nil
+#   Default
+lookup_by :column_name, cache: true
+
+# Raise if not found pre-loaded cache
+lookup_by :column_name, cache: true, raise: true
+
+# Raise if not found in DB, either
+lookup_by :column_name, cache: true, find: true, raise: true
+```
+
+
 ### Normalize values
 
 ```ruby

data/gemfiles/rails_3.2.gemfile

@@ -0,0 +1,22 @@
+# 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 "database_cleaner"
+  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.0.gemfile

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

@@ -0,0 +1,22 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 4.1.0"
+
+group :development, :test do
+  gem "appraisal", "~> 1.0", :require => false
+  gem "rspec"
+  gem "rspec-its"
+  gem "database_cleaner"
+  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/lib/lookup_by/association.rb

@@ -22,7 +22,7 @@ module LookupBy
         end
 
         options.symbolize_keys!
-        options.assert_valid_keys(:class_name, :foreign_key, :symbolize, :strict, :scope)
+        options.assert_valid_keys(:class_name, :foreign_key, :symbolize, :strict, :scope, :inverse_scope)
 
         field = field.to_sym
 
@@ -37,14 +37,30 @@ module LookupBy
         @lookups ||= []
         @lookups << field
 
-        scope_name = "with_#{field}" unless options[:scope] == false
+        scope_name =
+          if options[:scope] == false
+            nil
+          elsif !options.key?(:scope) || options[:scope] == true
+            "with_#{field}"
+          else
+            options[:scope].to_s
+          end
+
+        inverse_scope_name =
+          if options[:inverse_scope] == false
+            nil
+          elsif !options.key?(:inverse_scope) || options[:inverse_scope] == true
+            "without_#{field}"
+          else
+            options[:inverse_scope].to_s
+          end
 
-        if scope_name
-          single_scope = scope_name
-          plural_scope = scope_name.pluralize
+        if scope_name && respond_to?(scope_name)
+          raise Error, "#{scope_name} already exists on #{self}."
+        end
 
-          raise Error, "#{single_scope} already exists on #{self}. Use `lookup_for #{field}, scope: false` if you don't want scope :#{single_scope}" if respond_to?(single_scope)
-          raise Error, "#{plural_scope} already exists on #{self}. Use `lookup_for #{field}, scope: false` if you don't want scope :#{plural_scope}" if respond_to?(plural_scope)
+        if inverse_scope_name && respond_to?(inverse_scope_name)
+          raise Error, "#{inverse_scope_name} already exists on #{self}."
         end
 
         class_name = options[:class_name] || field
@@ -59,8 +75,17 @@ module LookupBy
         strict = true if strict.nil?
 
         class_eval <<-SCOPES, __FILE__, __LINE__.next if scope_name
-          scope :#{scope_name},           ->(name)   { where(#{foreign_key}: #{class_name}[name]) }
-          scope :#{scope_name.pluralize}, ->(*names) { where(#{foreign_key}: #{class_name}[*names]) }
+          scope :#{scope_name}, ->(*names) { where(#{foreign_key}: #{class_name}[*names]) }
+        SCOPES
+
+        class_eval <<-SCOPES, __FILE__, __LINE__.next if inverse_scope_name
+          scope :#{inverse_scope_name}, ->(*names) {
+            if names.length != 1
+              where('#{foreign_key} NOT IN (?)', #{class_name}[*names])
+            else
+              where('#{foreign_key} <> ?', #{class_name}[*names])
+            end
+          }
         SCOPES
 
         cast = options[:symbolize] ? ".to_sym" : ""

data/lib/lookup_by/cache.rb

@@ -14,6 +14,7 @@ module LookupBy
       @write            = options[:find_or_create]
       @allow_blank      = options[:allow_blank] || false
       @normalize        = options[:normalize]
+      @raise_on_miss    = options[:raise] || false
       @testing          = false
       @enabled          = true
 
@@ -39,6 +40,10 @@ module LookupBy
       else
         @read    = true
       end
+
+      if @write && @raise_on_miss
+        raise ArgumentError, "`#{@klass}.lookup_by :#{@field}` can not use `raise: true` and `find_or_create: true` together."
+      end
     end
 
     def reload
@@ -86,6 +91,11 @@ module LookupBy
       @cache[found.id] = found  if found && cache?
 
       found ||= db_write(value) if @write
+
+      if @raise_on_miss && found.nil?
+        raise LookupBy::RecordNotFound, "No #{@klass.name} lookup record found for value: #{value.inspect}"
+      end
+
       found
     end
 
@@ -125,7 +135,7 @@ module LookupBy
       case @primary_key_type
       when :integer
         value.is_a? Integer
-      when :uuid
+      when :uuid, :string
         value =~ UUID_REGEX
       end
     end

data/lib/lookup_by/caching/lru.rb

@@ -28,8 +28,13 @@ module LookupBy
         prune
       end
 
+      def merge(hash)
+        dup.merge!(hash)
+      end
+
       def merge!(hash)
         hash.each { |k, v| self[k] = v }
+        self
       end
 
       def delete(key)

data/lib/lookup_by/lookup.rb

@@ -1,4 +1,7 @@
 module LookupBy
+  class RecordNotFound < ActiveRecord::RecordNotFound
+  end
+
   module Lookup
     module MacroMethods
       def is_a_lookup?

data/lib/lookup_by/version.rb

@@ -1,3 +1,3 @@
 module LookupBy
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

data/spec/association_spec.rb

@@ -5,7 +5,7 @@ describe ::ActiveRecord::Base do
   describe "macro methods" do
     subject { described_class }
 
-    it { should respond_to :lookup_for }
+    it { is_expected.to respond_to :lookup_for }
   end
 
   describe ".lookup_for" do
@@ -28,13 +28,9 @@ describe ::ActiveRecord::Base do
         public :define_method, :remove_method
       end
 
-      [:with_foo, :with_foos].each do |method|
-        subject.singleton_class.define_method(method) { }
-
-        expect { subject.lookup_for :foo }.to raise_error LookupBy::Error, /already exists/
-
-        subject.singleton_class.remove_method(method)
-      end
+      subject.singleton_class.define_method(:with_foo) {}
+      expect { subject.lookup_for :foo }.to raise_error LookupBy::Error, /already exists/
+      subject.singleton_class.remove_method(:with_foo)
     end
 
     it "requires a foreign key" do
@@ -49,16 +45,6 @@ describe ::ActiveRecord::Base do
       expect { subject.lookup_for :country }.to raise_error LookupBy::Error, /Country does not use lookup_by/
     end
 
-    context "scope: nil" do
-      it { should respond_to(:with_city).with(1).arguments }
-      it { should respond_to(:with_cities).with(2).arguments }
-    end
-
-    context "scope: false" do
-      it { should_not respond_to(:with_postal_code) }
-      it { should_not respond_to(:with_postal_codes) }
-    end
-
     it "better include the association under test in lookups" do
       expect(subject.lookups).to include(:city)
     end
@@ -77,7 +63,7 @@ describe LookupBy::Association do
 
     it "accepts Integers" do
       subject.city = City.where(city: "New York").first.id
-      subject.city.should eq "New York"
+      expect(subject.city).to eq "New York"
     end
 
     it "rejects symbols" do
@@ -86,12 +72,12 @@ describe LookupBy::Association do
 
     it "returns strings" do
       subject.city = "New York"
-      subject.city.should eq "New York"
+      expect(subject.city).to eq "New York"
     end
 
     it "allows missing values" do
       subject.city = "Chicago"
-      subject.city.should be_nil
+      expect(subject.city).to be_nil
     end
   end
 
@@ -100,12 +86,12 @@ describe LookupBy::Association do
 
     it "allows symbols" do
       subject.state = :AL
-      subject.state.should eq :AL
+      expect(subject.state).to eq :AL
     end
 
     it "returns symbols" do
       subject.state = "AL"
-      subject.state.should eq :AL
+      expect(subject.state).to eq :AL
     end
 
     it "rejects missing values" do
@@ -125,3 +111,84 @@ describe LookupBy::Association do
     end
   end
 end
+
+describe LookupBy::Association, 'scopes' do
+  subject(:klass) do
+    Class.new(ActiveRecord::Base) do
+      self.table_name = 'addresses'
+    end
+  end
+
+  describe 'nomenclature' do
+    context 'default of :with_<foreign_key>' do
+      before { klass.lookup_for :city }
+      it { is_expected.to respond_to(:with_city) }
+    end
+
+    context 'scope: false' do
+      before { klass.lookup_for :city, scope: false }
+      it { is_expected.not_to respond_to(:with_city) }
+    end
+
+    context 'scope: :with_alternate_name' do
+      before { klass.lookup_for :city, scope: :with_home }
+      it { is_expected.to respond_to(:with_home) }
+    end
+
+    context 'scope: "with_alternate_name"' do
+      before { klass.lookup_for :city, scope: "with_home" }
+      it { is_expected.to respond_to(:with_home) }
+    end
+
+    context 'default inverse scope of :without_<foreign_key>' do
+      before { klass.lookup_for :city }
+      it { is_expected.to respond_to(:without_city) }
+    end
+
+    context 'inverse_scope: false' do
+      before { klass.lookup_for :city, inverse_scope: false }
+      it { is_expected.not_to respond_to(:without_city) }
+    end
+
+    context 'inverse_scope: true' do
+      before { klass.lookup_for :city, inverse_scope: true }
+      it { is_expected.to respond_to(:without_city) }
+    end
+
+    context 'inverse_scope: :with_alternate_name' do
+      before { klass.lookup_for :city, inverse_scope: :foreign_to }
+      it { is_expected.to respond_to(:foreign_to) }
+    end
+  end
+
+  context 'functionality' do
+    before do
+      City.create!(city: 'Chicago')
+      City.create!(city: 'Madison')
+      klass.lookup_for :city, scope: :inside_city, inverse_scope: :outside_city
+    end
+
+    let(:chicago) { City['Chicago'] }
+    let(:madison) { City['Madison'] }
+
+    specify 'with_city(a)' do
+      scope = klass.inside_city('Chicago')
+      expect(scope.to_sql).to eq klass.where(city_id: chicago.id).to_sql
+    end
+
+    specify 'with_city(a, b)' do
+      scope = klass.inside_city('Chicago', 'Madison')
+      expect(scope.to_sql).to eq klass.where(city_id: [chicago.id, madison.id]).to_sql
+    end
+
+    specify 'without_city(a)' do
+      scope = klass.outside_city('Chicago')
+      expect(scope.to_sql).to eq klass.where('city_id <> ?', chicago.id).to_sql
+    end
+
+    specify 'without_city(a, b)' do
+      scope = klass.outside_city('Chicago', 'Madison')
+      expect(scope.to_sql).to eq klass.where('city_id NOT IN (?)', [chicago.id, madison.id]).to_sql
+    end
+  end
+end

data/spec/caching/lru_spec.rb

@@ -15,56 +15,59 @@ module LookupBy::Caching
     subject { @cache }
 
     it "stores entries" do
-      @cache[1].should eq "one"
-      @cache[2].should eq "two"
+      expect(@cache[1]).to eq "one"
+      expect(@cache[2]).to eq "two"
     end
 
     it "drops oldest" do
       @cache[3] = "three"
 
-      @cache[1].should be_nil
+      expect(@cache[1]).to be_nil
     end
 
     it "keeps gets" do
       @cache[1]
       @cache[3] = "three"
 
-      @cache[1].should eq "one"
-      @cache[2].should be_nil
-      @cache[3].should eq "three"
+      expect(@cache[1]).to eq "one"
+      expect(@cache[2]).to be_nil
+      expect(@cache[3]).to eq "three"
     end
 
     it "keeps sets" do
       @cache[1] = "one"
       @cache[3] = "three"
 
-      @cache[1].should eq "one"
-      @cache[2].should be_nil
-      @cache[3].should eq "three"
+      expect(@cache[1]).to eq "one"
+      expect(@cache[2]).to be_nil
+      expect(@cache[3]).to eq "three"
     end
 
     it "#clear" do
       cache = LRU.new(2)
 
       cache[1] = "one"
-      cache.size.should eq 1
+      expect(cache.size).to eq 1
       cache.clear
-      cache.size.should eq 0
+      expect(cache.size).to eq 0
     end
 
     specify "#merge" do
-      @cache.merge(1 => "change", 3 => "three").should
-        eq(1 => "change", 2 => "two", 3 => "three")
+      merged = @cache.merge(1 => "change", 3 => "three")
+      expect(merged).to be_instance_of(LRU)
+      expect(merged).to eq(1 => "change", 3 => "three")
     end
 
     specify "#merge!" do
-      cache = LRU.new(3)
+      cache     = LRU.new(3)
+      object_id = cache.object_id
 
       cache[1] = "one"
       cache[2] = "two"
 
       cache.merge!(1 => "change", 3 => "three")
-      cache.should eq(1 => "change", 2 => "two", 3 => "three")
+      expect(cache.object_id).to eql(object_id)
+      expect(cache).to eq(1 => "change", 2 => "two", 3 => "three")
     end
 
     it "better include the values under test" do

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

@@ -0,0 +1,3 @@
+class Raisin < ActiveRecord::Base
+  lookup_by :raisin, cache: true, raise: true
+end

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

@@ -0,0 +1,3 @@
+class ReadThroughRaisin < ActiveRecord::Base
+  lookup_by :read_through_raisin, cache: true, find: true, raise: true
+end

data/spec/dummy/config/environments/test.rb

@@ -11,4 +11,9 @@ Dummy::Application.configure do
   # just for the purpose of running a single test. If you are using a tool that
   # preloads Rails for running tests, you may have to set it to true.
   config.eager_load = false
+  config.eager_load_paths = []
+
+  if config.active_support.respond_to?(:deprecation=)
+    config.active_support.deprecation = :stderr
+  end
 end

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

@@ -13,6 +13,9 @@ class CreateTables < ActiveRecord::Migration
     create_lookup_table :uncacheables
     create_lookup_table :unfindables
 
+    create_lookup_table :raisins
+    create_lookup_table :read_through_raisins
+
     enable_extension 'uuid-ossp'
 
     execute 'CREATE SCHEMA traffic;'

data/spec/dummy/db/structure.sql

@@ -257,6 +257,64 @@ CREATE SEQUENCE postal_codes_postal_code_id_seq
 ALTER SEQUENCE postal_codes_postal_code_id_seq OWNED BY postal_codes.postal_code_id;
 
 
+--
+-- Name: raisins; Type: TABLE; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE TABLE raisins (
+    raisin_id integer NOT NULL,
+    raisin text NOT NULL
+);
+
+
+--
+-- Name: raisins_raisin_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE raisins_raisin_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+--
+-- Name: raisins_raisin_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
+--
+
+ALTER SEQUENCE raisins_raisin_id_seq OWNED BY raisins.raisin_id;
+
+
+--
+-- Name: read_through_raisins; Type: TABLE; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE TABLE read_through_raisins (
+    read_through_raisin_id integer NOT NULL,
+    read_through_raisin text NOT NULL
+);
+
+
+--
+-- Name: read_through_raisins_read_through_raisin_id_seq; Type: SEQUENCE; Schema: public; Owner: -
+--
+
+CREATE SEQUENCE read_through_raisins_read_through_raisin_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+
+--
+-- Name: read_through_raisins_read_through_raisin_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: -
+--
+
+ALTER SEQUENCE read_through_raisins_read_through_raisin_id_seq OWNED BY read_through_raisins.read_through_raisin_id;
+
+
 --
 -- Name: schema_migrations; Type: TABLE; Schema: public; Owner: -; Tablespace: 
 --
@@ -503,6 +561,20 @@ ALTER TABLE ONLY ip_addresses ALTER COLUMN ip_address_id SET DEFAULT nextval('ip
 ALTER TABLE ONLY postal_codes ALTER COLUMN postal_code_id SET DEFAULT nextval('postal_codes_postal_code_id_seq'::regclass);
 
 
+--
+-- Name: raisin_id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY raisins ALTER COLUMN raisin_id SET DEFAULT nextval('raisins_raisin_id_seq'::regclass);
+
+
+--
+-- Name: read_through_raisin_id; Type: DEFAULT; Schema: public; Owner: -
+--
+
+ALTER TABLE ONLY read_through_raisins ALTER COLUMN read_through_raisin_id SET DEFAULT nextval('read_through_raisins_read_through_raisin_id_seq'::regclass);
+
+
 --
 -- Name: state_id; Type: DEFAULT; Schema: public; Owner: -
 --
@@ -601,6 +673,22 @@ ALTER TABLE ONLY postal_codes
     ADD CONSTRAINT postal_codes_pkey PRIMARY KEY (postal_code_id);
 
 
+--
+-- Name: raisins_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: 
+--
+
+ALTER TABLE ONLY raisins
+    ADD CONSTRAINT raisins_pkey PRIMARY KEY (raisin_id);
+
+
+--
+-- Name: read_through_raisins_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: 
+--
+
+ALTER TABLE ONLY read_through_raisins
+    ADD CONSTRAINT read_through_raisins_pkey PRIMARY KEY (read_through_raisin_id);
+
+
 --
 -- Name: states_pkey; Type: CONSTRAINT; Schema: public; Owner: -; Tablespace: 
 --
@@ -703,6 +791,20 @@ CREATE UNIQUE INDEX ip_addresses__u_ip_address ON ip_addresses USING btree (ip_a
 CREATE UNIQUE INDEX postal_codes__u_postal_code ON postal_codes USING btree (postal_code);
 
 
+--
+-- Name: raisins__u_raisin; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE UNIQUE INDEX raisins__u_raisin ON raisins USING btree (raisin);
+
+
+--
+-- Name: read_through_raisins__u_read_through_raisin; Type: INDEX; Schema: public; Owner: -; Tablespace: 
+--
+
+CREATE UNIQUE INDEX read_through_raisins__u_read_through_raisin ON read_through_raisins USING btree (read_through_raisin);
+
+
 --
 -- Name: states__u_state; Type: INDEX; Schema: public; Owner: -; Tablespace: 
 --

data/spec/lookup_by_spec.rb

@@ -6,14 +6,14 @@ describe ::ActiveRecord::Base do
   describe "macro methods" do
     subject { described_class }
 
-    it { should respond_to :lookup_by    }
-    it { should respond_to :is_a_lookup? }
+    it { is_expected.to respond_to :lookup_by    }
+    it { is_expected.to respond_to :is_a_lookup? }
   end
 
   describe "instance methods" do
     subject { Status.new }
 
-    it { should respond_to :name }
+    it { is_expected.to respond_to :name }
   end
 
 end
@@ -24,7 +24,8 @@ describe LookupBy::Lookup do
       City.lookup.seed 'Boston'
       City.lookup.seed 'Chicago', 'New York City'
 
-      City.all.map(&:name).sort.should eq(['Boston', 'Chicago', 'New York City'])
+      names = City.all.map(&:name).sort
+      expect(names.sort).to eq(['Boston', 'Chicago', 'New York City'])
       City.lookup.clear
     end
   end
@@ -43,7 +44,7 @@ describe LookupBy::Lookup do
     it_behaves_like "a read-through proxy"
 
     it "returns nil on db miss" do
-      subject["foo"].should be_nil
+      expect(subject["foo"]).to be_nil
     end
   end
 
@@ -57,11 +58,12 @@ describe LookupBy::Lookup do
     it "normalizes the lookup field" do
       status = subject.create(subject.lookup.field => "paid")
 
-      subject["  paid "].id.should == status.id
+      expect(subject["  paid "].id).to eq(status.id)
     end
 
     it "has a small primary key" do
-      expect { Status.create(status_id: 100_000, status: "too_big") }.to raise_error
+      sql_type = Status.columns_hash['status_id'].sql_type
+      expect(sql_type).to eq('smallint')
     end
   end
 
@@ -82,7 +84,7 @@ describe LookupBy::Lookup do
     it_behaves_like "a strict cache"
 
     it "preloads the cache" do
-      subject.lookup.cache.should_not be_empty
+      expect(subject.lookup.cache).not_to be_empty
     end
   end
 
@@ -102,7 +104,7 @@ describe LookupBy::Lookup do
     it_behaves_like "a read-through cache"
 
     it "is not testing when not writing through the LRU" do
-      subject.lookup.testing.should be false
+      expect(subject.lookup.testing).to be false
     end
   end
 
@@ -115,7 +117,7 @@ describe LookupBy::Lookup do
     it_behaves_like "a write-through cache"
 
     it "sets testing when RAILS_ENV=test" do
-      subject.lookup.testing.should be true
+      expect(subject.lookup.testing).to be true
     end
 
     it "does not write primary keys" do
@@ -150,13 +152,13 @@ describe LookupBy::Lookup do
     it "allows lookup by IPAddr" do
       ip = subject['127.0.0.1']
 
-      subject[IPAddr.new('127.0.0.1')].should == ip
-      subject[ip.id].should == ip
-      subject['127.0.0.1'].should == ip
+      expect(subject[IPAddr.new('127.0.0.1')]).to eq(ip)
+      expect(subject[ip.id]).to eq(ip)
+      expect(subject['127.0.0.1']).to eq(ip)
     end
   end
 
-  context "Path.lookup_by :column, cache: true, find_or_create: true (UUID primary key)" do
+  context "Path.lookup_by :column, cache: N, find_or_create: true (UUID primary key)" do
     subject { Path }
 
     it_behaves_like "a lookup"
@@ -166,8 +168,46 @@ describe LookupBy::Lookup do
 
     it 'treats UUIDs as the primary key' do
       path = subject['/']
-      path.id.should match(LookupBy::UUID_REGEX)
-      subject[path.id].should == path
+      expect(path.id).to match(LookupBy::UUID_REGEX)
+      expect(subject[path.id]).to eq(path)
+    end
+  end
+
+  context "Raisin.lookup_by :column, cache: true, raise: true" do
+    subject { Raisin }
+
+    it_behaves_like "a lookup"
+    it_behaves_like "a cache"
+
+    it "raises LookupBy::RecordNotFound on cache miss" do
+      expect {
+        subject[:not_disgusting]
+      }.to raise_error(LookupBy::RecordNotFound, /Raisin.*not_disgusting/)
+    end
+  end
+
+  context "ReadThroughRaisin.lookup_by :column, cache: true, find: true, raise: true" do
+    subject { ReadThroughRaisin }
+
+    it_behaves_like "a lookup"
+    it_behaves_like "a cache"
+    it_behaves_like "a read-through cache"
+
+    it "raises LookupBy::RecordNotFound on cache and DB miss" do
+      expect {
+        subject[:tasty]
+      }.to raise_error(LookupBy::RecordNotFound, /Raisin.*tasty/)
+    end
+  end
+
+  context "Raisin.lookup_by :column, find_or_create: true, raise: true" do
+    it "raises ArgumentError, as `raise` and `find_or_create` can not exist" do
+      expect {
+        class WriteThroughRaisin < ActiveRecord::Base
+          self.table_name = 'raisins'
+          lookup_by :raisin, find_or_create: true, raise: true
+        end
+      }.to raise_error(ArgumentError)
     end
   end
 end

data/spec/spec_helper.rb

@@ -24,7 +24,7 @@ require 'rspec/its'
 require 'database_cleaner'
 require 'pry'
 
-ActiveRecord::Migration.maintain_test_schema! if defined?(ActiveRecord::Migration)
+ActiveRecord::Migration.maintain_test_schema! if defined?(ActiveRecord::Migration) && ActiveRecord::Migration.respond_to?(:maintain_test_schema!)
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
@@ -34,6 +34,10 @@ RSpec.configure do |config|
   config.backtrace_exclusion_patterns << /vendor\//
   config.backtrace_exclusion_patterns << /lib\/rspec\/rails/
 
+  # Use `fit`, `fcontext`, etc. to focus on particular examples.
+  config.filter_run focus: true
+  config.run_all_when_everything_filtered = true
+
   # Run specs in random order to surface order dependencies. If you find an
   # order dependency and want to debug it, you can fix the order by providing
   # the seed, which is printed after each run.

data/spec/support/shared_examples_for_a_lookup.rb

@@ -1,8 +1,8 @@
 shared_examples "a lookup" do
-  it { should respond_to :[] }
-  it { should respond_to :lookup }
-  it { should respond_to :lookup_by  }
-  it { should respond_to :lookup_for }
+  it { is_expected.to respond_to :[] }
+  it { is_expected.to respond_to :lookup }
+  it { is_expected.to respond_to :lookup_by  }
+  it { is_expected.to respond_to :lookup_for }
 
   it "better be a lookup" do
     expect(subject.is_a_lookup?).to be true
@@ -13,19 +13,19 @@ shared_examples "a lookup" do
   end
 
   it "returns nil for nil" do
-    subject[nil].should be_nil
-    subject[nil, nil].should == [nil, nil]
+    expect(subject[nil]).to be_nil
+    expect(subject[nil, nil]).to eq([nil, nil])
   end
 
   it "returns nil for empty strings" do
-    subject[""].should be_nil
-    subject["", ""].should == [nil, nil]
+    expect(subject[""]).to be_nil
+    expect(subject["", ""]).to eq([nil, nil])
   end
 
   it "returns itself" do
     if first = subject.first
-      subject[first].should eq first
-      subject[first, first].should == [first, first]
+      expect(subject[first]).to eq first
+      expect(subject[first, first]).to eq([first, first])
     end
   end
 
@@ -49,7 +49,7 @@ shared_examples "a proxy" do
 
     subject[original.name]
     subject.update(original.id, name: "updated")
-    subject[original.id].name.should_not eq original.name
+    expect(subject[original.id].name).not_to eq original.name
   end
 
   it "allows .destroy_all" do
@@ -58,7 +58,7 @@ shared_examples "a proxy" do
 
   it "allows .destroy" do
     instance = subject.create(name: "foo")
-    subject.destroy(instance.id).should == instance
+    expect(subject.destroy(instance.id)).to eq(instance)
   end
 
   it "allows .delete_all" do
@@ -66,7 +66,7 @@ shared_examples "a proxy" do
   end
 
   it "allows .delete" do
-    subject.delete(1).should == 0
+    expect(subject.delete(1)).to eq(0)
   end
 end
 
@@ -81,7 +81,7 @@ shared_examples "a cache" do
     subject[original.name]
 
     subject.update(original.id, subject.lookup.field => "updated")
-    subject[original.id].name.should eq "original"
+    expect(subject[original.id].name).to eq "original"
 
     subject.lookup.testing = was_testing
   end
@@ -110,28 +110,28 @@ shared_examples "a strict cache" do
 
   xit "does cache .all" do
     new = subject.create(name: 'add')
-    subject.all.to_a.should_not include(new)
+    expect(subject.all.to_a).not_to include(new)
   end
 
   xit "reloads .all when called with args" do
     new = subject.create(name: "new")
-    subject.all.to_a.should_not include(new)
-    subject.all({}).to_a.should include(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")
-    subject.pluck(:name).should_not include("pluck this")
+    expect(subject.pluck(:name)).not_to include("pluck this")
   end
 
   it "returns nil on miss" do
-    subject["foo"].should be_nil
+    expect(subject["foo"]).to be_nil
   end
 
   it "ignores new records" do
     subject.create(name: "new record")
 
-    subject["new record"].should be_nil
+    expect(subject["new record"]).to be_nil
   end
 end
 
@@ -142,17 +142,17 @@ shared_examples "a read-through proxy" do
 
   it "reloads .all" do
     new = subject.create(name: 'add')
-    subject.all.to_a.should include (new)
+    expect(subject.all.to_a).to include (new)
   end
 
   it "reloads .pluck" do
     subject.create(name: "pluck this")
-    subject.pluck(subject.lookup.field).should include("pluck this")
+    expect(subject.pluck(subject.lookup.field)).to include("pluck this")
   end
 
   it "finds new records" do
     created = subject.create(name: "new record")
-    subject["new record"].id.should eq created.id
+    expect(subject["new record"].id).to eq created.id
   end
 end
 
@@ -169,7 +169,7 @@ shared_examples "a read-through cache" do
     subject[created.name]
 
     subject.update(created.id, name: "changed")
-    subject[created.id].name.should eq "cached"
+    expect(subject[created.id].name).to eq "cached"
 
     subject.lookup.testing = was_testing
   end
@@ -189,15 +189,15 @@ shared_examples "a write-through cache" do
     found = subject["found"]
 
     subject.update(found.id, name: "missing")
-    subject[found.id].name.should eq "missing"
+    expect(subject[found.id].name).to eq "missing"
   end
 end
 
 shared_examples "a lookup for" do |field|
-  it { should respond_to field }
-  it { should respond_to "#{field}=" }
-  it { should respond_to "raw_#{field}" }
-  it { should respond_to "#{field}_before_type_cast" }
+  it { is_expected.to respond_to field }
+  it { is_expected.to respond_to "#{field}=" }
+  it { is_expected.to respond_to "raw_#{field}" }
+  it { is_expected.to respond_to "#{field}_before_type_cast" }
 
   it "accepts nil" do
     expect { subject.send "#{field}=", nil }.to_not raise_error
@@ -205,7 +205,7 @@ shared_examples "a lookup for" do |field|
 
   it "converts empty strings to nil" do
     subject.send "#{field}=",  ""
-    subject.send(field).should be_nil
+    expect(subject.send(field)).to be_nil
   end
 
   it "rejects other argument types" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lookup_by
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Erik Peterson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-19 00:00:00.000000000 Z
+date: 2014-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -62,11 +62,15 @@ files:
 - ".gitignore"
 - ".ruby-version"
 - ".travis.yml"
+- Appraisals
 - Gemfile
 - MIT-LICENSE
 - README.md
 - Rakefile
 - TODO.md
+- gemfiles/rails_3.2.gemfile
+- gemfiles/rails_4.0.gemfile
+- gemfiles/rails_4.1.gemfile
 - lib/lookup_by.rb
 - lib/lookup_by/association.rb
 - lib/lookup_by/cache.rb
@@ -92,6 +96,8 @@ files:
 - spec/dummy/app/models/ip_address.rb
 - spec/dummy/app/models/path.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
@@ -159,6 +165,8 @@ test_files:
 - spec/dummy/app/models/ip_address.rb
 - spec/dummy/app/models/path.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