iron_mq 1.9.1 → 2.0.0

data/Gemfile.lock

@@ -1,25 +1,47 @@
 PATH
   remote: .
   specs:
-    iron_mq (1.9.0)
-      iron_core (>= 0.1.4)
+    iron_mq (1.9.1)
+      iron_core (>= 0.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    addressable (2.2.8)
     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.2)
+      addressable (>= 2.2.3)
+      cookiejar
+      em-socksify
+      eventmachine (>= 1.0.0.beta.4)
+      http_parser.rb (>= 0.5.3)
+    em-socksify (0.2.0)
+      eventmachine (>= 1.0.0.beta.4)
+    eventmachine (1.0.0.rc.4)
+    faraday (0.8.1)
+      multipart-post (~> 1.1)
     ffi (1.0.11)
-    iron_core (0.1.4)
-      bundler (> 1.0.0)
-      rest
-      rest-client
+    http_parser.rb (0.5.3)
+    iron_core (0.2.0)
+      rest (>= 2.0.0)
     mime-types (1.19)
+    multipart-post (1.1.5)
+    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)
@@ -30,7 +52,9 @@ PLATFORMS
 
 DEPENDENCIES
   beanstalk-client
+  concur
   iron_mq!
+  net-http-persistent
   rake
   test-unit
   typhoeus

data/iron_mq.gemspec

@@ -16,14 +16,15 @@ 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"
   gem.add_development_dependency "beanstalk-client"
   gem.add_development_dependency "uber_config"
   gem.add_development_dependency "typhoeus"
-
+  gem.add_development_dependency "concur"
+  gem.add_development_dependency "net-http-persistent"
 
 end
 

data/lib/iron_mq/client.rb

@@ -10,20 +10,31 @@ module IronMQ
     attr_accessor :queue_name, :logger
 
     def initialize(options={})
-      super('mq', options, [:queue_name])
+      default_options = {
+        :scheme => 'https',
+        :host => IronMQ::Client::AWS_US_EAST_HOST,
+        :port => 443,
+        :api_version => 1,
+        :user_agent => 'iron_mq_ruby-' + IronMQ::VERSION + ' (iron_core_ruby-' + IronCore.version + ')',
+        :queue_name => 'default'
+      }
+
+      super('iron', 'mq', options, default_options, [:project_id, :token, :api_version, :queue_name])
+
+      IronCore::Logger.error 'IronMQ', "Token is not set", IronCore::Error if @token.nil?
+
+      check_id(@project_id, 'project_id')
 
       @logger = Logger.new(STDOUT)
       @logger.level = Logger::INFO
+    end
 
-      load_from_hash('defaults', {:scheme => 'https', :host => IronMQ::Client::AWS_US_EAST_HOST, :port => 443,
-                                  :api_version => 1,
-                                  :user_agent => 'iron_mq_ruby-' + IronMQ::VERSION + ' (iron_core_ruby-' + IronCore.version + ')',
-                                  :queue_name => 'default'})
+    def headers
+      super.merge({'Authorization' => "OAuth #{@token}"})
+    end
 
-      if (not @token) || (not @project_id)
-        IronCore::Logger.error 'IronMQ', 'Both token and project_id must be specified' 
-        raise IronCore::IronError.new('Both token and project_id must be specified')
-      end
+    def url
+      super + @api_version.to_s + '/'
     end
 
     def queue(name)

data/lib/iron_mq/version.rb

@@ -1,3 +1,3 @@
 module IronMQ
-  VERSION = "1.9.1"
+  VERSION = "2.0.0"
 end

data/lib/iron_mq.rb

@@ -1,3 +1,4 @@
+require 'rest'
 require_relative 'iron_mq/queues'
 require_relative 'iron_mq/messages'
 require_relative 'iron_mq/client'

data/test/long_run.rb

@@ -9,18 +9,18 @@ end
 
 require_relative 'long_run_worker'
 
-@config = YAML::load_file(File.expand_path(File.join("~", "Dropbox", "configs", "iron_mq_ruby", "test", "config.yml")))
-@num_to_add = @config['count']
+@config = YAML::load_file(File.expand_path(File.join("~", "Dropbox", "configs", "iron_mq_ruby", "config.yml")))
+@num_to_add = 1000
 
-IronWorker.configure do |c|
-  c.token = @config['iron_mq']['token']
-  c.project_id = @config['iron_mq']['project_id']
-end
+#IronWorker.configure do |c|
+#  c.token = @config['iron_mq']['token']
+#  c.project_id = @config['iron_mq']['project_id']
+#end
 
 worker = LongRunWorker.new
 worker.config = @config
 worker.num_to_add = @num_to_add
-worker.run_local
+worker.run
 #worker.queue
 #status = worker.wait_until_complete
 #p status

data/test/long_run_worker.rb

@@ -1,17 +1,17 @@
-require 'iron_worker'
+require 'concur'
+require 'iron_mq'
 
-class LongRunWorker < IronWorker::Base
-
-  merge_gem 'concur'
-  merge_gem 'iron_mq'
+class LongRunWorker
 
   attr_accessor :config, :num_to_add
 
   def run
 
-    @client = IronMQ::Client.new(@config['iron_mq'])
+    @client = IronMQ::Client.new(@config['iron'])
     @client.queue_name = 'ironmq-gem-long'
 
+    @error_count = 0
+
     start = Time.now
     puts "Queuing #{@num_to_add} items at #{start}..."
     executor = Concur::Executor.new_thread_pool_executor(50)
@@ -22,6 +22,7 @@ class LongRunWorker < IronWorker::Base
           res = @client.messages.post("hello world! #{i}")
         rescue => ex
           puts "ERROR! #{ex.class.name}: #{ex.message} -- #{ex.backtrace.inspect}"
+          @error_count += 1
           raise ex
         end
       end
@@ -53,6 +54,7 @@ class LongRunWorker < IronWorker::Base
 
     puts "Finished pushing #{@num_to_add} items in #{put_time} seconds."
     puts "Finished getting and deleting #{@num_to_add} items in #{(Time.now.to_f - start.to_f)} seconds."
+    puts "Errors: #{@error_count}"
 
     executor.shutdown
 

data/test/test_base.rb

@@ -34,5 +34,11 @@ 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_bulk.rb

@@ -0,0 +1,33 @@
+require_relative 'test_base'
+
+class TestBulk < TestBase
+
+  def setup
+    super
+
+  end
+
+  def test_bulk
+
+    q_name = 'ironmq-gem-bulk'
+    queue = @client.queue(q_name)
+
+    times = 50
+    t = Time.now
+    times.times do |i|
+      puts "Posting #{i}"
+      res = queue.post("hello world #{i}!")
+    end
+    puts "#{times} posts took #{Time.now.to_f - t.to_f}"
+
+    t = Time.now
+    res = nil
+    while (res = queue.get())
+      del = res.delete
+    end
+    puts "#{times} gets and deletes took #{Time.now.to_f - t.to_f}"
+
+  end
+
+end
+

data/test/test_iron_mq.rb

@@ -20,15 +20,15 @@ class IronMQTests < TestBase
  
   def test_performance_post_100_messages
     @client.queue_name = 'test_basics'
-    100.times do 
-      @client.messages.post("hello world!")
+    # slower to rackspace since this is running on aws
+    timeout = @client.host.include?('rackspace') ? 40 : 10
+    assert_performance timeout do
+      100.times do
+        @client.messages.post("hello world!")
+      end
     end
   end
-  
-  def test_performance_post_message
-    @client.queue_name = 'test_basics'
-    @client.messages.post("hello world!")
-  end
+
 
   def test_basics
     @client.queue_name = 'test_basics'
@@ -163,7 +163,7 @@ class IronMQTests < TestBase
   def test_queues
     puts 'test_queues'
 
-    assert_raise IronCore::IronResponseError do
+    assert_raise Rest::HttpError do
       # should raise a 404
       q = @client.queues.get(:name => "some_queue_that_does_not_exist")
     end
@@ -177,7 +177,7 @@ class IronMQTests < TestBase
     end
     assert res.size > 0
 
-    res = @client.queues.list(:page => 5)
+    res = @client.queues.list(:page => 15)
     puts "res.size 2: " + res.size.to_s
     res.each do |q|
       p q.name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_mq
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 2.0.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
@@ -107,6 +107,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: concur
+  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: net-http-persistent
+  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 IronMQ by www.iron.io
 email:
 - treeder@gmail.com
@@ -125,16 +157,14 @@ files:
 - lib/iron_mq/messages.rb
 - lib/iron_mq/queues.rb
 - lib/iron_mq/version.rb
-- test/Gemfile
-- test/Gemfile.lock
 - test/long_run.rb
 - test/long_run_worker.rb
 - test/quick_run.rb
 - test/schedule_abt.rb
 - test/test_base.rb
 - test/test_beanstalkd.rb
+- test/test_bulk.rb
 - test/test_iron_mq.rb
-- test/test_push_queues.rb
 homepage: https://github.com/iron-io/iron_mq_ruby
 licenses: []
 post_install_message: 
@@ -160,13 +190,11 @@ signing_key:
 specification_version: 3
 summary: Ruby client for IronMQ by www.iron.io
 test_files:
-- test/Gemfile
-- test/Gemfile.lock
 - test/long_run.rb
 - test/long_run_worker.rb
 - test/quick_run.rb
 - test/schedule_abt.rb
 - test/test_base.rb
 - test/test_beanstalkd.rb
+- test/test_bulk.rb
 - test/test_iron_mq.rb
-- test/test_push_queues.rb

data/test/Gemfile

@@ -1,6 +0,0 @@
-source 'http://rubygems.org'
-gem 'beanstalk-client'
-gem 'test-unit'
-gem 'concur'
-gem 'uber_config'
-gem 'iron_core'

data/test/Gemfile.lock

@@ -1,48 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    addressable (2.2.8)
-    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.2)
-      addressable (>= 2.2.3)
-      cookiejar
-      em-socksify
-      eventmachine (>= 1.0.0.beta.4)
-      http_parser.rb (>= 0.5.3)
-    em-socksify (0.2.0)
-      eventmachine (>= 1.0.0.beta.4)
-    eventmachine (1.0.0.beta.4)
-    faraday (0.8.1)
-      multipart-post (~> 1.1)
-    http_parser.rb (0.5.3)
-    iron_core (0.1.4)
-      bundler (> 1.0.0)
-      rest
-      rest-client
-    mime-types (1.18)
-    multipart-post (1.1.5)
-    rest (0.3.0)
-      rest-client
-      rest-client
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
-    test-unit (2.5.0)
-    uber_config (0.0.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  beanstalk-client
-  concur
-  iron_core
-  test-unit
-  uber_config

data/test/test_push_queues.rb

@@ -1,32 +0,0 @@
-# Put config.yml file in ~/Dropbox/configs/ironmq_gem/test/config.yml
-require_relative 'test_base'
-
-class TestPushQueues < TestBase
-
-  def setup
-    super
-    @client.queue_name = 'ironmq-gem-quick'
-  end
-
-  def test_message_subscriptions
-    res = @client.messages.post("hello world!", :subscriptions=>["http://requestb.in/oui4adou"])
-    assert res.id
-    post_id = res.id
-    assert res.msg
-    p res
-  end
-
-  def test_queue_subscriptions
-    qname = "subscription-queue"
-    res = @client.queues.post(:queue_name=>qname, :subscriptions=>["http://requestb.in/1lhkwk31", "http://requestb.in/1icckwe1"])
-    q = @client.queues.get(:queue_name=>qname)
-    p q
-    p q["subscriptions"]
-
-    @client.messages.post("hello sub queue", :queue_name=>qname)
-
-
-  end
-
-end
-