finapps 0.1.10.pre → 0.1.11.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9bb9c1f912e72afc9a3b0b8c72e1f8285df32a7
-  data.tar.gz: 7047152f6c890bd120dc1e0cd1ef4ce76f393e09
+  metadata.gz: 53f9ba3a47f60be7a1331b950167d75dfc035840
+  data.tar.gz: ecb81f293534522901e6227f5d2a9133c7b8b858
 SHA512:
-  metadata.gz: 1739253c2b1d1c9420ceb99c486ea5d30f64763552d221fc41c015649a7a45c6b219d36159ef4906294044f73258c23e196cf3e2f3e205c2c7ef6c76f271897e
-  data.tar.gz: 445c302fe03d7727540fbd58e7bab99d4b6e3a5408adfe2a91ae5233f66d910f38808c59a77f9520aa1ab3ec35ba51b0c81431d6b4073ee10f66f52980c3ec77
+  metadata.gz: 1fa4e903b29d153006651bea2983304af2bac2e1bda130ea5e7f914be21a809c0791905288b97c0136487c345aa5dbc22e9c5c64194d3eb8262ad548e3fa86c4
+  data.tar.gz: 9cfb4694e3b0e44b3358f85f9d3938155053872b1f44e0ae1fc0fc66611f1a050761e5cb9d0630496c5cdd19a9ecb19402afa18fdf96838da3c422875f8fb64d

data/lib/finapps/rest/client.rb

@@ -52,17 +52,22 @@ module FinApps
 
           case method
             when :get
-              result, error_messages = get(path) { proc if block_given? }
+              response = get(path)
             when :post
-              result, error_messages = post(path, params) { proc if block_given? }
+              response = post(path, params)
             when :put
-              result, error_messages = put(path, params) { proc if block_given? }
+              response = put(path, params)
             when :delete
-              result, error_messages = delete(path, params) { proc if block_given? }
+              response = delete(path, params)
             else
               raise StandardError "Method not supported: #{method}."
           end
 
+          if response.present? && block_given?
+            result = proc.call(response)
+            logger.debug "##{__method__.to_s} => parsed result: #{result.pretty_inspect}" if result.present?
+          end
+
         rescue FinApps::REST::Error => error
           error_messages = error.error_messages
         rescue Faraday::ParsingError => error
@@ -79,29 +84,41 @@ module FinApps
         return result, error_messages
       end
 
+      # @param [String] user_identifier
+      # @param [String] user_token
+      def user_credentials!(user_identifier, user_token)
+        logger.debug "##{__method__.to_s} => Started"
+
+        {:user_identifier => user_identifier, :user_token => user_token}.validate_required_strings!
+        logger.debug "##{__method__.to_s} => Credentials passed validation. Attempting to set user credentials on current connection."
+
+
+        @config[:user_identifier] = user_identifier
+        @config[:user_token] = user_token
+        @connection = set_up_connection(@company_credentials, @config)
+
+        logger.debug "##{__method__.to_s} => Completed"
+      end
+
+      private
+
       # Performs an HTTP GET request. You shouldn't need to use this method directly,
       # but it can be useful for debugging. Returns a hash obtained from parsing
       # the JSON object in the response body.
       #
       # @param [String] path
-      # @param [Proc] proc
       # @return [Hash,Array<String>]
-      def get(path, &proc)
+      def get(path)
         logger.debug "##{__method__.to_s} => Started"
         raise MissingArgumentsError.new 'Missing argument: path.' if path.blank?
-        result, error_messages = nil, nil
 
         logger.debug "##{__method__.to_s} => GET path:#{path}"
         response = @connection.get do |req|
           req.url path
         end
-        if response.present? && block_given?
-          result = proc.call(response)
-          logger.debug "##{__method__.to_s} => parsed result: #{result.pretty_inspect}" if result.present?
-        end
 
         logger.debug "##{__method__.to_s} => Completed"
-        return result, error_messages
+        response
       end
 
       # Performs an HTTP POST request. You shouldn't need to use this method directly,
@@ -110,25 +127,19 @@ module FinApps
       #
       # @param [String] path
       # @param [Hash] params
-      # @param [Proc] proc
       # @return [Hash,Array<String>]
-      def post(path, params = {}, &proc)
+      def post(path, params = {})
         logger.debug "##{__method__.to_s} => Started"
         raise MissingArgumentsError.new 'Missing argument: path.' if path.blank?
-        result, error_messages = nil, nil
 
         logger.debug "##{__method__.to_s} => POST path:#{path} params:#{skip_sensitive_data(params)}"
         response = @connection.post do |req|
           req.url path
           req.body = params
         end
-        if response.present? && block_given?
-          result = proc.call(response)
-          logger.debug "##{__method__.to_s} => parsed result: #{result.pretty_inspect}" if result.present?
-        end
 
         logger.debug "##{__method__.to_s} => Completed"
-        return result, error_messages
+        response
       end
 
       # Performs an HTTP DELETE request. You shouldn't need to use this method directly,
@@ -137,50 +148,21 @@ module FinApps
       #
       # @param [String] path
       # @param [Hash] params
-      # @param [Proc] proc
       # @return [Hash,Array<String>]
-      def delete(path, params = {}, &proc)
+      def delete(path, params = {})
         logger.debug "##{__method__.to_s} => Started"
         raise MissingArgumentsError.new 'Missing argument: path.' if path.blank?
-        response, result, error_messages = nil, nil, nil
-
-        begin
-          logger.debug "##{__method__.to_s} => DELETE path:#{path} params:#{skip_sensitive_data(params)}"
-          response = @connection.delete do |req|
-            req.url path
-            req.body = params
-          end
-          if response.present? && block_given?
-            result = proc.call(response)
-            logger.debug "##{__method__.to_s} => parsed result: #{result.pretty_inspect}" if result.present?
-          end
 
-        rescue FinApps::REST::Error => error
-          error_messages = error.error_messages
-          logger.debug "##{__method__.to_s} => Failed, error_messages: #{error_messages.pretty_inspect}" if error_messages.present?
+        logger.debug "##{__method__.to_s} => DELETE path:#{path} params:#{skip_sensitive_data(params)}"
+        response = @connection.delete do |req|
+          req.url path
+          req.body = params
         end
 
         logger.debug "##{__method__.to_s} => Completed"
-        return result, error_messages
+        response
       end
 
-      # @param [String] user_identifier
-      # @param [String] user_token
-      def user_credentials!(user_identifier, user_token)
-        logger.debug "##{__method__.to_s} => Started"
-
-        {:user_identifier => user_identifier, :user_token => user_token}.validate_required_strings!
-        logger.debug "##{__method__.to_s} => Credentials passed validation. Attempting to set user credentials on current connection."
-
-
-        @config[:user_identifier] = user_identifier
-        @config[:user_token] = user_token
-        @connection = set_up_connection(@company_credentials, @config)
-
-        logger.debug "##{__method__.to_s} => Completed"
-      end
-
-      private
 
       def set_up_resources
         @users ||= FinApps::REST::Users.new self

data/lib/finapps/version.rb

@@ -1,3 +1,3 @@
 module FinApps
-  VERSION = '0.1.10.pre'
+  VERSION = '0.1.11.pre'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: finapps
 version: !ruby/object:Gem::Version
-  version: 0.1.10.pre
+  version: 0.1.11.pre
 platform: ruby
 authors:
 - Erich Quintero