quetzall-cloud_cache 1.1.0 → 1.1.3

data/lib/cloud_cache.rb

@@ -50,6 +50,7 @@ module ActiveSupport
 
 
                 uri = URI.parse(url)
+                #puts 'body=' + body.to_s
                 if (http_method == :put)
                     req = Net::HTTP::Put.new(uri.path)
                     req.body = body unless body.nil?
@@ -98,21 +99,43 @@ module ActiveSupport
                 else
                     data = (Marshal.dump(val))
                 end
-                puts 'putting=' + data.to_s
+                #puts 'putting=' + data.to_s
                 extra_headers = seconds_to_store > 0 ? {"ttl"=>seconds_to_store} : nil
                 run_http(:put, "PUT", key, data, nil, extra_headers)
             end
 
 
-            def get_multi(keys)
+            def get_multi(keys, raw=false)
                 kj = keys.to_json
-                puts "keys.to_json = " + kj
+                #puts "keys.to_json = " + kj
                 extra_headers = {"keys" => kj }
-                puts "get_multi, extra_headers keys =  " + extra_headers.keys.to_s
-                puts "get_multi, extra_headers vals = " + extra_headers.values.to_s
+                #puts "get_multi, extra_headers keys =  " + extra_headers.keys.to_s
+                #puts "get_multi, extra_headers vals = " + extra_headers.values.to_s
                 body = run_http(:get, "GET", "getmulti", nil, nil, extra_headers)
-                vals = ActiveSupport::JSON.decode body
-                vals
+                #puts 'body=' + body.to_s
+                # todo: should try to stream the body in
+                #vals = ActiveSupport::JSON.decode body
+                # New response format is:
+                # VALUE <key>  <bytes> \r\n
+                # <data block>\r\n
+                # VALUE <key>  <bytes> \r\n
+                # <data block>\r\n
+                # END
+                values = {}
+                curr_key = nil
+                data_length = 0
+                body.each_line do |line|
+                    break if line == "END\r\n"
+                    if line =~ /^VALUE (.+) (.+)/ then # (key) (bytes)
+                        curr_key, data_length = $1, $2
+                        #raise CloudCacheError, "Unexpected response #{line.inspect}"
+                    else
+                        # data block
+                        values[curr_key] = raw ? line.strip : Marshal.load(line.strip)
+                    end
+                end
+                #puts 'values=' + values.inspect
+                values
             end
 
             def get(key, raw=false)
@@ -131,6 +154,13 @@ module ActiveSupport
                 end
             end
 
+            # returns the value as an int.
+            def get_i(key)
+                val = get(key, true)
+                return nil if val.nil?
+                return val.to_i
+            end
+
             def list_keys
                 body = run_http(:get, "listkeys", "listkeys")
                 keys = ActiveSupport::JSON.decode body # body[1..-2].split(',').collect! {|n| n.to_i}
@@ -175,12 +205,8 @@ module ActiveSupport
             end
 
             def exist?(key, options = nil)
-                x = get(key)
-                r = true
-                if (x == nil)
-                    r = false
-                end
-                r
+                x = get(key, true)
+                return !x.nil?
             end
 
             def fetch(key, options = {})
@@ -223,6 +249,10 @@ module ActiveSupport
                 my_b64_hmac_digest = Base64.encode64(my_sha_hmac).strip
                 return my_b64_hmac_digest
             end
+
+            class CloudCacheError < RuntimeError
+
+            end
         end
     end
 end

data/test/cache_tests.rb

@@ -1,5 +1,5 @@
-require 'mini/test'
-require '../lib/cloudcache'
+require 'test/unit'
+require '../lib/cloud_cache'
 
 #
 # You'll need make a cloudcache.yml file in this directory that contains:
@@ -9,135 +9,156 @@ require '../lib/cloudcache'
 #
 class CacheTests < Test::Unit::TestCase
 
-  def test_for_truth
-    assert true
-  end
-
-  def setup
-    puts("Setting up cache...")
-    props = nil
-    begin
-      props = YAML::load(File.read('cloudcache.yml'))
-    rescue
-      puts "Couldn't find cloudcache.yml file. " + $!.message
-      return
+    #def initialize(*params)
+    #    super(*params)
+    #end
+
+    def test_for_truth
+        assert true
     end
-    @cache = ActiveSupport::Cache::CloudCache.new("cloudcache-ruby-tests", props['amazon']['access_key'], props['amazon']['secret_key'])
-  end
 
+    def setup
+        puts("Setting up cache...")
+        props = nil
+        begin
+            props = YAML::load(File.read('cloudcache.yml'))
+        rescue
+            raise "Couldn't find cloudcache.yml file. " + $!.message
+        end
+        @cache = ActiveSupport::Cache::CloudCache.new(props['access_key'], props['secret_key'])
+    end
 
-  def teardown
-    @cache.shutdown unless @cache.nil?
-  end
 
-  def test_auth
-    @cache.auth()
-  end
+    def teardown
+        @cache.shutdown unless @cache.nil?
+    end
 
-  def test_bad_auth
+    def test_auth
+        @cache.auth()
+    end
 
-    temp = @cache.secret_key
-    @cache.secret_key = "badkey"
+    def test_bad_auth
 
-    assert_raise Net::HTTPServerException do
-      test_basic_ops
+        temp = @cache.secret_key
+        @cache.secret_key = "badkey"
+
+        assert_raise Net::HTTPServerException do
+            test_basic_ops
+        end
+
+        @cache.secret_key = temp
     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, 0);
 
-  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, 0);
+        sleep(1)
 
-    sleep(5)
+        response = @cache.get("s1")
+        assert_equal(to_put, response)
 
-    response = @cache.get("s1")
-    assert_equal(to_put, response)
+    end
 
-  end
+    def test_not_exists
+        assert_nil @cache.get("does_not_exist")
+    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, 0)
+
+        sleep(1)
 
-  def test_not_exists
-    assert_nil @cache.get("does_not_exist")
-  end
+        response = @cache.get("s1")
+        assert_equal(to_put, response)
 
-  def test_delete
-    to_put = "I am a testing string. Take me apart and put me back together again."
-    @cache.put("s1", to_put, 0)
+        @cache.delete("s1");
 
-    sleep(5)
+        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, 2);
 
-    @cache.delete("s1");
+        sleep(4)
 
-    response = @cache.get("s1")
-    assert_nil(response)
-  end
+        response = @cache.get("s1")
+        assert_nil(response)
+    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, 5);
+    def test_list_keys
+        @cache.put("k1", "v2")
+        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
 
-    sleep(10)
+    def test_counters
+        val = 0
+        key = "counter1"
+        @cache.put(key, val, 50000, true)
+        10.times do
+            val = @cache.increment(key)
+        end
+        assert_equal(10, val)
 
-    response = @cache.get("s1")
-    assert_nil(response)
-  end
+        # get as normal int now
+        get_val = @cache.get_i(key)
+        assert_equal(10, get_val)
 
-  def test_list_keys
-    @cache.put("k1","v2") 
-    sleep 1
-    keys = @cache.list_keys
-    puts("PRINTING KEYS:")
-    for key in keys
-      puts key
+        10.times do
+            val = @cache.decrement(key)
+        end
+        assert_equal(0, val)
+
+        # One more to make sure it stays at 0
+        val = @cache.decrement(key)
+        assert_equal(0, val)
+
+    end
+
+    def test_flush
+        x = @cache.flush
+        assert_equal('[]', x)
+    end
+
+    def test_stats
+        x = @cache.stats
+        puts x
     end
-    haskey = keys.index("k1")
-    assert_not_nil(haskey)
-  end
-
-  def test_counters
-    val = 0;
-    key = "counter1";
-    @cache.put(key, val, 50000, true);
-    10.times do
-      val = @cache.increment(key)
+
+    def test_get_multi_raw
+        @cache.put("m1", "v1", 500, true)
+        @cache.put("m2", "v2", 500, true)
+
+        kz = Array["m1", "m2", "m3"]
+        vz = @cache.get_multi(kz, true)
+
+        assert_equal("v1", vz["m1"]);
+        assert_equal("v2", vz["m2"]);
+        assert_nil(vz["m3"]);
     end
-    assert_equal(10, val)
 
-    10.times do
-      val = @cache.decrement(key)
+    def test_get_multi
+        @cache.put("m1", "v1", 500, false)
+        @cache.put("m2", "v2", 500, false)
+
+        kz = Array["m1", "m2", "m3"]
+        vz = @cache.get_multi(kz)
+
+        assert_equal("v1", vz["m1"]);
+        assert_equal("v2", vz["m2"]);
+        assert_nil(vz["m3"]);
     end
-    assert_equal(0, val);
-
-    # One more to make sure it stays at 0
-    val = @cache.decrement(key);
-    assert_equal(0, val);
-
-  end
-
-  def test_flush
-    x = @cache.flush
-    assert_equal('[]', x)
-  end
-
-  def test_stats
-    x = @cache.stats
-    puts x
-  end
-  def test_get_multi
-    @cache.put("m1","v1")
-    @cache.put("m2","v2")
-
-    kz = Array["m1" , "m2", "m3"]
-    vz = @cache.get_multi(kz) 
-
-    assert_equal("v1",vz["m1"]);
-    assert_equal("v2",vz["m2"]);
-    assert_nil(vz["m3"]);
-  end
+
 
 
 

data/test/test_runner.rb

@@ -0,0 +1,10 @@
+# temporary until rubymine supports ruby 1.i
+
+require 'test/unit'
+require 'cache_tests'
+
+t = CacheTests.new("counterssdf")
+#Test::Unit::UI::Console::TestRunner.run(CacheTests)
+#t.setup
+#t.test_counters
+#t.teardown

metadata

@@ -1,23 +1,22 @@
 --- !ruby/object:Gem::Specification 
 name: quetzall-cloud_cache
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.1.3
 platform: ruby
 authors: 
 - Travis Reeder
-- Marc Byrd
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-06-23 00:00:00 -07:00
-default_executable: cloud_cache
+date: 2009-06-30 00:00:00 -07:00
+default_executable: 
 dependencies: []
 
 description: Client library for Quetzall's CloudCache service.
 email: travis@appoxy.com
-executables: 
-- cloud_cache
+executables: []
+
 extensions: []
 
 extra_rdoc_files: 
@@ -56,3 +55,4 @@ summary: Client library for Quetzall's CloudCache service.
 test_files: 
 - test/cache_tests.rb
 - test/test_cloud_cache.rb
+- test/test_runner.rb

data/bin/cloud_cache

@@ -1,3 +0,0 @@
-#!/usr/bin/env ruby
-
-abort "you need to write me"