cloud_cache 1.2.3 → 1.3.0

data/{README.txt → README.markdown}

@@ -1,4 +1,11 @@
-= cloud_cache
+= CloudCache - caching in the cloud
+
+- Infinite size cache in the cloud
+- High performance
+- Introspection (memcached doesn't have it)
+- No maintenance
+- No worries
+- Free 5MB Cache!
 
 http://www.quetzall.com/
 
@@ -6,21 +13,18 @@ http://www.quetzall.com/
 
 Instant memcached, no servers required! See www.quetzall.com for more information.
 
-== FEATURES/PROBLEMS:
-
-* FIX (list of features or problems)
+== INSTALL:
 
-== SYNOPSIS:
+Be sure you have the new http://gemcutter.org source ABOVE rubyforge.org, then:
 
-  FIX (code sample of usage)
+    gem install cloud_cache
 
-== REQUIREMENTS:
+Get your CloudCache credentials for free at www.quetzall.com, then:
 
-* FIX (list of requirements)
+    config.cache_store = CloudCache.new(CC_ACCESS_KEY, CC_SECRET_KEY)
 
-== INSTALL:
+That's it!  Now start caching as you normally would and CloudCache handles the rest.
 
-sudo gem install activesupport
 
 == LICENSE:
 

data/lib/cloud_cache.rb

@@ -2,6 +2,7 @@ require 'rubygems'
 require 'active_support'
 require 'net/http'
 require 'base64'
+require 'right_http_connection'
 
 $:.unshift(File.dirname(__FILE__))
 
@@ -17,14 +18,30 @@ end
 
 class CloudCache < ActiveSupport::Cache::Store
 
+    DEFAULT_TTL = 0
+    DEFAULT_HOST = "cloudcache.ws"
+    DEFAULT_PORT = "80"
+    DEFAULT_PROTOCOL = "http"
 
-    attr_accessor :secret_key
+    attr_accessor :access_key, :secret_key, :host, :port, :protocol, :pipeline, :default_ttl
 
-    def initialize(access_key, secret_key)
-        puts 'Creating new CloudCache'
+    def initialize(access_key, secret_key, options={})
         @access_key = access_key
         @secret_key = secret_key
 
+        @host = options[:host] || DEFAULT_HOST
+        @port = options[:port] || DEFAULT_PORT
+        @protocol = options[:protocol] || DEFAULT_PROTOCOL
+
+        @default_ttl = options[:default_ttl] || DEFAULT_TTL
+        @pipeline = options[:pipeline] || false
+
+        puts 'Creating new CloudCache [host=' + @host + ', default_ttl=' + @default_ttl.to_s + ', pipelining=' + @pipeline.to_s + ']'
+
+    end
+
+    def pipelined?
+        @pipeline
     end
 
     def run_http(http_method, command_name, command_path, body=nil, parameters=nil, extra_headers=nil)
@@ -32,8 +49,8 @@ class CloudCache < ActiveSupport::Cache::Store
         # puts 'timestamp = ' + ts
         sig = generate_signature("CloudCache", command_name, ts, @secret_key)
         # puts "My signature = " + sig
-        url = "http://cloudcache.ws/" + command_path
-        # puts url
+        url = @protocol + "://" + @host + "/" + command_path # todo: append port if non standard
+#         puts url
 
         user_agent = "CloudCache Ruby Client"
         headers = {'User-Agent' => user_agent, 'signature' => sig, 'timestamp' => ts, 'akey' => @access_key}
@@ -44,7 +61,6 @@ class CloudCache < ActiveSupport::Cache::Store
             end
         end
 
-
         uri = URI.parse(url)
         #puts 'body=' + body.to_s
         if (http_method == :put)
@@ -73,10 +89,23 @@ class CloudCache < ActiveSupport::Cache::Store
         # req.each_header do |k, v|
         # puts 'header ' + k + '=' + v
         #end
-        res = Net::HTTP.start(uri.host, uri.port) do |http|
-            http.request(req)
+        if pipelined?
+            unless @http_conn
+                @http_conn = Rightscale::HttpConnection.new()
+            end
+
+            req_params =  { :request  => req,
+        :server   => @host,
+        :port     => @port,
+        :protocol => @protocol }
+            res = @http_conn.request(req_params)
+        else
+            res = Net::HTTP.start(uri.host, uri.port) do |http|
+                http.request(req)
+            end
         end
-        #puts 'response body=' + res.body
+
+#        puts 'response body=' + res.body
         case res
             when Net::HTTPSuccess
                 #puts 'response body=' + res.body
@@ -221,7 +250,7 @@ class CloudCache < ActiveSupport::Cache::Store
         put(name, value, options)
     end
 
-    def delete(name, options = nil)
+    def delete(name, options={})
         super
         begin
             run_http(:delete, "DELETE", name)
@@ -291,6 +320,9 @@ class CloudCache < ActiveSupport::Cache::Store
 
     def close
         # close http connection if it exists.
+        if @http_conn
+            @http_conn.finish
+        end
     end
 
 

data/test/cache_tests.rb

@@ -1,9 +1,9 @@
 require 'test/unit'
-require '../lib/cloud_cache'
-require 'my_class'
+require File.join(File.dirname(__FILE__), '/../lib/cloud_cache')
+require 'my_class.rb'
 #
-# You'll need make a cloudcache.yml file in this directory that contains:
-# amazon:
+# You'll need make a ~/.test-configs/cloud_cache.yml file that contains:
+# cloud_cache:
 #    access_key: ACCESS_KEY
 #    secret_key: SECRET
 #
@@ -11,19 +11,16 @@ class CacheTests < Test::Unit::TestCase
 
     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'])
+        @config = YAML::load(File.open(File.expand_path("~/.test-configs/cloud_cache.yml")))
+        #puts @config.inspect
+        @cache = CloudCache.new(@config['cloud_cache']['access_key'], @config['cloud_cache']['secret_key'])
     end
 
     def teardown
         @cache.shutdown unless @cache.nil?
     end
 
+
     def test_auth
         @cache.auth()
     end
@@ -189,7 +186,19 @@ class CacheTests < Test::Unit::TestCase
         assert_equal("Travis", vz["m4"].name)
         assert_equal(10, vz["m4"].age)
 
+        kz = ["m1", "should_not_exist", "m3"]
+        vz = @cache.get_multi(kz)
+        puts 'VZ=' + vz.inspect
+        assert vz.size == 2
+        assert vz["should_not_exist"].nil?
 
+        @cache.delete("m1")
+        vz = @cache.get_multi(kz)
+        puts 'VZ=' + vz.inspect
+        assert vz.size == 1
+        assert vz["m1"].nil?
+        assert vz["should_not_exist"].nil?
+        assert !vz["m3"].nil?
     end
 
     def test_big
@@ -313,6 +322,29 @@ bmNvZGluZz0iVVRGLTgiPz4KPHJlc3BvbnNlPgogIDxtc2c+Y29udGludWU8
 L21zZz4KPC9yZXNwb25zZT4KBjsMQBc6E0BlcnJvcl9tZXNzYWdlMDoMQGFj
 dGlvbkkiCXBlcmYGOwxAFw==", :raw=>true)
     end
+    
+
+    def test_pipeline_vs_non
+        to_put = "I am a testing string. Take me apart and put me back together again."
 
+        @cache.pipeline = false
+        start = Time.now
+        100.times do |i|
+            @cache.put("k_#{i}", to_put)
+        end
+        duration1 = Time.now - start
+        puts 'non-pipelined duration=' + duration1.to_s
+        sleep(1)
+
+        @cache.pipeline = true
+        start = Time.now
+        100.times do |i|
+            @cache.put("k_#{i}", to_put)
+        end
+        duration2 = Time.now - start
+        puts 'pipelined duration=' + duration2.to_s
+
+        assert duration2 < duration1, "Pipelined was slower?? " + duration2.to_s + " slower than " + duration1.to_s
+    end
 
 end

data/test/my_class.rb

@@ -1,9 +1,9 @@
-
-class MyClass
-    attr_accessor :name, :age
-
-    def initialize(name, age)
-        @name = name
-        @age = age
-    end
+
+class MyClass
+    attr_accessor :name, :age
+
+    def initialize(name, age)
+        @name = name
+        @age = age
+    end
 end

data/test/test_runner.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cloud_cache
 version: !ruby/object:Gem::Version 
-  version: 1.2.3
+  version: 1.3.0
 platform: ruby
 authors: 
 - Travis Reeder
@@ -9,10 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-21 00:00:00 -07:00
+date: 2009-11-25 00:00:00 -08:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: http_connection
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: Client library for Quetzall's CloudCache service.
 email: travis@appoxy.com
 executables: []
@@ -20,12 +29,12 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- README.txt
+- README.markdown
 files: 
 - lib/cloud_cache.rb
 - lib/hmac-sha1.rb
 - lib/hmac.rb
-- README.txt
+- README.markdown
 has_rdoc: true
 homepage: http://github.com/quetzall/cloud_cache/
 licenses: []
@@ -52,7 +61,7 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Client library for Quetzall's CloudCache service.
 test_files: 
 - test/cache_tests.rb