simple_worker 2.0.2 → 2.0.3

data/lib/simple_worker/api.rb

@@ -1,5 +1,5 @@
 require 'rest_client'
-require 'typhoeus'
+require_relative 'uber_client'
 
 module SimpleWorker
 
@@ -56,6 +56,8 @@ module SimpleWorker
 
         @base_url = "#{@scheme}://#{@host}:#{@port}/#{@version}"
 
+        @uber_client = Uber::Client.new
+
       end
 
 
@@ -125,7 +127,7 @@ module SimpleWorker
         logger.debug 'get url=' + full_url
         req_hash = common_req_hash
         req_hash[:params] = params
-        response = Typhoeus::Request.get(full_url, req_hash) # could let typhoeus add params, using :params=>x
+        response = @uber_client.get(full_url, req_hash) # could let typhoeus add params, using :params=>x
         #response = @http_sess.request(:get, url_plus_params,
         #                              {},
         #                              {})
@@ -143,7 +145,7 @@ module SimpleWorker
           logger.debug "data = " + data
           logger.debug "params = " + params.inspect
           logger.debug "options = " + options.inspect
-          # todo: replace with typhoeus
+          # todo: replace with uber_client
           parse_response(RestClient.post(append_params(url, add_params(method, params)), {:data => data, :file => file}, :content_type => 'application/json'), options)
         rescue RestClient::Exception => ex
           process_ex(ex)
@@ -162,7 +164,7 @@ module SimpleWorker
           logger.debug 'body=' + json
           req_hash = common_req_hash
           req_hash[:body] = json
-          response = Typhoeus::Request.post(url, req_hash)
+          response = @uber_client.post(url, req_hash)
           #response = @http_sess.post(url, json, {"Content-Type" => 'application/json'})
           check_response(response)
           logger.debug 'response: ' + response.inspect
@@ -181,7 +183,7 @@ module SimpleWorker
 
       def put(method, body, options={})
         begin
-          # todo: replace with typhoeus
+          # todo: replace with uber_client
           parse_response RestClient.put(url_full(method), add_params(method, body).to_json, headers), options
         rescue RestClient::Exception => ex
           process_ex(ex)
@@ -190,7 +192,7 @@ module SimpleWorker
 
       def delete(method, params={}, options={})
         begin
-          # todo: replace with typhoeus
+          # todo: replace with uber_client
           parse_response RestClient.delete(append_params(url_full(method), add_params(method, params))), options
         rescue RestClient::Exception => ex
           process_ex(ex)

data/lib/simple_worker/base.rb

@@ -46,7 +46,7 @@ module SimpleWorker
         reqs.each do |r|
           r2 = "#{gem_info[:path]}/lib/#{r}"
           begin
-            puts 'requiring ' + r2
+            SimpleWorker.logger.debug 'requiring ' + r2
             require r2
           rescue LoadError=>ex
             SimpleWorker.logger.error "Error requiring gem #{r}: #{ex.message}"
@@ -70,7 +70,7 @@ module SimpleWorker
         f2 = SimpleWorker::MergeHelper.check_for_file(mailer, @caller_file)
         basename = File.basename(mailer, f2[:extname])
         path_to_templates = params[:path_to_templates] || File.join(Rails.root, "app/views/#{basename}")
-        @merged_mailers[basename] = {:name=>basename, :path_to_templates=>path_to_templates, :filename => mailer}.merge!(params)
+        @merged_mailers[basename] = {:name=>basename, :path_to_templates=>path_to_templates, :filename => f2[:path]}.merge!(params)
       end
 
       def merge_folder(path)

data/lib/simple_worker/server/overrides.rb

@@ -11,6 +11,12 @@ module SimpleWorker
     def running_class
       @running_class
     end
+    def task_data=(td)
+      @task_data = td
+    end
+    def task_data
+      @task_data
+    end
   end
 
   def self.disable_queueing()

data/lib/simple_worker/service.rb

@@ -194,21 +194,19 @@ Dir.chdir(dirname)
 job_data = JSON.load(File.open(task_data_file))
 puts 'job_data=' + job_data.inspect
 sw_config = job_data['sw_config']
-")
-
+SimpleWorker.task_data = job_data
 
-        # add some rails stuff if using Rails
-        if defined?(Rails)
-          f.write "module Rails
-  def self.version
-    '#{Rails.version}'
-  end
-  def self.env
-    '#{Rails.env}'
+if SimpleWorker.task_data['rails']
+  module ::Rails
+    def self.version
+      SimpleWorker.task_data['rails']['version']
+    end
+    def self.env
+      SimpleWorker.task_data['rails']['env']
+    end
   end
 end
-"
-        end
+")
 
         if SimpleWorker.config.extra_requires
           SimpleWorker.config.extra_requires.each do |r|
@@ -469,12 +467,12 @@ end
       ret
     end
 
-    def cancel_schedule(scheduled_task_id)
+    def cancel_schedule(scheduled_task_id, options={})
       raise "Must include a schedule id." if scheduled_task_id.blank?
       hash_to_send = {}
       hash_to_send["schedule_id"] = scheduled_task_id
-      ret = post("scheduler/cancel", hash_to_send)
-      ret
+      uri = "#{project_url_prefix(get_project_id(options))}schedules/#{scheduled_task_id}"
+      delete(uri, hash_to_send)
     end
 
     def get_projects()

data/lib/simple_worker/uber_client.rb

@@ -0,0 +1,88 @@
+# 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 Client
+
+    def initialize
+
+    end
+
+    def get(url, req_hash={})
+      if Uber.gem == :typhoeus
+        response = Typhoeus::Request.get(url, req_hash)
+      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
+        response = Typhoeus::Request.post(url, req_hash)
+      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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_worker
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-07 00:00:00.000000000 Z
+date: 2011-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zip
-  requirement: &25817460 !ruby/object:Gem::Requirement
+  requirement: &14034160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *25817460
+  version_requirements: *14034160
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &25816940 !ruby/object:Gem::Requirement
+  requirement: &14033500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *25816940
+  version_requirements: *14033500
 - !ruby/object:Gem::Dependency
   name: typhoeus
-  requirement: &25816440 !ruby/object:Gem::Requirement
+  requirement: &14103600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *25816440
+  version_requirements: *14103600
 - !ruby/object:Gem::Dependency
   name: zip
-  requirement: &25815920 !ruby/object:Gem::Requirement
+  requirement: &14103060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *25815920
+  version_requirements: *14103060
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &25815380 !ruby/object:Gem::Requirement
+  requirement: &14102560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *25815380
+  version_requirements: *14102560
 - !ruby/object:Gem::Dependency
   name: typhoeus
-  requirement: &25814840 !ruby/object:Gem::Requirement
+  requirement: &14102080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *25814840
+  version_requirements: *14102080
 description: The official SimpleWorker gem for http://www.simpleworker.com
 email: travis@appoxy.com
 executables: []
@@ -94,6 +94,7 @@ files:
 - lib/simple_worker/server/overrides.rb
 - lib/simple_worker/server/runner.rb
 - lib/simple_worker/service.rb
+- lib/simple_worker/uber_client.rb
 - lib/simple_worker/used_in_worker.rb
 - lib/simple_worker/utils.rb
 - rails/init.rb
@@ -118,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.8
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: The official SimpleWorker gem for http://www.simpleworker.com