rest-api-client 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4362dca96fd11280131e0db43bb36aca549c118d
-  data.tar.gz: d6f0dcddcca97eafcf0c98ff8ecf563f0d35f3e1
+  metadata.gz: 77c312be58c3857739624d8ed5d3db9c2216705d
+  data.tar.gz: 6ff9f71b15e12ddda09139dfb7659c9aae731747
 SHA512:
-  metadata.gz: ad0493709c322a34d167c72741c1df4eae1042e4ef602fe3d0d9599d0587b9d7ab73dbc1e23292a6f24f761a5b9a0addaa96636b8f8ca8b875fd3a696dda5970
-  data.tar.gz: 6d3133951d53dafc8b9a5d1d0a61a3ace4f1a2d4d4f92a3d1142594a62feefc7220437cbce07e824323932aaf161f29d6ffae109b2a8ac970ddbd8415d0fb83e
+  metadata.gz: 31ab1acf51e92df58ccac8f6c881f935551bb6fc44d9699903b290b3d1f7bd94f984586a46a50e176971ac27ca418a3e08a696461c881ef272c609540522550f
+  data.tar.gz: b4233d76a0a9130df98e261cb1677fcec91bafc231661b22c6cf4300390ab397b89df969aec071236f38b91c8d750e7114f3ed52be7d9073c8059123eba87b79

data/README.md

@@ -1,4 +1,7 @@
 # RestApiClient
+
+[![Gem Version](https://badge.fury.io/rb/rest-api-client.svg)](http://badge.fury.io/rb/rest-api-client)
+
 [![Build Status](https://travis-ci.org/victor0402/rest-api-client.svg?branch=master)](https://travis-ci.org/victor0402/rest-api-client)
 
 Common classes and methods to handle rest communication

data/lib/rest/api/client/config.rb

@@ -4,7 +4,6 @@ module RestApiClient
 
   # Configuration defaults
   @config = {
-      :log_level => 'verbose',
       :service_key => ''
   }
 
@@ -13,17 +12,28 @@ module RestApiClient
     opts.each { |k, v| @config[k.to_sym] = v }
   end
 
+  # Configure the authorization_key for one client
+  def self.configure_authorization(client_name, auth_key)
+    @config['authorization'] ||= {}
+    @config['authorization'][client_name] = auth_key
+  end
+
+  def self.get_auth_key(client_name)
+    @config['authorization'] ||= {}
+    @config['authorization'][client_name]
+  end
+
   # Configure through yaml file
   def self.configure_with(path_to_yaml_file)
     begin
       config = YAML::load(IO.read(path_to_yaml_file))
+      configure(config)
     rescue Errno::ENOENT
-      log(:warning, "YAML configuration file couldn't be found. Using defaults."); return
+      RestApiClient.logger.warn("YAML configuration file couldn't be found. Using defaults.");
     rescue Psych::SyntaxError
-      log(:warning, 'YAML configuration file contains invalid syntax. Using defaults.'); return
+      RestApiClient.logger.warn('YAML configuration file contains invalid syntax. Using defaults.');
     end
 
-    configure(config)
   end
 
   def self.config

data/lib/rest/api/client/json_parser.rb

@@ -3,24 +3,28 @@ require 'json'
 module RestApiClient
 
   def self.parse_json(json, opts = {})
-    json_response = JSON.parse json
+    begin
+      json_response = JSON.parse json
 
-    data_type = opts[:type]
+      data_type = opts[:type]
 
-    json_data = {}
-    if json_response.kind_of?(Hash) && json_response.has_key?('data')
-      json_data = json_response['data']
-    end
+      json_data = {}
+      if json_response.kind_of?(Hash) && json_response.has_key?('data')
+        json_data = json_response['data']
+      end
 
-    if json_data.kind_of?(Array) && data_type
-      return json_data.map { |data| data_type.new data }
-    elsif json_data.kind_of?(Hash) && data_type
-      return data_type.new json_data
-    else
-      return json_data unless json_data.empty?
-    end
+      if json_data.kind_of?(Array) && data_type
+        return json_data.map { |data| data_type.new data }
+      elsif json_data.kind_of?(Hash) && data_type
+        return data_type.new json_data
+      else
+        return json_data unless json_data.empty?
+      end
+      return json_response
 
-    json_response
+    rescue Exception => e
+      return (opts[:default_return] || nil)
+    end
   end
 
 end

data/lib/rest/api/client/logger.rb

@@ -0,0 +1,10 @@
+module RestApiClient
+
+  def self.logger
+    @@logger ||= defined?(Rails) ? Rails.logger : Logger.new(STDOUT)
+  end
+
+  def self.logger=(logger)
+    @@logger = logger
+  end
+end

data/lib/rest/api/client/request_handler.rb

@@ -1,38 +1,59 @@
 require 'rest-client'
 require 'json'
 require 'redis'
+require 'addressable/uri'
 
 module RestApiClient
 
   class RequestsHandler
 
-    def self.perform_get(service_key, path, args = {:params => {}})
-      RestClient.get(get_service_url(service_key) + path, args[:params]) { |response, request, result, &block|
-        get_response_callback(args).call(response, request, result, &block)
-      }
+    def self.perform_get(service_key, path, args = {:params => {}}, headers = {})
+      self.do_request_without_payload('get', service_key, path, args, headers)
     end
 
-    def self.perform_post(service_key, path, args = {})
-      RestClient.post(get_service_url(service_key) + path, args[:params]) { |response, request, result, &block|
-        get_response_callback(args).call(response, request, result, &block)
-      }
+    def self.perform_delete(service_key, path, args = {:params => {}}, headers = {})
+      self.do_request_without_payload('delete', service_key, path, args, headers)
     end
 
-    def self.perform_put(service_key, path, args = {})
-      RestClient.put(get_service_url(service_key) + path, args[:params]) { |response, request, result, &block|
+    def self.perform_post(service_key, path, args = {:params => {}}, headers = {})
+      self.do_request_with_payload('post', service_key, path, args, headers)
+    end
+
+    def self.perform_put(service_key, path, args = {:params => {}}, headers = {})
+      self.do_request_with_payload('put', service_key, path, args, headers)
+    end
+
+    def self.do_request_with_payload(method, service_key, path, args = {:params => {}}, headers = {})
+      headers = treat_header headers, service_key
+      url = get_service_url(service_key) + path
+
+      res = RestClient::Resource.new(url)
+      res.method(method).call(args[:params], headers) { |response, request, result, &block|
         get_response_callback(args).call(response, request, result, &block)
       }
     end
 
-    def self.perform_delete(service_key, path, args = {})
-      RestClient.delete(get_service_url(service_key) + path, args[:params]) { |response, request, result, &block|
+    def self.do_request_without_payload(method, service_key, path, args = {:params => {}}, headers = {})
+      headers = treat_header headers, service_key
+      url = get_service_url(service_key) + path + '?' + params_to_query(args[:params])
+
+      res = RestClient::Resource.new(url)
+      res.method(method).call(headers) { |response, request, result, &block|
         get_response_callback(args).call(response, request, result, &block)
       }
     end
 
+    def self.treat_header(headers, service_key)
+      authorization_key = RestApiClient.get_auth_key service_key
+      if authorization_key
+        headers = headers.merge(:Authorization => authorization_key)
+      end
+      headers
+    end
+
     def self.get_service_url(service_key)
       redis = Redis.new
-      path = redis.get service_key
+      path = redis.get "#{service_key}.url"
       raise RestApiClient::ServiceUrlException.new('You must need to set the service key') unless path
       path << '/' unless path.end_with?('/')
       path
@@ -46,10 +67,24 @@ module RestApiClient
         elsif [301, 302, 307].include? response.code
           response.follow_redirection(request, result, &block)
 
+        elsif response.code == 401
+          raise RestApiClient::UnauthorizedException.new RestApiClient.parse_json response
+
+        elsif response.code >= 400 && response.code < 500
+          response = RestApiClient.parse_json response
+          message = response.has_key?('message') ? response['message'] : ''
+          raise RestApiClient::ModelErrorsException.new message
+
         else
           response.return!(request, result, &block)
         end
       end
     end
+
+    def self.params_to_query(params)
+      uri = Addressable::URI.new
+      uri.query_values = params
+      uri.query || ''
+    end
   end
 end

data/lib/rest/api/client/version.rb

@@ -1,3 +1,3 @@
 module RestApiClient
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/lib/rest/api/client.rb

@@ -1,8 +1,11 @@
 require 'virtus'
 require 'rest/api/client/version'
+require 'rest/api/client/logger'
 require 'rest/api/client/json_parser'
 require 'rest/api/client/config'
 require 'rest/api/exceptions/service_url_exception'
+require 'rest/api/exceptions/unauthorized_exception'
+require 'rest/api/exceptions/model_errors_exception'
 require 'rest/api/client/request_handler'
 
 module RestApiClient
@@ -30,7 +33,9 @@ module RestApiClient
     end
 
     def save!
-      perform_post path, {:type => self, :params => self.attributes}
+      klazz = self.class
+      response = perform_post path, {:type => klazz, :params => {get_model_name => self.attributes}}
+      self.attributes = response && response.is_a?(klazz) ? response.attributes : {}
     end
 
     def delete
@@ -38,27 +43,35 @@ module RestApiClient
     end
 
     def update!
-      perform_put "#{path}/#{id}", {:type => self, :params => self.attributes}
+      perform_put "#{path}/#{id}", {:type => self.class, :params => self.attributes}
     end
 
-    def perform_get(path, args = {})
-      RequestsHandler.perform_get(service_key, path, args)
+    def perform_get(path, args = {}, headers = {})
+      RequestsHandler.perform_get(service_key, path, args, headers)
     end
 
-    def perform_post(path, args = {})
-      RequestsHandler.perform_post(service_key, path, args)
+    def perform_post(path, args = {}, headers = {})
+      RequestsHandler.perform_post(service_key, path, args, headers)
     end
 
-    def perform_put(path, args = {})
-      RequestsHandler.perform_put(service_key, path, args)
+    def perform_put(path, args = {}, headers = {})
+      RequestsHandler.perform_put(service_key, path, args, headers)
     end
 
-    def perform_delete(path, args = {})
-      RequestsHandler.perform_delete(service_key, path, args)
+    def perform_delete(path, args = {}, headers = {})
+      RequestsHandler.perform_delete(service_key, path, args, headers)
     end
 
-    def self.perform_get(path, args = {})
-      RequestsHandler.perform_get(service_key, path, args)
+    def self.perform_get(path, args = {}, headers = {})
+      RequestsHandler.perform_get(service_key, path, args, headers)
+    end
+
+    def get_model_name
+      self.class.name.split('::').last.downcase
+    end
+
+    def self.get_model_name
+      self.name.split('::').last.downcase
     end
 
     # default service_key to instance methods

data/lib/rest/api/exceptions/model_errors_exception.rb

@@ -0,0 +1,11 @@
+module RestApiClient
+  class ModelErrorsException < StandardError
+
+    attr_accessor :errors
+    
+    def initialize(errors)
+      super 'Bad request'
+      @errors = errors
+    end
+  end
+end

data/lib/rest/api/exceptions/unauthorized_exception.rb

@@ -0,0 +1,11 @@
+module RestApiClient
+  class UnauthorizedException < StandardError
+
+    attr_accessor :errors
+
+    def initialize(errors)
+      super 'You are not allowed to perform this action. Maybe you forgot to pass the authorization token?'
+      @errors = errors
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest-api-client
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Victor
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-02 00:00:00.000000000 Z
+date: 2015-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -155,9 +155,12 @@ files:
 - lib/rest/api/client.rb
 - lib/rest/api/client/config.rb
 - lib/rest/api/client/json_parser.rb
+- lib/rest/api/client/logger.rb
 - lib/rest/api/client/request_handler.rb
 - lib/rest/api/client/version.rb
+- lib/rest/api/exceptions/model_errors_exception.rb
 - lib/rest/api/exceptions/service_url_exception.rb
+- lib/rest/api/exceptions/unauthorized_exception.rb
 - rest-api-client.gemspec
 homepage: https://github.com/victor0402/rest-api-client
 licenses: