identity_cache 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a3b2c0bfce28e5d4b88e8f9003b82b8b1ce6ac4
-  data.tar.gz: 1aeba990c3842ddebcc6ffa81e7a95610d8e797b
+  metadata.gz: 4486319de757bbba037be1e7687cb18a2fd72dc8
+  data.tar.gz: 8869e35fceeca476227e9b8181a573cfe38f1d96
 SHA512:
-  metadata.gz: 5cb1a76f43cd10bafd968cc27c3aad201ca5f10ce20e9af90231deb6b663e42f5505497ef63d8eff94f64ad60ddc05e46be79d9ff64a3671a86142d33480248a
-  data.tar.gz: 976d47284787e9239bf81956fbfc0e518dd2c77915752e13b57c9cd70cf398b1b1d37f5325383ef1f415d76a6ac70ec0549c6d8432fd3b10bdcaee6f0297f345
+  metadata.gz: 1a7927f13588a480924f558473f536a94790a165820c4ff606e69456a5374394ae66c1b6eb6e40d39bd76490b0537a1b3bc164855f0174b122cbd1109376580e
+  data.tar.gz: 90f5bec88b0edd0e6c915804533eebb2d5f020dcf99ecc03b262eeaec9313d64f6c30aa9420384d8652014642198083d0bf17a8bd507872705c7838e2df827e8

data/CHANGELOG

@@ -1,3 +1,9 @@
+0.0.7
+* Fix: Not implemented error for cache_has_one with embed: false
+* Fix: cache key to change when adding a cache_has_many association with :embed => false
+* Add support for non-integer primary keys
+* Fix: Compatibility rails 4.1 for quote_value, which needs default column.
+
 0.0.6
 * Fix: bug where previously nil-cached attribute caches weren't expired on record creation
 * Fix: cache key to not change when adding a non-embedded association.

data/Gemfile.rails4

@@ -4,5 +4,4 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'activerecord', '~> 4.0.1'
-gem 'activesupport', '~> 4.0.1'
-gem 'dalli'
+gem 'activesupport', '~> 4.0.1'

data/identity_cache.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency('ar_transaction_changes', '= 0.0.3')
   gem.add_dependency('activerecord', '>= 3.2', '< 4.1')
 
-  gem.add_development_dependency('memcache-client')
+  gem.add_development_dependency('memcached_store', '~> 0.11.2')
   gem.add_development_dependency('rake')
   gem.add_development_dependency('mocha', '0.14.0')
 
@@ -29,5 +29,6 @@ Gem::Specification.new do |gem|
   else
     gem.add_development_dependency('cityhash', '0.6.0')
     gem.add_development_dependency('mysql2')
+    gem.add_development_dependency('stackprof') if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.1.0")
   end
 end

data/lib/identity_cache/cache_key_generation.rb

@@ -9,23 +9,18 @@ module IdentityCache
 
     def self.denormalized_schema_hash(klass)
       schema_string = schema_to_string(klass.columns)
-      if !(associations = embedded_associations(klass)).empty?
-        embedded_schema = associations.map do |name, options|
-          "#{name}:(#{denormalized_schema_hash(options[:association_class])})"
-        end.sort.join(',')
-        schema_string << "," << embedded_schema
+      if klass.include?(IdentityCache)
+        klass.send(:all_cached_associations).sort.each do |name, options|
+          if options[:embed]
+            schema_string << ",#{name}:(#{denormalized_schema_hash(options[:association_class])})"
+          elsif options[:cached_ids_name]
+            schema_string << ",#{name}:ids"
+          end
+        end
       end
       IdentityCache.memcache_hash(schema_string)
     end
 
-    def self.embedded_associations(klass)
-      if klass.respond_to?(:all_embedded_associations)
-        klass.all_embedded_associations
-      else
-        {}
-      end
-    end
-
     module ClassMethods
       def rails_cache_key(id)
         "#{rails_cache_key_prefix}#{id}"

data/lib/identity_cache/configuration_dsl.rb

@@ -14,10 +14,6 @@ module IdentityCache
       base.cache_attributes = []
       base.cache_indexes = []
       base.primary_cache_index_enabled = true
-
-      base.private_class_method :build_normalized_has_many_cache, :build_denormalized_association_cache,
-                                :add_parent_expiry_hook, :identity_cache_multiple_value_dynamic_fetcher,
-                                :identity_cache_single_value_dynamic_fetcher, :identity_cache_sql_conditions
     end
 
     module ClassMethods
