ngmoco-cache-money 0.2.21 → 0.2.22

data/lib/cash/config.rb

@@ -55,7 +55,8 @@ module Cash
       end
 
       def ttl
-        @ttl ||= @options[:ttl] || repository.default_ttl || 1.day
+        repository_ttl = repository.respond_to?(:default_ttl) ? repository.default_ttl : nil
+        @ttl ||= @options[:ttl] || repository_ttl || 1.day
       end
 
       def version

data/lib/memcached_wrapper.rb

@@ -7,16 +7,8 @@
 
 #this wrapper lets both work.
 
-####### they have MemCache installed (don't need the wrapper)
-if defined? MemCache
-
-Rails.logger.info("cache-money: MemCache installed") if defined? Rails
-#TODO add logging?
-class MemcachedWrapper < ::MemCache
-end
-
 ########## they have Memcached installed (do need the wrapper)
-elsif defined? Memcached
+if defined? Memcached
 Rails.logger.info("cache-money: Memcached installed") if defined? Rails
 
 class Memcached
@@ -258,6 +250,14 @@ private
   end
   
 end
+####### they have MemCache installed (don't need the wrapper)
+elsif defined? MemCache
+
+Rails.logger.info("cache-money: MemCache installed") if defined? Rails
+#TODO add logging?
+class MemcachedWrapper < ::MemCache
+end
+
 else
   Rails.logger.warn 'unable to determine memcache implementation' if defined? Rails
 end #include the wraper

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ngmoco-cache-money
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 59
   prerelease: false
   segments: 
   - 0
   - 2
-  - 21
-  version: 0.2.21
+  - 22
+  version: 0.2.22
 platform: ruby
 authors: 
 - Nick Kallen
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-05 00:00:00 -07:00
+date: 2010-10-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency