simple_worker 0.6.0 → 0.6.1

data/lib/simple_worker/service.rb

@@ -2,6 +2,9 @@ require 'base64'
 require 'logger'
 require 'appoxy_api'
 require 'zip'
+require 'rest_client'
+require 'json'
+
 module SimpleWorker
 
   @@logger = Logger.new(STDOUT)
@@ -15,6 +18,134 @@ module SimpleWorker
     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
+
+
+      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
+
   class Service < Appoxy::Api::Client
 
     attr_accessor :config
@@ -157,13 +288,13 @@ module SimpleWorker
       #File.open(fname2, "w") do |f|
       File.delete(fname2) if File.exist?(fname2)
       Zip::ZipFile.open(fname2, 'w') do |f|
-        if merged_gems
+        if merged_gems && merged_gems.size > 0
           merged_gems.each do |gem|
             next unless gem[:merge]
 #            puts 'gem=' + gem.inspect
             path = get_gem_path(gem)
             if path
-              puts "Collecting gem #{path}"
+              SimpleWorker.logger.debug "Collecting gem #{path}"
               Dir["#{path}/**/**"].each do |file|
 #                puts 'gem2=' + gem.inspect
                 zdest = "gems/#{gem[:name]}/#{file.sub(path+'/', '')}"
@@ -180,11 +311,10 @@ module SimpleWorker
 #          puts "merging #{m} into #{filename}"
           f.add(File.basename(m), m)
         end
-        puts "merge models - done"
-        if merged_mailers
-          puts " MERGED MAILERS" + merged_mailers.inspect
+        if merged_mailers && merged_mailers.size > 0
+         # puts " MERGED MAILERS" + merged_mailers.inspect
           merged_mailers.each do |mailer|
-            puts "Collecting mailer #{mailer[:name]}"
+            SimpleWorker.logger.debug "Collecting mailer #{mailer[:name]}"
             f.add(File.basename(mailer[:filename]), mailer[:filename])
             path = mailer[:path_to_templates]
             Dir["#{path}/**/**"].each do |file|
@@ -193,7 +323,6 @@ module SimpleWorker
             end
           end
         end
-        puts "merging templates - done"
       end
       fname2
     end

metadata

@@ -2,7 +2,7 @@
 name: simple_worker
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors: 
 - Travis Reeder
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-26 00:00:00 Z
+date: 2011-05-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: appoxy_api