fanforce-api 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e817a09166ee9f545d0cbef8e66eac06d1564813
-  data.tar.gz: 6423c94330ee17be6fda05f32133806261bf65aa
+  metadata.gz: c9b535f477646e92ddfa34e2e36a462e68ee2ec0
+  data.tar.gz: 5b85e380606cf373c51327c648013b46537fb108
 SHA512:
-  metadata.gz: 3c158ba89daf5186daf1271cb8e29fbc559f22f1d2e509272349ff8326cf4055c4ed0f47c23a29fb1b6d386b9746a9816c60ccb9d9030f7ce35b5c2377b97383
-  data.tar.gz: f195a6913fb4f975061327fbb51af96213ce389640a5ada01b06959a1f7494e098cb44756996658845ac3c5ee34f7e96e54c90c43cd49d7c0c157d15cb87f8de
+  metadata.gz: c2eef5909f1c911e5f8315bc260a774a35ff8a6ab3a5c6c4200941052299a1df50459b532b81f4df84a655f9d2b31a1677bff54ce0837eb6a62c9f8f447eef10
+  data.tar.gz: 80042227d65414eeded7a377c51defa749ba220e8f17b61d6184b0ed77832370bc4593438a6707a18c89aab410dd2e62449a0037164f51d0373cc642bd4d0cb2

data/lib/fanforce/api/errors/server.rb

@@ -14,7 +14,7 @@ class Fanforce::API::Error::Server < Fanforce::API::Error
       @errors = [{message: "(Response body from #{response.code} error was empty: #{response.body})"}]
     end
 
-    super(response.to_s, response, request, requested_url, requested_params)
+    super(@errors[0][:message], response, request, requested_url, requested_params)
   end
 
   def to_hash

data/lib/fanforce/api/main.rb

@@ -10,15 +10,6 @@ class Fanforce::API
     set_auth(auth_data) if auth_data
   end
 
-  # Get the raw url for a request
-  # @param path [String]
-  # @param req_params [Hash]
-  # @return [String] url
-  def raw_url(path, req_params={})
-    req_params = inject_auth_params(req_params)
-    "#{complete_url(path)}?#{to_query_string(req_params) if req_params.size > 0}"
-  end
-
   # Get the CURL command for a request
   # @param method [Symbol] (get/post/put/delete)
   # @param path [String]
@@ -26,7 +17,7 @@ class Fanforce::API
   # @return [String] curl command
   def curl_command(method, path, params={})
     params = inject_auth_params(params)
-    Fanforce.curl_command(method, complete_url(path), params)
+    Fanforce.curl_command(method, request_url(path), params)
   end
 
   # Handles a GET request for Fanforce API
@@ -35,8 +26,8 @@ class Fanforce::API
   # @return [Fanforce::API::Response]
   def get(path, params={})
     params = inject_auth_params(params)
-    RestClient.get(url(path, params), :accept => :json) do |response, request, result, &block|
-      Fanforce::API::Response.process(response, request, complete_url(path), params)
+    RestClient.get(request_url(path, params), :accept => :json) do |response, request, result, &block|
+      Fanforce::API::Response.process(response, request, request_url(path), params)
     end
   end
 
@@ -45,7 +36,7 @@ class Fanforce::API
   # @param params [Hash]
   # @return [Fanforce::API::Response]
   def post(path, params={}, retries=0)
-    url = complete_url(path)
+    url = request_url(path)
     params = inject_auth_params(params) unless retries > 0
     RestClient.post(url, MultiJson.dump(params), :content_type => :json, :accept => :json) do |response, request, result, &block|
       if response.code == 400 and response.body == '{"error":"Invalid JSON"}' and retries <= 2
@@ -62,7 +53,7 @@ class Fanforce::API
   # @param params [Hash]
   # @return [Fanforce::API::Response]
   def put(path, params={}, retries=0)
-    url = complete_url(path)
+    url = request_url(path)
     params = inject_auth_params(params) unless retries > 0
     RestClient.put(url, MultiJson.dump(params), :content_type => :json, :accept => :json) do |response, request, result, &block|
       if response.code == 400 and response.body == '{"error":"Invalid JSON"}' and retries <= 2
@@ -79,9 +70,9 @@ class Fanforce::API
   # @param params [Hash]
   # @return [Fanforce::API::Response]
   def delete(path, params={})
-    url = complete_url(path)
+    url = request_url(path)
     params = inject_auth_params(params)
-    RestClient.delete(url(path, params), :accept => :json) do |response, request, result, &block|
+    RestClient.delete(request_url(path, params), :accept => :json) do |response, request, result, &block|
       Fanforce::API::Response.process(response, request, url, params)
     end
   end
@@ -123,8 +114,9 @@ class Fanforce::API
     params.merge(@auth_params || {})
   end
 
-  def complete_url(path)
-    'http://' + Fanforce.api_domain + path
+  def request_url(path, params={})
+    params = inject_auth_params(params)
+    "http://#{Fanforce.api_domain}#{path}#{'?'+to_query_string(params) if params.size > 0}"
   end
 
 end

data/lib/fanforce/api/version.rb

@@ -1,5 +1,5 @@
 class Fanforce
   class API
-    VERSION = '1.0.3'
+    VERSION = '1.0.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fanforce-api
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Caleb Clark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-26 00:00:00.000000000 Z
+date: 2014-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client