@@ -134,7 +130,7 @@ module IdentityCache
       #   necessary if the name is not the lowercase pluralization of the
       #   parent object's class)
       def cache_has_one(association, options = {})
-        options[:embed] ||= true
+        options[:embed] = true unless options.has_key?(:embed)
         options[:inverse_name] ||= self.name.underscore.to_sym
         raise InverseAssociationError unless self.reflect_on_association(association)
         self.cached_has_ones[association] = options
@@ -182,12 +178,14 @@ module IdentityCache
         self.primary_cache_index_enabled = false
       end
 
+      private
+
       def identity_cache_single_value_dynamic_fetcher(fields, values) # :nodoc:
         sql_on_miss = "SELECT #{quoted_primary_key} FROM #{quoted_table_name} WHERE #{identity_cache_sql_conditions(fields, values)} LIMIT 1"
         cache_key = rails_cache_index_key_for_fields_and_values(fields, values)
         id = IdentityCache.fetch(cache_key) { connection.select_value(sql_on_miss) }
         unless id.nil?
-          record = fetch_by_id(id.to_i)
+          record = fetch_by_id(id)
           IdentityCache.cache.delete(cache_key) unless record
         end
 
@@ -292,7 +290,7 @@ module IdentityCache
       end
 
       def identity_cache_sql_conditions(fields, values)
-        fields.each_with_index.collect { |f, i| "#{connection.quote_column_name(f)} = #{quote_value(values[i])}" }.join(" AND ")
+        fields.each_with_index.collect { |f, i| "#{connection.quote_column_name(f)} = #{quote_value(values[i],nil)}" }.join(" AND ")
       end
     end
   end

data/lib/identity_cache/parent_model_expiration.rb

@@ -5,16 +5,16 @@ module IdentityCache
 
       if new_parent && new_parent.respond_to?(:expire_primary_index, true)
         if should_expire_identity_cache_parent?(foreign_key, only_on_foreign_key_change)
-          new_parent.expire_primary_index
-          new_parent.expire_parent_cache if new_parent.respond_to?(:expire_parent_cache)
+          new_parent.send(:expire_primary_index)
+          new_parent.send(:expire_parent_cache) if new_parent.respond_to?(:expire_parent_cache, true)
         end
       end
 
       if transaction_changed_attributes[foreign_key].present?
         begin
           old_parent = parent_class.find(transaction_changed_attributes[foreign_key])
-          old_parent.expire_primary_index if old_parent.respond_to?(:expire_primary_index)
-          old_parent.expire_parent_cache  if old_parent.respond_to?(:expire_parent_cache)
+          old_parent.send(:expire_primary_index) if old_parent.respond_to?(:expire_primary_index, true)
+          old_parent.send(:expire_parent_cache)  if old_parent.respond_to?(:expire_parent_cache, true)
         rescue ActiveRecord::RecordNotFound => e
           # suppress errors finding the old parent if its been destroyed since it will have expired itself in that case
         end

data/lib/identity_cache/query_api.rb

@@ -3,16 +3,6 @@ module IdentityCache
     extend ActiveSupport::Concern
 
     included do |base|
-      base.private_class_method :require_if_necessary
-      base.private_class_method :coder_from_record
-      base.private_class_method :record_from_coder
-      base.private_class_method :set_embedded_association
-      base.private_class_method :get_embedded_association
-      base.private_class_method :add_cached_associations_to_coder
-      base.instance_eval(<<-CODE, __FILE__, __LINE__ + 1)
-        private :expire_cache, :was_new_record?, :fetch_denormalized_cached_association,
-                :populate_denormalized_cached_association
-      CODE
       base.after_commit :expire_cache
       base.after_touch  :expire_cache
     end
@@ -66,7 +56,7 @@ module IdentityCache
             coders_by_key = IdentityCache.fetch_multi(*cache_keys) do |unresolved_keys|
               ids = unresolved_keys.map {|key| key_to_id_map[key] }
               records = find_batch(ids, options)
-              records.compact.each(&:populate_association_caches)
+              records.compact.each{ |record| record.send(:populate_association_caches) }
               records.map {|record| coder_from_record(record) }
             end
 
