cache_back 0.2.0 → 0.3.0

data/.gitignore

@@ -20,3 +20,4 @@ pkg
 *.gemspec
 
 ## PROJECT::SPECIFIC
+test/debug.log

data/Rakefile

@@ -11,6 +11,7 @@ begin
     gem.homepage = "http://github.com/staugaard/cache_back"
     gem.authors = ["Mick Staugaard"]
     gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
+    gem.add_development_dependency "mocha", ">= 0"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
@@ -21,7 +22,7 @@ end
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
+  test.pattern = 'test/**/*_test.rb'
   test.verbose = true
 end
 
@@ -29,7 +30,8 @@ begin
   require 'rcov/rcovtask'
   Rcov::RcovTask.new do |test|
     test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
+    test.pattern = 'test/**/*_test.rb'
+    test.rcov_opts << "--exclude \"test/*,gems/*,/Library/Ruby/*,config/*\" --rails" 
     test.verbose = true
   end
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/cache_back/configuration_mixin.rb

@@ -3,6 +3,7 @@ require 'activesupport'
 module CacheBack
   autoload :ReadMixin, 'cache_back/read_mixin'
   autoload :WriteMixin, 'cache_back/write_mixin'
+  autoload :DirtyMixin, 'cache_back/dirty_mixin'
 
   module ConfigurationMixin
     def cache_back_version(version)
@@ -34,7 +35,9 @@ module CacheBack
       @cache_back_option = options
 
       include WriteMixin unless instance_methods.include?('store_in_cache_back')
-      extend ReadMixin unless method_defined?(:find_one_with_cache_back!)
+      extend ReadMixin unless methods.include?('find_one_with_cache_back')
+      extend DirtyMixin unless methods.include?('cache_back_dirty_methods')
     end
+
   end
 end

data/lib/cache_back/dirty_mixin.rb

@@ -0,0 +1,16 @@
+module CacheBack
+  module DirtyMixin
+    def cache_back_dirty_methods(*method_names)
+      method_names.each do |method|
+        unless method_defined?("without_cache_back_update_#{method}")
+          alias_method("without_cache_back_update_#{method}", method)
+          define_method(method) do |*args|
+            result = send("without_cache_back_update_#{method}", *args)
+            store_in_cache_back
+            result
+          end
+        end
+      end
+    end
+  end
+end

data/lib/cache_back/read_mixin.rb

@@ -8,9 +8,9 @@ module CacheBack
     end
 
     def find_one_with_cache_back(id, options)
-      record = CacheBack.cache.read(cache_back_key_for(id))
+      record = cache_safe?(options) ? CacheBack.cache.read(cache_back_key_for(id)) : nil
 
-      unless record
+      if record.nil?
         record = find_one_without_cache_back(id, options)
         record.store_in_cache_back if record
       end
@@ -18,5 +18,11 @@ module CacheBack
       record
     end
 
+    private
+
+      def cache_safe?(options)
+        !options.has_key?(:select)
+      end
+
   end
 end

data/lib/cache_back/write_mixin.rb

@@ -12,7 +12,9 @@ module CacheBack
     end
 
     def store_in_cache_back
-      CacheBack.cache.write(cache_back_key, shallow_clone, self.class.inherited_cache_back_options) if cache_back_key
+      if !readonly? && cache_back_key
+        CacheBack.cache.write(cache_back_key, shallow_clone, self.class.inherited_cache_back_options)
+      end
     end
 
     def remove_from_cache_back
@@ -20,7 +22,7 @@ module CacheBack
     end
 
     def self.included(model_class)
-      model_class.after_save :store_in_cache_back
+      #model_class.after_save :store_in_cache_back
       model_class.after_destroy :remove_from_cache_back
     end
   end

data/lib/cache_back.rb

@@ -13,4 +13,9 @@ module CacheBack
 end
 
 ActiveRecord::Base.extend(CacheBack::ConfigurationMixin)
-ActionController::Dispatcher.middleware.use(CacheBack::Middleware)
+begin
+  ActionController::Dispatcher.middleware.use(CacheBack::Middleware)
+rescue NameError => e
+  
+end
+

data/test/database.yml

@@ -0,0 +1,7 @@
+test:
+  adapter: mysql
+  encoding: utf8
+  database: cache_back_test
+  username: root
+  password:
+  socket: /tmp/mysql.sock

data/test/dirty_test.rb

@@ -0,0 +1,18 @@
+require File.dirname(__FILE__) + '/helper'
+
+class DirtyTest < ActiveSupport::TestCase
+  fixtures :blogs, :posts
+
+  Post.has_cache_back
+  Post.cache_back_dirty_methods :make_dirty!
+
+  should "update the cache when a dirty method is called" do
+    post = Post.first
+
+    pots = Post.find(post.id)
+    assert(Rails.cache.read(post.cache_back_key))
+
+    CacheBack.cache.expects(:write)
+    post.make_dirty!
+  end
+end

data/test/find_one_test.rb

@@ -0,0 +1,30 @@
+require File.dirname(__FILE__) + '/helper'
+
+class FindOneTest < ActiveSupport::TestCase
+  fixtures :blogs, :posts
+
+  Post.has_cache_back
+
+  should "cache find(id) calls" do
+    post = Post.first
+    assert_nil(Rails.cache.read(post.cache_back_key))
+    Post.find(post.id)
+    assert(Rails.cache.read(post.cache_back_key))
+    Post.connection.expects(:select_all).never
+    Post.find(post.id)
+  end
+
+  should "not use cache when using the :select option" do
+    post = Post.first
+    assert_nil(Rails.cache.read(post.cache_back_key))
+
+    Post.find(post.id, :select => 'title')
+    assert_nil(Rails.cache.read(post.cache_back_key))
+
+    Post.find(post.id)
+    assert(Rails.cache.read(post.cache_back_key))
+
+    CacheBack.cache.expects(:read).never
+    Post.find(post.id, :select => 'title')
+  end
+end

