record-cache 0.1.2 → 0.1.3

data/spec/models/language.rb

@@ -0,0 +1,5 @@
+class Language < ActiveRecord::Base
+
+  cache_records :store => :local, :full_table => true
+
+end

data/spec/models/person.rb

@@ -1,6 +1,6 @@
 class Person < ActiveRecord::Base
   
-  cache_records :store => :shared, :key => "per"
+  cache_records :store => :shared, :key => "per", :unique_index => :name
 
   has_many :apples  # cached with index on person_id
   has_many :bananas # cached with index on person_id

data/spec/models/store.rb

@@ -1,12 +1,13 @@
 class Store < ActiveRecord::Base
 
-  cache_records :store => :local, :key => "st", :request_cache => true
+  cache_records :store => :local, :key => "st"
 
   belongs_to :owner, :class_name => "Person"
 
   has_many :apples, :autosave => true  # cached with index on store
   has_many :bananas # cached without index on store
   has_many :pears   # not cached
+  has_one :address, :autosave => true
 
   has_and_belongs_to_many :customers, :class_name => "Person"
 

data/spec/spec_helper.rb

@@ -2,10 +2,13 @@ dir = File.dirname(__FILE__)
 $LOAD_PATH.unshift dir + "/../lib"
 $LOAD_PATH.unshift dir
 
+require 'simplecov'
+SimpleCov.start do
+  add_filter '/spec/'
+end
+
 require "rubygems"
-require "test/unit"
 require "rspec"
-require 'rr'
 require 'database_cleaner'
 require "logger"
 require "record_cache"
@@ -31,9 +34,9 @@ load(dir + "/db/seeds.rb")
 
 # Clear cache after each test
 RSpec.configure do |config|
-  config.mock_with :rr
-  
+
   config.before(:each) do
+    RecordCache::Base.enable
     DatabaseCleaner.start
   end
   

data/spec/support/after_commit.rb

@@ -33,6 +33,7 @@ module ActiveRecord
         if !rolled_back && open_transactions == 1
           commit_transaction_records(false)
         end
+        true
       end
       alias_method_chain :transaction, :transactional_fixtures
 
@@ -64,6 +65,7 @@ module ActiveRecord
             @_current_transaction_records = real_current_transaction_records
           end
         end
+        true
       end
       alias_method_chain :commit_transaction_records, :transactional_fixtures
     end

data/spec/support/matchers/hit_cache_matcher.rb

@@ -1,17 +1,21 @@
 # Examples:
-#  1) lambda{ Person.find(22) }.should hit_cache(Person)
+#  1) expect{ Person.find(22) }.to hit_cache(Person)
 #     _should have at least one hit in any of the cache strategies for the Person model_
 #
-#  2) lambda{ Person.find(22) }.should hit_cache(Person).on(:id)
+#  2) expect{ Person.find(22) }.to hit_cache(Person).on(:id)
 #     _should have at least one hit in the ID cache strategy for the Person model_
 #
-#  3) lambda{ Person.find_by_ids(22, 23, 24) }.should hit_cache(Person).on(:id).times(2)
+#  3) expect{ Person.find_by_ids(22, 23, 24) }.to hit_cache(Person).on(:id).times(2)
 #     _should have exactly two hits in the :id cache strategy for the Person model_
 #
-#  4) lambda{ Person.find_by_ids(22, 23, 24) }.should hit_cache(Person).times(3)
+#  4) expect{ Person.find_by_ids(22, 23, 24) }.to hit_cache(Person).times(3)
 #     _should have exactly three hits in any of the cache strategies for the Person model_
 RSpec::Matchers.define :hit_cache do |model|
 
+  def supports_block_expectations?
+    true
+  end
+
   chain :on do |strategy|
     @strategy = strategy
   end
