perry 0.5.5 → 0.6.0

data/lib/perry.rb

@@ -27,6 +27,11 @@ require 'ostruct'
 require 'perry/core_ext/kernel/singleton_class'
 
 module Perry
+
+  autoload :Middlewares, 'perry/middlewares'
+  autoload :Processors, 'perry/processors'
+  autoload :Caching, 'perry/caching'
+
   @@log_file = nil
 
   def self.logger

data/lib/perry/base.rb

@@ -6,8 +6,6 @@ require 'perry/serialization'
 require 'perry/relation'
 require 'perry/scopes'
 require 'perry/adapters'
-require 'perry/middlewares'
-require 'perry/processors'
 
 class Perry::Base
   include Perry::Associations::Contains

data/lib/perry/caching.rb

@@ -0,0 +1,87 @@
+
+class Perry::Caching
+
+  ##
+  # Resets all registered caching services.  These can be middlewares, processors, adapters, or
+  # anything that needs to be called upon a cache reset.
+  #
+  def self.reset
+    registry.each { |method| method.call }
+  end
+
+  ##
+  # Register a method to be reset
+  #
+  def self.register(method=nil, &block)
+    registry
+    @registry << (method || block)
+  end
+
+  def self.registry
+    @registry ||= []
+  end
+
+  ##
+  # Return a list of registered methods
+  #
+  def self.registered
+    @registry || []
+  end
+
+  ##
+  # Enable caching flag
+  #
+  def self.enable
+    @enabled = true
+  end
+
+  ##
+  # Disable caching flag
+  #
+  def self.disable
+    @enabled = false
+  end
+
+  ##
+  # Return enabled flag status
+  #
+  def self.enabled?
+    @enabled
+  end
+
+  ##
+  # Accept a block to use caching in -- cache will be reset after the block and the original state
+  # of the enabled flag will be set after the block exits
+  #
+  def self.use(&block)
+    caching_block(true, &block)
+  end
+
+  ##
+  # Accept a block to NOT cache in -- caching will be disabled for this block and then returned to
+  # the previous status.
+  #
+  def self.forgo(&block)
+    caching_block(false, &block)
+  end
+
+  def self.clean_registry
+    @registry = []
+    @enabled = nil
+  end
+
+  protected
+
+  def self.caching_block(status)
+    initial_status = @enabled
+    begin
+      @enabled = status
+      yield
+    ensure
+      reset if status
+      @enabled = initial_status
+    end
+  end
+
+end
+

data/lib/perry/middlewares/cache_records.rb

@@ -12,12 +12,20 @@ class Perry::Middlewares::CacheRecords
   # TRP: Default to a 5 minute cache
   DEFAULT_LONGEVITY = 5*60
 
+  def self.global_cache
+    @@global_cache ||= {}
+  end
+
+  def self.reset_global_cache
+    @@global_cache = {}
+  end
+
   def reset_cache_store(default_longevity=DEFAULT_LONGEVITY)
-    @cache_store = Perry::Middlewares::CacheRecords::Store.new(default_longevity)
+    self.class.global_cache[self] = Perry::Middlewares::CacheRecords::Store.new(default_longevity)
   end
 
   def cache_store
-    @cache_store || reset_cache_store
+    self.class.global_cache[self] || reset_cache_store
   end
 
   def initialize(adapter, config={})
@@ -26,7 +34,7 @@ class Perry::Middlewares::CacheRecords
   end
 
   def call(options)
-    if options[:relation]
+    if options[:relation] && Perry::Caching.enabled?
       call_with_cache(options)
     else
       @adapter.call(options)
@@ -67,3 +75,7 @@ class Perry::Middlewares::CacheRecords
     !options[:noop]
   end
 end
+
+# Register the cache clearing method with the Caching class
+Perry::Caching.register(Perry::Middlewares::CacheRecords.method(:reset_global_cache))
+

data/lib/perry/version.rb

@@ -2,8 +2,8 @@ module Perry
   module Version
 
     MAJOR = 0
-    MINOR = 5
-    TINY  = 5
+    MINOR = 6
+    TINY  = 0
 
     def self.to_s # :nodoc:
       [MAJOR, MINOR, TINY].join('.')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: perry
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: 
   segments: 
   - 0
-  - 5
-  - 5
-  version: 0.5.5
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Travis Petticrew
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-18 00:00:00 -05:00
+date: 2011-05-25 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -148,6 +148,7 @@ files:
 - lib/perry/associations/contains.rb
 - lib/perry/associations/external.rb
 - lib/perry/base.rb
+- lib/perry/caching.rb
 - lib/perry/core_ext/kernel/singleton_class.rb
 - lib/perry/errors.rb
 - lib/perry/logger.rb