iron_cache 0.0.1 → 0.0.2

data/.gitignore

@@ -0,0 +1,7 @@
+.DS_Store
+pkg/
+doc
+.idea/
+log
+test/config.yml
+*.sublime*

data/Gemfile

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

data/Gemfile.lock

@@ -0,0 +1,35 @@
+PATH
+  remote: .
+  specs:
+    iron_cache (0.0.1)
+      iron_core
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    iron_core (0.1.0)
+      bundler (> 1.0.0)
+      json
+      rest
+      rest-client
+    json (1.7.1)
+    memcache-client (1.8.5)
+    mime-types (1.18)
+    rake (0.9.2.2)
+    rest (0.2.0)
+      rest-client
+      rest-client
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    test-unit (2.4.8)
+    uber_config (0.0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  iron_cache!
+  memcache-client
+  rake
+  test-unit
+  uber_config

data/Rakefile

@@ -10,6 +10,7 @@ begin
     gem.email = "travis@iron.io"
     gem.homepage = "http://www.iron.io"
     gem.authors = ["Travis Reeder"]
+    gem.add_dependency 'iron_core'
     gem.add_dependency 'rest-client'
     gem.add_dependency 'rest', '>= 0.1.2'
     #gem.add_dependency 'typhoeus'

data/iron_cache.gemspec

@@ -1,61 +1,28 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
+require File.expand_path('../lib/iron_cache/version', __FILE__)
 
-Gem::Specification.new do |s|
-  s.name = "iron_cache"
-  s.version = "0.0.1"
+Gem::Specification.new do |gem|
+  gem.authors       = ["Travis Reeder"]
+  gem.email         = ["treeder@gmail.com"]
+  gem.description   = "Ruby client for IronCache by www.iron.io"
+  gem.summary       = "Ruby client for IronCache by www.iron.io"
+  gem.homepage      = "https://github.com/iron-io/iron_cache_ruby"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Travis Reeder"]
-  s.date = "2012-03-26"
-  s.description = "Ruby client for IronCache by www.iron.io"
-  s.email = "travis@iron.io"
-  s.extra_rdoc_files = [
-    "README.md"
-  ]
-  s.files = [
-    "README.md",
-    "Rakefile",
-    "VERSION.yml",
-    "iron_cache.gemspec",
-    "lib/iron_cache.rb",
-    "lib/iron_cache/caches.rb",
-    "lib/iron_cache/client.rb",
-    "lib/iron_cache/items.rb",
-    "test/Gemfile",
-    "test/Gemfile.lock",
-    "test/quick_run.rb",
-    "test/test_base.rb",
-    "test/test_iron_cache.rb",
-    "test/test_memcached.rb"
-  ]
-  s.homepage = "http://www.iron.io"
-  s.require_paths = ["lib"]
-  s.required_ruby_version = Gem::Requirement.new(">= 1.9")
-  s.rubygems_version = "1.8.15"
-  s.summary = "Ruby client for IronCache by www.iron.io"
+  gem.files         = `git ls-files`.split($\)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.name          = "iron_cache"
+  gem.require_paths = ["lib"]
+  gem.version       = IronCache::VERSION
+
+  gem.required_rubygems_version = ">= 1.3.6"
+  gem.required_ruby_version = Gem::Requirement.new(">= 1.9")
+  gem.add_runtime_dependency "iron_core"
+
+  gem.add_development_dependency "test-unit"
+  gem.add_development_dependency "rake"
+  gem.add_development_dependency "memcache-client"
+  gem.add_development_dependency "uber_config"
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rest-client>, [">= 0"])
-      s.add_runtime_dependency(%q<rest>, [">= 0.1.2"])
-      s.add_runtime_dependency(%q<rest-client>, [">= 0"])
-      s.add_runtime_dependency(%q<rest>, [">= 0.1.2"])
-    else
-      s.add_dependency(%q<rest-client>, [">= 0"])
-      s.add_dependency(%q<rest>, [">= 0.1.2"])
-      s.add_dependency(%q<rest-client>, [">= 0"])
-      s.add_dependency(%q<rest>, [">= 0.1.2"])
-    end
-  else
-    s.add_dependency(%q<rest-client>, [">= 0"])
-    s.add_dependency(%q<rest>, [">= 0.1.2"])
-    s.add_dependency(%q<rest-client>, [">= 0"])
-    s.add_dependency(%q<rest>, [">= 0.1.2"])
-  end
 end
 

