cache-object 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1485233396171f659819ed221040368678fbe00e
-  data.tar.gz: d7fdcd4e545b9a80d89118f3b2e5869f53951802
+  metadata.gz: 8649b2dd01b782f1cf6825b5a30476b3a32472e0
+  data.tar.gz: 0c6f690cc791dbee837a559766d9e1c1db9b3fcd
 SHA512:
-  metadata.gz: 7dd097dcc97365356c283c40237a74e4252689c0899ca6ce05887245ae3f803d369a15ff6d474e8a2bc92048052d263557111c9a8651486f2549ebdcc381f6a3
-  data.tar.gz: 8119eef50f1435f73f3c838ac92a16a18d3cf31709803ee0fc3b66b00c536848dfb41f5d9fb19a594b95a019279a3417c7a3c5d251481620b028bd43a4861243
+  metadata.gz: 5d5b878fdc5924fded27f804d5739137c45f627465754a6355c9c9b8788587cb12e0a804be7e478a807294a793a4a835b4d007d642b67ea8d0fd6cdc7a3494fe
+  data.tar.gz: c266d30a7504657689049980a9155cf4290c2d44abb9d0af64fe9f151226a9f575002b86ff2db8d61ae532e7cb61ff09235122297ce7be1da8710a05d18268b5

data/.gitignore

@@ -4,6 +4,7 @@
 .config
 .yardoc
 Gemfile.lock
+Gemfile.*.lock
 InstalledFiles
 _yardoc
 coverage

data/.travis.yml

@@ -0,0 +1,10 @@
+language: ruby
+rvm:
+  - 2.1.7
+  - 2.2.3
+gemfile:
+  - gemfiles/Gemfile.Rails32
+  - gemfiles/Gemfile.Rails41
+  - gemfiles/Gemfile.Rails42
+script:
+  - bundle exec rspec

data/CHANGELOG.md

@@ -0,0 +1,10 @@
+Change Log
+==========
+
+## 0.2.0
+
+* Rails 4.2 integration
+
+## 0.1.0
+
+* Rails 3.2, 4.1 integration

data/Gemfile

@@ -1,4 +1,3 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in cache-object.gemspec
 gemspec

data/README.md

@@ -1,5 +1,7 @@
 # Cache::Object
 
+[![Build Status](https://travis-ci.org/wanelo/cache-object.svg?branch=master)](https://travis-ci.org/wanelo/cache-object)
+
 Cache ActiveRecord objects in memcached!
 
 ## Installation

data/cache-object.gemspec

@@ -4,32 +4,32 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'cache/object/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "cache-object"
+  spec.name          = 'cache-object'
   spec.version       = Cache::Object::VERSION
-  spec.authors       = ["Matt Camuto"]
-  spec.email         = ["dev@wanelo.com"]
+  spec.authors       = ['Matt Camuto']
+  spec.email         = ['dev@wanelo.com']
   spec.summary       = %q{Object R/W Caching}
   spec.description   = %q{Object R/W Caching on top of ActiveRecord}
-  spec.homepage      = ""
-  spec.license       = "MIT"
+  spec.homepage      = ''
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
  # spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_dependency "activerecord", [">= 3.0", "< 4.2"]
-  spec.add_dependency "ruby-usdt"
+  spec.add_dependency 'activerecord', ['>= 3.0', '< 4.3']
+  spec.add_dependency 'ruby-usdt'
 
-  spec.add_development_dependency "bundler", "~> 1.6"
-  spec.add_development_dependency "rake"
+  spec.add_development_dependency 'bundler', '~> 1.10'
+  spec.add_development_dependency 'rake'
 
-  spec.add_development_dependency "rspec", ">= 3.0"
-  spec.add_development_dependency "rspec-collection_matchers", ">= 1.0"
-  spec.add_development_dependency "rspec-its", ">= 1.0"
+  spec.add_development_dependency 'rspec', '>= 3.0'
+  spec.add_development_dependency 'rspec-collection_matchers', '>= 1.0'
+  spec.add_development_dependency 'rspec-its', '>= 1.0'
 
-  spec.add_development_dependency "guard"
-  spec.add_development_dependency "guard-rspec"
-  spec.add_development_dependency "sqlite3"
+  spec.add_development_dependency 'guard'
+  spec.add_development_dependency 'guard-rspec'
+  spec.add_development_dependency 'sqlite3'
 
 end

data/gemfiles/Gemfile.Rails32

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in cache-object.gemspec
+
+gem 'activerecord', '~> 3.2.0'
+
+gemspec :path => '../'

data/gemfiles/Gemfile.Rails41

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in cache-object.gemspec
+
+gem 'activerecord', '~> 4.1.0'
+
+gemspec :path => '../'

data/gemfiles/Gemfile.Rails42

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in cache-object.gemspec
+
+gem 'activerecord', '~> 4.2.0'
+
+gemspec :path => '../'

data/lib/cache/object/active_record.rb

@@ -35,14 +35,10 @@ module Cache
           send("#{key}=", attributes.delete(key.to_s))
         end
 
-        @attributes = self.class.initialize_attributes(attributes)
+        _assign_attributes_from_cache(attributes)
         @relation = nil
 
-        @attributes_cache, @previously_changed, @changed_attributes = {}, {}, {}
-        @association_cache = {}
-        @aggregation_cache = {}
-        @_start_transaction_state = {}
-        @readonly = @destroyed = @marked_for_destruction = false
+        _initialize_from_cache
         @new_record = false
         @column_types = self.class.column_types if self.class.respond_to?(:column_types)
         @changed_attributes = {}
@@ -63,6 +59,27 @@ module Cache
         Cache::Object::InstanceDecorator.new(self, self.class._object_cache_attr_mappings)
       end
 
+      private
+
+      def _initialize_from_cache
+        @attributes_cache, @previously_changed, @changed_attributes = {}, {}, {}
+        @association_cache = {}
+        @aggregation_cache = {}
+        @_start_transaction_state = {}
+        @readonly = @destroyed = @marked_for_destruction = false
+
+        init_internals if respond_to?(:init_internals)
+      end
+
+      def _assign_attributes_from_cache(attributes)
+        if self.class.respond_to?(:initialize_attributes)
+          @attributes = self.class.initialize_attributes(attributes)
+        else
+          @attributes = self.class._default_attributes.dup
+          init_attributes(attributes, {})
+        end
+      end
+
       module ClassMethods
         def _load(args)
           attributes = Marshal.load(args)

data/lib/cache/object/adapter.rb

@@ -4,7 +4,7 @@ module Cache
       attr_reader :store
 
       def initialize(store)
-        raise "Cache Store is nil, please initialize" unless store
+        raise 'Cache Store is nil, please initialize' unless store
         @store = store
       end
 

data/lib/cache/object/version.rb

@@ -1,5 +1,5 @@
 module Cache
   module Object
-    VERSION = "0.1.0"
+    VERSION = '0.2.0'
   end
 end

data/spec/cache/object/active_record_spec.rb

@@ -57,8 +57,8 @@ RSpec.describe Cache::Object::ActiveRecord do
     allow(Cache::Object).to receive(:adapter).and_return(adapter_instance)
   end
 
-  describe ".included" do
-    it "receives correct callbacks" do
+  describe '.included' do
+    it 'receives correct callbacks' do
       expect(clazz).to receive(:after_save).with(:write_cache!).once
       expect(clazz).to receive(:after_rollback).with(:expire_cache!).once
       expect(clazz).to receive(:after_destroy).with(:expire_cache!).once
@@ -66,17 +66,17 @@ RSpec.describe Cache::Object::ActiveRecord do
     end
   end
 
-  describe "caching methods" do
-    describe "#write_cache" do
-      it "calls write cache" do
+  describe 'caching methods' do
+    describe '#write_cache' do
+      it 'calls write cache' do
         expect(adapter_instance).to receive(:write).with(an_instance_of(Cache::Object::InstanceDecorator))
         object = clazz.new
         object.write_cache!
       end
     end
 
-    describe "#expire_cache" do
-      it "calls write cache" do
+    describe '#expire_cache' do
+      it 'calls write cache' do
         expect(adapter_instance).to receive(:delete).with(an_instance_of(Cache::Object::InstanceDecorator))
         object = clazz.new
         object.expire_cache!
@@ -84,19 +84,19 @@ RSpec.describe Cache::Object::ActiveRecord do
     end
   end
 
-  describe "Finder class methods" do
-    describe "#respond_to?" do
-      it "find" do
+  describe 'Finder class methods' do
+    describe '#respond_to?' do
+      it 'find' do
         expect(clazz).to respond_to(:find)
       end
-      it "find_by_id" do
+      it 'find_by_id' do
         expect(clazz).to respond_to(:find_by_id)
       end
     end
 
-    describe ".find" do
-      describe "caching interactions" do
-        it "yields to super with cache" do
+    describe '.find' do
+      describe 'caching interactions' do
+        it 'yields to super with cache' do
           allow(Cache::Object).to receive(:adapter).and_return(adapter.new)
           expect(super_clazz).to receive(:find).with(12).once
           clazz.find(12)
@@ -104,17 +104,17 @@ RSpec.describe Cache::Object::ActiveRecord do
       end
     end
 
-    describe ".find_by_id" do
-      describe "caching interactions" do
-        it "yields to super with cache" do
+    describe '.find_by_id' do
+      describe 'caching interactions' do
+        it 'yields to super with cache' do
           expect(super_clazz).to receive(:where).with(:id => 12).once { double(first: true) }
           clazz.find_by_id(12)
         end
       end
     end
 
-    describe ".fetch_all" do
-      it "should call through to multi_get" do
+    describe '.fetch_all' do
+      it 'should call through to multi_get' do
         multi_getter = double(fetch_all: true)
         expect(Cache::Object::MultiGet).to receive(:new).with(clazz) { multi_getter }
         expect(multi_getter).to receive(:fetch_all).with([1,2,4])
@@ -122,20 +122,20 @@ RSpec.describe Cache::Object::ActiveRecord do
       end
     end
 
-    describe "object_cache_on" do
+    describe 'object_cache_on' do
 
-      it "creates_finder_methods" do
+      it 'creates_finder_methods' do
         expect(clazz).to respond_to(:find_by_name_and_age)
       end
 
-      it "calls fetch_mapping on the adapter" do
-        expect(adapter_instance).to receive(:fetch_mapping).with(clazz, name: "bob", age: 13).once
-        clazz.find_by_name_and_age("bob", 13)
+      it 'calls fetch_mapping on the adapter' do
+        expect(adapter_instance).to receive(:fetch_mapping).with(clazz, name: 'bob', age: 13).once
+        clazz.find_by_name_and_age('bob', 13)
       end
 
-      it "calls super" do
-        expect(super_clazz).to receive(:find_by_name_and_age).with("bob", 13)
-        clazz.find_by_name_and_age("bob", 13)
+      it 'calls super' do
+        expect(super_clazz).to receive(:find_by_name_and_age).with('bob', 13)
+        clazz.find_by_name_and_age('bob', 13)
       end
     end
   end

data/spec/cache/object/adapter_spec.rb

@@ -6,113 +6,113 @@ RSpec.describe Cache::Object::Adapter do
     allow(Cache::Object.configuration).to receive(:ttl).and_return(118)
   end
 
-  let(:cache_store) { double("CacheStore", write: true) }
+  let(:cache_store) { double('CacheStore', write: true) }
   let(:adapter) { Cache::Object::Adapter.new(cache_store) }
   let(:instance) { double(class: double(name: "User"), id: "1") }
 
-  describe "#delete" do
-    it "dispatches to delete" do
-      expect(cache_store).to receive(:delete).with("User-1")
-      expect(cache_store).to receive(:delete).with("User-1-blah")
+  describe '#delete' do
+    it 'dispatches to delete' do
+      expect(cache_store).to receive(:delete).with('User-1')
+      expect(cache_store).to receive(:delete).with('User-1-blah')
 
-      adapter.delete(double(instance: instance, keys: ["User-1", "User-1-blah"]))
+      adapter.delete(double(instance: instance, keys: %w(User-1 User-1-blah)))
     end
 
-    describe "probes" do
+    describe 'probes' do
       before do
         allow(cache_store).to receive(:delete)
       end
 
-      it "fires the write probe" do
-        expect(Cache::Object::DTraceProvider).to receive(:fire!).with(:delete, "User", "1")
-        adapter.delete(double(instance: instance, keys: ["User-1", "User-1-blah"]))
+      it 'fires the write probe' do
+        expect(Cache::Object::DTraceProvider).to receive(:fire!).with(:delete, 'User', '1')
+        adapter.delete(double(instance: instance, keys: %w(User-1 User-1-blah)))
       end
     end
   end
 
-  describe "#write" do
-    it "dispatches to write" do
-      expect(cache_store).to receive(:write).with("User-1", instance, expires_in: 118)
-      expect(cache_store).to receive(:write).with("User-1-blah", instance, expires_in: 118)
+  describe '#write' do
+    it 'dispatches to write' do
+      expect(cache_store).to receive(:write).with('User-1', instance, expires_in: 118)
+      expect(cache_store).to receive(:write).with('User-1-blah', instance, expires_in: 118)
 
-      adapter.write(double(instance: instance, keys: ["User-1", "User-1-blah"]))
+      adapter.write(double(instance: instance, keys: %w(User-1 User-1-blah)))
     end
 
-    describe "probes" do
+    describe 'probes' do
       before do
         allow(cache_store).to receive(:write)
       end
 
-      it "fires the write probe" do
-        expect(Cache::Object::DTraceProvider).to receive(:fire!).with(:write, "User", "1", "118")
-        adapter.write(double(instance: instance, keys: ["User-1", "User-1-blah"]))
+      it 'fires the write probe' do
+        expect(Cache::Object::DTraceProvider).to receive(:fire!).with(:write, 'User', '1', '118')
+        adapter.write(double(instance: instance, keys: %w(User-1 User-1-blah)))
       end
     end
   end
 
-  describe "#fetch" do
-    it "fetches the object from the cache_store" do
-      expect(cache_store).to receive(:fetch).with("User-1", expires_in: 118).and_yield
+  describe '#fetch' do
+    it 'fetches the object from the cache_store' do
+      expect(cache_store).to receive(:fetch).with('User-1', expires_in: 118).and_yield
       expect { |b|
         adapter.fetch(instance.class, 1, &b)
       }.to yield_control
     end
 
-    describe "probes" do
-      it "fires the fetch probe" do
+    describe 'probes' do
+      it 'fires the fetch probe' do
         allow(cache_store).to receive(:fetch)
-        expect(Cache::Object::DTraceProvider).to receive(:fire!).with(:fetch, "User", "1", "118")
+        expect(Cache::Object::DTraceProvider).to receive(:fire!).with(:fetch, 'User', '1', '118')
         adapter.fetch(instance.class, 1) {}
       end
 
-      describe "when fetch is a miss" do
-        it "fires the fetch and fetch_miss probes" do
+      describe 'when fetch is a miss' do
+        it 'fires the fetch and fetch_miss probes' do
           allow(cache_store).to receive(:fetch).and_yield
-          expect(Cache::Object::DTraceProvider).to receive(:fire!).with(:fetch, "User", "1", "118")
-          expect(Cache::Object::DTraceProvider).to receive(:fire!).with(:fetch_miss, "User", "1", "118")
+          expect(Cache::Object::DTraceProvider).to receive(:fire!).with(:fetch, 'User', '1', '118')
+          expect(Cache::Object::DTraceProvider).to receive(:fire!).with(:fetch_miss, 'User', '1', '118')
           adapter.fetch(instance.class, 1) {}
         end
       end
     end
   end
 
-  describe "#fetch_mapping" do
-    it "fetches the object from the cache store based on the attributes" do
-      expect(cache_store).to receive(:fetch).with("User-user_id-1-name-bob", expires_in: 118).and_yield
+  describe '#fetch_mapping' do
+    it 'fetches the object from the cache store based on the attributes' do
+      expect(cache_store).to receive(:fetch).with('User-user_id-1-name-bob', expires_in: 118).and_yield
       expect { |b|
-        adapter.fetch_mapping(instance.class, { user_id: 1, name: "bob" }, &b)
+        adapter.fetch_mapping(instance.class, { user_id: 1, name: 'bob' }, &b)
       }.to yield_control
     end
 
-    describe "probes" do
-      it "fires the fetch probe" do
+    describe 'probes' do
+      it 'fires the fetch probe' do
         allow(cache_store).to receive(:fetch)
-        expect(Cache::Object::DTraceProvider).to receive(:fire!).with(:fetch_mapping, "User", { user_id: 1, name: "bob" }.inspect, "118")
-        adapter.fetch_mapping(instance.class, { user_id: 1, name: "bob" }) {}
+        expect(Cache::Object::DTraceProvider).to receive(:fire!).with(:fetch_mapping, 'User', { user_id: 1, name: 'bob' }.inspect, '118')
+        adapter.fetch_mapping(instance.class, { user_id: 1, name: 'bob' }) {}
       end
 
-      describe "when fetch is a miss" do
-        it "fires the fetch and fetch_miss probes" do
+      describe 'when fetch is a miss' do
+        it 'fires the fetch and fetch_miss probes' do
           allow(cache_store).to receive(:fetch).and_yield
-          expect(Cache::Object::DTraceProvider).to receive(:fire!).with(:fetch_mapping, "User", { user_id: 1, name: "bob" }.inspect, "118")
-          expect(Cache::Object::DTraceProvider).to receive(:fire!).with(:fetch_mapping_miss, "User", { user_id: 1, name: "bob" }.inspect, "118")
-          adapter.fetch_mapping(instance.class, { user_id: 1, name: "bob" }) {}
+          expect(Cache::Object::DTraceProvider).to receive(:fire!).with(:fetch_mapping, 'User', { user_id: 1, name: 'bob' }.inspect, '118')
+          expect(Cache::Object::DTraceProvider).to receive(:fire!).with(:fetch_mapping_miss, 'User', { user_id: 1, name: 'bob' }.inspect, '118')
+          adapter.fetch_mapping(instance.class, { user_id: 1, name: 'bob' }) {}
         end
       end
     end
   end
 
-  describe "#read_multi" do
-    it "calls read_multi on the cache_store" do
-      expect(cache_store).to receive(:read_multi).with("blah").and_return({})
-      adapter.read_multi(["blah"])
+  describe '#read_multi' do
+    it 'calls read_multi on the cache_store' do
+      expect(cache_store).to receive(:read_multi).with('blah').and_return({})
+      adapter.read_multi(['blah'])
     end
 
-    describe "probes" do
-      it "fires the read_multi probe" do
-        expect(Cache::Object::DTraceProvider).to receive(:fire!).with(:read_multi, ["blah", "blah2"].inspect, 1, 1)
-        allow(cache_store).to receive(:read_multi).and_return({"blah2" => 1})
-        adapter.read_multi(["blah", "blah2"])
+    describe 'probes' do
+      it 'fires the read_multi probe' do
+        expect(Cache::Object::DTraceProvider).to receive(:fire!).with(:read_multi, %w(blah blah2).inspect, 1, 1)
+        allow(cache_store).to receive(:read_multi).and_return({'blah2' => 1})
+        adapter.read_multi(%w(blah blah2))
       end
     end
   end

data/spec/cache/object/config_spec.rb

@@ -3,34 +3,34 @@ require 'spec_helper'
 
 RSpec.describe Cache::Object do
 
-  describe ".configure" do
+  describe '.configure' do
     let(:clazz) { Class.new }
 
-    describe "#cache" do
-      it "sets cache" do
+    describe '#cache' do
+      it 'sets cache' do
         Cache::Object.configure { |c| c.cache = clazz }
         expect(Cache::Object.configuration.cache).to eq(clazz)
       end
     end
 
-    describe "#enabled" do
-      it "is enabled by default" do
+    describe '#enabled' do
+      it 'is enabled by default' do
         expect(Cache::Object.configuration.enabled).to eq(true)
       end
 
 
-      it "is disabled if set false" do
+      it 'is disabled if set false' do
         Cache::Object.configure { |c| c.enabled = false }
         expect(Cache::Object.configuration.enabled).to eq(false)
       end
     end
 
-    describe "#ttl" do
-      it "sets to time" do
+    describe '#ttl' do
+      it 'sets to time' do
         Cache::Object.configure { |c| c.ttl = 1234 }
         expect(Cache::Object.configuration.ttl).to eq(1234)
       end
-      it "is one day by default" do
+      it 'is one day by default' do
         expect(Cache::Object.configuration.ttl).to eq(86400)
       end
     end

data/spec/cache/object/dtrace_provider_spec.rb

@@ -63,28 +63,28 @@ RSpec.describe Cache::Object::DTraceProvider do
     end
   end
 
-  describe ".fire!" do
-    it "raises if no provider" do
-      expect { Cache::Object::DTraceProvider.fire!(:fake) }.to raise_error
+  describe '.fire!' do
+    it 'raises if no provider' do
+      expect { Cache::Object::DTraceProvider.fire!(:fake) }.to raise_error(StandardError)
     end
 
-    describe "when probe is enabled" do
-      it "receives event" do
+    describe 'when probe is enabled' do
+      it 'receives event' do
         probe = double(enabled?: true)
         provider = double(probes: { boom: probe})
         allow(Cache::Object::DTraceProvider).to receive(:provider).and_return(provider)
-        expect(probe).to receive(:fire).with("hai")
-        Cache::Object::DTraceProvider.fire!(:boom, "hai")
+        expect(probe).to receive(:fire).with('hai')
+        Cache::Object::DTraceProvider.fire!(:boom, 'hai')
       end
     end
 
-    describe "when probe is disabled" do
-      it "does not receives event" do
+    describe 'when probe is disabled' do
+      it 'does not receives event' do
         probe = double(enabled?: false)
         provider = double(probes: { boom: probe})
         allow(Cache::Object::DTraceProvider).to receive(:provider).and_return(provider)
         expect(probe).to receive(:fire).never
-        Cache::Object::DTraceProvider.fire!(:boom, "hai")
+        Cache::Object::DTraceProvider.fire!(:boom, 'hai')
       end
     end
   end

data/spec/cache/object/multi_get_spec.rb

@@ -2,51 +2,51 @@ require 'spec_helper'
 
 RSpec.describe Cache::Object::MultiGet do
 
-  let(:fake_clazz) { double(name: "MyObj", primary_key: :foo) }
+  let(:fake_clazz) { double(name: 'MyObj', primary_key: :foo) }
   let(:obj_arr) { 1.upto(3).map { |i| double(class: fake_clazz, id: i) } }
   let(:multi_get) { Cache::Object::MultiGet.new(fake_clazz) }
-  let(:cache_store) { double("CacheStore", write: true) }
+  let(:cache_store) { double('CacheStore', write: true) }
   let(:adapter) { Cache::Object::Adapter.new(cache_store) }
 
-  describe "#object_keys" do
-    it "maps keys correctly" do
-      expect(multi_get.object_keys(1..3)).to eq(["MyObj-1", "MyObj-2", "MyObj-3"])
+  describe '#object_keys' do
+    it 'maps keys correctly' do
+      expect(multi_get.object_keys(1..3)).to eq(%w(MyObj-1 MyObj-2 MyObj-3))
     end
   end
 
-  describe "#cached_objects" do
-    it "fetches all the mapped keys" do
+  describe '#cached_objects' do
+    it 'fetches all the mapped keys' do
       expect(Cache::Object).to receive(:adapter) { adapter }
-      expect(adapter).to receive(:read_multi).with(["MyObj-1", "MyObj-2", "MyObj-3"]) { double(values: true) }
+      expect(adapter).to receive(:read_multi).with(%w(MyObj-1 MyObj-2 MyObj-3)) { double(values: true) }
       multi_get.cached_objects(1..3)
     end
   end
 
-  describe "#missed_ids" do
+  describe '#missed_ids' do
     let(:initial_ids) { [1, 2, 3, 4, 5, 6] }
-    it "computes missed ids" do
+    it 'computes missed ids' do
       expect(multi_get.missed_ids(initial_ids, obj_arr)).to eq([4, 5, 6])
     end
   end
 
-  describe "#load_remaining" do
-    it "performs missed queries" do
+  describe '#load_remaining' do
+    it 'performs missed queries' do
       expect(fake_clazz).to receive(:where).with(:foo => [1, 2, 3]).once { [double(write_cache!: true)] }
       multi_get.load_from_db([1, 2, 3])
     end
   end
 
-  describe "#fetch_all" do
-    describe "with all expected ids" do
-      it "never calls through to db" do
+  describe '#fetch_all' do
+    describe 'with all expected ids' do
+      it 'never calls through to db' do
         expect(multi_get).to receive(:cached_objects).with([1, 2, 3]) {  obj_arr }
         expect(multi_get).to receive(:load_from_db).never
         multi_get.fetch_all([1, 2, 3])
       end
     end
 
-    describe "with a cache miss" do
-      it "calls through to db" do
+    describe 'with a cache miss' do
+      it 'calls through to db' do
         expect(multi_get).to receive(:cached_objects).with([1, 2, 3]) { [ obj_arr[0] ]}
         expect(multi_get).to receive(:load_from_db).with([2, 3]) { [obj_arr[1], obj_arr[2]] }
         expect(multi_get.fetch_all([1, 2, 3])).to have(3).items

data/spec/features/cache_object_spec.rb

@@ -3,7 +3,7 @@ require 'support/models'
 
 # Only writing the features before all the units to see the semantics of
 # using with actual AR finder methods
-RSpec.describe "Caching" do
+RSpec.describe 'Caching' do
 
   before do
     CreateModelsForTest.migrate(:up)
@@ -18,52 +18,52 @@ RSpec.describe "Caching" do
     Cache::Object.instance_variable_set(:@configuration, nil)
   end
 
-  let!(:user) { User.create(age: 13, name: "Bob") }
+  let!(:user) { User.create(age: 13, name: 'Bob') }
 
-  describe "#find" do
-    it "finds the object from the cache" do
+  describe '#find' do
+    it 'finds the object from the cache' do
       expect {
         expect(User.find(user.id)).to eq(user)
       }.to change { ActiveRecord::QueryCounter.query_count }.by(0)
     end
   end
 
-  describe "#find_by_id" do
-    it "finds the object from the cache" do
+  describe '#find_by_id' do
+    it 'finds the object from the cache' do
       expect {
         expect(User.find_by_id(user.id)).to eq(user)
       }.to change { ActiveRecord::QueryCounter.query_count }.by(0)
     end
   end
 
-  describe "#find_by_name_and_age" do
-    it "finds the object from the cache" do
+  describe '#find_by_name_and_age' do
+    it 'finds the object from the cache' do
       expect {
-        expect(User.find_by_name_and_age("Bob", 13)).to eq(user)
+        expect(User.find_by_name_and_age('Bob', 13)).to eq(user)
       }.to change { ActiveRecord::QueryCounter.query_count }.by(0)
     end
 
-    describe "when the name is changed" do
-      it "writes the updated data into the cache" do
-        user.update_attributes(name: "Sally")
+    describe 'when the name is changed' do
+      it 'writes the updated data into the cache' do
+        user.update_attributes(name: 'Sally')
         expect {
-          fetched_user = User.find_by_name_and_age("Sally", 13)
-          expect(fetched_user.name).to eq("Sally")
+          fetched_user = User.find_by_name_and_age('Sally', 13)
+          expect(fetched_user.name).to eq('Sally')
         }.to change { ActiveRecord::QueryCounter.query_count }.by(0)
       end
     end
   end
 
-  describe "#fetch_all" do
+  describe '#fetch_all' do
     let!(:u1) { 1.upto(3).map { |i| User.create(age: 13, name: "name#{i}") } }
-    it "Should call db once for all in one read" do
+    it 'Should call db once for all in one read' do
 
       expect {
         User.fetch_all(u1.map(&:id))
       }.to change { ActiveRecord::QueryCounter.query_count }.by(0)
     end
 
-    it "Should call the db again after cache flush" do
+    it 'Should call the db again after cache flush' do
       Cache::Object.configuration.cache.clear
 
       expect {
@@ -78,22 +78,22 @@ RSpec.describe "Caching" do
   end
 
 
-  describe "when user id destroyed" do
-    it "tries to run a query" do
+  describe 'when user id destroyed' do
+    it 'tries to run a query' do
       user.destroy
       expect {
         expect {
           User.find(user.id)
-        }.to raise_error
+        }.to raise_error(ActiveRecord::RecordNotFound)
       }.to change { ActiveRecord::QueryCounter.query_count }.by(1)
     end
   end
 
-  describe "rolling back a transaction" do
-    it "expires the cache" do
+  describe 'rolling back a transaction' do
+    it 'expires the cache' do
       expect {
-        user.update_attributes(name: "asplode")
-      }.to raise_error
+        user.update_attributes(name: 'asplode')
+      }.to raise_error(User::SillyTestError)
 
       expect {
         User.find(user.id)
@@ -101,15 +101,15 @@ RSpec.describe "Caching" do
     end
   end
 
-  describe "when object is not persisted" do
-    it "does not call the adapter" do
+  describe 'when object is not persisted' do
+    it 'does not call the adapter' do
       expect(Cache::Object.adapter).to receive(:write).never
-      User.new(name: "blah").write_cache!
+      User.new(name: 'blah').write_cache!
     end
   end
 
-  describe "object_cache_include" do
-    it "has expected additional attribute" do
+  describe 'object_cache_include' do
+    it 'has expected additional attribute' do
       user.shoe_size = '14'
       user.write_cache!
 

data/spec/support/models.rb

@@ -1,4 +1,5 @@
 require 'active_record'
+require 'logger'
 
 ActiveRecord::Migration.verbose = false
 ActiveRecord::Base.logger = Logger.new($STDOUT)
@@ -38,6 +39,8 @@ class CreateModelsForTest < ActiveRecord::Migration
 end
 
 class User < ActiveRecord::Base
+  class SillyTestError < StandardError; end
+
   include Cache::Object::ActiveRecord
 
   object_cache_include :shoe_size
@@ -48,6 +51,6 @@ class User < ActiveRecord::Base
   after_save :asplode_if_name_is_asplode
 
   def asplode_if_name_is_asplode
-    raise "WOAH" if name == "asplode"
+    raise SillyTestError.new('WOAH') if name == 'asplode'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cache-object
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Matt Camuto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-04 00:00:00.000000000 Z
+date: 2015-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.3'
 - !ruby/object:Gem::Dependency
   name: ruby-usdt
   requirement: !ruby/object:Gem::Requirement
@@ -50,14 +50,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -165,6 +165,8 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -181,6 +183,9 @@ files:
 - bin/rspec
 - bin/thor
 - cache-object.gemspec
+- gemfiles/Gemfile.Rails32
+- gemfiles/Gemfile.Rails41
+- gemfiles/Gemfile.Rails42
 - lib/cache/object.rb
 - lib/cache/object/active_record.rb
 - lib/cache/object/adapter.rb