iron_cache 1.4.0 → 1.4.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0c8dd8df9e783faf82960cf94653ea10753b5b9d
+  data.tar.gz: 80af4020ad491ffd0ae3c5dfc088ec0bed62e6ac
+SHA512:
+  metadata.gz: 5e9075944819698e6e33b9a3a6e5c0044ed8f83f24d09b12357049bb6da49e8658c3ba2affa1160bffb6190a95defbcf422b450bb891522f425222a68c1beb7b
+  data.tar.gz: 46990545a9c707d19c9020ed6796841a35b3307f1caa5e36a14fb2ddead9699ba279285e4c9c0e7604b2aa66d314b8d27db847bfe2cb55d2dbb89962248d51e1

data/.gitignore

@@ -5,3 +5,5 @@ doc
 log
 test/config.yml
 *.sublime*
+iron.json
+config.yml

data/Gemfile.lock

@@ -7,20 +7,20 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    iron_core (0.5.1)
-      rest (>= 2.2.0)
+    iron_core (1.0.2)
+      rest (>= 2.6.4)
     memcache-client (1.8.5)
-    mime-types (1.19)
-    minitest (4.4.0)
-    net-http-persistent (2.8)
-    rake (10.0.3)
-    rest (2.2.0)
+    mime-types (2.0)
+    minitest (5.2.0)
+    net-http-persistent (2.9)
+    rake (10.1.0)
+    rest (2.6.5)
       net-http-persistent
       rest-client (>= 0.3.0)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    test-unit (2.5.3)
-    uber_config (1.0.5)
+    test-unit (2.5.5)
+    uber_config (1.1.0)
 
 PLATFORMS
   ruby

data/lib/iron_cache/caches.rb

@@ -12,7 +12,7 @@ module IronCache
     def path(options={})
       path = "projects/#{@client.project_id}/caches"
       if options[:name]
-        path << "/#{CGI::escape(options[:name])}"
+        path << "/#{CGI::escape(options[:name]).gsub('+', '%20')}"
       end
       path
     end

data/lib/iron_cache/items.rb

@@ -10,7 +10,7 @@ module IronCache
     end
 
     def path(key, options={})
-      path = "projects/#{@client.project_id}/caches/#{CGI::escape(options[:cache_name] || @client.cache_name)}/items/#{CGI::escape(key)}#{'/increment' if options[:increment] == true}"
+      path = "projects/#{@client.project_id}/caches/#{CGI::escape(options[:cache_name] || @client.cache_name).gsub('+', '%20')}/items/#{CGI::escape(key).gsub('+', '%20')}#{'/increment' if options[:increment] == true}"
     end
 
     # options:

data/lib/iron_cache/version.rb

@@ -1,3 +1,3 @@
 module IronCache
-  VERSION = "1.4.0"
+  VERSION = "1.4.1"
 end

data/test/load_er_up.rb

@@ -1,4 +1,4 @@
-require 'test_base'
+require File.expand_path('test_base.rb', File.dirname(__FILE__))
 
 class QuickRun < TestBase
 

data/test/quick_run.rb

@@ -1,4 +1,4 @@
-require 'test_base'
+require File.expand_path('test_base.rb', File.dirname(__FILE__))
 
 class QuickRun < TestBase
 

data/test/test_base.rb

@@ -22,32 +22,41 @@ class TestBase < Test::Unit::TestCase
   def setup
     puts 'setup'
     # check multiple config locations
-    @config = UberConfig.load
-    puts "config=" + @config.inspect
-    @client = IronCache::Client.new(@config['iron'])
+    begin
+      @config = UberConfig.load
+      puts "config=" + @config.inspect
+      @client = IronCache::Client.new(@config['iron'])
+    rescue => ex
+      puts "UberConfig couldn't find file, trying normal Iron.io config..."
+      @client = IronCache::Client.new
+    end
+
     @client.logger.level = Logger::DEBUG
     @client.cache_name = 'iron_cache_ruby_tests'
 
   end
 
