simple_worker 0.6.1 → 0.6.2

data/lib/railtie.rb

@@ -10,29 +10,36 @@ module SimpleWorker
     initializer "simple_worker.configure_rails_initialization" do |app|
       puts "Initializing SimpleWorker for Rails 3..."
       SimpleWorker.configure do |c2|
-        models_path       = File.join(Rails.root, 'app/models/*.rb')
-        c2.models         = Dir.glob(models_path)
-        mailers_path      = File.join(Rails.root, 'app/mailers/*.rb')
-        c2.mailers        =Dir.glob(mailers_path).collect { |m| {:filename=>m, :name => File.basename(m), :path_to_templates=>File.join(Rails.root, "app/views/#{File.basename(m, File.extname(m))}")} }
+        models_path = File.join(Rails.root, 'app/models/*.rb')
+        c2.models = Dir.glob(models_path)
+        mailers_path = File.join(Rails.root, 'app/mailers/*.rb')
+        c2.mailers =Dir.glob(mailers_path).collect { |m| {:filename=>m, :name => File.basename(m), :path_to_templates=>File.join(Rails.root, "app/views/#{File.basename(m, File.extname(m))}")} }
         c2.extra_requires += ['active_support/core_ext', 'active_record', 'action_mailer']
-        c2.database       = Rails.configuration.database_configuration[Rails.env]
-        c2.gems = get_required_gems if Bundler
-        puts "MODELS" + c2.models.inspect
-        puts "MAILERS" + c2.mailers.inspect
-        puts "DATABASE" + c2.database.inspect
-        puts "GEMS" + c2.gems.inspect
+        c2.database = Rails.configuration.database_configuration[Rails.env]
+        c2.gems = get_required_gems if defined?(Bundler)
+        SimpleWorker.logger.debug "MODELS " + c2.models.inspect
+        SimpleWorker.logger.debug "MAILERS " + c2.mailers.inspect
+        SimpleWorker.logger.debug "DATABASE " + c2.database.inspect
+        SimpleWorker.logger.debug "GEMS " + c2.gems.inspect
       end
     end
 
     def get_required_gems
       gems_in_gemfile = Bundler.environment.dependencies.select { |d| d.groups.include?(:default) }
-      gems            =[]
+      gems =[]
+      specs = Bundler.load.specs
+      puts 'specs=' + specs.inspect
       gems_in_gemfile.each do |dep|
         next if dep.name=='rails' #monkey patch
         gem_info = {:name=>dep.name, :version=>dep.requirement}
         gem_info.merge!({:require=>dep.autorequire.join}) if dep.autorequire
-        gem_info[:version] = Bundler.load.specs.find { |g| g.name==gem_info[:name] }.version.to_s
-        gems << gem_info
+        spec = specs.find { |g| g.name==gem_info[:name] }
+        if spec
+          gem_info[:version] = spec.version.to_s
+          gems << gem_info
+        else
+          SimpleWorker.logger.warn "Could not find gem spec for #{gem_info[:name]}"
+        end
       end
       gems
     end

data/lib/simple_worker.rb

@@ -1,5 +1,3 @@
-require 'appoxy_api'
-#require 'active_support/core_ext'
 require_relative 'simple_worker/service'
 require_relative 'simple_worker/base'
 require_relative 'simple_worker/config'
@@ -7,6 +5,9 @@ require_relative 'simple_worker/used_in_worker'
 
 
 module SimpleWorker
+  @@logger = Logger.new(STDOUT)
+  @@logger.level = Logger::INFO
+
 
   class << self
     attr_accessor :config,
@@ -20,7 +21,14 @@ module SimpleWorker
     def config
       @config ||= Config.new
     end
- 
+
+    def logger
+      @@logger
+    end
+
+    def api_version
+      3
+    end
   end
 
 end

data/lib/simple_worker/api.rb

