quetzall-cloud_cache 1.2.0 → 1.2.1

data/lib/cloud_cache.rb

@@ -106,6 +106,7 @@ module ActiveSupport
                     data = val.to_s
                 else
                     data = (Marshal.dump(val))
+                    data = Base64.encode64(data)
                 end
                 #puts 'putting=' + data.to_s
                 extra_headers = seconds_to_store > 0 ? {"ttl"=>seconds_to_store} : nil
@@ -143,7 +144,7 @@ module ActiveSupport
                     end
                     if line =~ /^VALUE (.+) (.+)/ then # (key) (bytes)
                         if !curr_key.nil?
-                            values[curr_key] = raw ? val.strip : Marshal.load(val.strip)
+                            values[curr_key] = raw ? val.strip : Marshal.load(Base64.decode64(val.strip))
                         end
                         curr_key, data_length = $1, $2
                         val = ""
@@ -155,7 +156,7 @@ module ActiveSupport
                     count += 1
                 end
                 if !val.nil? && val != ""
-                    values[curr_key] = raw ? val.strip : Marshal.load(val.strip)
+                    values[curr_key] = raw ? val.strip :  Marshal.load(Base64.decode64(val.strip))
                 end
                 #puts 'values=' + values.inspect
                 values
@@ -170,10 +171,11 @@ module ActiveSupport
                     return nil if $!.message.include? "404"
                     raise $!
                 end
-                # puts 'data=' + data.to_s
+                #puts 'data1=' + data.to_s
                 if raw
                     return data
                 else
+                    data = Base64.decode64(data)
                     return Marshal.load((data))
                 end
             end

data/test/cache_tests.rb

@@ -25,193 +25,193 @@ class CacheTests < Test::Unit::TestCase
     end
 
     def test_auth
-           @cache.auth()
-       end
-
-       def test_bad_auth
-
-           temp = @cache.secret_key
-           @cache.secret_key = "badkey"
-
-           assert_raise Net::HTTPServerException do
-               test_basic_ops
-           end
-
-           @cache.secret_key = temp
-       end
-
-       def test_basic_ops
-           to_put = "I am a testing string. Take me apart and put me back together again."
-           @cache.put("s1", to_put)
-
-           sleep(1)
-
-           response = @cache.get("s1")
-           assert_equal(to_put, response)
+        @cache.auth()
+    end
 
-       end
+    def test_bad_auth
 
-       def test_not_exists
-           assert_nil @cache.get("does_not_exist")
-       end
+        temp = @cache.secret_key
+        @cache.secret_key = "badkey"
 
-       def test_delete
-           to_put = "I am a testing string. Take me apart and put me back together again."
-           @cache.put("s1", to_put)
+        assert_raise Net::HTTPServerException do
+            test_basic_ops
+        end
 
-           sleep(1)
+        @cache.secret_key = temp
+    end
 
-           response = @cache.get("s1")
-           assert_equal(to_put, response)
+    def test_basic_ops
+        to_put = "I am a testing string. Take me apart and put me back together again."
+        @cache.put("s1", to_put)
 
-           @cache.delete("s1")
+        sleep(1)
 
-           response = @cache.get("s1")
-           assert_nil(response)
-       end
+        response = @cache.get("s1")
+        assert_equal(to_put, response)
 
-       def test_expiry
-           to_put = "I am a testing string. Take me apart and put me back together again."
-           @cache.put("s1", to_put, :ttl=>2);
-           sleep(4)
-           response = @cache.get("s1")
-           assert_nil(response)
+    end
 
-           @cache.write("s1", to_put, :expires_in=>2);
-           sleep(4)
-           response = @cache.get("s1")
-           assert_nil(response)
-       end
+    def test_not_exists
+        assert_nil @cache.get("does_not_exist")
+    end
 
-       def test_list_keys
-           @cache.put("k1", "v2", :expires_in=>15)
-           sleep 1
-           keys = @cache.list_keys
-           puts("PRINTING KEYS:")
-           for key in keys
-               puts key
-           end
-           haskey = keys.index("k1")
-           assert_not_nil(haskey)
-       end
+    def test_delete
+        to_put = "I am a testing string. Take me apart and put me back together again."
+        @cache.put("s1", to_put)
 
-       def test_counters
-           val = 0
-           key = "counter1" # should add a test for a key with a slash
-           @cache.put(key, val, :ttl=>50000, :raw=>true)
-           10.times do
-               val = @cache.increment(key)
-               puts 'val=' + val.to_s
-           end
-           assert_equal(10, val)
+        sleep(1)
 
-           # get as normal int now
-           get_val = @cache.get_i(key)
-           assert_equal(10, get_val)
+        response = @cache.get("s1")
+        assert_equal(to_put, response)
 
-           10.times do
-               val = @cache.decrement(key)
-           end
-           assert_equal(0, val)
+        @cache.delete("s1")
 
-           # One more to make sure it stays at 0
-           val = @cache.decrement(key)
-           assert_equal(0, val)
+        response = @cache.get("s1")
+        assert_nil(response)
+    end
 
-       end
+    def test_expiry
+        to_put = "I am a testing string. Take me apart and put me back together again."
+        @cache.put("s1", to_put, :ttl=>2);
+        sleep(4)
+        response = @cache.get("s1")
+        assert_nil(response)
+
+        @cache.write("s1", to_put, :expires_in=>2);
+        sleep(4)
+        response = @cache.get("s1")
+        assert_nil(response)
+    end
 
-       def test_flush
-           x = @cache.flush
-           assert_equal('[]', x)
-       end
+    def test_list_keys
+        @cache.put("k1", "v2", :expires_in=>15)
+        sleep 1
+        keys = @cache.list_keys
+        puts("PRINTING KEYS:")
+        for key in keys
+            puts key
+        end
+        haskey = keys.index("k1")
+        assert_not_nil(haskey)
+    end
 
-       def test_stats
-           x = @cache.stats
-           puts x
-       end
+    def test_counters
+        val = 0
+        key = "counter1" # should add a test for a key with a slash
+        @cache.put(key, val, :ttl=>50000, :raw=>true)
+        10.times do
+            val = @cache.increment(key)
+            puts 'val=' + val.to_s
+        end
+        assert_equal(10, val)
 
-       def test_get_multi_raw
-           @cache.remove("m1") rescue false
-           @cache.remove("m2") rescue false
-           @cache.remove("m3") rescue false
-           @cache.remove("m4") rescue false
+        # get as normal int now
+        get_val = @cache.get_i(key)
+        assert_equal(10, get_val)
 
-           @cache.put("m1", "v1", :ttl=>500, :raw=>true)
-           @cache.put("m2", "v2", :ttl=>500, :raw=>true)
+        10.times do
+            val = @cache.decrement(key)
+        end
+        assert_equal(0, val)
 
-           kz = Array["m1", "m2", "m3"]
-           vz = @cache.get_multi(kz, :raw=>true)
+        # One more to make sure it stays at 0
+        val = @cache.decrement(key)
+        assert_equal(0, val)
 
-           assert_equal("v1", vz["m1"])
-           assert_equal("v2", vz["m2"])
-           assert_nil(vz["m3"])
+    end
 
+    def test_flush
+        x = @cache.flush
+        assert_equal('[]', x)
+    end
 
-       end
+    def test_stats
+        x = @cache.stats
+        puts x
+    end
 
-       def test_get_multi
+    def test_get_multi_raw
+        @cache.remove("m1") rescue false
+        @cache.remove("m2") rescue false
+        @cache.remove("m3") rescue false
+        @cache.remove("m4") rescue false
 
-           kz = []
-           vz = @cache.get_multi(kz)
-           assert vz.size == 0
+        @cache.put("m1", "v1", :ttl=>500, :raw=>true)
+        @cache.put("m2", "v2", :ttl=>500, :raw=>true)
 
-           kz = ["nothere"]
-           vz = @cache.get_multi(kz)
-           assert vz.size == 0
+        kz = Array["m1", "m2", "m3"]
+        vz = @cache.get_multi(kz, :raw=>true)
 
-           @cache.remove("m1") rescue false
-           @cache.remove("m2") rescue false
-           @cache.remove("m3") rescue false
-           @cache.remove("m4") rescue false
+        assert_equal("v1", vz["m1"])
+        assert_equal("v2", vz["m2"])
+        assert_nil(vz["m3"])
 
-           @cache.put("m1", "v1", :ttl=>500, :raw=>false)
-           @cache.put("m2", "v2", :ttl=>500, :raw=>false)
-           @cache.put("m4", MyClass.new("Travis", 10), :ttl=>500, :raw=>false)
-
-           kz = ["m1", "m2", "m3", "m4"]
-           vz = @cache.get_multi(kz)
-
-           assert_equal("v1", vz["m1"]);
-           assert_equal("v2", vz["m2"]);
-           assert_nil(vz["m3"]);
-           assert_equal("Travis", vz["m4"].name)
-           assert_equal(10, vz["m4"].age)
 
-           @cache.put("m3", MyClass.new("Leroy", 3), :ttl=>500, :raw=>false)
-
-           kz = ["m1", "m2", "m3", "m4"]
-           vz = @cache.get_multi(kz)
+    end
+
+    def test_get_multi
+
+        kz = []
+        vz = @cache.get_multi(kz)
+        assert vz.size == 0
+
+        kz = ["nothere"]
+        vz = @cache.get_multi(kz)
+        assert vz.size == 0
+
+        @cache.remove("m1") rescue false
+        @cache.remove("m2") rescue false
+        @cache.remove("m3") rescue false
+        @cache.remove("m4") rescue false
+
+        @cache.put("m1", "v1", :ttl=>500, :raw=>false)
+        @cache.put("m2", "v2", :ttl=>500, :raw=>false)
+        @cache.put("m4", MyClass.new("Travis", 10), :ttl=>500, :raw=>false)
+
+        kz = ["m1", "m2", "m3", "m4"]
+        vz = @cache.get_multi(kz)
 
-           assert_equal("v1", vz["m1"]);
-           assert_equal("v2", vz["m2"]);
-           assert_equal("Leroy", vz["m3"].name)
-           assert_equal(3, vz["m3"].age)
-           assert_equal("Travis", vz["m4"].name)
-           assert_equal(10, vz["m4"].age)
+        assert_equal("v1", vz["m1"]);
+        assert_equal("v2", vz["m2"]);
+        assert_nil(vz["m3"]);
+        assert_equal("Travis", vz["m4"].name)
+        assert_equal(10, vz["m4"].age)
 
+        @cache.put("m3", MyClass.new("Leroy", 3), :ttl=>500, :raw=>false)
 
-       end
+        kz = ["m1", "m2", "m3", "m4"]
+        vz = @cache.get_multi(kz)
 
-       def test_big
-           s = random_string(100000)
-           @cache.put("s1", s)
+        assert_equal("v1", vz["m1"]);
+        assert_equal("v2", vz["m2"]);
+        assert_equal("Leroy", vz["m3"].name)
+        assert_equal(3, vz["m3"].age)
+        assert_equal("Travis", vz["m4"].name)
+        assert_equal(10, vz["m4"].age)
 
-           s2 = @cache.get("s1")
 
-           assert_equal(s, s2)
-       end
+    end
+
+    def test_big
+        s = random_string(100000)
+        @cache.put("s1", s)
 
-       def random_string(length=10)
-           chars = 'abcdefghjkmnpqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789'
-           password = ''
-           length.times { password << chars[rand(chars.size)] }
-           password
-       end
+        s2 = @cache.get("s1")
+
+        assert_equal(s, s2)
+    end
 
-       def test_usage
-           usage = @cache.usage
-           assert_kind_of(Numeric, usage)
-       end
+    def random_string(length=10)
+        chars = 'abcdefghjkmnpqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ23456789'
+        password = ''
+        length.times { password << chars[rand(chars.size)] }
+        password
+    end
+
+    def test_usage
+        usage = @cache.usage
+        assert_kind_of(Numeric, usage)
+    end
 
 
     def test_set_if_not_found
@@ -223,7 +223,12 @@ class CacheTests < Test::Unit::TestCase
         end
 
         val = 3
-        @cache.increment(key, 1, :set_if_not_found=>val)
+        ret = @cache.increment(key, 1, :set_if_not_found=>val)
+        assert ret == val
+        ret = @cache.get(key)
+        assert ret == val
+        ret = @cache.increment(key, 1, :set_if_not_found=>val)
+        assert ret == val + 1
 
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: quetzall-cloud_cache
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors: 
 - Travis Reeder
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-09 00:00:00 -07:00
+date: 2009-09-11 00:00:00 -07:00
 default_executable: 
 dependencies: []