activerecord_cache 0.0.5 → 0.0.6

data/activerecord_cache.gemspec

@@ -17,5 +17,5 @@ Gem::Specification.new do |s|
 
   s.licenses = ['MIT']
 
-  s.add_dependency 'rails', ['~> 3.1.3']
+  s.add_dependency 'rails', ['>= 3.1.3', '<= 3.3.0']
 end

data/lib/activerecord_cache/base.rb

@@ -1,31 +1,31 @@
 module ActiveRecordCache
   module Base
     extend ActiveSupport::Concern
-    
+
     included do
       class_attribute :use_activerecord_cache, :instance_writer => false
       self.use_activerecord_cache = false
-      
+
       after_save    :write_to_cache,    :if => lambda { self.class.use_activerecord_cache }
       after_destroy :delete_from_cache, :if => lambda { self.class.use_activerecord_cache }
     end
-    
+
     module ClassMethods
       def cache_key(id_or_record)
         unless use_activerecord_cache
           message = "ActiveRecord cache is not enabled for #{self.name}"
           raise ActiveRecordCache::CachingNotEnabled, message
         end
-        
+
         if id_or_record.is_a?(ActiveRecord::Base)
           id = id_or_record[id_or_record.class.primary_key]
         else
           id = id_or_record
         end
-        
+
         "#{model_name}/#{id}"
       end
-      
+
       def find_through_cache(id)
         unless use_activerecord_cache
           message = "ActiveRecord cache is not enabled for #{self.name}"
@@ -34,31 +34,31 @@ module ActiveRecordCache
 
         Rails.cache.read(cache_key(id)) || where(primary_key => id).first
       end
-      
+
       def find_some_through_cache(ids)
         unless use_activerecord_cache
           message = "ActiveRecord cache is not enabled for #{self.name}"
           raise ActiveRecordCache::CacheNotEnabled, message
         end
-        
+
         records = []
         cache_misses = []
-        
+
         ids.each do |id|
           if record = find_in_cache(id)
             records << record
           else
-            cache_misses << id 
+            cache_misses << id
           end
         end
-        
+
         if cache_misses.present?
           records += where(primary_key => cache_misses).all
         end
-        
+
         records
       end
-      
+
       def find_in_cache(id)
         unless use_activerecord_cache
           message = "ActiveRecord cache is not enabled for #{self.name}"
@@ -67,25 +67,20 @@ module ActiveRecordCache
 
         Rails.cache.read(cache_key(id))
       end
-      
+
     end
-    
-    module InstanceMethods
 
-      def write_to_cache
-        unless self.class.use_activerecord_cache
-          message = "ActiveRecord cache is not enabled for #{self.class.name}"
-          raise ActiveRecordCache::CacheNotEnabled, message
-        end
-        
-        Rails.cache.write(self.class.cache_key(self), self)
+    def write_to_cache
+      unless self.class.use_activerecord_cache
+        message = "ActiveRecord cache is not enabled for #{self.class.name}"
+        raise ActiveRecordCache::CacheNotEnabled, message
       end
 
-      def delete_from_cache
-        Rails.cache.delete(self.class.cache_key(self))
-      end
-      
+      Rails.cache.write(self.class.cache_key(self), self)
+    end
+
+    def delete_from_cache
+      Rails.cache.delete(self.class.cache_key(self))
     end
-    
   end
 end

data/lib/activerecord_cache/belongs_to_association.rb

@@ -1,24 +1,19 @@
 module ActiveRecordCache
   module BelongsToAssociation
     extend ActiveSupport::Concern
-    
+
     included do
       alias_method_chain :find_target, :caching
     end
-    
-    
-    module InstanceMethods
-      
+
     private
-    
-      def find_target_with_caching
-        if klass.use_activerecord_cache && reflection.options[:primary_key].nil?
-          klass.find_through_cache(owner[reflection.foreign_key]).tap { |record| set_inverse_instance(record) }
-        else
-          find_target_without_caching
-        end
+
+    def find_target_with_caching
+      if klass.use_activerecord_cache && reflection.options[:primary_key].nil?
+        klass.find_through_cache(owner[reflection.foreign_key]).tap { |record| set_inverse_instance(record) }
+      else
+        find_target_without_caching
       end
     end
-    
   end
-end
+end

data/lib/activerecord_cache/belongs_to_preloader.rb

@@ -1,23 +1,17 @@
 module ActiveRecordCache
   module BelongsToPreloader
     extend ActiveSupport::Concern
-    
+
     included do
       alias_method_chain :records_for, :caching
     end
-    
-    
-    module InstanceMethods
-      
-      def records_for_with_caching(ids)
-        if klass.use_activerecord_cache && association_key.name == klass.primary_key
-          klass.find_some_through_cache(ids)
-        else
-          records_for_without_caching(ids) 
-        end
+
+    def records_for_with_caching(ids)
+      if klass.use_activerecord_cache && association_key.name == klass.primary_key
+        klass.find_some_through_cache(ids)
+      else
+        records_for_without_caching(ids)
       end
-      
     end
-    
   end
-end
+end

data/lib/activerecord_cache/finder_methods.rb

@@ -1,68 +1,60 @@
 module ActiveRecordCache
   module FinderMethods
     extend ActiveSupport::Concern
-    
+
     included do
       alias_method_chain :find_by_attributes, :caching
       alias_method_chain :find_some, :caching
       alias_method_chain :find_one, :caching
     end
 
-    module InstanceMethods
-      
     protected
-      
-      def find_by_attributes_with_caching(match, attributes, *args)
-        unless cached_lookup_allowed? && attributes == Array(@klass.primary_key) && (match.finder == :all || !args.first.is_a?(Array))
-          return find_by_attributes_without_caching(match, attributes, *args)
-        end
-        
-        param = args.first
-      
-        results = case match.finder
-        when :all   then @klass.find_some_through_cache(Array(param))
-        when :first then @klass.find_through_cache(param)
-        when :last  then @klass.find_through_cache(param)
-        end
-      
-        results
-      end
-    
-    
-      def find_some_with_caching(ids)
-        return find_some_without_caching(ids) unless cached_lookup_allowed?
-      
-        results = find_some_through_cache(ids)
 
-        if results.size != ids.size
-          error = "Couldn't find all #{@klass.name.pluralize} with IDs "
-          error << "(#{ids.join(", ")}) (found #{results.size} results, but was looking for #{ids.size})"
-          raise ActiveRecord::RecordNotFound, error
-        end
-      
-        results
+    def find_by_attributes_with_caching(match, attributes, *args)
+      unless cached_lookup_allowed? && attributes == Array(@klass.primary_key) && (match.finder == :all || !args.first.is_a?(Array))
+        return find_by_attributes_without_caching(match, attributes, *args)
       end
-    
-    
-      def find_one_with_caching(id)
-        return find_one_without_caching(id) unless cached_lookup_allowed?
-      
-        record = @klass.find_through_cache(id)
-      
-        unless record
-          raise ActiveRecord::RecordNotFound, "Couldn't find #{@klass.name} with #{primary_key}=#{id}"
-        end
-      
-        record
+
+      param = args.first
+
+      results = case match.finder
+                when :all   then @klass.find_some_through_cache(Array(param))
+                when :first then @klass.find_through_cache(param)
+                when :last  then @klass.find_through_cache(param)
+                end
+
+      results
+    end
+
+    def find_some_with_caching(ids)
+      return find_some_without_caching(ids) unless cached_lookup_allowed?
+
+      results = find_some_through_cache(ids)
+
+      if results.size != ids.size
+        error = "Couldn't find all #{@klass.name.pluralize} with IDs "
+        error << "(#{ids.join(", ")}) (found #{results.size} results, but was looking for #{ids.size})"
+        raise ActiveRecord::RecordNotFound, error
       end
-    
-    
-      # only support the most basic lookups through the cache
-      def cached_lookup_allowed?
-        @klass.use_activerecord_cache && arel.where_sql.nil? && arel.join_sql.nil? && @limit_value.nil? && @offset_value.nil?
+
+      results
+    end
+
+    def find_one_with_caching(id)
+      return find_one_without_caching(id) unless cached_lookup_allowed?
+
+      record = @klass.find_through_cache(id)
+
+      unless record
+        raise ActiveRecord::RecordNotFound, "Couldn't find #{@klass.name} with #{primary_key}=#{id}"
       end
-      
+
+      record
+    end
+
+    # only support the most basic lookups through the cache
+    def cached_lookup_allowed?
+      @klass.use_activerecord_cache && arel.where_sql.nil? && arel.join_sql.nil? && @limit_value.nil? && @offset_value.nil?
     end
-    
   end
-end
+end

data/lib/activerecord_cache/relation.rb

@@ -1,22 +1,18 @@
 module ActiveRecordCache
   module Relation
     extend ActiveSupport::Concern
-    
+
     included do
       alias_method_chain :to_a, :caching
     end
-    
-    module InstanceMethods
-      def to_a_with_caching
-        previously_loaded = loaded?
 
-        records = to_a_without_caching
-        records.each(&:write_to_cache) if @klass.use_activerecord_cache && !previously_loaded && select_values.empty?
-        
-        records
-      end
-      
+    def to_a_with_caching
+      previously_loaded = loaded?
+
+      records = to_a_without_caching
+      records.each(&:write_to_cache) if @klass.use_activerecord_cache && !previously_loaded && select_values.empty?
+
+      records
     end
-    
   end
 end

data/lib/activerecord_cache/version.rb

@@ -2,7 +2,7 @@ module ActiveRecordCache
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 5
+    TINY  = 6
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord_cache
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,19 +9,30 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-02 00:00:00.000000000Z
+date: 2013-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2170443680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.1.3
+    - - <=
+      - !ruby/object:Gem::Version
+        version: 3.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *2170443680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.3
+    - - <=
+      - !ruby/object:Gem::Version
+        version: 3.3.0
 description: Caches ActiveRecord models for simple finds using the Rails low-level
   cache
 email:
@@ -56,15 +67,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1348494793212696198
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1348494793212696198
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A basic caching plugin for ActiveRecord