ironmq 1.2.7 → 1.2.8

data/README.markdown

@@ -6,7 +6,7 @@ Getting Started
 
 Install the gem:
 
-    gem install ironmq
+    gem install iron_mq
 
 Create an IronMQ client object:
 
@@ -26,7 +26,7 @@ The Basics
 **Pop** a message off the queue:
 
     msg = @ironmq.messages.get()
-    p res
+    p msg
 
 When you pop/get a message from the queue, it will NOT be deleted. It will eventually go back onto the queue after
 a timeout if you don't delete it (default timeout is 10 minutes).

data/Rakefile

@@ -10,7 +10,9 @@ begin
     gem.email = "travis@iron.io"
     gem.homepage = "http://www.iron.io"
     gem.authors = ["Travis Reeder"]
-    gem.add_dependency 'typhoeus'
+    gem.add_dependency 'rest-client'
+    gem.add_dependency 'rest'
+    #gem.add_dependency 'typhoeus'
     gem.required_ruby_version = '>= 1.9'
   end
   Jeweler::GemcutterTasks.new
@@ -32,7 +34,7 @@ Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
   rdoc.rdoc_dir = 'doc'
-  rdoc.title = "ironmq_gem #{version}"
+  rdoc.title = "iron_mq #{version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/VERSION.yml

@@ -1,5 +1,5 @@
 ---
 :major: 1
 :minor: 2
-:patch: 7
+:patch: 8
 :build: 

data/{ironmq.gemspec → iron_mq.gemspec}

@@ -4,12 +4,12 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = "ironmq"
-  s.version = "1.2.7"
+  s.name = "iron_mq"
+  s.version = "1.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Travis Reeder"]
-  s.date = "2011-12-08"
+  s.date = "2011-12-18"
   s.description = "Ruby client for IronMQ"
   s.email = "travis@iron.io"
   s.extra_rdoc_files = [
@@ -19,15 +19,15 @@ Gem::Specification.new do |s|
     "README.markdown",
     "Rakefile",
     "VERSION.yml",
-    "ironmq.gemspec",
-    "lib/ironmq.rb",
-    "lib/ironmq/client.rb",
-    "lib/ironmq/messages.rb",
-    "lib/ironmq/queues.rb",
+    "iron_mq.gemspec",
+    "lib/iron_mq.rb",
+    "lib/iron_mq/client.rb",
+    "lib/iron_mq/messages.rb",
+    "lib/iron_mq/queues.rb",
     "test/long_run.rb",
     "test/quick_run.rb",
     "test/test_base.rb",
-    "test/test_ironmq.rb"
+    "test/test_iron_mq.rb"
   ]
   s.homepage = "http://www.iron.io"
   s.require_paths = ["lib"]
@@ -39,15 +39,21 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<typhoeus>, [">= 0"])
-      s.add_runtime_dependency(%q<typhoeus>, [">= 0"])
+      s.add_runtime_dependency(%q<rest-client>, [">= 0"])
+      s.add_runtime_dependency(%q<rest>, [">= 0"])
+      s.add_runtime_dependency(%q<rest-client>, [">= 0"])
+      s.add_runtime_dependency(%q<rest>, [">= 0"])
     else
-      s.add_dependency(%q<typhoeus>, [">= 0"])
-      s.add_dependency(%q<typhoeus>, [">= 0"])
+      s.add_dependency(%q<rest-client>, [">= 0"])
+      s.add_dependency(%q<rest>, [">= 0"])
+      s.add_dependency(%q<rest-client>, [">= 0"])
+      s.add_dependency(%q<rest>, [">= 0"])
     end
   else
-    s.add_dependency(%q<typhoeus>, [">= 0"])
-    s.add_dependency(%q<typhoeus>, [">= 0"])
+    s.add_dependency(%q<rest-client>, [">= 0"])
+    s.add_dependency(%q<rest>, [">= 0"])
+    s.add_dependency(%q<rest-client>, [">= 0"])
+    s.add_dependency(%q<rest>, [">= 0"])
   end
 end
 

data/lib/ironmq.rb

@@ -1,3 +1 @@
-require_relative 'ironmq/queues'
-require_relative 'ironmq/messages'
-require_relative 'ironmq/client'
+raise "The ironmq gem is deprecated. Please change to iron_mq instead. Same usage, different name."

data/test/long_run.rb

@@ -1,13 +1,13 @@
 require 'yaml'
 require 'concur'
 begin
-  require File.join(File.dirname(__FILE__), '..', 'lib', 'ironmq')
+  require File.join(File.dirname(__FILE__), '..', 'lib', 'iron_mq')
 rescue Exception => ex
-  puts "Could NOT load current ironmq: " + ex.message
+  puts "Could NOT load current iron_mq: " + ex.message
   raise ex
 end
 
-@config = YAML::load_file(File.expand_path(File.join("~", "Dropbox", "configs", "ironmq_gem", "test", "config.yml")))
+@config = YAML::load_file(File.expand_path(File.join("~", "Dropbox", "configs", "iron_mq_ruby", "test", "config.yml")))
 @client = IronMQ::Client.new(@config['ironmq'])
 @client.queue_name = 'ironmq-gem-long'
 @num_to_add = @config['count']

data/test/quick_run.rb

@@ -2,27 +2,32 @@
 require_relative 'test_base'
 
 class QuickRun < TestBase
- 
- def setup
-  super
-   @client.queue_name = 'ironmq-gem-quick'
-end
+
+  def setup
+    super
+    @client.queue_name = 'ironmq-gem-quick'
+  end
 
   def test_basics
     res = @client.messages.post("hello world!")
+    assert res.id
+    assert res.msg
     p res
 
     res = @client.messages.get()
+    assert res.id
+    assert res.body
     p res
 
     res = @client.messages.delete(res["id"])
+    assert res.msg
     p res
 
     res = @client.messages.get()
     p res
-   
+
   end
 
- 
+
 end
 

data/test/test_base.rb

@@ -2,7 +2,7 @@ gem 'test-unit'
 require 'test/unit'
 require 'yaml'
 begin
-  require File.join(File.dirname(__FILE__), '../lib/ironmq')
+  require File.join(File.dirname(__FILE__), '../lib/iron_mq')
 rescue Exception => ex
   puts "Could NOT load current ironmq: " + ex.message
   raise ex
@@ -10,12 +10,28 @@ end
 
 
 class TestBase < Test::Unit::TestCase
- def setup
+  def setup
     puts 'setup'
-    @config = YAML::load_file(File.expand_path(File.join("~", "Dropbox", "configs", "ironmq_gem", "test", "config.yml")))
-    @client = IronMQ::Client.new(@config['ironmq'])
+    # check multiple config locations
+    @config = load_config
+    puts "config=" + @config.inspect
+    @client = IronMQ::Client.new(@config['iron_mq'])
     @client.logger.level = Logger::DEBUG
     @client.queue_name = 'ironmq-ruby-tests'
 
   end
+
+  def load_config
+    # check for config
+    if defined? $abt_config
+      @config = $abt_config
+      return @config
+    end
+    cf = File.expand_path(File.join("~", "Dropbox", "configs", "iron_mq_ruby", "test", "config.yml"))
+    if File.exist?(cf)
+      @config = YAML::load_file(cf)
+      return @config
+    end
+
+  end
 end

data/test/{test_ironmq.rb → test_iron_mq.rb}

@@ -1,5 +1,7 @@
 # Put config.yml file in ~/Dropbox/configs/ironmq_gem/test/config.yml
 
+#$abt_config = {:hello=>'abt_config_ya'}
+
 gem 'test-unit'
 require 'test/unit'
 require 'yaml'
@@ -93,8 +95,8 @@ class IronMQTests < TestBase
     end
     assert res.size > 0
 
-    res = @client.queues.list(:page=>2)
-    puts "res.size=" + res.size.to_s
+    res = @client.queues.list(:page=>5)
+    puts "res.size 2=" + res.size.to_s
     res.each do |q|
       p q.name
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ironmq
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.2.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-08 00:00:00.000000000 Z
+date: 2011-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: typhoeus
-  requirement: &16958660 !ruby/object:Gem::Requirement
+  name: rest-client
+  requirement: &13083060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16958660
+  version_requirements: *13083060
 - !ruby/object:Gem::Dependency
-  name: typhoeus
-  requirement: &16958160 !ruby/object:Gem::Requirement
+  name: rest
+  requirement: &13082540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,29 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16958160
+  version_requirements: *13082540
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: &13082000 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *13082000
+- !ruby/object:Gem::Dependency
+  name: rest
+  requirement: &13081420 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *13081420
 description: Ruby client for IronMQ
 email: travis@iron.io
 executables: []
@@ -43,15 +65,12 @@ files:
 - README.markdown
 - Rakefile
 - VERSION.yml
-- ironmq.gemspec
+- iron_mq.gemspec
 - lib/ironmq.rb
-- lib/ironmq/client.rb
-- lib/ironmq/messages.rb
-- lib/ironmq/queues.rb
 - test/long_run.rb
 - test/quick_run.rb
 - test/test_base.rb
-- test/test_ironmq.rb
+- test/test_iron_mq.rb
 homepage: http://www.iron.io
 licenses: []
 post_install_message: 

data/lib/ironmq/client.rb