data/lib/iron_cache/caches.rb

@@ -1,3 +1,5 @@
+require 'uri'
+
 module IronCache
   class Caches
 
@@ -8,13 +10,16 @@ module IronCache
     end
 
     def path(options={})
-      path = "/projects/#{@client.project_id}/caches"
+      path = "projects/#{@client.project_id}/caches"
     end
 
     def list(options={})
       ret = []
-      res, status = @client.get("#{path(options)}", options)
-      res.each do |q|
+      res = @client.get("#{path(options)}", options)
+      p res
+      parsed = @client.parse_response(res, true)
+      p parsed
+      parsed.each do |q|
         #p q
         q = Cache.new(self, q)
         ret << q
@@ -25,7 +30,7 @@ module IronCache
     # options:
     #  :name => can specify an alternative queue name
     def get(options={})
-      res, status = @client.get("#{path(options)}/#{options[:name]}")
+      res, status = @client.get("#{path(options)}/#{URI.escape options[:name]}")
       return Cache.new(self, res)
     end
 

data/lib/iron_cache/client.rb

@@ -1,28 +1,38 @@
 require 'json'
 require 'logger'
 require 'rest'
+require 'iron_core'
 
 module IronCache
 
-  class Client
+  class Client < IronCore::Client
 
-    attr_accessor :token, :project_id, :cache_name, :logger,
-        :scheme, :host, :port
+    AWS_US_EAST_HOST = "cache-aws-us-east-1.iron.io"
+
+    def self.version
+
+    end
+
+    attr_accessor :cache_name, :logger
 
     def initialize(options={})
+      super("cache", options)
+
       @logger = Logger.new(STDOUT)
-      @logger.level=Logger::INFO
 
-      @token = options[:token] || options['token']
-      @project_id = options[:project_id] || options['project_id']
       @cache_name = options[:cache_name] || options['cache_name'] || "default"
-      @scheme = options[:scheme] || options['scheme'] || "https"
-      @host = options[:host] || options['host'] || "cache-aws-us-east-1.iron.io"
-      @port = options[:port] || options['port'] || 443
 
-      @base_url = "#{@scheme}://#{@host}:#{@port}/1"
+      load_from_hash(:scheme => 'https',
+                     :host => AWS_US_EAST_HOST,
+                     :port => 443,
+                     :api_version => 1,
+                     :user_agent => 'iron_cache_ruby-' + IronCache::VERSION + ' (iron_core_ruby-' + IronCore.version + ')')
+
+      if (not @token) || (not @project_id)
+        IronCore::Logger.error 'IronWorkerNG', 'Both token and project_id must be specified'
+        raise IronCore::IronError.new('Both token and project_id must be specified')
+      end
 
-      @rest = Rest::Client.new
 
     end
 
@@ -38,101 +48,17 @@ module IronCache
       return Caches.new(self)
     end
 
-    def base_url
-      #"#{scheme}://#{host}:#{port}/1"
-      @base_url
-    end
 
+    def put(method, params={})
+      request_hash = {}
+      request_hash[:headers] = common_request_hash
+      request_hash[:body] = params.to_json
 
-    def full_url(path)
-      url = "#{base_url}#{path}"
-      url
-    end
-
-    def common_req_hash
-      {
-          :headers=>{"Content-Type" => 'application/json',
-                     "Authorization"=>"OAuth #{@token}",
-                     "User-Agent"=>"IronCache Ruby Client"}
-      }
-    end
+      IronCore::Logger.debug 'IronCore', "PUT #{url + method} with params='#{request_hash.to_s}'"
 