@@ -81,6 +71,8 @@ module IdentityCache
         end
       end
 
+      private
+
       def record_from_coder(coder) #:nodoc:
         if coder.present? && coder.has_key?(:class)
           record = coder[:class].allocate
@@ -122,7 +114,7 @@ module IdentityCache
         else
           record_from_coder(coder_or_array)
         end
-        variable_name = record.class.all_embedded_associations[association_name][:records_variable_name]
+        variable_name = record.class.send(:all_embedded_associations)[association_name][:records_variable_name]
         record.instance_variable_set(:"@#{variable_name}", IdentityCache.map_cached_nil_for(value))
       end
 
@@ -147,8 +139,8 @@ module IdentityCache
       end
 
       def add_cached_associations_to_coder(record, coder)
-        if record.class.respond_to?(:all_embedded_associations) && record.class.all_embedded_associations.present?
-          coder[:associations] = record.class.all_embedded_associations.each_with_object({}) do |(name, options), hash|
+        if record.class.respond_to?(:all_embedded_associations, true) && record.class.send(:all_embedded_associations).present?
+          coder[:associations] = record.class.send(:all_embedded_associations).each_with_object({}) do |(name, options), hash|
             hash[name] = IdentityCache.map_cached_nil_for(get_embedded_association(record, name, options))
           end
         end
@@ -179,7 +171,7 @@ module IdentityCache
 
       def resolve_cache_miss(id)
         object = self.includes(cache_fetch_includes).where(id: id).try(:first)
-        object.try(:populate_association_caches)
+        object.send(:populate_association_caches) if object
         object
       end
 
@@ -208,8 +200,8 @@ module IdentityCache
 
           child_includes = additions.delete(child_association)
 
-          if child_class.respond_to?(:cache_fetch_includes)
-            child_includes = child_class.cache_fetch_includes(child_includes)
+          if child_class.respond_to?(:cache_fetch_includes, true)
+            child_includes = child_class.send(:cache_fetch_includes, child_includes)
           end
 
           if child_includes.blank?
@@ -295,8 +287,8 @@ module IdentityCache
             raise ArgumentError.new("Unknown cached association #{association} listed for prefetching")
           end
 
-          if details && details[:association_class].respond_to?(:prefetch_associations)
-            details[:association_class].prefetch_associations(sub_associations, next_level_records)
+          if details && details[:association_class].respond_to?(:prefetch_associations, true)
+            details[:association_class].send(:prefetch_associations, sub_associations, next_level_records)
           end
         end
       end
@@ -322,13 +314,15 @@ module IdentityCache
       end
     end
 
+    private
+
     def populate_association_caches # :nodoc:
-      self.class.all_cached_associations_needing_population.each do |cached_association, options|
+      self.class.send(:all_cached_associations_needing_population).each do |cached_association, options|
         send(options[:population_method_name])
         reflection = options[:embed] && self.class.reflect_on_association(cached_association)
         if reflection && reflection.klass.respond_to?(:cached_has_manys)
           child_objects = Array.wrap(send(options[:cached_accessor_name]))
-          child_objects.each(&:populate_association_caches)
+          child_objects.each{ |child| child.send(:populate_association_caches) }
         end
       end
     end

data/lib/identity_cache/version.rb

@@ -1,4 +1,4 @@
 module IdentityCache
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
   CACHE_VERSION = 3
 end

data/performance/cache_runner.rb

@@ -3,7 +3,8 @@ require 'active_record'
 require 'active_support/core_ext'
 require 'active_support/cache'
 require 'identity_cache'
-require 'memcache'
+require 'memcached_store'
+require 'active_support/cache/memcached_store'
 
 if ENV['BOXEN_HOME'].present?
   $memcached_port = 21211
@@ -29,17 +30,9 @@ end
 
 def create_database(count)
   DatabaseConnection.setup
-  a = CacheRunner.new(count)
 
-  a.setup_models
-
-  DatabaseConnection.setup
-  # set up associations
-  Item.cache_has_one :associated
-  Item.cache_has_many :associated_records, :embed => true
-  Item.cache_has_many :normalized_associated_records, :embed => false
-  Item.cache_index :title, :unique => :true
-  AssociatedRecord.cache_has_many :deeply_associated_records, :embed => true
+  helper = Object.new.extend(ActiveRecordObjects)
+  helper.setup_models
 
   return if database_ready(count)
   puts "Database not ready for performance testing, generating records"
