iron_cache 1.0.0 → 1.1.0

data/Gemfile.lock

@@ -1,25 +1,25 @@
 PATH
   remote: .
   specs:
-    iron_cache (0.1.0)
-      iron_core (>= 0.1.4)
+    iron_cache (1.0.0)
+      iron_core (>= 0.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ffi (1.0.11)
-    iron_core (0.1.4)
-      bundler (> 1.0.0)
-      rest
-      rest-client
+    iron_core (0.2.0)
+      rest (>= 2.0.0)
     memcache-client (1.8.5)
     mime-types (1.19)
+    net-http-persistent (2.7)
     rake (0.9.2.2)
-    rest (1.0.0)
+    rest (2.0.0)
+      net-http-persistent
       rest-client (>= 0.3.0)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    test-unit (2.5.0)
+    test-unit (2.5.1)
     typhoeus (0.4.2)
       ffi (~> 1.0)
       mime-types (~> 1.18)

data/README.md

@@ -17,7 +17,7 @@ Getting Started
 The Basics
 =========
 
-**Get a cache object**
+**Get a Cache object**
 
 You can have as many caches as you want, each with their own unique set of items.
 
@@ -27,13 +27,13 @@ Now you can use it:
 
 **Put** an item in the cache:
 
-    msg = @cache.put("mykey", "hello world!")
-    p msg
+    item = @cache.put("mykey", "hello world!")
+    p item
 
 **Get** an item from the cache:
 
-    msg = @cache.get("mykey")
-    p msg
+    item = @cache.get("mykey")
+    p item.value
 
 **Delete** an item from the cache:
 

data/iron_cache.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
 
   gem.required_rubygems_version = ">= 1.3.6"
   gem.required_ruby_version = Gem::Requirement.new(">= 1.9")
-  gem.add_runtime_dependency "iron_core", ">= 0.1.4"
+  gem.add_runtime_dependency "iron_core", ">= 0.2.0"
 
   gem.add_development_dependency "test-unit"
   gem.add_development_dependency "rake"

data/lib/iron_cache/client.rb

@@ -9,29 +9,34 @@ module IronCache
 
     AWS_US_EAST_HOST = "cache-aws-us-east-1.iron.io"
 
-    attr_accessor :cache_name, :logger
+    attr_accessor :logger
 
     def initialize(options={})
-      super("cache", options)
+      default_options = {
+        :scheme => 'https',
+        :host => IronCache::Client::AWS_US_EAST_HOST,
+        :port => 443,
+        :api_version => 1,
+        :user_agent => 'iron_mq_ruby-' + IronCache::VERSION + ' (iron_core_ruby-' + IronCore.version + ')',
+        :cache_name => 'default'
+      }
 
-      @logger = Logger.new(STDOUT)
-      @logger.level = Logger::INFO
+      super('iron', 'cache', options, default_options, [:project_id, :token, :api_version, :cache_name])
 
-      @cache_name = options[:cache_name] || options['cache_name'] || "default"
+      IronCore::Logger.error 'IronCache', "Token is not set", IronCore::Error if @token.nil?
 
-      load_from_hash('defaults', {
-                     :scheme => 'https',
-                     :host => AWS_US_EAST_HOST,
-                     :port => 443,
-                     :api_version => 1,
-                     :user_agent => 'iron_cache_ruby-' + IronCache::VERSION + ' (iron_core_ruby-' + IronCore.version + ')'})
+      check_id(@project_id, 'project_id')
 
-      if (not @token) || (not @project_id)
-        IronCore::Logger.error 'IronCache', 'Both token and project_id must be specified'
-        raise IronCore::IronError.new('Both token and project_id must be specified')
-      end
+      @logger = Logger.new(STDOUT)
+      @logger.level = Logger::INFO
+    end
 
+    def headers
+      super.merge({'Authorization' => "OAuth #{@token}"})
+    end
 
+    def url
+      super + @api_version.to_s + '/'
     end
 
     def items
@@ -45,7 +50,6 @@ module IronCache
     def caches
       return Caches.new(self)
     end
-
   end
 
   class Error < StandardError

data/lib/iron_cache/items.rb

@@ -22,7 +22,7 @@ module IronCache
         @client.logger.debug "GET response: " + res.inspect
         json = @client.parse_response(res, true)
         return Item.new(self, json)
-      rescue IronCore::IronResponseError => ex
+      rescue Rest::HttpError => ex
         @client.logger.debug ex.inspect
         if ex.code == 404
           return nil
@@ -108,4 +108,4 @@ module IronCache
     end
   end
 
-end
+end

data/lib/iron_cache/version.rb

@@ -1,3 +1,3 @@
 module IronCache
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/lib/iron_cache.rb

@@ -1,3 +1,4 @@
+require 'rest'
 require_relative "iron_cache/version"
 require_relative 'iron_cache/caches'
 require_relative 'iron_cache/items'

data/test/test_base.rb

@@ -33,4 +33,13 @@ class TestBase < Test::Unit::TestCase
     #puts 'cleared.'
   end
 
+  def assert_performance(time)
+    start_time = Time.now
+    yield
+    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_iron_cache.rb

@@ -10,13 +10,18 @@ class IronCacheTests < TestBase
   end
   def test_performance_put_message
     @client.cache_name = 'test_basics'
-    res = @client.items.put("key", "value")
+    assert_performance 0.02 do
+      @client.items.put("key", "value")
+    end
   end
   
   def test_performance_put_100_messages
     @client.cache_name = 'test_basics'
-    100.times do 
-      res = @client.items.put("key", "value")
+    assert_performance 2 do
+      100.times do
+        res = @client.items.put("key", "value")
+        puts "putting message #{res.inspect}"
+      end
     end
   end
 

data/test/test_memcached.rb

@@ -29,6 +29,12 @@ class IronCacheMemcachedTests < TestBase
     assert !ret.nil?
     assert ret == v
 
+    @memcache.delete(k)
+
+    ret = @memcache.get(k)
+    puts 'after delete: ' + ret.inspect
+    assert ret.nil?
+
   end
 
   def test_expiry_memcached

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_cache
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-25 00:00:00.000000000 Z
+date: 2012-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iron_core
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement