rcache 0.0.1 → 0.0.2

data/lib/rcache/arel.rb

@@ -0,0 +1,5 @@
+module Arel
+  class SelectManager
+    attr_accessor :rcache_value
+  end
+end

data/lib/rcache/query_cache.rb

@@ -1,12 +1,10 @@
 module ActiveRecord
   module ConnectionAdapters # :nodoc:
     module QueryCache
-      attr_accessor :rcache_value
-
       def select_all(arel, name = nil, binds = [])
-        if @rcache_value && !locked?(arel) && (@rcache_value[:expires_in] || Rcache.expires_in).to_i > 0
+        if arel.rcache_value && !locked?(arel) && (arel.rcache_value[:expires_in] || Rcache.expires_in).to_i > 0
           sql = to_sql(arel, binds)
-          redis_cache_sql(sql, binds) { super(sql, name, binds) }
+          redis_cache_sql(arel.rcache_value, sql, binds) { super(sql, name, binds) }
         elsif @query_cache_enabled && !locked?(arel)
           sql = to_sql(arel, binds)
           cache_sql(sql, binds) { super(sql, name, binds) }
@@ -17,14 +15,14 @@ module ActiveRecord
 
       private
 
-      def redis_cache_sql(sql, binds)
+      def redis_cache_sql(rcache_value, sql, binds)
         [:redis, :expires_in, :log_cached_queries, :key_prefix].each do |attr|
-          instance_variable_set("@#{attr}", @rcache_value.has_key?(attr) ? @rcache_value[attr] : Rcache.send(attr))
+          instance_variable_set("@#{attr}", rcache_value.has_key?(attr) ? rcache_value[attr] : Rcache.send(attr))
         end
 
         result =
           # return from memory
-          if @query_cache[sql].key?(binds)
+          if @query_cache_enabled && @query_cache[sql].key?(binds)
             ActiveSupport::Notifications.instrument("sql.active_record", :sql => sql, :binds => binds, :name => "CACHE", :connection_id => object_id) if @log_cached_queries
             @query_cache[sql][binds]
           # write to memory from redis and return

data/lib/rcache/query_methods.rb

@@ -1,8 +1,9 @@
 module ActiveRecord
   module QueryMethods
     def rcache(opts = {})
-      connection.rcache_value = opts
-      self
+      relation = clone
+      relation.rcache_value = opts
+      relation
     end
   end
 end

data/lib/rcache/relation.rb

@@ -1,10 +1,14 @@
 module ActiveRecord
   class Relation
+    attr_accessor :rcache_value
+
     def exec_queries
       return @records if loaded?
   
       default_scoped = with_default_scope
   
+      arel.rcache_value = rcache_value
+
       if default_scoped.equal?(self)
         @records = if @readonly_value.nil? && !@klass.locking_enabled?
           eager_loading? ? find_with_associations : @klass.find_by_sql(arel, @bind_values)
@@ -18,7 +22,7 @@ module ActiveRecord
         preload +=  @includes_values unless eager_loading?
         preload.each do |associations|
           # this line distincts only
-          ActiveRecord::Associations::Preloader.new(@records, associations, :rcache_value => @klass.connection.rcache_value).run
+          ActiveRecord::Associations::Preloader.new(@records, associations, :rcache_value => rcache_value).run
         end
   
         # @readonly_value is true only if set explicitly. @implicit_readonly is true if there
@@ -28,7 +32,8 @@ module ActiveRecord
       else
         @records = default_scoped.to_a
       end
-  
+
+
       @loaded = true
       @records
     end

data/lib/rcache/version.rb

@@ -1,3 +1,3 @@
 module Rcache
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rcache
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-14 00:00:00.000000000 Z
+date: 2013-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -72,6 +72,7 @@ files:
 - README.md
 - Rakefile
 - lib/rcache.rb
+- lib/rcache/arel.rb
 - lib/rcache/association.rb
 - lib/rcache/preloader.rb
 - lib/rcache/query_cache.rb
@@ -95,7 +96,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3051535261146459295
+      hash: 2546036101043435318
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -104,10 +105,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3051535261146459295
+      hash: 2546036101043435318
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: ActiveRecord redis query cache