@@ -0,0 +1,153 @@
+module SimpleWorker
+  module Api
+
+    module Signatures
+
+
+      def self.generate_timestamp(gmtime)
+        return gmtime.strftime("%Y-%m-%dT%H:%M:%SZ")
+      end
+
+
+      def self.generate_signature(operation, timestamp, secret_key)
+        my_sha_hmac = Digest::HMAC.digest(operation + timestamp, secret_key, Digest::SHA1)
+        my_b64_hmac_digest = Base64.encode64(my_sha_hmac).strip
+        return my_b64_hmac_digest
+      end
+
+
+      def self.hash_to_s(hash)
+        str = ""
+        hash.sort.each { |a| str+= "#{a[0]}#{a[1]}" }
+        #removing all characters that could differ after parsing with rails
+        return str.delete "\"\/:{}[]\' T"
+      end
+    end
+
+    # Subclass must define:
+    #  host: endpoint url for service
+    class Client
+
+      @@logger = Logger.new(STDOUT)
+      @@logger.level = Logger::INFO
+
+      def self.logger
+        @@logger
+      end
+
+      attr_accessor :host, :access_key, :secret_key, :version
+
+      def initialize(host, access_key, secret_key, options={})
+        @host = host
+        @access_key = access_key
+        @secret_key = secret_key
+      end
+
+      def process_ex(ex)
+        body = ex.http_body
+        puts 'EX BODY=' + body.to_s
+        decoded_ex = JSON.parse(ex.http_body)
+        exception = Exception.new(ex.message+":"+decoded_ex["msg"])
+        exception.set_backtrace(decoded_ex["backtrace"].split(",")) if decoded_ex["backtrace"]
+        raise exception
+      end
+
+      def get(method, params={}, options={})
+        begin
+#                ClientHelper.run_http(host, access_key, secret_key, :get, method, nil, params)
+          parse_response RestClient.get(append_params(url(method), add_params(method, params)), headers), options
+        rescue RestClient::BadRequest, RestClient::InternalServerError => ex
+          process_ex(ex)
+        end
+      end
+
+      def post_file(method, file, params={}, options={})
+        begin
+          parse_response RestClient.post(url(method), add_params(method, params).merge!({:file=>file}), :multipart => true), options
+        rescue RestClient::BadRequest, RestClient::InternalServerError => ex
+          process_ex(ex)
+        end
+      end
+
+      def post(method, params={}, options={})
+        begin
+          parse_response RestClient.post(url(method), add_params(method, params).to_json, headers), options
+          #ClientHelper.run_http(host, access_key, secret_key, :post, method, nil, params)
+        rescue RestClient::BadRequest, RestClient::InternalServerError => ex
+          process_ex(ex)
+        end
+      end
+
+
+      def put(method, body, options={})
+        begin
+          parse_response RestClient.put(url(method), add_params(method, body).to_json, headers), options
+          #ClientHelper.run_http(host, access_key, secret_key, :put, method, body, nil)
+        rescue RestClient::BadRequest, RestClient::InternalServerError => ex
+          process_ex(ex)
+        end
+      end
+
+      def delete(method, params={}, options={})
+        begin
+          parse_response RestClient.delete(append_params(url(method), add_params(method, params))), options
+        rescue RestClient::BadRequest, RestClient::InternalServerError => ex
+          process_ex(ex)
+        end
+      end
+
+      def url(command_path)
+        url = host + command_path
+        url
+      end
+
+      def add_params(command_path, hash)
+        v = version||"0.1"
+        ts = SimpleWorker::Api::Signatures.generate_timestamp(Time.now.gmtime)
+        # puts 'timestamp = ' + ts
+        sig = case v
+                when "0.2"
+                  SimpleWorker::Api::Signatures.generate_signature(command_path + SimpleWorker::Api::Signatures.hash_to_s(hash), ts, secret_key)
+                when "0.1"
+                  SimpleWorker::Api::Signatures.generate_signature(command_path, ts, secret_key)
+              end
+
+        extra_params = {'sigv'=>v, 'sig' => sig, 'timestamp' => ts, 'access_key' => access_key}
+        hash.merge!(extra_params)
+      end
+
+      def append_params(host, params)
+        host += "?"
+        i = 0
+        params.each_pair do |k, v|
+          host += "&" if i > 0
+          host += k + "=" + CGI.escape(v)
+          i +=1
+        end
+        return host
+      end
+
+      def headers
+        user_agent = "SimpleWorker Ruby Client"
+        headers = {'User-Agent' => user_agent}
+      end
+
+      def parse_response(response, options={})
+#        puts 'PARSE RESPONSE!'
+        unless options[:parse] == false
+          begin
+            return JSON.parse(response.to_s)
+          rescue => ex
+            puts 'response that caused error = ' + response.to_s
+            raise ex
+          end
+        else
+          response
+        end
+      end
+
+    end
+
+  end
+
+end

data/lib/simple_worker/service.rb

@@ -1,152 +1,14 @@
 require 'base64'
 require 'logger'
-require 'appoxy_api'
 require 'zip'
 require 'rest_client'
 require 'json'
 
-module SimpleWorker
-
-  @@logger = Logger.new(STDOUT)
-  @@logger.level = Logger::INFO
-
-  def self.logger
-    @@logger
-  end
-
-  def self.api_version
-    3
-  end
-
-  module Api
-
-    # Subclass must define:
-    #  host: endpoint url for service
-    class Client
-
-      @@logger = Logger.new(STDOUT)
-      @@logger.level = Logger::INFO
-
-      def self.logger
-        @@logger
-      end
-
-      attr_accessor :host, :access_key, :secret_key, :version
-
-      def initialize(host, access_key, secret_key, options={})
-        @host = host
-        @access_key = access_key
-        @secret_key = secret_key
-      end
-
-      def process_ex(ex)
-        body = ex.http_body
-        puts 'EX BODY=' + body.to_s
-        decoded_ex = JSON.parse(ex.http_body)
-        exception = Exception.new(ex.message+":"+decoded_ex["msg"])
-        exception.set_backtrace(decoded_ex["backtrace"].split(",")) if decoded_ex["backtrace"]
-        raise exception
-      end
-
-      def get(method, params={}, options={})
-        begin
-#                ClientHelper.run_http(host, access_key, secret_key, :get, method, nil, params)
-          parse_response RestClient.get(append_params(url(method), add_params(method, params)), headers), options
-        rescue RestClient::BadRequest, RestClient::InternalServerError => ex
-          process_ex(ex)
-        end
-      end
-
-      def post_file(method, file, params={}, options={})
-        begin
-          parse_response RestClient.post(url(method), add_params(method, params).merge!({:file=>file}), :multipart => true), options
-        rescue RestClient::BadRequest, RestClient::InternalServerError => ex
-          process_ex(ex)
-        end
-      end
-
-      def post(method, params={}, options={})
-        begin
-          parse_response RestClient.post(url(method), add_params(method, params).to_json, headers), options
-          #ClientHelper.run_http(host, access_key, secret_key, :post, method, nil, params)
-        rescue RestClient::BadRequest, RestClient::InternalServerError => ex
-          process_ex(ex)
-        end
-      end
-
+require_relative 'api'
 
-      def put(method, body, options={})
-        begin
-          parse_response RestClient.put(url(method), add_params(method, body).to_json, headers), options
-          #ClientHelper.run_http(host, access_key, secret_key, :put, method, body, nil)
-        rescue RestClient::BadRequest, RestClient::InternalServerError => ex
-          process_ex(ex)
-        end
-      end
-
-      def delete(method, params={}, options={})
-        begin
-          parse_response RestClient.delete(append_params(url(method), add_params(method, params))), options
-        rescue RestClient::BadRequest, RestClient::InternalServerError => ex
-          process_ex(ex)
-        end
-      end
-
-      def url(command_path)
-        url = host + command_path
-        url
-      end
-
-      def add_params(command_path, hash)
-        v            = version||"0.1"
-        ts           = Appoxy::Api::Signatures.generate_timestamp(Time.now.gmtime)
-        # puts 'timestamp = ' + ts
-        sig          = case v
-          when "0.2"
-            Appoxy::Api::Signatures.generate_signature(command_path + Appoxy::Api::Signatures.hash_to_s(hash), ts, secret_key)
-          when "0.1"
-            Appoxy::Api::Signatures.generate_signature(command_path, ts, secret_key)
-        end
-
-        extra_params = {'sigv'=>v, 'sig' => sig, 'timestamp' => ts, 'access_key' => access_key}
-        hash.merge!(extra_params)
-      end
-
-      def append_params(host, params)
-        host += "?"
-        i = 0
-        params.each_pair do |k, v|
-          host += "&" if i > 0
-          host += k + "=" + CGI.escape(v)
-          i +=1
-        end
-        return host
-      end
-
-      def headers
-        user_agent = "Appoxy API Ruby Client"
-        headers = {'User-Agent' => user_agent}
-      end
-
-      def parse_response(response, options={})
-        puts 'PARSE RESPONSE!'
-        unless options[:parse] == false
-          begin
-            return JSON.parse(response.to_s)
-          rescue => ex
-            puts 'response that caused error = ' + response.to_s
-            raise ex
-          end
-        else
-          response
-        end
-      end
-
-    end
-
-  end
+module SimpleWorker
 
-  class Service < Appoxy::Api::Client
+  class Service < SimpleWorker::Api::Client
 
     attr_accessor :config
 
@@ -223,7 +85,7 @@ module SimpleWorker
       gem_name =(gem_info[:require] || gem_info[:name].match(/^[a-zA-Z0-9\-_]+/)[0])
       puts "Searching for #{gem_name}..."
       searcher = Gem::GemPathSearcher.new
-      gems     = searcher.find_all(gem_name)
+      gems = searcher.find_all(gem_name)
 #      gems     = searcher.init_gemspecs.select { |gem| gem.name==gem_name }
       puts 'gems found=' + gems.inspect
       gems = gems.select { |g| g.version.version==gem_info[:version] } if gem_info[:version]
@@ -312,7 +174,7 @@ module SimpleWorker
           f.add(File.basename(m), m)
         end
         if merged_mailers && merged_mailers.size > 0
-         # puts " MERGED MAILERS" + merged_mailers.inspect
+          # puts " MERGED MAILERS" + merged_mailers.inspect
           merged_mailers.each do |mailer|
             SimpleWorker.logger.debug "Collecting mailer #{mailer[:name]}"
             f.add(File.basename(mailer[:filename]), mailer[:filename])
@@ -435,4 +297,4 @@ module SimpleWorker
 
   end
 
-end
+end

metadata

@@ -1,8 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: simple_worker
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.6.1
+  prerelease: false
+  segments: 
+  - 0
+  - 6
+  - 2
+  version: 0.6.2
 platform: ruby
 authors: 
 - Travis Reeder
@@ -10,27 +14,32 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-27 00:00:00 Z
+date: 2011-05-29 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: appoxy_api
+  name: zip
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.0.11
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: zip
+  name: rest-client
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
@@ -46,12 +55,14 @@ files:
 - lib/rails2_init.rb
 - lib/railtie.rb
 - lib/simple_worker.rb
+- lib/simple_worker/api.rb
 - lib/simple_worker/base.rb
 - lib/simple_worker/config.rb
 - lib/simple_worker/service.rb
 - lib/simple_worker/used_in_worker.rb
 - rails/init.rb
 - README.markdown
+has_rdoc: true
 homepage: http://github.com/appoxy/simple_worker
 licenses: []
 
@@ -65,17 +76,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: The official SimpleWorker gem for http://www.simpleworker.com