business_insight_api_client 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a36aebe2079574cf93797fafe1f574030bae237
-  data.tar.gz: b4aef315a2dc3fec580eca5774e71a356f5bc485
+  metadata.gz: ef59f6b6787285076c903e5cee6acd0df94db21e
+  data.tar.gz: ac7856f65e8f8384cfaed30f7ac4f82a375caa14
 SHA512:
-  metadata.gz: 54d0bcf354e9e9419eeb4b5c74b61d42a68b1cee49dfd80971267cbe15284bfd33ce8a3636d00836155d42decb52eaba73f6d07b8450b8610b7b43f37eff3ae2
-  data.tar.gz: d22ca8f0beaa98423a5bde2f0c093f3376dade5c30860cdccac514e922942f88b35af62c97a56c25cebc0c30e2ede96c352aac26f6ed955a7076936bc0d078b4
+  metadata.gz: e326364678b9f2ad71258e7479c449c7f3cf50cb62fed8e451e08674f2d5e73bcc69ef9caab324a55940fb31eda9ab19c168b6e5f489291bc772ea9d0b7d6a2d
+  data.tar.gz: 1faacecb237f6d43c354977af171fade6a3aaf2e0442ce821ee4d472df31d2b8813eb085374584c4827681a516442295f62956c7b282695e25d136036d103e69

data/lib/business_insight_api_client/api/animals.rb

@@ -60,7 +60,7 @@ module BusinessInsightApiClient
       # @param [Hash] animal animal to be updated. See docs for parameters.
       # @return [BusinessInsightApiClient::Mash] response mash.
       # @see https://api.nedap-bi.com/api/docs/
-      def update_animal(animal_id,animal={})
+      def update_animal(animal_id, animal={})
         ::BusinessInsightApiClient::Mash.from_json client.put("/animals/#{animal_id}", animal.to_json)
       end
 

data/lib/business_insight_api_client/api/applications.rb

@@ -21,16 +21,16 @@ module BusinessInsightApiClient
         tokens = ::BusinessInsightApiClient::Mash.from_json client.get('/applications/access_tokens', header: client_credential_token.headers)
         expired_time = Time.now
         Hash[tokens.access_tokens.collect do |token|
-              [
-                  token.resource_owner_id,
-                  authorization.access_token_from_hash(
-                      token: token.token,
-                      expires_in: token.expires_in_seconds,
-                      expires_at: Time.now.to_i + token.expires_in_seconds,
-                      refresh_token: token.refresh_token
-                  )
-              ]
-            end]
+               [
+                   token.resource_owner_id,
+                   authorization.access_token_from_hash(
+                       token: token.token,
+                       expires_in: token.expires_in_seconds,
+                       expires_at: Time.now.to_i + token.expires_in_seconds,
+                       refresh_token: token.refresh_token
+                   )
+               ]
+             end]
 
       end
 

data/lib/business_insight_api_client/api/groups.rb

@@ -9,6 +9,7 @@ module BusinessInsightApiClient
       def groups
         ::BusinessInsightApiClient::Mash.from_json client.get('/groups')
       end
+
       # get: '/groups/:id'
       # @param [Integer] id group id
       # @see https://api.nedap-bi.com/api/docs/

data/lib/business_insight_api_client/client.rb

@@ -39,11 +39,11 @@ module BusinessInsightApiClient
     # @option options [String] :client_secret (BusinessInsightApiClient.client_secret) the client secret uses in OAuth authorization.
     def initialize(options = {})
       @options = options
-      @options[:api_url]              ||= BusinessInsightApiClient.api_url
-      @options[:authorization_url]    ||= BusinessInsightApiClient.authorization_url
-      @options[:content_type]         ||= BusinessInsightApiClient.default_content_type
-      @options[:client_id]            ||= BusinessInsightApiClient.client_id
-      @options[:client_secret]        ||= BusinessInsightApiClient.client_secret
+      @options[:api_url] ||= BusinessInsightApiClient.api_url
+      @options[:authorization_url] ||= BusinessInsightApiClient.authorization_url
+      @options[:content_type] ||= BusinessInsightApiClient.default_content_type
+      @options[:client_id] ||= BusinessInsightApiClient.client_id
+      @options[:client_secret] ||= BusinessInsightApiClient.client_secret
     end
 
     # Creates new or returns an existing Authorization helper.

data/lib/business_insight_api_client/helpers/authorization.rb

@@ -6,9 +6,9 @@ module BusinessInsightApiClient
     class Authorization
 
       DEFAULT_OPTIONS = {
-        authorization_url: 'https://nedap-bi.com',
-        client_id: '',
-        client_secret: ''
+          authorization_url: 'https://nedap-bi.com',
+          client_id: '',
+          client_secret: ''
       }
 
 
@@ -65,8 +65,8 @@ module BusinessInsightApiClient
       # @param [Hash] params additional params
       # @option params [String] :redirect_uri  the redirect uri to which the client has to be redirected to.
       # @param [Hash] options options
-      def auth_code_token_from_access_grant(access_grant, params={},options={})
-        oauth_client.auth_code.get_token(access_grant,params,options)
+      def auth_code_token_from_access_grant(access_grant, params={}, options={})
+        oauth_client.auth_code.get_token(access_grant, params, options)
       end
 
 

data/lib/business_insight_api_client/helpers/restclient.rb

@@ -10,8 +10,8 @@ module BusinessInsightApiClient
       include HTTPClient::Util
 
       DEFAULT_OPTIONS = {
-        api_url: 'https://api.nedap-bi.com',
-        default_content_type: 'application/json',
+          api_url: 'https://api.nedap-bi.com',
+          default_content_type: 'application/json',
       }
 
       API_VERSION_PATH = '/v1'
@@ -40,39 +40,60 @@ module BusinessInsightApiClient
       def get(path, *args, &block)
         build_path(path)
         begin
-          arguments = argument_to_hash(args,:query, :body, :header, :follow_redirect) || {}
-          arguments[:header] = access_token_header.merge(arguments[:header] || {})
-          response = client.request(:get, @base_uri.to_s, arguments, &block)
+          execute do
+            arguments = argument_to_hash(args, :query, :body, :header, :follow_redirect) || {}
+            arguments[:header] = access_token_header.merge(arguments[:header] || {})
+            client.request(:get, @base_uri.to_s, arguments, &block)
+          end
         rescue HTTPClient::TimeoutError
           raise ::BusinessInsightApiClient::Errors::RequestTimedOutError
         end
-        raise_errors(response)
-        response.body
+
       end
 
       def put(path, body = '')
         build_path(path)
-        response = client.put(@base_uri.to_s, body: body, header: { 'Content-Type' => content_type, 'Accept' => content_type}.merge(access_token_header))
-        raise_errors(response)
-        response.body
+        execute do
+          client.put(@base_uri.to_s, body: body, header: { 'Content-Type' => content_type, 'Accept' => content_type }.merge(access_token_header))
+        end
       end
 
       def post(path, body = '')
         build_path(path)
-        response = client.post(@base_uri.to_s, body: body, header: { 'Content-Type' => content_type, 'Accept' => content_type}.merge(access_token_header))
-        raise_errors(response)
-        response.body
+        execute do
+          client.post(@base_uri.to_s, body: body, header: { 'Content-Type' => content_type, 'Accept' => content_type }.merge(access_token_header))
+        end
       end
 
       def delete(path)
         build_path(path)
-        response = client.delete(@base_uri.to_s, header: access_token_header)
-        raise_errors(response)
-        response.body
+        execute do
+          client.delete(@base_uri.to_s, header: access_token_header)
+        end
       end
 
       private
 
+      # Executes an request and retries when an token could be expired.
+      # It refreshes the token before retrying.
+      #
+      # @return [String] the response. 
+      # @raise [::BusinessInsightApiClient::Errors] on request errors.
+      def execute
+        retries ||= 1
+        response = yield
+        raise_on_response_errors(response)
+      rescue ::BusinessInsightApiClient::Errors::UnauthorizedError => e
+        if (retries -= 1) >= 0
+          authorization.current_token = authorization.current_token.refresh!
+          retry
+        else
+          raise
+        end
+      else
+        response.body
+      end
+
       def access_token_header
         authorization.current_token_headers
       end
@@ -85,14 +106,14 @@ module BusinessInsightApiClient
         @client ||= HTTPClient.new
       end
 
-      def raise_errors(response)
+      def raise_on_response_errors(response)
         case response.status
           when 400
             response_body = BusinessInsightApiClient::Mash.from_json(response.body)
             raise ::BusinessInsightApiClient::Errors::BadRequestError.new(response.status, response_body), "(#{response.status}): #{[*response_body.messages].join(', ')}"
           when 401
             response_body = BusinessInsightApiClient::Mash.from_json(response.body)
-            raise ::BusinessInsightApiClient::Errors::UnauthorizedError.new(response.status,response_body),"(#{response.status}): #{[*response_body.messages].join(', ')}"
+            raise ::BusinessInsightApiClient::Errors::UnauthorizedError.new(response.status, response_body), "(#{response.status}): #{[*response_body.messages].join(', ')}"
           when 403
             response_body = BusinessInsightApiClient::Mash.from_json(response.body)
             raise ::BusinessInsightApiClient::Errors::ForbiddenError.new(response.status, response_body), "(#{response.status}): #{[*response_body.messages].join(', ')}"
@@ -102,7 +123,7 @@ module BusinessInsightApiClient
           when 500
             raise ::BusinessInsightApiClient::Errors::InternalError.new(response.status, response.reason), "#{response.code} : #{response.reason}"
           when 501..503
-            raise ::BusinessInsightApiClient::Errors::UnavailableError.new(response.status, response.reason),"#{response.code} : #{response.reason}"
+            raise ::BusinessInsightApiClient::Errors::UnavailableError.new(response.status, response.reason), "#{response.code} : #{response.reason}"
         end
       end
 

data/lib/business_insight_api_client/version.rb

@@ -1,3 +1,3 @@
 module BusinessInsightApiClient
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: business_insight_api_client
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Nedap
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-21 00:00:00.000000000 Z
+date: 2015-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json