@@ -60,6 +53,14 @@ def create_database(count)
       a.save
     end
   end
+ensure
+  helper.teardown_models
+end
+
+def setup_embedded_associations
+  Item.cache_has_one :associated
+  Item.cache_has_many :associated_records, :embed => true
+  AssociatedRecord.cache_has_many :deeply_associated_records, :embed => true
 end
 
 class CacheRunner
@@ -71,81 +72,92 @@ class CacheRunner
   end
 
   def prepare
+    setup_models
+  end
+
+  def cleanup
+    teardown_models
   end
 end
 
+CACHE_RUNNERS = []
+
 class FindRunner < CacheRunner
   def run
     (1..@count).each do |i|
-      ::Item.find(i)
+      ::Item.find(i, :include => [:associated, {:associated_records => :deeply_associated_records}])
     end
   end
 end
+CACHE_RUNNERS << FindRunner
 
 module MissRunner
   def prepare
+    super
     IdentityCache.cache.clear
   end
 end
 
-class FetchMissRunner < CacheRunner
-  include MissRunner
-
-  def run
-    (1..@count).each do |i|
-      rec = ::Item.fetch(i)
-      rec.fetch_associated
-      rec.fetch_associated_records
-    end
+module HitRunner
+  def prepare
+    super
+    run
   end
 end
 
-class DoubleFetchMissRunner < CacheRunner
-  include MissRunner
+class EmbedRunner < CacheRunner
+  def setup_models
+    super
+    Item.cache_has_one :associated
+    Item.cache_has_many :associated_records, :embed => true
+    AssociatedRecord.cache_has_many :deeply_associated_records, :embed => true
+  end
 
   def run
     (1..@count).each do |i|
       rec = ::Item.fetch(i)
       rec.fetch_associated
       rec.fetch_associated_records
-      rec.fetch_normalized_associated_records
     end
   end
 end
 
-module HitRunner
-  def prepare
-    IdentityCache.cache.clear
-    (1..@count).each do |i|
-      rec = ::Item.fetch(i)
-      rec.fetch_normalized_associated_records
-    end
-  end
+class FetchEmbedMissRunner < EmbedRunner
+  include MissRunner
 end
+CACHE_RUNNERS << FetchEmbedMissRunner
 
-class FetchHitRunner < CacheRunner
+class FetchEmbedHitRunner < EmbedRunner
   include HitRunner
+end
+CACHE_RUNNERS << FetchEmbedHitRunner
+
+
+class NormalizedRunner < CacheRunner
+  def setup_models
+    super
+    Item.cache_has_one :associated # :embed => false isn't supported
+    Item.cache_has_many :associated_records, :embed => false
+    AssociatedRecord.cache_has_many :deeply_associated_records, :embed => false
+  end
 
   def run
     (1..@count).each do |i|
       rec = ::Item.fetch(i)
-      # these should all be no cost
       rec.fetch_associated
-      rec.fetch_associated_records
+      associated_records = rec.fetch_associated_records
+      # FIXME: Only fetch_multi has :includes support, so use what it uses internally
+      AssociatedRecord.send(:prefetch_associations, :deeply_associated_records, associated_records)
     end
   end
 end
 
-class DoubleFetchHitRunner < CacheRunner
-  include HitRunner
+class FetchNormalizedMissRunner < NormalizedRunner
+  include MissRunner
+end
+CACHE_RUNNERS << FetchNormalizedMissRunner
 
-  def run
-    (1..@count).each do |i|
-      rec = ::Item.fetch(i)
-      # these should all be no cost
-      rec.fetch_associated
-      rec.fetch_associated_records
-      rec.fetch_normalized_associated_records
-    end
-  end
+class FetchNormalizedHitRunner < NormalizedRunner
+  include HitRunner
 end
+CACHE_RUNNERS << FetchNormalizedHitRunner

data/performance/cpu.rb

@@ -3,29 +3,41 @@ require 'benchmark'
 
 require_relative 'cache_runner'
 
-RUNS = 4000
+RUNS = 400
 
 class ARCreator
   include ActiveRecordObjects
 end
 
-def run(obj, bench)
-  bench.report("#{obj.class.name}:") do
-    obj.prepare
+def run(obj)
+  obj.prepare
+  GC.start
+  Benchmark.measure do
     obj.run
   end
+ensure
+  obj.cleanup
 end
 
-create_database(RUNS)
+def benchmark(runners, label_width=0)
+  IdentityCache.cache.clear
+  runners.each do |runner|
+    print "#{runner.name}: ".ljust(label_width)
+    puts run(runner.new(RUNS))
+  end
+end
 
-Benchmark.bmbm do |x|
-  run(FindRunner.new(RUNS), x)
+def bmbm(runners)
+  label_width = runners.map{ |r| r.name.size }.max + 2
+  width = label_width + Benchmark::CAPTION.size
 
-  run(FetchMissRunner.new(RUNS), x)
+  puts 'Rehearsal: '.ljust(width, '-')
+  benchmark(runners, label_width)
+  puts '-' * width
 
-  run(FetchHitRunner.new(RUNS), x)
+  benchmark(runners, label_width)
+end
 
-  run(DoubleFetchHitRunner.new(RUNS), x)
+create_database(RUNS)
 
-  run(DoubleFetchMissRunner.new(RUNS), x)
-end
+bmbm(CACHE_RUNNERS)

data/performance/profile.rb

@@ -1,30 +1,25 @@
 require 'rubygems'
 require 'benchmark'
-require 'ruby-prof'
+require 'stackprof'
 
 require_relative 'cache_runner'
 
 RUNS = 1000
-RubyProf.measure_mode = RubyProf::CPU_TIME
 
 def run(obj)
+  puts "#{obj.class.name}:"
   obj.prepare
-  RubyProf.start
-  obj.run
-  result = RubyProf.stop
-  puts "Results for #{obj.class.name}:"
-  printer = RubyProf::FlatPrinter.new(result)
-  printer.print(STDOUT)
+  data = StackProf.run(mode: :cpu) do
+    obj.run
+  end
+  StackProf::Report.new(data).print_text(false, 20)
+  puts
+ensure
+  obj.cleanup
 end
 
 create_database(RUNS)
 
-run(FindRunner.new(RUNS))
-
-run(FetchMissRunner.new(RUNS))
-
-run(FetchHitRunner.new(RUNS))
-
-run(DoubleFetchHitRunner.new(RUNS))
-
-run(DoubleFetchMissRunner.new(RUNS))
+CACHE_RUNNERS.each do |runner|
+  run(runner.new(RUNS))
+end

data/test/cache_fetch_includes_test.rb

@@ -7,28 +7,28 @@ class CacheFetchIncludesTest < IdentityCache::TestCase
 
   def test_cached_embedded_has_manys_are_included_in_includes
     Item.send(:cache_has_many, :associated_records, :embed => true)
-    assert_equal [:associated_records], Item.cache_fetch_includes
+    assert_equal [:associated_records], Item.send(:cache_fetch_includes)
   end
 
   def test_cached_nonembedded_has_manys_are_included_in_includes
     Item.send(:cache_has_many, :associated_records, :embed => false)
-    assert_equal [], Item.cache_fetch_includes
+    assert_equal [], Item.send(:cache_fetch_includes)
   end
 
   def test_cached_has_ones_are_included_in_includes
     Item.send(:cache_has_one, :associated)
-    assert_equal [:associated], Item.cache_fetch_includes
+    assert_equal [:associated], Item.send(:cache_fetch_includes)
   end
 
   def test_cached_nonembedded_belongs_tos_are_not_included_in_includes
     Item.send(:cache_belongs_to, :item)
-    assert_equal [], Item.cache_fetch_includes
+    assert_equal [], Item.send(:cache_fetch_includes)
   end
 
   def test_cached_child_associations_are_included_in_includes
     Item.send(:cache_has_many, :associated_records, :embed => true)
     AssociatedRecord.send(:cache_has_many, :deeply_associated_records, :embed => true)
-    assert_equal [{:associated_records => [:deeply_associated_records]}], Item.cache_fetch_includes
+    assert_equal [{:associated_records => [:deeply_associated_records]}], Item.send(:cache_fetch_includes)
   end
 
   def test_multiple_cached_associations_and_child_associations_are_included_in_includes
@@ -40,16 +40,16 @@ class CacheFetchIncludesTest < IdentityCache::TestCase
       {:associated_records => [:deeply_associated_records]},
       :polymorphic_records,
       {:associated => [:deeply_associated_records]}
-    ],  Item.cache_fetch_includes
+    ],  Item.send(:cache_fetch_includes)
   end
 
   def test_empty_additions_for_top_level_associations_makes_no_difference
     Item.send(:cache_has_many, :associated_records, :embed => true)
-    assert_equal [:associated_records], Item.cache_fetch_includes({})
+    assert_equal [:associated_records], Item.send(:cache_fetch_includes, {})
   end
 
   def test_top_level_additions_are_included_in_includes
-    assert_equal [{:associated_records => []}], Item.cache_fetch_includes({:associated_records => []})
+    assert_equal [{:associated_records => []}], Item.send(:cache_fetch_includes, {:associated_records => []})
   end
 
   def test_top_level_additions_alongside_top_level_cached_associations_are_included_in_includes
@@ -57,21 +57,21 @@ class CacheFetchIncludesTest < IdentityCache::TestCase
     assert_equal [
       :associated_records,
       {:polymorphic_records => []}
-    ], Item.cache_fetch_includes({:polymorphic_records => []})
+    ], Item.send(:cache_fetch_includes, {:polymorphic_records => []})
   end
 
   def test_child_level_additions_for_top_level_cached_associations_are_included_in_includes
     Item.send(:cache_has_many, :associated_records, :embed => true)
     assert_equal [
       {:associated_records => [{:deeply_associated_records => []}]}
-    ], Item.cache_fetch_includes({:associated_records => :deeply_associated_records})
+    ], Item.send(:cache_fetch_includes, {:associated_records => :deeply_associated_records})
   end
 
   def test_array_child_level_additions_for_top_level_cached_associations_are_included_in_includes
     Item.send(:cache_has_many, :associated_records, :embed => true)
     assert_equal [
       {:associated_records => [{:deeply_associated_records => []}]}
-    ], Item.cache_fetch_includes({:associated_records => [:deeply_associated_records]})
+    ], Item.send(:cache_fetch_includes, {:associated_records => [:deeply_associated_records]})
   end
 
   def test_array_child_level_additions_for_child_level_cached_associations_are_included_in_includes
@@ -82,7 +82,7 @@ class CacheFetchIncludesTest < IdentityCache::TestCase
         :deeply_associated_records,
         {:record => []}
       ]}
-    ], Item.cache_fetch_includes({:associated_records => [:record]})
+    ], Item.send(:cache_fetch_includes, {:associated_records => [:record]})
   end
 
 end

data/test/denormalized_has_one_test.rb

@@ -28,7 +28,7 @@ class DenormalizedHasOneTest < IdentityCache::TestCase
     @record.associated = nil
     @record.save!
     @record.reload
-    @record.populate_association_caches
+    @record.send(:populate_association_caches)
     Item.expects(:resolve_cache_miss).with(@record.id).once.returns(@record)
 
     IdentityCache.cache.expects(:read).with(@record.secondary_cache_index_key_for_current_values([:title]))
@@ -51,7 +51,7 @@ class DenormalizedHasOneTest < IdentityCache::TestCase
   end
 
   def test_on_cache_hit_record_should_come_back_with_cached_association
-    @record.populate_association_caches
+    @record.send(:populate_association_caches)
     Item.expects(:resolve_cache_miss).with(1).once.returns(@record)
     Item.fetch_by_title('foo')
 
@@ -67,7 +67,7 @@ class DenormalizedHasOneTest < IdentityCache::TestCase
     @record.save!
     @record.reload
 
-    @record.populate_association_caches
+    @record.send(:populate_association_caches)
     Item.expects(:resolve_cache_miss).with(1).once.returns(@record)
     Item.fetch_by_title('foo')
 

data/test/fetch_multi_test.rb

@@ -125,7 +125,7 @@ class FetchMultiTest < IdentityCache::TestCase
     Item.expects(:where).returns(mock_relation)
     mock_relation.expects(:includes).returns(stub(:to_a => [@bob, @joe, @fred]))
 
-    Item.find_batch([@bob, @joe, @fred].map(&:id).map(&:to_s))
+    Item.send(:find_batch, [@bob, @joe, @fred].map(&:id).map(&:to_s))
   end
 
   def test_fetch_multi_doesnt_freeze_keys

data/test/fetch_multi_with_batched_associations_test.rb