-    def get(path, params={})
-      url = full_url(path)
-      @logger.debug 'url=' + url
-      req_hash = common_req_hash
-      req_hash[:params] = params if params
-      @logger.debug 'req_hash=' + req_hash.inspect
-      response = @rest.get(url, req_hash)
-      @logger.debug 'GET response=' + response.inspect
-      res = check_response(response)
-      return res, response.code
+      @rest.put(url + method, request_hash)
     end
 
-    def post(path, params={})
-      url = full_url(path)
-      @logger.debug 'url=' + url
-      #response = @http_sess.post(path + "?oauth=#{@token}", {'oauth' => @token}.merge(params).to_json, {"Content-Type" => 'application/json'})
-      req_hash = common_req_hash
-      req_hash[:body] = params.to_json
-      response = @rest.post(url, req_hash)
-      @logger.debug 'POST response=' + response.inspect
-      res = check_response(response)
-      #@logger.debug 'response: ' + res.inspect
-      #body = response.body
-      #res = JSON.parse(body)
-      return res, response.code
-    end
-
-    def put(path, params={})
-      url = full_url(path)
-      @logger.debug 'url=' + url
-      #response = @http_sess.post(path + "?oauth=#{@token}", {'oauth' => @token}.merge(params).to_json, {"Content-Type" => 'application/json'})
-      req_hash = common_req_hash
-      req_hash[:body] = params.to_json
-      response = @rest.put(url, req_hash)
-      @logger.debug 'POST response=' + response.inspect
-      res = check_response(response)
-      #@logger.debug 'response: ' + res.inspect
-      #body = response.body
-      #res = JSON.parse(body)
-      return res, response.code
-    end
-
-
-
-    def delete(path, params={})
-      url = "#{base_url}#{path}"
-      @logger.debug 'url=' + url
-      req_hash = common_req_hash
-      req_hash[:params] = params
-      response = @rest.delete(url, req_hash)
-      res = check_response(response)
-      #body = response.body
-      #res = JSON.parse(body)
-      #@logger.debug 'response: ' + res.inspect
-      return res, response.code
-    end
-
-    def check_response(response)
-      # response.code    # http status code
-      #response.time    # time in seconds the request took
-      #response.headers # the http headers
-      #response.headers_hash # http headers put into a hash
-      #response.body    # the response body
-      status = response.code
-      body = response.body
-      # todo: check content-type == application/json before parsing
-      @logger.debug "response code=" + status.to_s
-      @logger.debug "response body=" + body.inspect
-      res = JSON.parse(body)
-      if status < 400
-
-      else
-        raise IronCache::Error.new(res["msg"], :status=>status)
-      end
-      res
-    end
 
   end
 

data/lib/iron_cache/items.rb

@@ -1,3 +1,5 @@
+require 'uri'
+
 module IronCache
   class Items
 
@@ -8,7 +10,7 @@ module IronCache
     end
 
     def path(key, options={})
-      path = "/projects/#{@client.project_id}/caches/#{options[:cache_name] || @client.cache_name}/items/#{key}"
+      path = "projects/#{@client.project_id}/caches/#{URI.escape(options[:cache_name] || @client.cache_name)}/items/#{URI.escape key}"
     end
 
     # options:
@@ -16,11 +18,13 @@ module IronCache
     #  :timeout => amount of time before message goes back on the queue
     def get(key, options={})
       begin
-        res, status = @client.get(path(key, options), options)
+        res = @client.get(path(key, options), options)
         @client.logger.debug "GET response: " + res.inspect
-        return Item.new(self, res)
-      rescue IronCache::Error => ex
-        if ex.status == 404
+        json = @client.parse_response(res, true)
+        return Item.new(self, json)
+      rescue IronCore::IronError => ex
+        p ex
+        if ex.code == 404
           return nil
         end
         raise ex
@@ -34,9 +38,10 @@ module IronCache
     def put(key, value, options={})
       to_send = options
       to_send[:body] = value
