rcache 0.0.4 → 0.0.6

data/README.md

@@ -39,6 +39,8 @@ Cache where results with includes for 10 seconds and not show cached queries in
 
     Event.limit(2).includes(:thumbnails, :type => :variable).rcache(:expires_in => 10.seconds, :log_cached_queries => false)
 
+It supports only activerecord 3.2 so far
+
 ## Contributing
 
 1. Fork it

data/Rakefile

@@ -1 +1,10 @@
 require "bundler/gem_tasks"
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.libs << 'test'
+  t.test_files = FileList['test/*_test.rb']
+end
+
+desc "Run tests"
+task :default => :test

data/config/redis.yml

@@ -0,0 +1,8 @@
+development: &development
+  host: 127.0.0.1
+  port: 6379
+  database: 0
+
+test:
+  <<: *development
+  database: 15

data/lib/rcache/association.rb

@@ -2,24 +2,11 @@ module ActiveRecord
   module Associations
     class Preloader
       class Association #:nodoc:
-        def build_scope
-          scope = klass.scoped
-
-          scope = scope.where(process_conditions(options[:conditions]))
-          scope = scope.where(process_conditions(preload_options[:conditions]))
-
-          scope = scope.select(preload_options[:select] || options[:select] || table[Arel.star])
-          scope = scope.includes(preload_options[:include] || options[:include])
+        alias :old_build_scope :build_scope
 
-          if options[:as]
-            scope = scope.where(
-              klass.table_name => {
-                reflection.type => model.base_class.sti_name
-              }
-            )
-          end
+        def build_scope
+          scope = old_build_scope
           scope = scope.rcache(preload_options[:rcache_value]) if preload_options[:rcache_value]
-
           scope
         end
       end

data/lib/rcache/relation.rb

@@ -30,7 +30,7 @@ module ActiveRecord
         readonly = @readonly_value.nil? ? @implicit_readonly : @readonly_value
         @records.each { |record| record.readonly! } if readonly
       else
-        @records = default_scoped.to_a
+        @records = default_scoped.rcache(rcache_value).to_a
       end
 
 

data/lib/rcache/version.rb

@@ -1,3 +1,3 @@
 module Rcache
-  VERSION = "0.0.4"
+  VERSION = "0.0.6"
 end

data/lib/rcache.rb

@@ -1,5 +1,7 @@
 require "rcache/version"
 require "json"
+require "active_record"
+require "redis"
 require "digest/md5"
 require "rcache/query_cache"
 require "rcache/query_methods"

data/rcache.gemspec

@@ -19,7 +19,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "json"
+  spec.add_runtime_dependency "activerecord", "~> 3.2"
+  spec.add_runtime_dependency "redis"
 
   spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "test-unit"
+  spec.add_development_dependency "shoulda-context"
 end

data/test/models/client.rb

@@ -0,0 +1,3 @@
+class Client < ActiveRecord::Base
+  has_many :events
+end

data/test/models/event.rb

@@ -0,0 +1,4 @@
+class Event < ActiveRecord::Base
+  belongs_to :client
+  has_many :quotes
+end

data/test/models/quote.rb

@@ -0,0 +1,5 @@
+class Quote < ActiveRecord::Base
+  belongs_to :event
+
+  default_scope order(:name)
+end

data/test/rcache_test.rb

@@ -0,0 +1,43 @@
+require 'test_helper'
+
+class RcacheTest < Test::Unit::TestCase
+  context 'rcache' do
+    setup do
+      setup_db
+      seed_db
+    end
+
+    context 'disabled' do
+      should 'return from db' do
+        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.present?
+        ActiveRecord::Base.connection.execute('delete from clients')
+        assert Client.first.nil?
+      end
+    end
+
+    context 'enabled' do
+      should 'return from cache' do
+        assert Client.rcache.includes(:events => :quotes).first.events.map(&:quotes).flatten.any?
+        ActiveRecord::Base.connection.execute('delete from quotes')
+        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.rcache.first.present?
+        ActiveRecord::Base.connection.execute('delete from clients')
+        assert Client.rcache.first.present?
+        teardown_redis
+        assert Client.rcache.first.nil?
+      end
+    end
+
+    teardown do 
+      teardown_db
+      teardown_redis
+    end
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,64 @@
+$:.unshift File.expand_path('../lib', File.dirname(__FILE__))
+
+require 'test/unit'
+require 'shoulda-context'
+require 'rcache'
+
+redis_config = YAML.load_file("config/redis.yml")['test'].symbolize_keys
+redis = Redis.new(
+  :host => redis_config[:host],
+  :port => redis_config[:port],
+  :db   => redis_config[:database],
+  :password => redis_config[:password]
+)
+Rcache.configure do |config|
+  config.redis = redis
+  config.expires_in = 10
+end
+
+MODELS = File.join(File.dirname(__FILE__), "models")
+$LOAD_PATH.unshift(MODELS)
+Dir[ File.join(MODELS, "*.rb") ].each do |model|
+  model = File.basename(model, ".rb")
+  autoload model.camelize.to_sym, model
+end
+
+ActiveRecord::Migration.verbose = false
+
+def setup_db
+  ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
+
+  ActiveRecord::Schema.define(:version => 1) do
+    create_table :clients do |t|
+      t.string :name
+    end
+
+    create_table :events do |t|
+      t.string :name
+      t.integer :client_id
+    end
+
+    create_table :quotes do |t|
+      t.string :name
+      t.integer :event_id
+    end
+  end
+end
+
+def seed_db
+  clients = Client.create([{ :name => 'client1' }, { :name => 'client2' }])
+  3.times do |n|
+    event = Event.create(:name => "event#{n + 1}", :client => clients.sample)
+    Quote.create(:name => "quote#{n + 1}", :event => event)
+  end
+end
+
+def teardown_db
+  ActiveRecord::Base.connection.tables.each do |table|
+    ActiveRecord::Base.connection.drop_table(table)
+  end
+end
+
+def teardown_redis
+  Rcache.redis.keys(Rcache.key_prefix + '*').each { |k| Rcache.redis.del k }
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rcache
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-18 00:00:00.000000000 Z
+date: 2013-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -27,6 +27,38 @@ dependencies:
     - - ! '>='
       - !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
@@ -43,6 +75,22 @@ dependencies:
     - - ~>
       - !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
@@ -59,6 +107,38 @@ dependencies:
     - - ! '>='
       - !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
 email:
 - novikov@inventos.ru
@@ -71,6 +151,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- config/redis.yml
 - lib/rcache.rb
 - lib/rcache/arel.rb
 - lib/rcache/association.rb
@@ -81,6 +162,11 @@ files:
 - lib/rcache/relation.rb
 - lib/rcache/version.rb
 - rcache.gemspec
+- test/models/client.rb
+- test/models/event.rb
+- test/models/quote.rb
+- test/rcache_test.rb
+- test/test_helper.rb
 homepage: ''
 licenses:
 - MIT
@@ -96,7 +182,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -932354997145963509
+      hash: -2852935033633211742
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -105,11 +191,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -932354997145963509
+      hash: -2852935033633211742
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: ActiveRecord redis query cache
-test_files: []
+test_files:
+- test/models/client.rb
+- test/models/event.rb
+- test/models/quote.rb
+- test/rcache_test.rb
+- test/test_helper.rb