-  def clear_queue(queue_name=nil)
-    #queue_name ||= @client.cache_name
-    #puts "clearing queue #{queue_name}"
-    #while res = @client.messages.get(:cache_name=>queue_name)
-    #  p res
-    #  puts res.body.to_s
-    #  res.delete
-    #end
-    #puts 'cleared.'
+  def clear_cache(cache_name=nil)
+    cache_name ||= @client.cache_name
+    puts "clearing cache #{cache_name}"
+    cache = @client.cache(cache_name)
+    begin
+      cache.clear
+      puts 'cleared.'
+    rescue Rest::HttpError => ex
+      unless ex.code == 404
+        raise ex
+      end
+    end
+
   end
 
   def assert_performance(time)
     start_time = Time.now
     yield
-    execution_time =  Time.now - start_time
+    execution_time = Time.now - start_time
     assert execution_time < time, "Execution time too big #{execution_time.round(2)}, should be #{time}"
   end
 
 
-
 end

data/test/test_errors.rb

@@ -0,0 +1,23 @@
+require 'test/unit'
+require 'yaml'
+require File.expand_path('test_base.rb', File.dirname(__FILE__))
+
+class IronCacheTests < TestBase
+  def setup
+    super
+  end
+
+  def test_basics
+    @client.cache_name = 'test_errors'
+    clear_cache
+
+    k = "key1"
+    v = "hello world!"
+
+    res = @client.items.get(k)
+    p res
+
+  end
+
+end
+

data/test/test_iron_cache.rb

@@ -1,6 +1,6 @@
 require 'test/unit'
 require 'yaml'
-require 'test_base'
+require File.expand_path('test_base.rb', File.dirname(__FILE__))
 
 class IronCacheTests < TestBase
   def setup
@@ -9,7 +9,7 @@ class IronCacheTests < TestBase
 
   def test_basics
     @client.cache_name = 'test_basics'
-    clear_queue
+    clear_cache
 
     k = "key1"
     v = "hello world!"
@@ -104,7 +104,7 @@ class IronCacheTests < TestBase
 
   def test_expiry
     @client.cache_name = 'test_basics'
-    clear_queue
+    clear_cache
     k = "key1"
     v = "hello world!"
     res = @client.items.put(k, v, :expires_in => 10)
@@ -121,7 +121,7 @@ class IronCacheTests < TestBase
 
   def test_incrementors
     @client.cache_name = 'test_incrementors'
-    clear_queue
+    clear_cache
     k = "incr1"
     v = 1
     res = @client.items.put(k, v)
@@ -178,7 +178,7 @@ class IronCacheTests < TestBase
 
   def test_keys
     @client.cache_name = 'test_keys'
-    clear_queue
+    clear_cache
 
     k = "word_count_[EBook"
     v = "hello world!"
@@ -193,6 +193,8 @@ class IronCacheTests < TestBase
 
   def test_clear
     cache = @client.cache("test_clear_3")
+    clear_cache(cache.name)
+
     num_items = 50
 
     num_items.times do |i|
@@ -201,6 +203,8 @@ class IronCacheTests < TestBase
 
     tkey = "key-0"
     assert_equal "value", cache.get(tkey).value
+
+    cache.reload
     puts "cache.size: #{cache.size}"
     assert_equal num_items, cache.size
 
@@ -210,5 +214,26 @@ class IronCacheTests < TestBase
     assert_equal 0, cache.reload.size
   end
 
+  def test_add
+    cache = @client.cache("test_add")
+    cache.clear rescue ""
+    udq_expires = 60 # 1 min
+    k = 'mykey'
+    r = cache.put(k, 0, :expires_in => udq_expires)
+    r = cache.increment(k)
+    p r
+    assert_equal 1, r.value
+    cache.put(k, 0, :add => true, :expires_in => udq_expires)
+    p r
+    r = cache.increment(k)
+    p r
+    assert_equal 2, r.value
+    cache.put(k, 0, :add => true, :expires_in => udq_expires)
+    r = cache.increment(k)
+    p r
+    assert_equal 3, r.value, "value is #{r.value}, expected 3"
+  end
+
+
 end
 

data/test/test_memcached.rb

@@ -1,7 +1,7 @@
 require 'test/unit'
 require 'yaml'
 require 'memcache'
