cachetastic 1.2.1 → 1.2.2

data/lib/adapters/cachetastic_adapters_file.rb

@@ -45,6 +45,8 @@ class Cachetastic::Adapters::File < Cachetastic::Adapters::Base
         require so.value.class.underscore
         so = YAML::load(File.open(full_path).read)
       end
+      puts so.value.class
+      pp so.value
       return so.value
     end
     return nil

data/lib/caches/cachetastic_caches_base.rb

@@ -139,7 +139,12 @@ class Cachetastic::Caches::Base
     
     # Returns the underlying Cachetastic::Adapters::Base for this cache.
     def adapter
-      cache_conn_instance.get(cache_name)
+      a = cache_conn_instance.get(cache_name)
+      if adapter_supported?(a.class)
+        return a
+      else
+        raise Cachetastic::Errors::UnsupportedAdapter.new(cache_name, a.class)
+      end
     end
     
     # Returns the Cachetastic::Logger for the underlying Cachetastic::Adapters::Base.
@@ -147,6 +152,18 @@ class Cachetastic::Caches::Base
       adapter.logger
     end
     
+    # Returns an array of unsupported adapters for this cache. Defaults to an empty
+    # array which will let any adapter be used by the cache. Override in your specific
+    # cache to prevent certain adapters.
+    def unsupported_adapters
+      []
+    end
+    
+    # Returns true/false on whether the adapter you want to use is supported for the cache.
+    def adapter_supported?(a = cache_conn_instance.get(cache_name).class)
+      return !unsupported_adapters.include?(a)
+    end
+    
     private
     # If the expiry time is set to 60 minutes and the expiry_swing time is set to
     # 15 minutes, this method will return a number between 45 minutes and 75 minutes.

data/lib/caches/cachetastic_caches_rails_session_cache.rb

@@ -1,3 +1,12 @@
 # Used for storing Rails sessions.
 class Cachetastic::Caches::RailsSessionCache < Cachetastic::Caches::Base
+  
+  class << self
+    
+    def unsupported_adapters
+      [Cachetastic::Adapters::File]
+    end
+    
+  end
+  
 end

data/lib/cachetastic.rb

@@ -14,6 +14,8 @@ module Cachetastic #:nodoc:#
   end
   module Adapters #:nodoc:#
   end
+  module Errors #:nodoc:#
+  end
   module Helpers #:nodoc:#
     module ActiveRecord #:nodoc:#
     end
@@ -27,6 +29,7 @@ require 'cachetastic_logger'
 require 'caches/cachetastic_caches_base'
 require 'caches/cachetastic_caches_page_cache'
 require 'caches/cachetastic_caches_rails_session_cache'
+require 'errors/cachetastic_errors_unsupported_adapter'
 require 'adapters/cachetastic_adapters_base'
 require 'adapters/cachetastic_adapters_store_object'
 require 'adapters/cachetastic_adapters_memcache'

data/lib/errors/cachetastic_errors_unsupported_adapter.rb

@@ -0,0 +1,7 @@
+class Cachetastic::Errors::UnsupportedAdapter < Exception
+  
+  def initialize(cache_name, adapter)
+    super("#{cache_name} does not support the use of the #{adapter} adapter!")
+  end
+  
+end

data/lib/tasks/rubyforge_config.yml

@@ -2,4 +2,4 @@
 gem_name: cachetastic
 package: cachetastic
 project: magrathea
-version: 1.2.1
+version: 1.2.2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cachetastic
 version: !ruby/object:Gem::Version 
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors: 
 - markbates
@@ -123,6 +123,7 @@ files:
 - lib/cachetastic.rb
 - lib/cachetastic_connection.rb
 - lib/cachetastic_logger.rb
+- lib/errors/cachetastic_errors_unsupported_adapter.rb
 - lib/helpers/cachetastic_helpers_active_record.rb
 - lib/rails_extensions/cachetastic_active_record_base.rb
 - lib/rails_extensions/cgi_session_cachetastic_store.rb