@@ -1,126 +0,0 @@
-require 'json'
-require 'typhoeus'
-require 'logger'
-
-module IronMQ
-
-  class Client
-
-    attr_accessor :token, :project_id, :queue_name, :logger
-
-    def initialize(options={})
-      @logger = Logger.new(STDOUT)
-      @logger.level=Logger::INFO
-
-      @token = options[:token] || options['token']
-      @project_id = options[:project_id] || options['project_id']
-      @queue_name = options[:queue_name] || options['queue_name'] || "default"
-      @scheme = options[:scheme] || options['scheme'] || "https"
-      @host = options[:host] || options['host'] || "mq-aws-us-east-1.iron.io"
-      @port = options[:port] || options['port'] || 443
-
-      @base_url = "#{@scheme}://#{@host}:#{@port}/1"
-
-    end
-
-    def messages
-      return Messages.new(self)
-    end
-
-    def queues
-      return Queues.new(self)
-    end
-
-    def base_url
-      #"#{scheme}://#{host}:#{port}/1"
-      @base_url
-    end
-
-    def full_url(path)
-      url = "#{base_url}#{path}"
-      url
-    end
-
-    def common_req_hash
-      {
-          :headers=>{"Content-Type" => 'application/json',
-                     "Authorization"=>"OAuth #{@token}",
-                     "User-Agent"=>"IronMQ Ruby Client"}
-      }
-    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 = Typhoeus::Request.post(url, req_hash)
-      @logger.debug 'typhoeus 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 get(path, params={})
-      url = full_url(path)
-      @logger.debug 'url=' + url
-      req_hash = common_req_hash
-      req_hash[:params] = params
-      @logger.debug 'req_hash=' + req_hash.inspect
-      response = Typhoeus::Request.get(url, req_hash)
-      res = check_response(response)
-      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 = Typhoeus::Request.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 IronMQ::Error.new(res["msg"], :status=>status)
-      end
-      res
-    end
-
-  end
-
-  class Error < StandardError
-    def initialize(msg, options={})
-      super(msg)
-      @options = options
-    end
-
-    def status
-      @options[:status]
-    end
-  end
-
-
-end
-

data/lib/ironmq/messages.rb

@@ -1,78 +0,0 @@
-module IronMQ
-  class Messages
-
-    attr_accessor :client
-
-    def initialize(client)
-      @client = client
-    end
-
-    def path(options={})
-      path = "/projects/#{@client.project_id}/queues/#{options[:queue_name] || @client.queue_name}/messages"
-    end
-
-    # options:
-    #  :queue_name => can specify an alternative queue name
-    #  :timeout => amount of time before message goes back on the queue
-    def get(options={})
-      begin
-        params = nil
-        if options[:timeout]
-          params = {:timeout => options[:timeout]}
-        end
-        res, status = @client.get(path(options), params)
-        return Message.new(self, res)
-      rescue IronMQ::Error => ex
-        if ex.status == 404
-          return nil
-        end
-        raise ex
-      end
-
-
-    end
-
-    # options:
-    #  :queue_name => can specify an alternative queue name
-    def post(payload, options={})
-      res, status = @client.post(path(options), :body=>payload)
-      return Message.new(self, res)
-    end
-
-    def delete(message_id, options={})
-      path2 = "#{self.path(options)}/#{message_id}"
-      res, status = @client.delete(path2)
-      res
-    end
-
-  end
-
-  class Message
-
-    def initialize(messages, res)
-      @messages = messages
-      @data = res
-    end
-
-    def raw
-      @data
-    end
-
-    def [](key)
-      raw[key]
-    end
-
-    def id
-      raw["id"]
-    end
-
-    def body
-      raw["body"]
-    end
-
-    def delete
-      @messages.delete(self.id)
-    end
-  end
-
-end

data/lib/ironmq/queues.rb

@@ -1,72 +0,0 @@
-module IronMQ
-  class Queues
-
-    attr_accessor :client
-
-    def initialize(client)
-      @client = client
-    end
-
-    def path(options={})
-      path = "/projects/#{@client.project_id}/queues"
-    end
-
-    def list(options={})
-      ret = []
-      res, status = @client.get("#{path(options)}", options)
-      res.each do |q|
-        #p q
-        q = Queue.new(self, q)
-        ret << q
-      end
-      ret
-    end
-
-    # options:
-    #  :name => can specify an alternative queue name
-    def get(options={})
-      res, status = @client.get("#{path(options)}/#{options[:name]}")
-      return Queue.new(self, res)
-    end
-
-
-  end
-
-  class Queue
-
-    def initialize(queues, res)
-      @queues = queues
-      @data = res
-    end
-
-    def raw
-      @data
-    end
-
-    def [](key)
-      raw[key]
-    end
-
-    def id
-      raw["id"]
-    end
-
-    def name
-      raw["name"]
-    end
-
-    def size
-      return raw["size"] if raw["size"]
-      return @size if @size
-      q = @queues.get(:name=>name)
-      @size = q.size
-      return @size
-    end
-
-    # def delete
-    # @messages.delete(self.id)
-    # end
-  end
-
-end
-