iron_cache 1.2.1 → 1.2.2

data/Gemfile

@@ -1,4 +1,3 @@
-# A sample Gemfile
 source "https://rubygems.org"
 
 gemspec

data/Gemfile.lock

@@ -1,26 +1,26 @@
 PATH
   remote: .
   specs:
-    iron_cache (1.2.0)
+    iron_cache (1.2.1)
       iron_core (>= 0.4.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    iron_core (0.4.2)
+    iron_core (0.4.3)
       rest (>= 2.0.2)
     memcache-client (1.8.5)
     mime-types (1.19)
-    minitest (3.3.0)
+    minitest (4.1.0)
     net-http-persistent (2.7)
     rake (0.9.2.2)
-    rest (2.0.2)
+    rest (2.0.4)
       net-http-persistent
       rest-client (>= 0.3.0)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    test-unit (2.5.1)
-    uber_config (0.0.6)
+    test-unit (2.5.2)
+    uber_config (1.0.5)
 
 PLATFORMS
   ruby

data/lib/active_support/cache/iron_cache_store.rb

@@ -0,0 +1,100 @@
+require 'iron_cache'
+require 'base64'
+
+module ActiveSupport
+  module Cache
+    class IronCacheStore < ActiveSupport::Cache::Store
+
+      def initialize(options = nil)
+        super(options)
+
+        @client = IronCache::Client.new(@options)
+
+        extend ActiveSupport::Cache::Strategy::LocalCache
+      end
+
+      def increment(key, amount = 1, options = nil)
+        with_namespace(key, options) do |cache, k|
+          cache.increment(k, amount)
+        end
+      end
+
+      def decrement(key, amount = 1, options = nil)
+        with_namespace(key, options) do |cache, k|
+          cache.increment(k, -amount)
+        end
+      end
+
+      protected
+
+      def read_entry(key, options)
+        item = nil
+
+        with_namespace(key, options) do |cache, k|
+          item = cache.get(k).value
+        end
+
+        deserialize_entry(item)
+      end
+
+      def write_entry(key, entry, options)
+        with_namespace(key, options) do |cache, k|
+          cache.put(k, serialize_entry(entry, options), options)
+        end
+
+        true
+      end
+
+      def delete_entry(key, options)
+        with_namespace(key, options) do |cache, k|
+          cache.delete(k)
+        end
+
+        true
+      end
+
+      private
+
+      def with_namespace(key, options)
+        options[:namespace] ||= 'rails_cache'
+
+        cache_name, key_name = namespaced_key(key, options).split(':', 2)
+
+        yield(@client.cache(cache_name), escape_key(key_name))
+      end
+
+      def escape_key(key)
+        ekey = ::Base64.encode64(key)
+
+        if ekey.size > 250
+          ekey = "#{key[0, 213]}:md5:#{Digest::MD5.hexdigest(key)}"
+        end
+
+        ekey
+      end
+
+      def deserialize_entry(raw_value)
+        if raw_value
+          entry = Marshal.load(raw_value) rescue raw_value
+          entry.is_a?(ActiveSupport::Cache::Entry) ? entry : ActiveSupport::Cache::Entry.new(entry)
+        else
+          nil
+        end
+      end
+
+      def serialize_entry(entry, options)
+        value = nil
+
+        if options[:raw]
+          if entry.respond_to?(:value)
+            value = entry.value.to_s
+          else
+            value = entry.to_s
+          end
+        else
+          value = Marshal.dump(entry)
+        end
+      end
+    end
+  end
+end

data/lib/iron_cache/caches.rb

@@ -76,6 +76,10 @@ module IronCache
       q
     end
 
+    def reload
+      load_cache
+    end
+
     def size
       return raw["size"] if raw["size"]
       return @size if @size

data/lib/iron_cache/client.rb

@@ -17,7 +17,7 @@ module IronCache
         :host => IronCache::Client::AWS_US_EAST_HOST,
         :port => 443,
         :api_version => 1,
-        :user_agent => 'iron_mq_ruby-' + IronCache::VERSION + ' (iron_core_ruby-' + IronCore.version + ')',
+        :user_agent => 'iron_cache_ruby-' + IronCache::VERSION + ' (iron_core_ruby-' + IronCore.version + ')',
         :cache_name => 'default'
       }
 

data/lib/iron_cache/version.rb

@@ -1,3 +1,3 @@
 module IronCache
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 end

data/test/load_er_up.rb

@@ -0,0 +1,57 @@
+require_relative 'test_base'
+
+class QuickRun < TestBase
+
+  def setup
+    super
+  end
+
+  #def test_loader
+  #  cache_name = 'ironcache-load'
+  #  cache = @client.cache(cache_name)
+  #  p cache
+  #  100.times do |i|
+  #    p i
+  #    key = "x"
+  #    value = "hello world!"
+  #    res = cache.put(key, value)
+  #    p res
+  #    assert res.msg
+  #  end
+  #
+  #  cache.reload
+  #  puts "size: #{cache.size}"
+  #  assert_equal 100, cache.size
+  #
+  #end
+
+  def test_unloader
+    cache_name = 'ironcache-load'
+    cache = @client.cache(cache_name)
+    p cache
+    assert_equal 201, cache.size
+    res = cache.get("x")
+    p res
+    value = "hello world!"
+    assert_equal value, res.value
+
+    100.times do |i|
+      p i
+      key = "x#{i}"
+      res = cache.put(key, value)
+      #p res
+      assert res.msg
+    end
+
+    cache.reload
+    puts "size: #{cache.size}"
+    assert_equal 201, cache.size
+
+    res = cache.put("randomyo", value)
+    assert_equal 202, cache.reload.size
+
+  end
+
+
+end
+

