cachet 0.0.0 → 0.0.1

data/lib/cachet.rb

@@ -3,6 +3,7 @@ require 'rails'
 module Cachet
   mattr_accessor :logger
   mattr_accessor :storage
+  mattr_accessor :enabled
 
   class << self
     def setup
@@ -10,23 +11,28 @@ module Cachet
     end
 
     def cache (entity, key)
-      cached_item = storage.read(entity, key)
-      if not cached_item
-        cached_item = yield
-        storage.write(entity, key, cached_item)
-        Cachet.logger.info "#{entity} with key:#{key} could not found in cache. Evaluated and written to cache"
+      if enabled
+        cached_item = storage.read(entity, key)
+        if not cached_item
+          cached_item = yield
+          storage.write(entity, key, cached_item)
+          Cachet.logger.info "#{entity} with key:#{key} could not found in cache. Evaluated and written to cache"
+        else
+          Cachet.logger.info "#{entity} with key:#{key} found in cache."
+        end
+        cached_item
       else
-        Cachet.logger.info "#{entity} with key:#{key} found in cache."
+        yield
       end
-      cached_item
     end
 
     def invalidate (entity, key)
-      storage.purge(entity, key)
-      Cachet.logger.info "#{entity} with key:#{key} invalidated."
+      if enabled
+        storage.purge(entity, key)
+        Cachet.logger.info "#{entity} with key:#{key} invalidated."
+      end
     end
   end
-
 end
 
 require 'cachet/file_store'

data/lib/cachet/cacheable.rb

@@ -21,7 +21,9 @@ module Cachet
         define_method("#{cached_method}_with_cache_invalidation") { |*args|
           cache_key = block_given? ? yield(*args) : cached_method.to_s
           method("#{cached_method}_without_cache_invalidation".to_sym).call(*args)
-          Cachet.invalidate(entity, cache_key)
+          (entity.kind_of?(Array) ? entity : [entity]).each do |ent|
+            Cachet.invalidate(ent, cache_key)
+          end
         }
         alias_method_chain "#{cached_method}".to_sym, :cache_invalidation
         Cachet.logger.debug "Aliasing method : #{cached_method} to invalidate the #{entity} entities"

data/lib/cachet/file_store.rb

@@ -9,7 +9,7 @@ module Cachet
 
     def initialize(root)
       @root = root
-      FileUtils.mkdir_p root, :mode=>0755
+      FileUtils.mkdir_p root
       @optimize = TRUE
       @dir_level = 3
       @dir_count = 19
@@ -23,7 +23,7 @@ module Cachet
     def write(entity, key, data_to_be_stored)
       file_name = storage_path(entity, key)
       temp_file_name = file_name + '.' + Thread.current.object_id.to_s
-      FileUtils.mkdir_p File.dirname(file_name), :mode => 755
+      FileUtils.mkdir_p File.dirname(file_name)
       File.open(temp_file_name, 'wb') { |f| f.write(Marshal.dump(data_to_be_stored)) }
       if File.exist?(file_name)
         File.unlink temp_file_name
@@ -43,6 +43,17 @@ module Cachet
       Cachet.logger.info "An element of #{entity} in the cache with key:#{key} to path #{file_name}entity has been removed from the cache."
     end
 
+    def entities
+      Dir.entries(root).reject { |entry| entry =='.' || entry == '..' }.inject({}) do |entities, entity|
+        entities[entity] = Dir["#{root}/#{entity}/**/*"].count { |file| File.file?(file) }
+        entities
+      end
+    end
+
+    def remove_entity(entity)
+      FileUtils.remove_dir File.join root, entity
+    end
+
     def storage_path(entity, key)
       file_name = Digest::MD5.hexdigest(key)
       if optimize

data/test/test_cacheable.rb

@@ -0,0 +1,55 @@
+require_relative 'test_helper'
+
+module Cachet
+  mattr_accessor :cache_calls
+  mattr_accessor :invalidate_calls
+
+  def self.cache (entity, key)
+    @@cache_calls = ((@@cache_calls or []) << [entity, key])
+  end
+
+  def self.invalidate (entity, key)
+    @@invalidate_calls = ((@@invalidate_calls or []) << [entity, key])
+  end
+end
+
+class CacheableTest < Test::Unit::TestCase
+  include Cachet::Cacheable
+
+  def setup
+  end
+
+  def method_cached(param1, param2)
+    return [param1, param2].join('-')
+  end
+
+  def method_invalidator(param1, param2)
+
+  end
+
+  def test_cacheable
+    self.method_cached 'umut', 'utkan'
+    assert_equal Cachet.cache_calls.length, 1
+    cache_call = Cachet.cache_calls[0]
+    assert_equal :foo, cache_call[0]
+    assert_equal 'umut-utkan', cache_call[1]
+
+    self.method_invalidator 'umut', 'utkan'
+    assert_equal Cachet.invalidate_calls.length, 2
+    invalidate_call = Cachet.invalidate_calls[0]
+    assert_equal :foo, invalidate_call[0]
+    assert_equal 'umut/utkan', invalidate_call[1]
+    invalidate_call = Cachet.invalidate_calls[1]
+    assert_equal :bar, invalidate_call[0]
+    assert_equal 'umut/utkan', invalidate_call[1]
+  end
+
+  cacheable :method_cached, :foo do |param1, param2|
+    [param1, param2].join '-'
+  end
+
+  cache_invalidator :method_invalidator, [:foo, :bar] do |param1, param2|
+    [param1, param2].join '/'
+  end
+
+end

metadata

@@ -2,7 +2,7 @@
 name: cachet
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.0
+  version: 0.0.1
 platform: ruby
 authors: 
 - Meltem Atesalp
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-07 00:00:00 +02:00
+date: 2012-02-27 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,6 +51,7 @@ files:
 - README
 - test/test_file_store.rb
 - test/test_helper.rb
+- test/test_cacheable.rb
 has_rdoc: true
 homepage: https://github.com/meltem/cachet
 licenses: []
@@ -82,3 +83,4 @@ summary: Caches method responses to have a better performance!
 test_files: 
 - test/test_file_store.rb
 - test/test_helper.rb
+- test/test_cacheable.rb