@@ -203,7 +203,7 @@ class FetchMultiWithBatchedAssociationsTest < IdentityCache::TestCase
     Item.expects(:where).returns(mock_relation)
     mock_relation.expects(:includes).returns(stub(:to_a => [@bob, @joe, @fred]))
 
-    Item.find_batch([@bob, @joe, @fred].map(&:id).map(&:to_s))
+    Item.send(:find_batch, [@bob, @joe, @fred].map(&:id).map(&:to_s))
   end
 
   private

data/test/helpers/cache.rb

@@ -2,7 +2,7 @@ require 'logger'
 
 module Rails
 
-  class Cache < ActiveSupport::Cache::MemCacheStore
+  class Cache < ActiveSupport::Cache::MemcachedStore
   end
 
   def self.cache

data/test/normalized_has_one_test.rb

@@ -0,0 +1,9 @@
+require "test_helper"
+
+class NormalizedHasOneTest < IdentityCache::TestCase
+  def test_not_implemented_error
+    assert_raises(NotImplementedError) do
+      Item.cache_has_one :associated, :embed => false
+    end
+  end
+end

data/test/recursive_denormalized_has_many_test.rb

@@ -23,7 +23,7 @@ class RecursiveDenormalizedHasManyTest < IdentityCache::TestCase
   end
 
   def test_cache_fetch_includes
-    assert_equal [{:associated_records => [:deeply_associated_records]}, :associated => [:deeply_associated_records]], Item.cache_fetch_includes
+    assert_equal [{:associated_records => [:deeply_associated_records]}, :associated => [:deeply_associated_records]], Item.send(:cache_fetch_includes)
   end
 
   def test_uncached_record_from_the_db_will_use_normal_association_for_deeply_associated_records

data/test/schema_change_test.rb

@@ -94,4 +94,14 @@ class SchemaChangeTest < IdentityCache::TestCase
     Item.expects(:resolve_cache_miss).returns(@record)
     record = Item.fetch(@record.id)
   end
+
+  def test_add_non_embedded_cache_has_many
+    record = Item.fetch(@record.id)
+
+    Item.cache_has_many :polymorphic_records, :inverse_name => :owner, :embed => false
+    read_new_schema
+
+    Item.expects(:resolve_cache_miss).returns(@record)
+    record = Item.fetch(@record.id)
+  end
 end

data/test/test_helper.rb

@@ -1,6 +1,8 @@
 require 'minitest/autorun'
 require 'mocha/setup'
 require 'active_record'
+require 'memcached_store'
+require 'active_support/cache/memcached_store'
 require 'helpers/cache'
 require 'helpers/database_connection'
 require 'helpers/active_record_objects'
@@ -19,7 +21,7 @@ DatabaseConnection.setup
 ActiveSupport::Cache::Store.instrument = true
 
 # This patches AR::MemcacheStore to notify AS::Notifications upon read_multis like the rest of rails does
-class ActiveSupport::Cache::MemCacheStore
+class ActiveSupport::Cache::MemcachedStore
   def read_multi_with_instrumentation(*args, &block)
     instrument("read_multi", "MULTI", {:keys => args}) do
       read_multi_without_instrumentation(*args, &block)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: identity_cache
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Camilo Lopez
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-21 00:00:00.000000000 Z
+date: 2014-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ar_transaction_changes
@@ -50,19 +50,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.1'
 - !ruby/object:Gem::Dependency
-  name: memcache-client
+  name: memcached_store
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.11.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.11.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -119,6 +119,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: stackprof
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Opt in read through ActiveRecord caching.
 email:
 - harry.brundage@shopify.com
@@ -168,6 +182,7 @@ files:
 - test/memoized_cache_proxy_test.rb
 - test/normalized_belongs_to_test.rb
 - test/normalized_has_many_test.rb
+- test/normalized_has_one_test.rb
 - test/recursive_denormalized_has_many_test.rb
 - test/save_test.rb
 - test/schema_change_test.rb
@@ -219,8 +234,10 @@ test_files:
 - test/memoized_cache_proxy_test.rb
 - test/normalized_belongs_to_test.rb
 - test/normalized_has_many_test.rb
+- test/normalized_has_one_test.rb
 - test/recursive_denormalized_has_many_test.rb
 - test/save_test.rb
 - test/schema_change_test.rb
 - test/serialization_format_change_test.rb
 - test/test_helper.rb
+has_rdoc: