appoxy_api 0.0.10 → 0.0.11

data/lib/api/client.rb

@@ -24,28 +24,37 @@ module Appoxy
         @secret_key = secret_key
       end
 
+      def process_ex(ex)
+        decoded_ex = ActiveSupport::JSON.decode(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 => ex
-#                    puts ex.http_body
-          raise "Bad Request: " + ActiveSupport::JSON.decode(ex.http_body)["msg"].to_s
+        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 => ex
-#                    puts ex.http_body
-          raise "Bad Request: " + ActiveSupport::JSON.decode(ex.http_body)["msg"].to_s
+        rescue RestClient::BadRequest, RestClient::InternalServerError => ex
+          process_ex(ex)
         end
-
       end
 
 
@@ -53,45 +62,39 @@ module Appoxy
         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 => ex
-#                    puts ex.http_body
-          raise "Bad Request: " + ActiveSupport::JSON.decode(ex.http_body)["msg"].to_s
+        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 => ex
-          raise "Bad Request: " + ActiveSupport::JSON.decode(ex.http_body)["msg"].to_s
+        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
+          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
@@ -103,13 +106,11 @@ module Appoxy
         return host
       end
 
-
       def headers
         user_agent = "Appoxy API Ruby Client"
         headers = {'User-Agent' => user_agent}
       end
 
-
       def parse_response(response, options={})
         unless options[:parse] == false
           begin
@@ -123,8 +124,6 @@ module Appoxy
         end
       end
 
-
     end
-
   end
 end

metadata

@@ -1,35 +1,44 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: appoxy_api
-version: !ruby/object:Gem::Version
-  version: 0.0.10
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 11
+  version: 0.0.11
 platform: ruby
-authors:
+authors: 
 - Travis Reeder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-03-06 00:00:00.000000000 -08:00
+
+date: 2011-03-24 00:00:00 -07:00
 default_executable: 
-dependencies:
-- !ruby/object:Gem::Dependency
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rest-client
-  requirement: &23295948 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *23295948
+  version_requirements: *id001
 description: Appoxy API Helper gem description...
 email: travis@appoxy.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.markdown
-files:
+files: 
 - lib/api/client.rb
 - lib/api/client_helper.rb
 - lib/api/signatures.rb
@@ -38,26 +47,34 @@ files:
 has_rdoc: true
 homepage: http://www.appoxy.com
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_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
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.6.0
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Appoxy API Helper gem
 test_files: []
+