data/test/quick_run.rb

@@ -4,29 +4,36 @@ class QuickRun < TestBase
 
   def setup
     super
-    @client.cache_name = 'ironcache-gem-quick'
   end
 
   def test_basics
+    cache_name = 'ironcache-gem-quick'
+    cache = @client.cache(cache_name)
+    p cache
     key = "x"
     value = "hello world!"
-    res = @client.items.put(key, value)
+    res = cache.put(key, value)
     p res
     assert res.msg
+    puts "size: #{cache.size}"
+    assert_equal 1, cache.size
 
-    res = @client.items.get(key)
-    assert res.value
-    assert res.value == value
+    res = cache.get(key)
     p res
+    assert_equal value, res.value
 
-    res = @client.items.delete(key)
+    res = cache.delete(key)
     p res
     assert res.msg
 
-    res = @client.items.get(key)
+    res = cache.get(key)
     p res
     assert res.nil?
 
+    cache.reload
+    puts "size: #{cache.size}"
+    assert_equal 0, cache.size
+
   end
 
 

data/test/test_iron_cache.rb

@@ -24,15 +24,15 @@ class IronCacheTests < TestBase
     p res
     assert res["key"]
     assert res.key
-    assert res.key == k
-    assert res.value == v
+    assert_equal k, res.key
+    assert_equal v, res.value
 
     res = @client.items.delete(res.key)
     p res
     puts "shouldn't be any more"
     res = @client.items.get(k)
     p res
-    assert res.nil?
+    assert_nil res
 
     # new style of referencing cache
     cache = @client.cache("test_basics")
@@ -44,15 +44,15 @@ class IronCacheTests < TestBase
     p res
     assert res["key"]
     assert res.key
-    assert res.key == k
-    assert res.value == v
+    assert_equal k, res.key
+    assert_equal v, res.value
 
     res = cache.delete(k)
     p res
     puts "shouldn't be any more"
     res = cache.get(k)
     p res
-    assert res.nil?
+    assert_nil res
 
     # test delete by item
     res = cache.put(k, v)
@@ -67,7 +67,7 @@ class IronCacheTests < TestBase
     puts "shouldn't be any more"
     res = cache.get(k)
     p res
-    assert res.nil?
+    assert_nil res
 
 
     # different cache names
@@ -112,11 +112,11 @@ class IronCacheTests < TestBase
 
     res = @client.items.get(k)
     p res
-    assert res.key == k
+    assert_equal k, res.key
 
     sleep 11
     res = @client.items.get(k)
-    assert res.nil?, "res is not nil, should be nil because it expired, but it's: #{res}"
+    assert_nil res
 
   end
 
@@ -130,16 +130,16 @@ class IronCacheTests < TestBase
 
     res = @client.items.get(k)
     p res
-    assert res.key == k
-    assert res.value == v, "value #{res.value.inspect} does not equal v: #{v.inspect}"
+    assert_equal k, res.key
+    assert_equal v, res.value
 
     incr_by = 10
     res = @client.items.increment(k, incr_by)
     res = @client.items.get(k)
-    assert res.value == (v + incr_by)
+    assert_equal v + incr_by, res.value
 
     res = @client.items.increment(k, -6)
-    assert res.value == 5
+    assert_equal 5, res.value
 
     res.delete
 
@@ -150,16 +150,16 @@ class IronCacheTests < TestBase
 
     res = cache.get(k)
     p res
-    assert res.key == k
-    assert res.value == v, "value #{res.value.inspect} does not equal v: #{v.inspect}"
+    assert_equal k, res.key
+    assert_equal v, res.value
 
     incr_by = 10
     res = cache.increment(k, incr_by)
     res = cache.get(k)
-    assert res.value == (v + incr_by)
+    assert_equal v + incr_by, res.value
 
     res = cache.increment(k, -6)
-    assert res.value == 5
+    assert_equal 5, res.value
 
     res.delete
   end
@@ -173,7 +173,7 @@ class IronCacheTests < TestBase
     end
 
     puts "cache.size: #{cache.size}"
-    assert cache.size == num_items
+    assert_equal num_items, cache.size
   end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_cache
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-23 00:00:00.000000000 Z
+date: 2012-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iron_core
@@ -120,11 +120,13 @@ files:
 - README.md
 - Rakefile
 - iron_cache.gemspec
+- lib/active_support/cache/iron_cache_store.rb
 - lib/iron_cache.rb
 - lib/iron_cache/caches.rb
 - lib/iron_cache/client.rb
 - lib/iron_cache/items.rb
 - lib/iron_cache/version.rb
+- test/load_er_up.rb
 - test/quick_run.rb
 - test/test_base.rb
 - test/test_iron_cache.rb
@@ -156,6 +158,7 @@ signing_key:
 specification_version: 3
 summary: Ruby client for IronCache by www.iron.io
 test_files:
+- test/load_er_up.rb
 - test/quick_run.rb
 - test/test_base.rb
 - test/test_iron_cache.rb