rcache 0.0.6 → 0.0.7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 93ff360d64d82e9276cf2e81e752b8f9eb1b56da
+  data.tar.gz: 4282167769d0177286b5f63b1f0cc655a1593210
+SHA512:
+  metadata.gz: bad8a84b940d6ebc72ffdc51336f3d05a628734b5ab7306760cb9f43fd3b09914d47ee0af34d1643bbfa421f8b76dc24719adfeaddc28b7cfbcb1aa4974dfdda
+  data.tar.gz: 7b5ce5f3dc2405c965be7308bf6c8f1c4936c89c6381d3d8098fe3b8260ea79c66e570dee1194e2b6a8bfa5f30d270b565444ce388ba774b5f0e258270d0d0a5

data/README.md

@@ -35,6 +35,10 @@ Cache find result for 60 seconds:
 
     Client.rcache.find(2)
 
+Cache count results:
+
+    Client.rcache.count
+
 Cache where results with includes for 10 seconds and not show cached queries in log:
 
     Event.limit(2).includes(:thumbnails, :type => :variable).rcache(:expires_in => 10.seconds, :log_cached_queries => false)

data/lib/rcache.rb

@@ -10,6 +10,7 @@ require "rcache/association"
 require "rcache/querying"
 require "rcache/preloader"
 require "rcache/arel"
+require "rcache/calculations"
 
 module Rcache
   class << self

data/lib/rcache/calculations.rb

@@ -0,0 +1,25 @@
+module ActiveRecord
+  module Calculations
+    def execute_simple_calculation(operation, column_name, distinct) #:nodoc:
+      # Postgresql doesn't like ORDER BY when there are no GROUP BY
+      relation = reorder(nil)
+
+      if operation == "count" && (relation.limit_value || relation.offset_value)
+        # Shortcut when limit is zero.
+        return 0 if relation.limit_value == 0
+
+        query_builder = build_count_subquery(relation, column_name, distinct)
+      else
+        column = aggregate_column(column_name)
+
+        select_value = operation_over_aggregate_column(column, operation, distinct)
+
+        relation.select_values = [select_value]
+
+        query_builder = relation.arel
+      end
+      query_builder.rcache_value = relation.rcache_value
+      type_cast_calculated_value(@klass.connection.select_value(query_builder), column_for(column_name), operation)
+    end
+  end
+end

data/lib/rcache/query_cache.rb

@@ -5,6 +5,7 @@ module ActiveRecord
         if (arel.rcache_value rescue false) && !locked?(arel) && (arel.rcache_value[:expires_in] || Rcache.expires_in).to_i > 0
           sql = to_sql(arel, binds)
           redis_cache_sql(arel.rcache_value, sql, binds) { super(sql, name, binds) }
+            .collect { |row| row.dup }
         elsif @query_cache_enabled && !locked?(arel)
           sql = to_sql(arel, binds)
           cache_sql(sql, binds) { super(sql, name, binds) }
@@ -13,6 +14,16 @@ module ActiveRecord
         end
       end
 
+      def select_value(arel, name = nil)
+        binds = []
+        if (arel.rcache_value rescue false) && !locked?(arel) && (arel.rcache_value[:expires_in] || Rcache.expires_in).to_i > 0
+          sql = to_sql(arel, binds)
+          redis_cache_sql(arel.rcache_value, sql, binds) { super(sql, name) }
+        else
+          super
+        end
+      end
+
       private
 
       def redis_cache_sql(rcache_value, sql, binds)
@@ -20,24 +31,28 @@ module ActiveRecord
           instance_variable_set("@#{attr}", rcache_value.has_key?(attr) ? rcache_value[attr] : Rcache.send(attr))
         end
 
-        result =
-          # return from memory
-          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
-          elsif res = (JSON.parse(@redis.get(redis_cache_key(sql, binds, @key_prefix))) rescue nil)
+        # return from memory
+        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
+        else
+          res = @redis.get(redis_cache_key(sql, binds, @key_prefix))
+          if res
+            begin
+              res = JSON.parse(res)
+            rescue JSON::ParserError
+            end
             ActiveSupport::Notifications.instrument("sql.active_record", :sql => sql, :binds => binds, :name => "REDIS", :connection_id => object_id) if @log_cached_queries
             @query_cache[sql][binds] = res
-          # write to memory and redis from db and return
           else
+            # write to memory and redis from db and return
             res = yield
             @query_cache[sql][binds] = res
             @redis.setex(redis_cache_key(sql, binds, @key_prefix), @expires_in, res.to_json)
             res
           end
-
-        result.collect { |row| row.dup }
+        end
       end
 
       def redis_cache_key(sql, binds, key_prefix)

data/lib/rcache/relation.rb

@@ -1,12 +1,13 @@
 module ActiveRecord
   class Relation
+    SINGLE_VALUE_METHODS.push(:rcache)
     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)
@@ -17,14 +18,14 @@ module ActiveRecord
             eager_loading? ? find_with_associations : @klass.find_by_sql(arel, @bind_values)
           end
         end
-  
+
         preload = @preload_values
         preload +=  @includes_values unless eager_loading?
         preload.each do |associations|
           # this line distincts only
           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
         # are JOINS and no explicit SELECT.
         readonly = @readonly_value.nil? ? @implicit_readonly : @readonly_value

data/lib/rcache/version.rb

@@ -1,3 +1,4 @@
+#
 module Rcache
-  VERSION = "0.0.6"
+  VERSION = '0.0.7'
 end

data/test/rcache_test.rb

@@ -12,7 +12,11 @@ class RcacheTest < Test::Unit::TestCase
         assert Client.includes(:events => :quotes).first.events.map(&:quotes).flatten.any?
         ActiveRecord::Base.connection.execute('delete from quotes')
         assert Client.includes(:events => :quotes).first.events.map(&:quotes).flatten.empty?
-        
+
+        assert Client.first.events.count > 0
+        ActiveRecord::Base.connection.execute('delete from events')
+        assert Client.first.events.count == 0
+
         assert Client.first.present?
         ActiveRecord::Base.connection.execute('delete from clients')
         assert Client.first.nil?
@@ -26,7 +30,13 @@ class RcacheTest < Test::Unit::TestCase
         assert Client.rcache.includes(:events => :quotes).first.events.map(&:quotes).flatten.any?
         teardown_redis
         assert Client.rcache.includes(:events => :quotes).first.events.map(&:quotes).flatten.empty?
-        
+
+        assert Client.first.events.rcache.count > 0
+        ActiveRecord::Base.connection.execute('delete from events')
+        assert Client.first.events.rcache.count > 0
+        teardown_redis
+        assert Client.first.events.rcache.count == 0
+
         assert Client.rcache.first.present?
         ActiveRecord::Base.connection.execute('delete from clients')
         assert Client.rcache.first.present?
@@ -35,7 +45,7 @@ class RcacheTest < Test::Unit::TestCase
       end
     end
 
-    teardown do 
+    teardown do
       teardown_db
       teardown_redis
     end

metadata

@@ -1,142 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: rcache
 version: !ruby/object:Gem::Version
-  version: 0.0.6
-  prerelease: 
+  version: 0.0.7
 platform: ruby
 authors:
 - novikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-20 00:00:00.000000000 Z
+date: 2016-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda-context
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: ActiveRecord redis query cache
@@ -146,7 +129,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -155,6 +138,7 @@ files:
 - lib/rcache.rb
 - lib/rcache/arel.rb
 - lib/rcache/association.rb
+- lib/rcache/calculations.rb
 - lib/rcache/preloader.rb
 - lib/rcache/query_cache.rb
 - lib/rcache/query_methods.rb
@@ -170,33 +154,26 @@ files:
 homepage: ''
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2852935033633211742
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2852935033633211742
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: ActiveRecord redis query cache
 test_files:
 - test/models/client.rb