h2ocube_rails_cache 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 852632a99122d3c7d6e43f558eae3898224cca40
-  data.tar.gz: debe972dfae26a1bf1d03db710e01fe187d01ae4
+  metadata.gz: 2348a9736459123e522839e417ab16b2e68651b9
+  data.tar.gz: e321a73a80995cd9d90cae7342ddce29915c6a56
 SHA512:
-  metadata.gz: d5cfbff54d12754f1696e340a7f944d74d1ac99fe889d66d6037b334e8f5989f80948b79b6a17c51d401501127e578b9b54f67d888c2080928c9863ae6b0d1ad
-  data.tar.gz: 89f781daf9a6948600a8d0c4f640ed81428e9ec8b827810f88cd0eea52cda64e61a35ee26cdb1a427b94f2d56ad59c2349fc1f3c23e96fc0bbf778a000d6869f
+  metadata.gz: 0cb15088fee644512bbdcfde93acb5ebcde226bec3e77577d116a5f0be992d7825f1e9e108849f0f8271fed9e38a587ca5d80384b158c4c888a8d14e1bb0f87e
+  data.tar.gz: a4f720931709e2c815da75d399588e29b65aacb9440498133064d1b9d85faec81058add8bd94fc28a0a4375494758d473cf929147702bbda29ffe05e3b44e501

data/README.md

@@ -17,6 +17,19 @@ And then execute:
 
 Disable default session_store in config/initializers/session_store.rb
 
+## Rails.cache support methods
+
+* `keys key = '*'`
+* `read key, options = nil`
+* `write key, entry, options = nil`
+* `fetch key, options = nil, &blk`
+* `delete key, options = nil`
+* `exist? key, options = nil`
+* `increment key, amount = 1, options = nil`
+* `decrement key, amount = 1, options = nil`
+* `clear`
+* `info`
+
 ## Task changed
 
     rake tmp:sessions:clear # will clear redis session data too

data/h2ocube_rails_cache.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = 'h2ocube_rails_cache'
-  gem.version       = '0.0.7'
+  gem.version       = '0.0.8'
   gem.authors       = ['Ben']
   gem.email         = ['ben@h2ocube.com']
   gem.description   = 'Just an redis cache.'

data/lib/active_support/cache/h2ocube_rails_cache.rb

@@ -15,10 +15,12 @@ module ActiveSupport
         @data.keys key
       end
 
-      def fetch key, options = nil
+      def fetch key, options = nil, &blk
         key = expanded_key key
-        write key, yield, options if block_given? && !exist?(key)
-        read key, options
+
+        return read(key, options) if exist?(key)
+
+        write key, blk, options if block_given?
       end
 
       def read key, options = nil
@@ -40,8 +42,14 @@ module ActiveSupport
       def write key, entry, options = nil
         key = expanded_key key
         return false if key.start_with?('http')
-        @data.set key, dump_entry(entry), options
-        true
+        entry = dump_entry entry
+        if entry.nil?
+          Rails.logger.warn "CacheWarn: '#{key}' is not cacheable!"
+          nil
+        else
+          @data.set key, entry, options
+          load_entry entry
+        end
       end
 
       def delete key, options = nil
@@ -90,11 +98,17 @@ module ActiveSupport
 
       def dump_entry entry
         entry = entry.call if entry.class.to_s == 'Proc'
+
         case entry.class.to_s
         when 'String', 'Fixnum', 'Float'
           entry
         else
-          Marshal.dump entry
+          begin
+            Marshal.dump entry
+          rescue Exception => e
+            Rails.logger.error "CacheError: #{e}"
+            return nil
+          end
         end
       end
 

data/test/cache_test.rb

@@ -101,6 +101,16 @@ describe 'h2ocube_rails_cache' do
     sleep 2
     Rails.cache.exist?('fetch expire').must_be_same_as false
   end
+
+  it 'fetch with error block' do
+    Rails.cache.fetch 'fetch error' do
+      {
+        proc: -> {}
+      }
+    end.must_be_nil
+
+    Rails.cache.exist?('fetch error').must_be_same_as false
+  end
 end
 
 describe ApplicationController do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: h2ocube_rails_cache
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Ben
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-29 00:00:00.000000000 Z
+date: 2013-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-namespace