appoxy_api 0.0.3 → 0.0.5

data/lib/api/api_controller.rb

@@ -15,7 +15,7 @@ module Appoxy
 
             def verify_signature
 
-                if request.put?
+                if request.put? || request.post?
                     # We'll extract params from body instead here
                     # todo: maybe check for json format first in case this is a file or something?
                     body = request.body.read

data/lib/api/client.rb

@@ -1,6 +1,8 @@
 module Appoxy
     module Api
 
+        require 'rest_client'
+
         # Subclass must define:
         #  host: endpoint url for service
         class Client
@@ -14,20 +16,70 @@ module Appoxy
             end
 
             def get(method, params={}, options={})
-                parse_response ClientHelper.run_http(host, access_key, secret_key, :get, method, nil, params)
+                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)
+                rescue RestClient::BadRequest => ex
+#                    puts ex.http_body
+                    raise "Bad Request: " + ActiveSupport::JSON.decode(ex.http_body)["msg"].to_s
+                end
             end
 
             def post(method, params={}, options={})
-               parse_response ClientHelper.run_http(host, access_key, secret_key, :post, method, nil, params)
+                begin
+                    parse_response RestClient.post(url(method), add_params(method, params).to_json, headers)
+                    #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
+                end
+
             end
 
             def put(method, body, options={})
-                parse_response ClientHelper.run_http(host, access_key, secret_key, :put, method, body, nil)
+                begin
+                    parse_response RestClient.put(url(method), add_params(method, body).to_json, headers)
+                    #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
+                end
+            end
+
+            def url(command_path)
+                url = host + command_path
+                url
+            end
+
+            def add_params(command_path, hash)
+                ts = Appoxy::Api::Signatures.generate_timestamp(Time.now.gmtime)
+                # puts 'timestamp = ' + ts
+                sig = Appoxy::Api::Signatures.generate_signature(command_path, ts, secret_key)
+
+                extra_params = {'sigv'=>"0.1", '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)
                 begin
-                    return ActiveSupport::JSON.decode(response)
+                    return ActiveSupport::JSON.decode(response.to_s)
                 rescue => ex
                     puts 'response that caused error = ' + response.to_s
                     raise ex

data/lib/api/client_helper.rb

@@ -1,87 +1,10 @@
 module Appoxy
     module Api
-        module ClientHelper
-
-            # TODO: SWAP OUT ALL THIS CRAP AND USE REST-CLIENT INSTEAD
-
-            # body is a hash
-            def self.run_http(host, access_key, secret_key, http_method, command_path, body=nil, parameters={}, extra_headers=nil)
-                ts = Appoxy::Api::Signatures.generate_timestamp(Time.now.gmtime)
-                # puts 'timestamp = ' + ts
-                sig = Appoxy::Api::Signatures.generate_signature(command_path, ts, secret_key)
-                # puts "My signature = " + sig
-                url = host + command_path
-                # puts url
-
-                user_agent = "Appoxy API Ruby Client"
-                headers = {'User-Agent' => user_agent}
-
-                if !extra_headers.nil?
-                    extra_headers.each_pair do |k, v|
-                        headers[k] = v
-                    end
-                end
 
-                extra_params = {'sigv'=>"0.1", 'sig' => sig, 'timestamp' => ts, 'access_key' => access_key}
-                if http_method == :put
-                    body.update(extra_params)
-                else
-                    parameters = {} if parameters.nil?
-                    parameters.update(extra_params)
-#                puts 'params=' + parameters.inspect
+        require 'rest_client'
 
-                end
-
-
-                uri = URI.parse(url)
-                #puts 'body=' + body.to_s
-                if (http_method == :put)
-                    req = Net::HTTP::Put.new(uri.path)
-                    body = ActiveSupport::JSON.encode(body)
-                    req.body = body unless body.nil?
-                elsif (http_method == :post)
-                    req = Net::HTTP::Post.new(uri.path)
-                    if !parameters.nil?
-                        req.set_form_data(parameters)
-                    else
-                        req.body = body unless body.nil?
-                    end
-                elsif (http_method == :delete)
-                    req = Net::HTTP::Delete.new(uri.path)
-                    if !parameters.nil?
-                        req.set_form_data(parameters)
-                    end
-                else
-                    req = Net::HTTP::Get.new(uri.path)
-                    if !parameters.nil?
-                        req.set_form_data(parameters)
-                    end
-                end
-                headers.each_pair do |k, v|
-                    req[k] = v
-                end
-                # req.each_header do |k, v|
-                # puts 'header ' + k + '=' + v
-                #end
-                res = Net::HTTP.start(uri.host, uri.port) do |http|
-                    http.request(req)
-                end
-
-                ret = ''
-                case res
-                    when Net::HTTPSuccess
-                        # puts 'response body=' + res.body
-                        ret = res.body
-                    when Net::HTTPClientError
-                        raise ClientError.new(res.class.name, ActiveSupport::JSON.decode(res.body))
-                    else
-                        #res.error
-                        puts 'ERROR BODY=' + res.body
-                        raise ServiceError.new(res.class.name, res.body)
-                end
-                return ret
+        module ClientHelper
 
-            end
 
         end
 
@@ -107,4 +30,3 @@ module Appoxy
         end
     end
 end
-	

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Travis Reeder
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-08 00:00:00 -07:00
+date: 2010-04-17 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency