cache_back 0.5.0 → 0.5.1

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

data/lib/cache_back.rb

@@ -5,7 +5,6 @@ require 'active_support'
 require 'cache_back/configuration_mixin'
 require 'cache_back/reload_association_mixin'
 require 'cache_back/cache'
-require 'cache_back/rack_middleware'
 
 module CacheBack
   CONFIGURATION = {:max_collection_size => 100}

data/lib/cache_back/cache.rb

@@ -54,6 +54,12 @@ module CacheBack
       Rails.cache.delete(*args)
     end
 
+    def delete_local(*keys)
+      keys.each do |key|
+        @local_cache.delete(key)
+      end
+    end
+
     def reset!
       @local_cache = {}
     end

data/lib/cache_back/conditions_parser.rb

@@ -4,57 +4,64 @@ module CacheBack
       @model_class = model_class
     end
 
-    def attribute_value_pairs(options, scope)
-      from_scope = attribute_value_pairs_for_conditions((scope || {})[:conditions])
-      return nil unless from_scope
+    def attribute_value_pairs(options)
+      #pulls out the conditions from each hash
+      condition_fragments = [options[:conditions]]
 
-      from_options = attribute_value_pairs_for_conditions(options[:conditions])
-      return nil unless from_options
-
-      pairs = from_scope.inject(from_options) do |memo, pair|
-        attribute = pair[0]
-        if memo_pair = memo.find{ |p| p[0] == attribute}
-          memo_pair[0] = Array(memo_pair[0])
-          memo_pair[0] << pair[1]
-        else
-          memo << pair
-        end
+      #add the scope to the mix
+      if scope = @model_class.send(:scope, :find)
+        condition_fragments << scope[:conditions]
       end
 
-      pairs.sort! { |pair1, pair2| pair1[0] <=> pair2[0] }
+      #add the type if we are on STI
+      condition_fragments << {:type => @model_class.name} if @model_class.finder_needs_type_condition?
 
-      pairs.map do |attribute, value|
-        if value.is_a?(Array)
-          value.flatten!
-          if value.size == 1
-            [attribute.to_sym, value[0]]
-          else
-            [attribute.to_sym, value]
-          end
-        else
-          [attribute.to_sym, value]
+      condition_fragments.compact!
+
+      #parses each conditions fragment but bails if one of the did not parse
+      attributes_fragments = condition_fragments.map do |condition_fragment|
+        attributes_fragment = attributes_for_conditions(condition_fragment)
+        return nil unless attributes_fragment
+        attributes_fragment
+      end
+
+      #merges the hashes but bails if there is an overlap
+      attributes = attributes_fragments.inject({}) do |memo, attributes_fragment|
+        attributes_fragment.each do |attribute, value|
+          return nil if memo.has_key?(attribute)
+          memo[attribute] = value
         end
+        memo
       end
+
+      attributes.keys.sort.map { |attribute| [attribute.to_sym, attributes[attribute]] }
     end
 