-      res, status = @client.put(path(key, options), to_send)
+      res = @client.put(path(key, options), to_send)
+      json = @client.parse_response(res, true)
       #return Message.new(self, res)
-      return ResponseBase.new(res)
+      return ResponseBase.new(json)
     end
 
     def delete(key, options={})

data/lib/iron_cache/version.rb

@@ -0,0 +1,3 @@
+module IronCache
+  VERSION = "0.0.2"
+end

data/lib/iron_cache.rb

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

data/schedule_abt.rb

@@ -0,0 +1,16 @@
+require 'abt'
+
+
+@test_config = UberConfig.load()
+
+worker = Abt::TestWorker.new
+worker.git_url = "git://github.com/iron-io/iron_cache_ruby.git"
+worker.test_config = @test_config
+worker.run_local
+
+worker.add_notifier(:hip_chat_notifier,
+                    :config=>{
+                        "hipchat_api_key"=>'secret_api_key',
+                        "room_name"=>'Room Name',
+                        "user_name"=>"AbtWorker"
+                    })

data/test/test_base.rb

@@ -1,6 +1,7 @@
 gem 'test-unit'
 require 'test/unit'
 require 'yaml'
+require 'uber_config'
 begin
   require File.join(File.dirname(__FILE__), '../lib/iron_cache')
 rescue Exception => ex
@@ -13,7 +14,7 @@ class TestBase < Test::Unit::TestCase
   def setup
     puts 'setup'
     # check multiple config locations
-    @config = load_config
+    @config = UberConfig.load
     puts "config=" + @config.inspect
     @client = IronCache::Client.new(@config['iron'])
     @client.logger.level = Logger::DEBUG
@@ -21,22 +22,6 @@ class TestBase < Test::Unit::TestCase
 
   end
 
-  def load_config
-    # check for config
-    # First check if running in abt worker
-    if defined? $abt_config
-      @config = $abt_config
-      return @config
-    end
-    cf = File.expand_path(File.join("~", "Dropbox", "configs", "iron_cache_ruby", "test", "config.yml"))
-    if File.exist?(cf)
-      @config = YAML::load_file(cf)
-      return @config
-    end
-
-  end
-
-
   def clear_queue(queue_name=nil)
     #queue_name ||= @client.cache_name
     #puts "clearing queue #{queue_name}"

data/test/test_iron_cache.rb

@@ -1,6 +1,5 @@
 gem 'test-unit'
 require 'test/unit'
-require 'beanstalk-client'
 require 'yaml'
 require_relative 'test_base'
 
@@ -38,6 +37,16 @@ class IronCacheTests < TestBase
 
   end
 
+  def test_caches
+    caches = @client.caches.list
+    p caches
+    assert caches
+    assert caches.is_a?(Array)
+    assert caches.size > 0
+    assert caches[0].name
+
+  end
+
   def test_expiry
     @client.cache_name = 'test_basics'
     clear_queue
@@ -51,7 +60,7 @@ class IronCacheTests < TestBase
 
     sleep 11
     res = @client.items.get(k)
-    assert res.nil?
+    assert res.nil?, "res is not nil, should be nil because it expired, but it's: #{res}"
 
   end
 

data/test/test_memcached.rb

@@ -1,57 +1,37 @@
 gem 'test-unit'
 require 'test/unit'
-require 'beanstalk-client'
 require 'yaml'
+require 'memcache'
 require_relative 'test_base'
 
-class IronCacheTests < TestBase
+class IronCacheMemcachedTests < TestBase
   def setup
     super
 
+    @memcache = MemCache.new "#{IronCache::Client::AWS_US_EAST_HOST}:11211"
+
   end
 
-  def test_basics
-    @client.cache_name = 'test_basics'
-    clear_queue
-
-    k = "key1"
-    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
-
-    res = @client.items.get(k)
-    p res
-    assert res["key"]
-    assert res.key
-    assert res.key == k
-    assert res.value == v
-
-    res = @client.items.delete(res.key)
-    p res
-    puts "shouldn't be any more"
-    res = @client.items.get(k)
-    p res
-    assert res.nil?
+  def test_basics_memcached
+    puts "#{@client.token} #{@client.project_id}"
 
