cloud_cache 1.3.0 → 1.3.1

data/lib/cloud_cache.rb

@@ -94,10 +94,10 @@ class CloudCache < ActiveSupport::Cache::Store
                 @http_conn = Rightscale::HttpConnection.new()
             end
 
-            req_params =  { :request  => req,
-        :server   => @host,
-        :port     => @port,
-        :protocol => @protocol }
+            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|
@@ -143,7 +143,7 @@ class CloudCache < ActiveSupport::Cache::Store
         raw = options[:raw]
         kj = keys.to_json
         #puts "keys.to_json = " + kj
-        extra_headers = {"keys" => 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
         body = run_http(:get, "GET", "getmulti", nil, nil, extra_headers)
@@ -201,7 +201,16 @@ class CloudCache < ActiveSupport::Cache::Store
             return data
         else
             #data = Base64.decode64(data)
-            return Marshal.load((data))
+            begin
+                return Marshal.load((data))
+            rescue ArgumentError => ex
+                # Most likely: ArgumentError: marshal data too short
+                # Let's assume the ruby version has been updated or something and handle this elegantly, next put should fix it
+                puts 'ArgumentError on Marshal.load! ' + ex.message
+                puts 'Returning nil, please reput and try again.'
+                return nil
+            end
+
         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,12 @@
 --- !ruby/object:Gem::Specification 
 name: cloud_cache
 version: !ruby/object:Gem::Version 
-  version: 1.3.0
+  prerelease: false
+  segments: 
+  - 1
+  - 3
+  - 1
+  version: 1.3.1
 platform: ruby
 authors: 
 - Travis Reeder
@@ -9,19 +14,22 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-25 00:00:00 -08:00
+date: 2010-09-19 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: http_connection
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: Client library for Quetzall's CloudCache service.
 email: travis@appoxy.com
 executables: []
@@ -35,6 +43,9 @@ files:
 - lib/hmac-sha1.rb
 - lib/hmac.rb
 - README.markdown
+- test/cache_tests.rb
+- test/my_class.rb
+- test/test_runner.rb
 has_rdoc: true
 homepage: http://github.com/quetzall/cloud_cache/
 licenses: []
@@ -45,21 +56,25 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Client library for Quetzall's CloudCache service.