data/test/fixtures/blogs.yml

@@ -0,0 +1,2 @@
+a_blog:
+  name: My Blog

data/test/fixtures/comments.yml

@@ -0,0 +1,14 @@
+few_comments_1:
+  post: has_two_comments
+  body: what ever body 1
+
+few_comments_2:
+  post: has_two_comments
+  body: what ever body 2
+
+<% (1..10000).each do |i| %>
+many_comments_<%= i %>:
+  post: has_many_comments
+  body: what ever body <%= i %>
+<% end %>
+

data/test/fixtures/posts.yml

@@ -0,0 +1,11 @@
+no_comments:
+  blog: a_blog
+  title: This post has no comments
+
+has_two_comments:
+  blog: a_blog
+  title: This post has a few comments
+
+has_many_comments:
+  blog: a_blog
+  title: A shit load of comments on this one

data/test/helper.rb

@@ -1,10 +1,75 @@
 require 'rubygems'
 require 'test/unit'
+require 'mocha'
 require 'shoulda'
+require 'active_support'
+require 'active_record'
+require 'active_record/fixtures'
+
+ActiveRecord::Base.configurations = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
+ActiveRecord::Base.establish_connection('test')
+ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
+
+load(File.dirname(__FILE__) + "/schema.rb")
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'cache_back'
 
-class Test::Unit::TestCase
+class ActiveSupport::TestCase
+  include ActiveRecord::TestFixtures
+
+  fixtures :all
+
+  setup :clear_cache
+
+  def create_fixtures(*table_names)
+    if block_given?
+      Fixtures.create_fixtures(Test::Unit::TestCase.fixture_path, table_names) { yield }
+    else
+      Fixtures.create_fixtures(Test::Unit::TestCase.fixture_path, table_names)
+    end
+  end
+
+  # Turn off transactional fixtures if you're working with MyISAM tables in MySQL
+  self.use_transactional_fixtures = true
+
+  # Instantiated fixtures are slow, but give you @david where you otherwise would need people(:david)
+  self.use_instantiated_fixtures  = false
+
+  # Add more helper methods to be used by all tests here...
+  def clear_cache
+    CacheBack.cache.reset!
+    Rails.cache.clear
+  end
+end
+
+ActiveSupport::TestCase.fixture_path = File.dirname(__FILE__) + "/fixtures/"
+$LOAD_PATH.unshift(ActiveSupport::TestCase.fixture_path)
+
+module Rails
+  module_function
+  CACHE = ActiveSupport::Cache::MemoryStore.new
+
+  def cache
+    CACHE
+  end
+end
+
+class Comment < ActiveRecord::Base
+  belongs_to :post
+end
+
+class Post < ActiveRecord::Base
+  belongs_to :blog
+  has_many :comments
+
+  def make_dirty!
+    self.updated_at = Time.now
+    self.connection.execute("UPDATE posts SET updated_at = '#{updated_at.utc.to_s(:db)}' WHERE id = #{id}")
+  end
+end
+
+class Blog < ActiveRecord::Base
+  has_many :posts
 end

data/test/schema.rb

@@ -0,0 +1,35 @@
+# This file is auto-generated from the current state of the database. Instead of editing this file, 
+# please use the migrations feature of Active Record to incrementally modify your database, and
+# then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your database schema. If you need
+# to create the application database on another system, you should be using db:schema:load, not running
+# all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended to check this file into your version control system.
+
+ActiveRecord::Schema.define(:version => 1) do
+
+  create_table "comments", :force => true do |t|
+    t.text     "body"
+    t.integer  "post_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "posts", :force => true do |t|
+    t.string   "title"
+    t.integer  "blog_id"
+    t.string   "comments_cache_key"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  create_table "blogs", :force => true do |t|
+    t.string   "name"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cache_back
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Mick Staugaard
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: A rewrite of cache money
 email: mick@staugaard.com
 executables: []
@@ -41,11 +51,18 @@ files:
 - lib/cache_back.rb
 - lib/cache_back/cache.rb
 - lib/cache_back/configuration_mixin.rb
+- lib/cache_back/dirty_mixin.rb
 - lib/cache_back/middleware.rb
 - lib/cache_back/read_mixin.rb
 - lib/cache_back/write_mixin.rb
+- test/database.yml
+- test/dirty_test.rb
+- test/find_one_test.rb
+- test/fixtures/blogs.yml
+- test/fixtures/comments.yml
+- test/fixtures/posts.yml
 - test/helper.rb
-- test/test_cache_back.rb
+- test/schema.rb
 has_rdoc: true
 homepage: http://github.com/staugaard/cache_back
 licenses: []
@@ -75,5 +92,7 @@ signing_key:
 specification_version: 3
 summary: A write back caching layer on active record
 test_files: 
+- test/dirty_test.rb
+- test/find_one_test.rb
 - test/helper.rb
-- test/test_cache_back.rb
+- test/schema.rb

data/test/test_cache_back.rb

@@ -1,7 +0,0 @@
-require 'helper'
-
-class TestCacheBack < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
-end