-  end
+    #@memcache.get("abc")
+    #@memcache.set("abc", "123")
 
-  def test_expiry
-    @client.cache_name = 'test_basics'
-    clear_queue
-    k = "key1"
-    v = "hello world!"
-    res = @client.items.put(k, v, :expires_in=>10)
+    # auth format: "{token} {project ID} {cache name}"
+    @memcache.set("oauth", "#{@client.token} #{@client.project_id} gem_tests", 0, true)
+    k = 'abc'
+    v = 'xyz'
+    @memcache.set(k, v)
 
-    res = @client.items.get(k)
-    p res
-    assert res.key == k
+    ret = @memcache.get(k)
+    p ret
+    assert !ret.nil?
+    assert ret == v
+
+  end
 
-    sleep 11
-    res = @client.items.get(k)
-    assert res.nil?
+  def test_expiry_memcached
 
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_cache
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-26 00:00:00.000000000Z
+date: 2012-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: &15146280 !ruby/object:Gem::Requirement
+  name: iron_core
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,62 +21,100 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15146280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rest
-  requirement: &15145660 !ruby/object:Gem::Requirement
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.2
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
-  version_requirements: *15145660
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rest-client
-  requirement: &15145020 !ruby/object:Gem::Requirement
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
-  version_requirements: *15145020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rest
-  requirement: &15144420 !ruby/object:Gem::Requirement
+  name: memcache-client
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.2
-  type: :runtime
+        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: *15144420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby client for IronCache by www.iron.io
-email: travis@iron.io
+email:
+- treeder@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- README.md
+extra_rdoc_files: []
 files:
+- .gitignore
+- Gemfile
+- Gemfile.lock
 - README.md
 - Rakefile
-- VERSION.yml
 - iron_cache.gemspec
 - lib/iron_cache.rb
 - lib/iron_cache/caches.rb
 - lib/iron_cache/client.rb
 - lib/iron_cache/items.rb
-- test/Gemfile
-- test/Gemfile.lock
+- lib/iron_cache/version.rb
+- schedule_abt.rb
 - test/quick_run.rb
 - test/test_base.rb
 - test/test_iron_cache.rb
 - test/test_memcached.rb
-homepage: http://www.iron.io
+homepage: https://github.com/iron-io/iron_cache_ruby
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -93,11 +131,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Ruby client for IronCache by www.iron.io
-test_files: []
+test_files:
+- test/quick_run.rb
+- test/test_base.rb
+- test/test_iron_cache.rb
+- test/test_memcached.rb

data/VERSION.yml

@@ -1,5 +0,0 @@
----
-:major: 0
-:minor: 0
-:patch: 1
-:build:

data/test/Gemfile

@@ -1,4 +0,0 @@
-source 'http://rubygems.org'
-
-gem 'test-unit'
-gem 'concur'

data/test/Gemfile.lock

@@ -1,38 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    addressable (2.2.6)
-    beanstalk-client (1.1.1)
-    concur (0.1.2)
-      em-http-request
-      em-http-request
-      eventmachine
-      eventmachine
-      faraday
-      faraday
-    cookiejar (0.3.0)
-    em-http-request (1.0.1)
-      addressable (>= 2.2.3)
-      cookiejar
-      em-socksify
-      eventmachine (>= 1.0.0.beta.4)
-      http_parser.rb (>= 0.5.3)
-    em-socksify (0.1.0)
-      eventmachine
-    eventmachine (1.0.0.beta.4)
-    faraday (0.7.5)
-      addressable (~> 2.2.6)
-      multipart-post (~> 1.1.3)
-      rack (>= 1.1.0, < 2)
-    http_parser.rb (0.5.3)
-    multipart-post (1.1.4)
-    rack (1.4.0)
-    test-unit (2.4.4)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  beanstalk-client
-  concur
-  test-unit