fanforce 0.5.8 → 0.5.9

data/lib/fanforce/errors.rb

@@ -4,7 +4,7 @@ class Fanforce
   class Error < StandardError
     attr_accessor :path, :query_params, :request, :response, :request_url, :http_status
 
-    def initialize(response, request, path, query_params)
+    def initialize(request, response, path, query_params)
       @query_params = query_params
       @path = path
       @request = request
@@ -47,9 +47,9 @@ class Fanforce
 
   class UnknownError             < Error
     def code; @http_status ||= 500; 500 end
-    def initialize(response, request, path, query_params)
+    def initialize(request, response, path, query_params)
       @http_status = response.code
-      super(response, request, path, query_params)
+      super(request, response, path, query_params)
     end
   end
 end

data/lib/fanforce/main.rb

@@ -25,8 +25,8 @@ class Fanforce
 
   def get(path, req_params={})
     req_params = apply_auth(req_params)
-    RestClient.get(url(path, req_params), :accept => :json) do |response, request, result, &block|
-      Fanforce::Response.new(response, request, complete_url(path), req_params)
+    RestClient.get(url(path, req_params), :accept => :json) do |request, response, result, &block|
+      Fanforce::Response.new(request, response, complete_url(path), req_params)
     end
   end
 
@@ -43,24 +43,24 @@ class Fanforce
   def post(path, req_params={})
     url = complete_url(path)
     req_params = apply_auth(req_params)
-    RestClient.post(url, req_params.to_json, :content_type => :json, :accept => :json) do |response, request, result, &block|
-      Fanforce::Response.new(response, request, url, req_params)
+    RestClient.post(url, req_params.to_json, :content_type => :json, :accept => :json) do |request, response, result, &block|
+      Fanforce::Response.new(request, response, url, req_params)
     end
   end
 
   def put(path, req_params={})
     url = complete_url(path)
     req_params = apply_auth(req_params)
-    RestClient.put(url, req_params.to_json, :content_type => :json, :accept => :json) do |response, request, result, &block|
-      Fanforce::Response.new(response, request, url, req_params)
+    RestClient.put(url, req_params.to_json, :content_type => :json, :accept => :json) do |request, response, result, &block|
+      Fanforce::Response.new(request, response, url, req_params)
     end
   end
 
   def delete(path, req_params={})
     url = complete_url(path)
     req_params = apply_auth(req_params)
-    RestClient.delete(url, {:params => to_query_string(req_params), :accept => :json}) do |response, request, result, &block|
-      Fanforce::Response.new(response, request, url, req_params)
+    RestClient.delete(url, {:params => to_query_string(req_params), :accept => :json}) do |request, response, result, &block|
+      Fanforce::Response.new(request, response, url, req_params)
     end
   end
 

data/lib/fanforce/response.rb

@@ -1,42 +1,46 @@
 class Fanforce::Response
+  attr_reader :curl_command, :request_url, :response_body, :response_json
 
-  def initialize(response, request, url, req_params)
+  def initialize(request, response, url, req_params)
     case response.code
       when 200, 201
         begin
-          @raw_response = Fanforce::Utils.decode_json(response)
-          if !@raw_response[:results].nil?
-            @results = @raw_response[:results]
-            @current_results = @raw_response[:current_results]
-            @total_results = @raw_response[:total_results]
-            @current_page = @raw_response[:current_page]
-            @total_pages = @raw_response[:total_pages]
-            if request.method == :get and @raw_response[:total_pages] > @raw_response[:current_page]
-              next_page = @raw_response[:current_page] + 1
+          @response_body = response.to_s
+          @response_json = Fanforce::Utils.decode_json(response)
+          @curl_command = Fanforce::Utils.curl_command(request.method, url, req_params)
+          @request_url = url
+          if !@response_json[:results].nil?
+            @results = @response_json[:results]
+            @current_results = @response_json[:current_results]
+            @total_results = @response_json[:total_results]
+            @current_page = @response_json[:current_page]
+            @total_pages = @response_json[:total_pages]
+            if request.method == :get and @response_json[:total_pages] > @response_json[:current_page]
+              next_page = @response_json[:current_page] + 1
               @next_url = "#{url}?#{Fanforce::Utils.to_query_string(req_params.merge(page: next_page))}"
             end
-            if request.method == :get and @raw_response[:current_page] > 1
-              prev_page = @raw_response[:current_page] - 1
+            if request.method == :get and @response_json[:current_page] > 1
+              prev_page = @response_json[:current_page] - 1
               @prev_url = "#{url}?#{Fanforce::Utils.to_query_string(req_params.merge(page: prev_page))}"
             end
           else
-            @result = @raw_response
+            @result = @response_json
           end
         rescue
           raise
         end
       when 400
-        raise Fanforce::BadRequestError.new(response, request, url, req_params)
+        raise Fanforce::BadRequestError.new(request, response, url, req_params)
       when 401
-        raise Fanforce::Unauthorized.new(response, request, url, req_params)
+        raise Fanforce::Unauthorized.new(request, response, url, req_params)
       when 403
-        raise Fanforce::ForbiddenError.new(response, request, url, req_params)
+        raise Fanforce::ForbiddenError.new(request, response, url, req_params)
       when 404
-        raise Fanforce::NotFoundError.new(response, request, url, req_params)
+        raise Fanforce::NotFoundError.new(request, response, url, req_params)
       when 422
-        raise Fanforce::UnprocessableEntityError.new(response, request, url, req_params)
+        raise Fanforce::UnprocessableEntityError.new(request, response, url, req_params)
       else
-        raise Fanforce::UnknownError.new(response, request, url, req_params)
+        raise Fanforce::UnknownError.new(request, response, url, req_params)
     end
     response
   end
@@ -46,11 +50,11 @@ class Fanforce::Response
   end
 
   def to_hash
-    @raw_response
+    @response_json
   end
 
   def [](key)
-    @raw_response[key]
+    @response_json[key]
   end
 
   def result

data/lib/fanforce/version.rb

@@ -1,3 +1,3 @@
 class Fanforce
-  VERSION = '0.5.8'
+  VERSION = '0.5.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fanforce
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.9
   prerelease: 
 platform: ruby
 authors: