h2ocube_rails_cache 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d9a6b8ef97b0726b986a78456b0acc7f58ba457
-  data.tar.gz: d4dc1c0bee67215dc08bcaebc4468ccb0d2c1c2b
+  metadata.gz: e7360a8fa112914930362a58fef207c6a903b0a8
+  data.tar.gz: 9b36bbe3952252515b46adaf292e8ea8669c0cc1
 SHA512:
-  metadata.gz: b3004ea8f51b991842e8a4995151f4af34f02736ef164e69a75ddc75e98b6ea0a9925d4eba83dcbf8aec5945c3218721f08176be8f894b184a0b7d343e21f364
-  data.tar.gz: c9db60273fdac7ee363b69cda7abaf3bc75a6cb52cad8947d8395015864575c9a3d8aca9f8b074a63f76cdc8cac5ef311b5680c5e90df62a7fa83743a44bf241
+  metadata.gz: 885c6717c9aa1f55d43f3e9cf01d8a1bda4dc751cadb5077ae59f0bd10f74004a9bc89477f46ff7853b35b9aaaf8e1a42bd8725315e2703b9470e9382f309efd
+  data.tar.gz: 0c361281730b2bf7872f8be2a91b1a1141c6d33c0d4ff7dff6e97a7d2060cddf8d35e6faae96fcd96e2a2f072957208c81aeb613832093cd4eb7e6566c66eba4

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.4'
+  gem.version       = '0.0.5'
   gem.authors       = ['Ben']
   gem.email         = ['ben@h2ocube.com']
   gem.description   = 'Just an redis cache.'

data/lib/active_support/cache/h2ocube_rails_cache.rb

@@ -14,27 +14,34 @@ module ActiveSupport
         @data.keys key
       end
 
-      def read(key, options = nil)
+      def read key, options = nil
+        key = expanded_key key
         return nil if key.start_with?('http')
         if exist? key
-          Marshal.load(@data.get key)
+          load_entry(@data.get key)
         else
           nil
         end
       end
 
-      def write(key, entry, options = nil)
+      def read_raw key, options = nil
+        @data.get key
+      end
+
+
+      def write key, entry, options = nil
+        key = expanded_key key
         return false if key.start_with?('http')
-        @data.set key, Marshal.dump(entry), options
+        @data.set key, dump_entry(entry), options
         true
       end
 
-      def delete(name, options = nil)
+      def delete name, options = nil
         @data.keys(name).each{ |k| @data.del k }
         true
       end
 
-      def exist?(name, options = nil)
+      def exist? name, options = nil
         @data.exists name
       end
 
@@ -42,6 +49,52 @@ module ActiveSupport
         @data.keys('*').each{ |k| @data.del k }
         true
       end
+
+      def info
+        @data.info
+      end
+
+      def increment key, amount = 1, options = nil
+        if amount == 1
+          @data.incr key
+        else
+          @data.incrby key, amount
+        end
+      end
+
+      def decrement key, amount = 1, options = nil
+        if amount == 1
+          @data.decr key
+        else
+          @data.decrby key, amount
+        end
+      end
+
+      alias_method :read_entry, :read
+      alias_method :write_entry, :write
+      alias_method :delete_entry, :delete
+
+      private
+
+      def dump_entry entry
+        case entry.class.to_s
+        when 'String', 'Fixnum', 'Float'
+          entry
+        else
+          Marshal.dump entry
+        end
+      end
+
+      def load_entry entry
+        begin
+          Marshal.load entry
+        rescue
+          return entry.to_f if entry.respond_to?(:to_f) && entry.to_f.to_s == entry
+          return entry.to_i if entry.respond_to?(:to_i) && entry.to_i.to_s == entry
+
+          entry
+        end
+      end
     end
   end
 end

data/test/cache_test.rb

@@ -5,6 +5,7 @@ describe 'h2ocube_rails_cache' do
     @redis = Redis.new
     @cache_key = Rails.application.class.to_s.split("::").first << ':Cache'
     @cache = Redis::Namespace.new(@cache_key)
+    Rails.cache.clear
   end
 
   it 'should work' do
@@ -24,13 +25,13 @@ describe 'h2ocube_rails_cache' do
   end
 
   it '.write, .exist?, .read and .delete' do
-    Rails.cache.write('a', 'true').must_be_same_as true
+    Rails.cache.write('a', true).must_be_same_as true
 
     Rails.cache.exist?('a').must_be_same_as true
 
-    Rails.cache.read('a').must_equal 'true'
+    Rails.cache.read('a').must_equal true
 
-    Marshal.load(@redis.get("#{@cache_key}:a")).must_equal 'true'
+    Marshal.load(@redis.get("#{@cache_key}:a")).must_equal true
 
     Rails.cache.delete('a').must_be_same_as true
 
@@ -46,6 +47,42 @@ describe 'h2ocube_rails_cache' do
     sleep 1
     Rails.cache.exist?('expire').must_be_same_as false
   end
+
+  it 'key class' do
+    Rails.cache.write ['a', 0], 'a0'
+    Rails.cache.keys[0].must_equal 'a/0'
+    Rails.cache.clear
+
+    Rails.cache.write({a: 0}, 'a0')
+    Rails.cache.keys[0].must_equal 'a=0'
+    Rails.cache.clear
+  end
+
+  it 'value class' do
+    Rails.cache.write 'String', 'String'
+    Rails.cache.read_raw('String').must_be_kind_of String
+
+    Rails.cache.write 'Fixnum', 1
+    Rails.cache.read('Fixnum').must_be_kind_of Fixnum
+
+    Rails.cache.write 'Float', 1.1
+    Rails.cache.read('Float').must_be_kind_of Float
+  end
+
+  it 'increment' do
+    Rails.cache.write 'number', 1
+    Rails.cache.increment 'number'
+    Rails.cache.read('number').must_equal 2
+
+    Rails.cache.decrement 'number'
+    Rails.cache.read('number').must_equal 1
+
+    Rails.cache.increment 'number', 2
+    Rails.cache.read('number').must_equal 3
+
+    Rails.cache.decrement 'number', 2
+    Rails.cache.read('number').must_equal 1
+  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.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Ben
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-22 00:00:00.000000000 Z
+date: 2013-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-namespace