@@ -34,12 +38,12 @@ RSpec::Matchers.define :hit_cache do |model|
     @expected_nr_of_hits ? @nr_of_hits == @expected_nr_of_hits : @nr_of_hits > 0
   end
 
-  failure_message_for_should do |proc|
+  failure_message do |proc|
     prepare_message
     "Expected #{@strategy_msg} for #{model.name} to be hit #{@times_msg}, but found #{@nr_of_hits}: #{@statistics_msg}"
   end
 
-  failure_message_for_should_not do |proc|
+  failure_message_when_negated do |proc|
     prepare_message
     "Expected #{@strategy_msg} for #{model.name} not to be hit #{@times_msg}, but found #{@nr_of_hits}: #{@statistics_msg}"
   end

data/spec/support/matchers/log.rb

@@ -0,0 +1,45 @@
+# Examples:
+#  1) expect{ Person.find(22) }.to log(:debug, %(UniqueIndexCache on 'id' hit for ids 1)
+#     _should have at least one debug log statement as given above_
+#
+#  2) expect{ Person.find(22) }.to log(:debug, /^UniqueIndexCache/)
+#     _should have at least one debug log statement starting with UniqueIndexCache_
+RSpec::Matchers.define :log do |severity, expected|
+
+  def supports_block_expectations?
+    true
+  end
+
+  match do |proc|
+    logger = RecordCache::Base.logger
+    # override the debug/info/warn/error method
+    logger.instance_variable_set(:@found_messages, [])
+    logger.instance_variable_set(:@found, false)
+    logger.class.send(:alias_method, "orig_#{severity}", severity)
+    logger.class.send(:define_method, severity) do |progname = nil, &block|
+      unless @found
+        actual= progname.is_a?(String) ? progname : block ? block.call : nil
+        unless actual.blank?
+          @found = actual.is_a?(String) && expected.is_a?(Regexp) ? actual =~ expected : actual == expected
+          @found_messages << actual
+        end
+      end
+    end
+    # call the given proc
+    proc.call
+    # redefine
+    logger.class.send(:alias_method, severity, "orig_#{severity}")
+    # the result
+    @found_messages = logger.instance_variable_get(:@found_messages)
+    @found = logger.instance_variable_get(:@found)
+  end
+
+  failure_message do |proc|
+    "Expected #{@found_messages.inspect} to include #{expected.inspect}"
+  end
+
+  failure_message_when_negated do |proc|
+    "Expected #{@found_messages.inspect} not to include #{expected.inspect}"
+  end
+
+end 

data/spec/support/matchers/miss_cache_matcher.rb

@@ -1,17 +1,21 @@
 # Examples:
-#  1) lambda{ Person.find(22) }.should miss_cache(Person)
+#  1) expect{ Person.find(22) }.to miss_cache(Person)
 #     _should have at least one miss in any of the cache strategies for the Person model_
 #
-#  2) lambda{ Person.find(22) }.should miss_cache(Person).on(:id)
+#  2) expect{ Person.find(22) }.to miss_cache(Person).on(:id)
 #     _should have at least one miss for the ID cache strategy for the Person model_
 #
-#  3) lambda{ Person.find_by_ids(22, 23, 24) }.should miss_cache(Person).on(:id).times(2)
+#  3) expect{ Person.find_by_ids(22, 23, 24) }.to miss_cache(Person).on(:id).times(2)
 #     _should have exactly two misses in the :id cache strategy for the Person model_
 #
-#  4) lambda{ Person.find_by_ids(22, 23, 24) }.should miss_cache(Person).times(3)
+#  4) expect{ Person.find_by_ids(22, 23, 24) }.to miss_cache(Person).times(3)
 #     _should have exactly three misses in any of the cache strategies for the Person model_
 RSpec::Matchers.define :miss_cache do |model|
 
+  def supports_block_expectations?
+    true
+  end
+
   chain :on do |strategy|
     @strategy = strategy
   end
@@ -34,12 +38,12 @@ RSpec::Matchers.define :miss_cache do |model|
     @expected_nr_of_misses ? @nr_of_misses == @expected_nr_of_misses : @nr_of_misses > 0
   end
 
-  failure_message_for_should do |proc|
+  failure_message do |proc|
     prepare_message
     "Expected #{@strategy_msg} for #{model.name} to be missed #{@times_msg}, but found #{@nr_of_misses}: #{@statistics_msg}"
   end
 
-  failure_message_for_should_not do |proc|
+  failure_message_when_negated do |proc|
     prepare_message
     "Expected #{@strategy_msg} for #{model.name} not to be missed #{@times_msg}, but found #{@nr_of_misses}: #{@statistics_msg}"
   end

data/spec/support/matchers/use_cache_matcher.rb

@@ -1,17 +1,21 @@
 # Examples:
-#  1) lambda{ Person.find(22) }.should use_cache(Person)
+#  1) expect{ Person.find(22) }.to use_cache(Person)
 #     _should perform at least one call (hit/miss) to any of the cache strategies for the Person model_
 #
-#  2) lambda{ Person.find(22) }.should use_cache(Person).on(:id)
+#  2) expect{ Person.find(22) }.to use_cache(Person).on(:id)
 #     _should perform at least one call (hit/miss) to the ID cache strategy for the Person model_
 #
-#  3) lambda{ Person.find_by_ids(22, 23, 24) }.should use_cache(Person).on(:id).times(2)
+#  3) expect{ Person.find_by_ids(22, 23, 24) }.to use_cache(Person).on(:id).times(2)
 #     _should perform exactly two calls (hit/miss) to the :id cache strategy for the Person model_
 #
-#  4) lambda{ Person.find_by_ids(22, 23, 24) }.should use_cache(Person).times(3)
+#  4) expect{ Person.find_by_ids(22, 23, 24) }.to use_cache(Person).times(3)
 #     _should perform exactly three calls (hit/miss) to any of the cache strategies for the Person model_
 RSpec::Matchers.define :use_cache do |model|
 
+  def supports_block_expectations?
+    true
+  end
+
   chain :on do |strategy|
     @strategy = strategy
   end
@@ -34,12 +38,12 @@ RSpec::Matchers.define :use_cache do |model|
     @expected_nr_of_calls ? @nr_of_calls == @expected_nr_of_calls : @nr_of_calls > 0
   end
 
-  failure_message_for_should do |proc|
+  failure_message do |proc|
     prepare_message
     "Expected #{@strategy_msg} for #{model.name} to be called #{@times_msg}, but found #{@nr_of_calls}: #{@statistics_msg}"
   end
 
-  failure_message_for_should_not do |proc|
+  failure_message_when_negated do |proc|
     prepare_message
     "Expected #{@strategy_msg} for #{model.name} not to be called #{@times_msg}, but found #{@nr_of_calls}: #{@statistics_msg}"
   end

metadata

@@ -1,173 +1,162 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: record-cache
-version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 2
-  version: 0.1.2
+version: !ruby/object:Gem::Version
+  version: 0.1.3
 platform: ruby
-authors: 
+authors:
 - Orslumen
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-20 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-09-16 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: activerecord
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rcov
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rr
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: database_cleaner
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id009
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Record Cache for Rails 3
 email: orslumen@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/record-cache.rb
 - lib/record_cache.rb
 - lib/record_cache/base.rb
 - lib/record_cache/datastore/active_record.rb
 - lib/record_cache/datastore/active_record_30.rb
 - lib/record_cache/datastore/active_record_31.rb
+- lib/record_cache/datastore/active_record_32.rb
 - lib/record_cache/dispatcher.rb
 - lib/record_cache/multi_read.rb
 - lib/record_cache/query.rb
 - lib/record_cache/statistics.rb
 - lib/record_cache/strategy/base.rb
-- lib/record_cache/strategy/id_cache.rb
+- lib/record_cache/strategy/full_table_cache.rb
 - lib/record_cache/strategy/index_cache.rb
-- lib/record_cache/strategy/request_cache.rb
+- lib/record_cache/strategy/unique_index_cache.rb
 - lib/record_cache/strategy/util.rb
 - lib/record_cache/test/resettable_version_store.rb
 - lib/record_cache/version.rb
@@ -176,81 +165,87 @@ files:
 - spec/db/schema.rb
 - spec/db/seeds.rb
 - spec/initializers/record_cache.rb
+- spec/lib/active_record/visitor_spec.rb
+- spec/lib/base_spec.rb
 - spec/lib/dispatcher_spec.rb
 - spec/lib/multi_read_spec.rb
 - spec/lib/query_spec.rb
 - spec/lib/statistics_spec.rb
 - spec/lib/strategy/base_spec.rb
-- spec/lib/strategy/id_cache_spec.rb
+- spec/lib/strategy/full_table_cache_spec.rb
 - spec/lib/strategy/index_cache_spec.rb
-- spec/lib/strategy/request_cache_spec.rb
+- spec/lib/strategy/query_cache_spec.rb
+- spec/lib/strategy/unique_index_on_id_cache_spec.rb
+- spec/lib/strategy/unique_index_on_string_cache_spec.rb
 - spec/lib/strategy/util_spec.rb
 - spec/lib/version_store_spec.rb
+- spec/models/address.rb
 - spec/models/apple.rb
 - spec/models/banana.rb
+- spec/models/language.rb
 - spec/models/pear.rb
 - spec/models/person.rb
 - spec/models/store.rb
 - spec/spec_helper.rb
 - spec/support/after_commit.rb
 - spec/support/matchers/hit_cache_matcher.rb
+- spec/support/matchers/log.rb
 - spec/support/matchers/miss_cache_matcher.rb
 - spec/support/matchers/use_cache_matcher.rb
 homepage: https://github.com/orslumen/record-cache
-licenses: []
-
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
-summary: Record Cache v0.1.2 transparantly stores Records in a Cache Store and retrieve those Records from the store when queried (by ID) using Active Model.
-test_files: 
+specification_version: 4
+summary: Record Cache v0.1.3 transparantly stores Records in a Cache Store and retrieve
+  those Records from the store when queried using Active Model.
+test_files:
 - spec/db/database.yml
 - spec/db/schema.rb
 - spec/db/seeds.rb
 - spec/initializers/record_cache.rb
+- spec/lib/active_record/visitor_spec.rb
+- spec/lib/base_spec.rb
 - spec/lib/dispatcher_spec.rb
 - spec/lib/multi_read_spec.rb
 - spec/lib/query_spec.rb
 - spec/lib/statistics_spec.rb
 - spec/lib/strategy/base_spec.rb
-- spec/lib/strategy/id_cache_spec.rb
+- spec/lib/strategy/full_table_cache_spec.rb
 - spec/lib/strategy/index_cache_spec.rb
-- spec/lib/strategy/request_cache_spec.rb
+- spec/lib/strategy/query_cache_spec.rb
+- spec/lib/strategy/unique_index_on_id_cache_spec.rb
+- spec/lib/strategy/unique_index_on_string_cache_spec.rb
 - spec/lib/strategy/util_spec.rb
 - spec/lib/version_store_spec.rb
+- spec/models/address.rb
 - spec/models/apple.rb
 - spec/models/banana.rb
+- spec/models/language.rb
 - spec/models/pear.rb
 - spec/models/person.rb
 - spec/models/store.rb
 - spec/spec_helper.rb
 - spec/support/after_commit.rb
 - spec/support/matchers/hit_cache_matcher.rb
+- spec/support/matchers/log.rb
 - spec/support/matchers/miss_cache_matcher.rb
 - spec/support/matchers/use_cache_matcher.rb