-require 'test_base'
+require File.expand_path('test_base.rb', File.dirname(__FILE__))
 
 class IronCacheMemcachedTests < TestBase
   def setup

data/test/test_performance.rb

@@ -1,6 +1,6 @@
 require 'test/unit'
 require 'yaml'
-require 'test_base'
+require File.expand_path('test_base.rb', File.dirname(__FILE__))
 
 class TestPerformance < TestBase
   def setup

data/test/tmp.rb

@@ -1,6 +1,6 @@
 require 'test/unit'
 require 'yaml'
-require 'test_base'
+require File.expand_path('test_base.rb', File.dirname(__FILE__))
 
 class IronCacheTests < TestBase
   def setup
@@ -8,23 +8,5 @@ class IronCacheTests < TestBase
   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
 

metadata

@@ -1,110 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: iron_cache
 version: !ruby/object:Gem::Version
-  version: 1.4.0
-  prerelease: 
+  version: 1.4.1
 platform: ruby
 authors:
 - Travis Reeder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-18 00:00:00.000000000 Z
+date: 2014-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iron_core
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.1
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: memcache-client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: uber_config
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Ruby client for IronCache by www.iron.io
@@ -120,8 +107,6 @@ files:
 - README.md
 - Rakefile
 - iron_cache.gemspec
-- lib/action_dispatch/session/iron_cache.rb
-- lib/active_support/cache/iron_cache_store.rb
 - lib/iron_cache.rb
 - lib/iron_cache/caches.rb
 - lib/iron_cache/client.rb
@@ -130,38 +115,39 @@ files:
 - test/load_er_up.rb
 - test/quick_run.rb
 - test/test_base.rb
+- test/test_errors.rb
 - test/test_iron_cache.rb
 - test/test_memcached.rb
 - test/test_performance.rb
 - test/tmp.rb
 homepage: https://github.com/iron-io/iron_cache_ruby
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '1.8'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 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_errors.rb
 - test/test_iron_cache.rb
 - test/test_memcached.rb
 - test/test_performance.rb

data/lib/action_dispatch/session/iron_cache.rb

@@ -1,93 +0,0 @@
-require 'iron_cache'
-require 'base64'
-require 'action_dispatch/middleware/session/abstract_store'
-
-module ActionDispatch
-  module Session
-    class IronCache < ActionDispatch::Session::AbstractStore
-
-      def initialize(app, options = {})
-        @options = options
-        super
-
-        @client = ::IronCache::Client.new(options)
-      end
-
-      def options
-        @options
-      end
-
-      def get_session(env, session_id)
-        item = nil
-        session_id ||= generate_sid
-
-        with_namespace(session_id, options) do |cache, k|
-          item = cache.get(k)
-          item = item.value unless item.nil?
-        end
-
-        session_data = deserialize_entry(item) rescue {}
-
-        [session_id, session_data]
-      end
-
-      def set_session(env, session_id, session, options)
-        with_namespace(session_id, options) do |cache, k|
-          cache.put(k, serialize_entry(session, options), options)
-        end
-
-        session_id
-      end
-
-      def destroy_session(env, session_id, options)
-        with_namespace(session_id, options) do |cache, k|
-          cache.delete(k)
-        end
-
-        generate_sid
-      end
-
-      private
-
-      def with_namespace(key, options)
-        options[:namespace] ||= 'rails_cache'
-
-        cache_name = options[:namespace]
-
-        yield(@client.cache(cache_name), escape_key(key))
-      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
-          raw_value = ::Base64.decode64(raw_value) rescue raw_value
-          Marshal.load(raw_value) rescue raw_value
-        else
-          nil
-        end
-      end
-
-      def serialize_entry(entry, options)
-        if options[:raw]
-          if entry.respond_to?(:value)
-            entry.value.to_s
-          else
-            entry.to_s
-          end
-        else
-          ::Base64.encode64 Marshal.dump(entry)
-        end
-      end
-
-    end
-  end
-end

data/lib/active_support/cache/iron_cache_store.rb

@@ -1,102 +0,0 @@
-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)
-          item = item.value unless item.nil?
-        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
-          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
-          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 = ::Base64.encode64 Marshal.dump(entry)
-        end
-      end
-    end
-  end
-end