cachecataz 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/cachecataz.rb

@@ -6,11 +6,13 @@ module Cachecataz
   #   config.after_initialize do
   #     Cachecataz.enable = true
   #     Cachecataz.provider = Rails.cache
+  #     Cachecataz.random = false
   #   end
-  Config = {:api => {:get => :read, :set => :write, :incr => :increment, :exist? => :exist?}, 
+  Config = {:api => {:get => :read, :set => :write, :exist? => :exist?}, 
             :enabled => false,
             :ns_delim => ":",
-            :index_delim => "/" }
+            :index_delim => "/", 
+            :random => true }
     
   # Config method to enable Cachecataz
   #
@@ -19,6 +21,13 @@ module Cachecataz
     Config[:enabled] = val
   end
   
+  # Config method to randomize the seed for namespaces in Cachecataz.  (default to true, the recommended setting)
+  #
+  # @param [Boolean] val
+  def self.random=(val)
+    Config[:random] = val
+  end
+  
   # Set custom delimiter if desired
   def self.delim=(val)
     Config[:ns_delim] = val.first rescue ":"
@@ -49,17 +58,20 @@ module Cachecataz
     
     api_method = api_args.slice!(0)
     
-    if Config[:api][api_method].respond_to?(:call)
+    case
+    when Config[:api][api_method].respond_to?(:call)
       Config[:api][api_method].call(*api_args)
+    when Config[:provider].respond_to?(Config[:api][api_method])
+      Config[:provider].send(Config[:api][api_method], *api_args)
     else
-      Config[:provider].send(Config[:api][api_method], *api_args)    
+      raise "Unknown method for provider: #{Config[:provider]}"
     end
   end
 
   # Method that validates the api and provider if they are defined in configuration
   def self.validate_api(api={})
-    unless api.include?(:get) && api.include?(:set) && api.include?(:incr) && api.include?(:exist?)
-      raise "Unknown api methods, define [:get, :set, :incr, :exist?] to use cachecataz with a non-standard provider"
+    unless api.include?(:get) && api.include?(:set) && api.include?(:exist?)
+      raise "Unknown api methods, define [:get, :set, :exist?] to use cachecataz with a non-standard provider"
     end
   end
   
@@ -87,7 +99,7 @@ module Cachecataz
     def cache_point(point_key, scope_hash)
       c_scope = @_point_keys[point_key]   
       c_point = c_scope.inject(point_key.to_s){|s, i| s << Cachecataz::Config[:ns_delim] << (scope_hash[i.to_s] || scope_hash[i]).to_s }
-      Cachecataz[:set, c_point, "0"] if !Cachecataz[:exist?, c_point]
+      Cachecataz[:set, c_point, Cachecataz::Config[:random] ? rand(10000).to_s : "0"] if !Cachecataz[:exist?, c_point]
       return c_point
     end
 
@@ -110,7 +122,7 @@ module Cachecataz
     # @param [Hash] scope_hash the data provider for the scope of the namespace
     def expire_namespace(point_key, scope_hash={})
       c_point = cache_point(point_key, scope_hash)
-      Cachecataz[:incr, c_point]
+      Cachecataz[:set, c_point, (Cachecataz[:get, c_point].to_i + 1 rescue rand(10000)).to_s]
     end
     
     # Class level method to expire all the namespace of cachecataz for a given data provider

data/spec/cachecataz_spec.rb

@@ -5,6 +5,7 @@ describe MockModel do
     
     before(:all) do
       Cachecataz.enable = false
+      Cachecataz.random = false
     end
     
     it "is disabled on initialization for cache_scope :user" do
@@ -22,6 +23,7 @@ describe MockModel do
     before(:all) do
       Cachecataz.enable = true
       Cachecataz.provider = MockCache.new
+      Cachecataz.random = false
     end
 
     it "returns a namespace key for an empty cache_scope" do
@@ -96,6 +98,7 @@ describe MockModel do
       before(:all) do
         Cachecataz::Config[:provider].clear # not part of api, just an easy way to clear the mock cache
         Cachecataz.delim = ["|", "/"]
+        Cachecataz.random = false
       end
       
       it "returns a namespace key with index for cache_scope :user, :id" do
@@ -111,6 +114,7 @@ describe MockModel do
       before(:all) do
         Cachecataz::Config[:provider].clear  # not part of api, just an easy way to clear the mock cache
         Cachecataz.delim = [":", "|"]
+        Cachecataz.random = false
       end
       
       it "returns a namespace key with index for cache_scope :user, :id" do
@@ -130,6 +134,7 @@ describe MockModel do
                           :set => lambda{ |*args| Cachecataz::Config[:provider].all(:write, *args) }, 
                           :incr => lambda{ |*args| Cachecataz::Config[:provider].all(:increment, *args) }, 
                           :exist? => lambda{ |*args| Cachecataz::Config[:provider].all(:exist?, *args) }}
+        Cachecataz.random = false
       end
   
       it "returns a namespace key for an empty cache_scope" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cachecataz
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Brandon Dewitt
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-14 00:00:00 -04:00
+date: 2011-03-20 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency