iron_worker 2.1.1 → 2.2.0

data/VERSION.yml

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

data/lib/iron_worker/api.rb

@@ -1,5 +1,4 @@
-require 'rest_client'
-require_relative 'uber_client'
+require 'rest'
 
 module IronWorker
 
@@ -54,12 +53,15 @@ module IronWorker
         @version = options[:version]
         #@logger = options[:logger]
 
-        @base_url = "#{@scheme}://#{@host}:#{@port}/#{@version}"
+        reset_base_url
 
-        @uber_client = Uber::Client.new
+        @uber_client = Rest::Client.new
 
       end
 
+      def reset_base_url
+        @base_url = "#{@scheme}://#{@host}:#{@port}/#{@version}"
+      end
 
       def base_url
         @base_url
@@ -77,13 +79,13 @@ module IronWorker
       end
 
 
-    def common_req_hash
-      {
-          :headers=>{"Content-Type" => 'application/json',
-                     "Authorization"=>"OAuth #{@token}",
-                     "User-Agent"=>"IronWorker Ruby Client"}
-      }
-    end
+      def common_req_hash
+        {
+            :headers=>{"Content-Type" => 'application/json',
+                       "Authorization"=>"OAuth #{@token}",
+                       "User-Agent"=>"IronWorker Ruby Client"}
+        }
+      end
 
       def process_ex(ex)
         logger.error "EX #{ex.class.name}: #{ex.message}"

data/lib/iron_worker/service.rb

@@ -25,7 +25,9 @@ module IronWorker
       super("worker-aws-us-east-1.iron.io", token, options)
       self.host = self.config.host if self.config && self.config.host
       # automerge simple worker gem and dependenices
+      self.config.merge_gem('zip')
       self.config.merge_gem('rest-client')
+      self.config.merge_gem('rest')
       self.config.merge_gem('iron_worker')
       IronWorker.logger.info 'IronWorker initialized.'
       IronWorker.logger.debug ' host = ' + self.host.inspect
@@ -499,21 +501,21 @@ end
 
     def get_codes(options={})
       hash_to_send = {}
-      uri = "projects/" + get_project_id(options) + "/codes/"
+      uri = "projects/" + get_project_id(options) + "/codes"
       ret = get(uri, hash_to_send)
       ret
     end
 
     def get_schedules(options={})
       hash_to_send = {}
-      uri = "projects/" + get_project_id(options) + "/schedules/"
+      uri = "projects/" + get_project_id(options) + "/schedules"
       ret = get(uri, hash_to_send)
       ret
     end
 
     def get_jobs(options={})
       hash_to_send = {}
-      uri = "projects/" + get_project_id(options) + "/tasks/"
+      uri = "projects/" + get_project_id(options) + "/tasks"
       ret = get(uri, hash_to_send)
       ret
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iron_worker
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-05 00:00:00.000000000 Z
+date: 2011-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zip
-  requirement: &23155260 !ruby/object:Gem::Requirement
+  requirement: &9516660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23155260
+  version_requirements: *9516660
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &23154320 !ruby/object:Gem::Requirement
+  requirement: &9548900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23154320
+  version_requirements: *9548900
+- !ruby/object:Gem::Dependency
+  name: rest
+  requirement: &9545520 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *9545520
 - !ruby/object:Gem::Dependency
   name: zip
-  requirement: &23153100 !ruby/object:Gem::Requirement
+  requirement: &9544720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +54,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23153100
+  version_requirements: *9544720
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &23152180 !ruby/object:Gem::Requirement
+  requirement: &9567580 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *9567580
+- !ruby/object:Gem::Dependency
+  name: rest
+  requirement: &9564080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +76,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23152180
+  version_requirements: *9564080
 description: The official IronWorker gem for IronWorker by Iron.io. http://www.iron.io
 email: travis@iron.io
 executables: []
@@ -73,7 +95,6 @@ files:
 - lib/iron_worker/server/overrides.rb
 - lib/iron_worker/server/runner.rb
 - lib/iron_worker/service.rb
-- lib/iron_worker/uber_client.rb
 - lib/iron_worker/used_in_worker.rb
 - lib/iron_worker/utils.rb
 - rails/init.rb

data/lib/iron_worker/uber_client.rb

@@ -1,117 +0,0 @@
-# This is a simple wrapper that can use different http clients depending on what's installed.
-# The purpose of this is so that users who can't install binaries easily (like windoze users) can have fallbacks that work.
-
-
-module Uber
-  def self.gem=(g)
-    @gem = g
-  end
-
-  def self.gem
-    @gem
-  end
-
-  begin
-    require 'typhoeus'
-    Uber.gem = :typhoeus
-  rescue LoadError => ex
-    puts "Could not load typhoeus. #{ex.class.name}: #{ex.message}. Falling back to rest-client. Please install 'typhoeus' gem for best performance."
-    require 'rest_client'
-    Uber.gem = :rest_client
-  end
-
-  class RestClientResponseWrapper
-    def initialize(response)
-      @response = response
-    end
-
-    def code
-      @response.code
-    end
-
-    def body
-      @response.body
-    end
-
-  end
-
-  class ClientError < StandardError
-    
-  end
-
-  class RestClientExceptionWrapper < ClientError
-    def initialize(ex)
-      super(ex.message)
-      @ex = ex
-    end
-  end
-
-  class TimeoutError < ClientError
-    def initialize(msg=nil)
-      msg ||= "HTTP Request Timed out."
-      super(msg)
-    end
-  end
-
-  class TyphoeusTimeoutError < TimeoutError
-    def initialize(response)  
-      msg ||= "HTTP Request Timed out. Curl code: #{response.curl_return_code}. Curl error msg: #{response.curl_error_message}."
-      super(msg)
-    end
-  end
-
-  class Client
-
-    def initialize
-
-    end
-
-    def get(url, req_hash={})
-      if Uber.gem == :typhoeus
-        req_hash[:connect_timeout] = 5000
-        req_hash[:timeout] ||= 10000
-        # puts "REQ_HASH=" + req_hash.inspect
-        response = Typhoeus::Request.get(url, req_hash)
-        #p response
-        if response.timed_out?
-          raise TyphoeusTimeoutError.new(response)
-        end
-      else
-        begin
-          headers = req_hash[:headers] || {}
-          r2 = RestClient.get(url, req_hash.merge(headers))
-          response = RestClientResponseWrapper.new(r2)
-            # todo: make generic exception
-        rescue RestClient::Exception => ex
-          raise RestClientExceptionWrapper.new(ex)
-        end
-      end
-      response
-    end
-
-    def post(url, req_hash={})
-      if Uber.gem == :typhoeus
-        # todo: should change this timeout to longer if it's for posting file
-        req_hash[:connect_timeout] = 5000
-        req_hash[:timeout] ||= 10000
-        # puts "REQ_HASH=" + req_hash.inspect
-        response = Typhoeus::Request.post(url, req_hash)
-        #p response
-        if response.timed_out?
-          raise TyphoeusTimeoutError.new(response)
-        end
-      else
-        begin
-          headers = req_hash[:headers] || {}
-          r2 = RestClient.post(url, req_hash[:body], headers)
-          response = RestClientResponseWrapper.new(r2)
-            # todo: make generic exception
-        rescue RestClient::Exception => ex
-          raise RestClientExceptionWrapper(ex)
-        end
-      end
-      response
-    end
-
-  end
-end