-    def attribute_value_pairs_for_conditions(conditions)
-      case conditions
-      when Hash
-        conditions.to_a.collect { |key, value| [key.to_s, value] }
-      when String
-        parse_indices_from_condition(conditions)
-      when Array
-        parse_indices_from_condition(*conditions)
-      when NilClass
-        []
+    def attributes_for_conditions(conditions)
+      pairs = case conditions
+        when Hash
+          return conditions.stringify_keys
+        when String
+          parse_indices_from_condition(conditions)
+        when Array
+          parse_indices_from_condition(*conditions)
+        when NilClass
+          []
+      end
+
+      return nil unless pairs
+
+      pairs.inject({}) do |memo, pair|
+        return nil if memo.has_key?(pair[0])
+        memo[pair[0]] = pair[1]
+        memo
       end
     end
 
     AND = /\s+AND\s+/i
     TABLE_AND_COLUMN = /(?:(?:`|")?(\w+)(?:`|")?\.)?(?:`|")?(\w+)(?:`|")?/ # Matches: `users`.id, `users`.`id`, users.id, id
     VALUE = /'?(\d+|\?|(?:(?:[^']|'')*))'?/                     # Matches: 123, ?, '123', '12''3'
-    KEY_EQ_VALUE = /^\(?#{TABLE_AND_COLUMN}\s+=\s+#{VALUE}\)?$/ # Matches: KEY = VALUE, (KEY = VALUE)
-    ORDER = /^#{TABLE_AND_COLUMN}\s*(ASC|DESC)?$/i              # Matches: COLUMN ASC, COLUMN DESC, COLUMN
+    KEY_EQ_VALUE = /^[\(\s]*#{TABLE_AND_COLUMN}\s+=\s+#{VALUE}[\)\s]*$/ # Matches: KEY = VALUE, (KEY = VALUE), ()(KEY = VALUE))
 
     def parse_indices_from_condition(conditions = '', *values)
       values = values.dup
@@ -69,4 +76,4 @@ module CacheBack
       end
     end
   end
-end
+end

data/lib/cache_back/configuration_mixin.rb

@@ -1,4 +1,5 @@
 require 'active_support'
+require 'zlib'
 
 module CacheBack
   autoload :ReadMixin, 'cache_back/read_mixin'
@@ -6,37 +7,12 @@ module CacheBack
   autoload :DirtyMixin, 'cache_back/dirty_mixin'
 
   module ConfigurationMixin
-    def cache_back_version(version)
-      @cache_back_version = version.to_s
-    end
-
-    def inherited_cache_back_version
-      if self == ActiveRecord::Base
-        @cache_back_version
-      else
-        @cache_back_version ||= superclass.inherited_cache_back_version
-      end
-    end
-
-    def inherited_cache_back_options
-      if self == ActiveRecord::Base
-        @cache_back_option
-      else
-        @cache_back_option ||= superclass.inherited_cache_back_options
-      end
+    def cache_back_key_prefix
+      @cache_back_key_prefix ||= "cache_back/#{table_name}/version=#{Zlib.crc32(column_names.sort.join)}/"
     end
 
     def cache_back_key_for(attribute_value_pairs)
-      key = "cache_back/#{table_name}/version=#{inherited_cache_back_version}"
-      attribute_value_pairs.each do |attribute, value|
-        key << "/#{attribute}="
-        if value.is_a?(Array)
-          key << value.join(',')
-        else
-          key << value.to_s
-        end
-      end
-      key
+      cache_back_key_prefix + attribute_value_pairs.map {|attribute, value| attribute.to_s + '=' + value.to_s}.join('/')
     end
 
     def cache_back_key_for_id(id)
@@ -58,12 +34,7 @@ module CacheBack
     end
 
     def has_cache_back_on(*args)
-      options = args.extract_options!
       attributes = args.sort! { |x, y| x.to_s <=> y.to_s }
-
-      @cache_back_version ||= options.delete(:version) || '1'
-      @cache_back_option ||= options
-
       if attributes != [:id] && !cache_back_indices.include?([:id])
         has_cache_back_on(:id)
       end

data/lib/cache_back/dirty_mixin.rb

@@ -12,5 +12,7 @@ module CacheBack
         end
       end
     end
+
+    alias_method :cache_back_dirty_method, :cache_back_dirty_methods
   end
 end

data/lib/cache_back/read_mixin.rb

@@ -19,7 +19,7 @@ module CacheBack
     end
 
     def find_every_with_cache_back(options)
-      attribute_value_pairs = cache_back_conditions_parser.attribute_value_pairs(options, scope(:find)) if cache_safe?(options)
+      attribute_value_pairs = cache_back_conditions_parser.attribute_value_pairs(options) if cache_safe?(options)
 
       limit = (options[:limit] || (scope(:find) || {})[:limit])
 
@@ -48,7 +48,7 @@ module CacheBack
     end
 
     def find_some_with_cache_back(ids, options)
-      attribute_value_pairs = cache_back_conditions_parser.attribute_value_pairs(options, scope(:find)) if cache_safe?(options)
+      attribute_value_pairs = cache_back_conditions_parser.attribute_value_pairs(options) if cache_safe?(options)
       attribute_value_pairs << [:id, ids] if attribute_value_pairs
 
       limit = (options[:limit] || (scope(:find) || {})[:limit])
@@ -88,6 +88,5 @@ module CacheBack
       def cache_back_conditions_parser
         @cache_back_conditions_parser ||= CacheBack::ConditionsParser.new(self)
       end
-
   end
 end

data/lib/cache_back/reload_association_mixin.rb

@@ -2,9 +2,8 @@ module CacheBack
   module ReloadAssociationMixin
     def reload_with_cache_back_clearing(*args)
       # TODO we could calculate the right key to clear by parsing the association conditions.
-      # this would clear less keys, and we would not have to load the target
-      load_target
-      target.clear_cache_back_indices if target.respond_to?(:clear_cache_back_indices)
+      # this would clear less keys
+      CacheBack.cache.reset!
       reload_without_cache_back_clearing(*args)
     end
 

data/lib/cache_back/write_mixin.rb

@@ -20,29 +20,43 @@ module CacheBack
 
       def store_in_cache_back
         if !readonly? && cache_back_key
-          CacheBack.cache.write(cache_back_key, self, self.class.inherited_cache_back_options)
+          CacheBack.cache.write(cache_back_key, self)
         end
       end
 
-      def clear_cache_back_indices
+      def cache_back_keys
         new_attributes = attributes.symbolize_keys
 
         old_attributes = Hash[changes.map {|attribute, values| [attribute, values[0]]}].symbolize_keys
         old_attributes.reverse_merge!(new_attributes)
 
+        keys = []
         self.class.cache_back_indices.each do |index|
           old_key = self.class.cache_back_key_for(index.map { |attribute| [attribute, old_attributes[attribute]]})
           new_key = self.class.cache_back_key_for(index.map { |attribute| [attribute, new_attributes[attribute]]})
 
           [old_key, new_key].uniq.each do |key|
-            CacheBack.cache.delete(key)
-            CacheBack.cache.delete("#{key}/first")
+            keys << key
+            keys << "#{key}/first"
           end
         end
+        keys
+      end
+
+      def clear_cache_back_indices
+        cache_back_keys.each do |key|
+          CacheBack.cache.delete(key)
+        end
+      end
+
+      def clear_local_cache_back_indices
+        cache_back_keys.each do |key|
+          CacheBack.cache.delete_local(key)
+        end
       end
 
       def reload_with_cache_back_clearing(*args)
-        clear_cache_back_indices
+        clear_local_cache_back_indices
         reload_without_cache_back_clearing(*args)
       end
     end

data/test/cache_expiry_test.rb

@@ -20,12 +20,12 @@ class CacheExpiryTest < ActiveSupport::TestCase
     end
 
     should "clear all indices for instance when deleted" do
-      CacheBack.cache.expects(:delete).with("cache_back/posts/version=1/id=#{@post.id}")
-      CacheBack.cache.expects(:delete).with("cache_back/posts/version=1/id=#{@post.id}/first")
-      CacheBack.cache.expects(:delete).with("cache_back/posts/version=1/title=#{@post.title}")
-      CacheBack.cache.expects(:delete).with("cache_back/posts/version=1/title=#{@post.title}/first")
-      CacheBack.cache.expects(:delete).with("cache_back/posts/version=1/blog_id=#{@post.blog_id}")
-      CacheBack.cache.expects(:delete).with("cache_back/posts/version=1/blog_id=#{@post.blog_id}/first")
+      CacheBack.cache.expects(:delete).with(Post.cache_back_key_prefix + "id=#{@post.id}")
+      CacheBack.cache.expects(:delete).with(Post.cache_back_key_prefix + "id=#{@post.id}/first")
+      CacheBack.cache.expects(:delete).with(Post.cache_back_key_prefix + "title=#{@post.title}")
+      CacheBack.cache.expects(:delete).with(Post.cache_back_key_prefix + "title=#{@post.title}/first")
+      CacheBack.cache.expects(:delete).with(Post.cache_back_key_prefix + "blog_id=#{@post.blog_id}")
+      CacheBack.cache.expects(:delete).with(Post.cache_back_key_prefix + "blog_id=#{@post.blog_id}/first")
       CacheBack.cache.expects(:delete).never
 
       @post.destroy
@@ -38,14 +38,14 @@ class CacheExpiryTest < ActiveSupport::TestCase
     end
 
     should "clear all indices for instance when updated" do
-      CacheBack.cache.expects(:delete).with("cache_back/posts/version=1/id=#{@post.id}")
-      CacheBack.cache.expects(:delete).with("cache_back/posts/version=1/id=#{@post.id}/first")
-      CacheBack.cache.expects(:delete).with("cache_back/posts/version=1/title=#{@post.title}")
-      CacheBack.cache.expects(:delete).with("cache_back/posts/version=1/title=#{@post.title}/first")
-      CacheBack.cache.expects(:delete).with("cache_back/posts/version=1/title=new title")
-      CacheBack.cache.expects(:delete).with("cache_back/posts/version=1/title=new title/first")
-      CacheBack.cache.expects(:delete).with("cache_back/posts/version=1/blog_id=#{@post.blog_id}")
-      CacheBack.cache.expects(:delete).with("cache_back/posts/version=1/blog_id=#{@post.blog_id}/first")
+      CacheBack.cache.expects(:delete).with(Post.cache_back_key_prefix + "id=#{@post.id}")
+      CacheBack.cache.expects(:delete).with(Post.cache_back_key_prefix + "id=#{@post.id}/first")
+      CacheBack.cache.expects(:delete).with(Post.cache_back_key_prefix + "title=#{@post.title}")
+      CacheBack.cache.expects(:delete).with(Post.cache_back_key_prefix + "title=#{@post.title}/first")
+      CacheBack.cache.expects(:delete).with(Post.cache_back_key_prefix + "title=new title")
+      CacheBack.cache.expects(:delete).with(Post.cache_back_key_prefix + "title=new title/first")
+      CacheBack.cache.expects(:delete).with(Post.cache_back_key_prefix + "blog_id=#{@post.blog_id}")
+      CacheBack.cache.expects(:delete).with(Post.cache_back_key_prefix + "blog_id=#{@post.blog_id}/first")
       CacheBack.cache.expects(:delete).never
 
       @post.title = "new title"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cache_back
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors: 
 - Mick Staugaard
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-29 00:00:00 -08:00
+date: 2009-11-30 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,7 +53,6 @@ files:
 - lib/cache_back/conditions_parser.rb
 - lib/cache_back/configuration_mixin.rb
 - lib/cache_back/dirty_mixin.rb
-- lib/cache_back/rack_middleware.rb
 - lib/cache_back/read_mixin.rb
 - lib/cache_back/reload_association_mixin.rb
 - lib/cache_back/write_mixin.rb

data/lib/cache_back/rack_middleware.rb

@@ -1,13 +0,0 @@
-module CacheBack
-  class RackMiddleware
-    def initialize(app)
-      @app = app
-    end
-
-    def call(env)
-      result = @app.call(env)
-      CacheBack.cache.reset!
-      result
-    end
-  end
-end