Merge branch 'master' of github.com:zertico/api-client

Conflicts:
	lib/api-client/instance_methods.rb

lib/api-client.rb

@@ -27,5 +27,6 @@ def self.config
 
   configure do |config|
     config.path = ''
+    config.header = { 'Content-Type' => 'application/json' }
   end
 end

lib/api-client/class_methods.rb

@@ -73,6 +73,10 @@ def delete(id, header = {})
       build(params)
     end
 
+    # Removes the root node attribute if found.
+    #
+    # @param [Hash] attributes the hash with attributes.
+    # @return [Hash] the hash with attributes without the root node.
     def remove_root(attributes = {})
       attributes = attributes[self.root_node.to_sym] if attributes.key?(self.root_node.to_sym)
       attributes = attributes[self.root_node.to_s] if attributes.key?(self.root_node.to_s)

lib/api-client/dispatcher/typhoeus.rb

@@ -8,7 +8,7 @@ module ApiClient::Dispatcher::Typhoeus
   # @param [Hash] header attributes of the request.
   # @return [Typhoeus::Request] the response object.
   def self.get(url, header = {})
-    ::Typhoeus::Request.get(url, :headers => ApiClient.config.header.merge(header))
+    ::Typhoeus.get(url, :headers => ApiClient.config.header.merge(header))
   end
 
   # Make a post request and returns it.
@@ -18,7 +18,7 @@ def self.get(url, header = {})
   # @param [Hash] header attributes of the request.
   # @return [Typhoeus::Request] the response object.
   def self.post(url, args, header = {})
-    ::Typhoeus::Request.post(url, :body => args, :headers => ApiClient.config.header.merge(header))
+    ::Typhoeus.post(url, :body => args, :headers => ApiClient.config.header.merge(header))
   end
 
   # Make a put request and returns it.
@@ -28,7 +28,7 @@ def self.post(url, args, header = {})
   # @param [Hash] header attributes of the request.
   # @return [Typhoeus::Request] the response object.
   def self.put(url, args, header = {})
-    ::Typhoeus::Request.put(url, :body => args, :headers => ApiClient.config.header.merge(header))
+    ::Typhoeus.put(url, :body => args, :headers => ApiClient.config.header.merge(header))
   end
 
   # Make a patch request and returns it.
@@ -38,7 +38,7 @@ def self.put(url, args, header = {})
   # @param [Hash] header attributes of the request.
   # @return [Typhoeus::Request] the response object.
   def self.patch(url, args, header = {})
-    ::Typhoeus::Request.patch(url, :body => args, :headers => ApiClient.config.header.merge(header))
+    ::Typhoeus.patch(url, :body => args, :headers => ApiClient.config.header.merge(header))
   end
 
   # Make a delete request and returns it.
@@ -47,6 +47,6 @@ def self.patch(url, args, header = {})
   # @param [Hash] header attributes of the request.
   # @return [Typhoeus::Request] the response object.
   def self.delete(url, header = {})
-    ::Typhoeus::Request.delete(url, :headers => ApiClient.config.header.merge(header))
+    ::Typhoeus.delete(url, :headers => ApiClient.config.header.merge(header))
   end
 end

lib/api-client/instance_methods.rb

@@ -3,7 +3,7 @@ module ApiClient
   module InstanceMethods
     # Update an object based on a hash of attributes.
     #
-    # @param [Hash] params hash of attributes.
+    # @param [Hash] attributes hash of attributes.
     # @return [Base] the update_attributes object.
     def update_attributes(attributes)
       hash = remove_root(attributes)
@@ -14,41 +14,65 @@ def update_attributes(attributes)
       self
     end
 
+    # Make a get requisition and update the object with the response.
+    #
+    # @param [Hash] header hash with the header options.
+    # @return [Base] the object updated.
     def get(header = {})
       url = "#{ApiClient.config.path}#{self.class.resource_path}/#{id}"
       response = ApiClient::Dispatcher.get(url, header)
       attributes = ApiClient::Parser.response(response, url)
       update_attributes(attributes)
     end
 
+    # Make a post requisition and update the object with the response.
+    #
+    # @param [Hash] header hash with the header options.
+    # @return [Base] the object updated.
     def post(header = {})
       url = "#{ApiClient.config.path}#{self.class.resource_path}"
       response = ApiClient::Dispatcher.post(url, self.to_hash, header)
       attributes = ApiClient::Parser.response(response, url)
       update_attributes(attributes)
     end
 
+    # Make a put requisition and update the object with the response.
+    #
+    # @param [Hash] header hash with the header options.
+    # @return [Base] the object updated.
     def put(header = {})
       url = "#{ApiClient.config.path}#{self.class.resource_path}"
       response = ApiClient::Dispatcher.put(url, self.to_hash, header)
       attributes = ApiClient::Parser.response(response, url)
       update_attributes(attributes)
     end
 
+    # Make a patch requisition and update the object with the response.
+    #
+    # @param [Hash] header hash with the header options.
+    # @return [Base] the object updated.
     def patch(header = {})
       url = "#{ApiClient.config.path}#{self.class.resource_path}"
-      response = ApiClient::Dispatcher.post(url, self.to_hash, header)
+      response = ApiClient::Dispatcher.patch(url, self.to_hash, header)
       attributes = ApiClient::Parser.response(response, url)
       update_attributes(attributes)
     end
 
+    # Make a delete requisition and update the object with the response.
+    #
+    # @param [Hash] header hash with the header options.
+    # @return [Base] the object updated.
     def delete(header = {})
       url = "#{ApiClient.config.path}#{self.class.resource_path}/#{id}"
-      response = ApiClient::Dispatcher.post(url, header)
+      response = ApiClient::Dispatcher.delete(url, header)
       attributes = ApiClient::Parser.response(response, url)
       update_attributes(attributes)
     end
 
+    # Removes the root node attribute if found.
+    #
+    # @param [Hash] attributes the hash with attributes.
+    # @return [Hash] the hash with attributes without the root node.
     def remove_root(attributes = {})
       attributes = attributes[self.class.root_node.to_sym] if attributes.key?(self.class.root_node.to_sym)
       attributes = attributes[self.class.root_node.to_s] if attributes.key?(self.class.root_node.to_s)