iron_cache 1.2.3 → 1.3.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    iron_cache (1.2.1)
+    iron_cache (1.2.3)
       iron_core (>= 0.4.2)
 
 GEM
@@ -12,7 +12,7 @@ GEM
     memcache-client (1.8.5)
     mime-types (1.19)
     minitest (4.1.0)
-    net-http-persistent (2.7)
+    net-http-persistent (2.8)
     rake (0.9.2.2)
     rest (2.0.4)
       net-http-persistent

data/lib/active_support/cache/iron_cache_store.rb

@@ -76,6 +76,7 @@ module ActiveSupport
 
       def deserialize_entry(raw_value)
         if raw_value
+          raw_value = ::Base64.decode64(raw_value) rescue raw_value
           entry = Marshal.load(raw_value) rescue raw_value
           entry.is_a?(ActiveSupport::Cache::Entry) ? entry : ActiveSupport::Cache::Entry.new(entry)
         else
@@ -93,7 +94,7 @@ module ActiveSupport
             value = entry.to_s
           end
         else
-          value = Marshal.dump(entry)
+          value = ::Base64.encode64 Marshal.dump(entry)
         end
       end
     end

data/lib/iron_cache/caches.rb

@@ -1,4 +1,4 @@
-require 'uri'
+require 'cgi'
 
 module IronCache
   class Caches
@@ -12,7 +12,7 @@ module IronCache
     def path(options={})
       path = "projects/#{@client.project_id}/caches"
       if options[:name]
-        path << "/#{URI.escape(options[:name])}"
+        path << "/#{CGI::escape(options[:name])}"
       end
       path
     end
@@ -38,10 +38,17 @@ module IronCache
         options = {:name=>options}
       end
       options[:name] ||= @client.cache_name
-      res = @client.parse_response(@client.get("#{path(options)}"))
+      res = @client.parse_response(@client.get(path(options)))
       Cache.new(@client, res)
     end
 
+    def clear(options={})
+      res = @client.post(path(options) + "/clear")
+      json = @client.parse_response(res, true)
+      #return Message.new(self, res)
+      return ResponseBase.new(json)
+    end
+
 
   end
 
@@ -108,6 +115,10 @@ module IronCache
       @client.items.increment(k, amount, options.merge(:cache_name=>name))
     end
 
+    def clear(options={})
+      @client.caches.clear(options.merge(:name=>name))
+    end
+
   end
 
 end

data/lib/iron_cache/items.rb

@@ -1,4 +1,4 @@
-require 'uri'
+require 'cgi'
 
 module IronCache
   class Items

data/lib/iron_cache/version.rb

@@ -1,3 +1,3 @@
 module IronCache
-  VERSION = "1.2.3"
+  VERSION = "1.3.0"
 end

data/test/test_iron_cache.rb

@@ -177,5 +177,38 @@ class IronCacheTests < TestBase
   end
 
 
+  def test_keys
+    @client.cache_name = 'test_keys'
+    clear_queue
+
+    k = "word_count_[EBook"
+    v = "hello world!"
+    res = @client.items.put(k, v)
+    # another naming option we could try:
+    #res = @client.cache('test_basics').items.put("key1", "hello world!")
+    p res
+    assert res.msg
+
+  end
+
+
+  def test_clear
+    cache = @client.cache("test_clear")
+    num_items = 50
+
+    num_items.times do |i|
+      res = cache.put("key-#{i}", "value")
+    end
+
+    tkey = "key-0"
+    assert_equal "value", cache.get(tkey).value
+    puts "cache.size: #{cache.size}"
+    assert_equal num_items, cache.size
+
+    p cache.clear
+    assert_nil cache.get(tkey)
+    assert_equal 0, cache.reload.size
+  end
+
 end
 

data/test/tmp.rb

@@ -8,18 +8,23 @@ class IronCacheTests < TestBase
     super
   end
 
-  def test_keys
-    @client.cache_name = 'test_keys'
-    clear_queue
-
-    k = "word_count_[EBook"
-    v = "hello world!"
-    res = @client.items.put(k, v)
-    # another naming option we could try:
-    #res = @client.cache('test_basics').items.put("key1", "hello world!")
-    p res
-    assert res.msg
 
+  def test_clear
+    cache = @client.cache("test_clear")
+    num_items = 50
+
+    num_items.times do |i|
+      res = cache.put("key-#{i}", "value")
+    end
+
+    tkey = "key-0"
+    assert_equal "value", cache.get(tkey).value
+    puts "cache.size: #{cache.size}"
+    assert_equal num_items, cache.size
+
+    p cache.clear
+    assert_nil cache.get(tkey)
+    assert_equal 0, cache.reload.size
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_cache
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-17 00:00:00.000000000 Z
+date: 2012-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iron_core