rs4 0.1.6 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d11e0ed8ace80f96d0ffde3b72915bfcd77c7eff73c47eb8682751e88b385755
-  data.tar.gz: cc830ddf9f7684734e687a6f85a17aa21726f1ca01bb45798a7c0ae5951087fc
+  metadata.gz: 4e8e2fd74b61acb79edb0d4fbc64e49ef1c0fad6b8696d466b83a0cec8e6bab9
+  data.tar.gz: 2b611b82edec6aa6c897472a2163110cd8a1d01a8cb39cc85a47e1628de7d955
 SHA512:
-  metadata.gz: b07928a830d6a935334c2ae13384c322beb41056cb4648f5905fbf7c2774de91fc0b338587d50719c6b8acffd101d086ea1dbf0e6e9276f6970ccd2058e8b9bf
-  data.tar.gz: 5ae429530d7eb69a6794d0458ee8c30ab28dec8499879bb4b4108977d8d4dc7025267fefd91337eff9ea0fe0885b02a0573ad37dec195129a38bf3705a8bd37a
+  metadata.gz: '0975d5000647806f81c71796563a0f13857093da7e4e18518c02bce918ce293e2247f50f08cc03a831bb0eca2dfaaf4f77b2784eafaf5032230f42773ebcf7b4'
+  data.tar.gz: 3bccea9722d64d825e1dc8aa5e542fc7bc6fd98b5ff521e3bd93661b8e2f56a2af8fbfd7ccaf9cf6b82252cde7dbbb868c0fe0af910e0c7214426e50e45bece7

data/lib/rs4.rb

@@ -8,5 +8,7 @@ require 'rs4/configuration.rb'
 require 'rs4/request_error.rb'
 require 'rs4/reusable_template.rb'
 
+require 'test/mock_request.rb'
+
 module RS4
 end

data/lib/rs4/configuration.rb

@@ -11,6 +11,7 @@ module RS4
   end
 
   class Configuration
+    attr_accessor :request_handler
     attr_accessor :private_api_key
     attr_accessor :api_host
   end

data/lib/rs4/document.rb

@@ -87,42 +87,30 @@ module RS4
 
         path = "documents/#{document_guid}"
 
-        response = RS4::Request.execute(path, :get)
+        response = RS4.configuration.request_handler.execute(path, :get)
 
-        if response.class == Net::HTTPOK
-          raw_document = JSON.parse(response.body, symbolize_names: true)
+        unless response.class == RS4::RequestError || response.nil? # .class == Net::HTTPOK
+          raw_document = response.dig(:document) # JSON.parse(response.body, symbolize_names: true)
 
-          Document.new(raw_document[:document])
-        else
-          Rails.logger.error("Unable to get document #{document_guid}")
-          RS4::RequestError.new(
-            response.code,
-            response.class,
-            JSON.parse(response.read_body)
-          )
+          # Document.new(raw_document[:document])
+          Document.new(raw_document) if raw_document
         end
       end
 
       def get_documents
         path = 'documents'
-        response = RS4::Request.execute(path, :get)
+        response = RS4.configuration.request_handler.execute(path, :get)
 
-        if response.class == Net::HTTPOK
+        unless response.class == RS4::RequestError || response.nil?
           documents = []
 
-          raw_documents = JSON.parse(response.body, symbolize_names: true)
-
-          raw_documents.each do |raw_document|
-            documents << Document.new(raw_document[:document])
+          response.dig(:documents).each do |document_hash|
+            # document_hash = raw_document.pluck(:document)
+            documents << Document.new(document_hash)
           end
-        else
-          Rails.logger.error('Unable to get documents')
-          RS4::RequestError.new(
-            response.code,
-            response.class,
-            JSON.parse(response.read_body)
-          )
         end
+
+        documents
       end
     end
   end

data/lib/rs4/request.rb

@@ -30,7 +30,19 @@ module RS4
         # https://stackoverflow.com/questions/5370697/what-s-the-best-way-to-handle-exceptions-from-nethttp#answer-11802674
         begin
           retries ||= 0
-          http.request(request)
+          response = http.request(request)
+
+          result = if response.class == Net::HTTPOK
+                     JSON.parse(response.body, symbolize_names: true)
+                   else
+                     RS4::RequestError.new(
+                       response.code,
+                       response.class,
+                       JSON.parse(response.read_body)
+                     )
+                   end
+
+          result
         rescue StandardError => e
           Rails.logger.error(e)
           retry if (retries += 1) < MAX_RETRIES

data/lib/rs4/reusable_template.rb

@@ -48,20 +48,14 @@ module RS4
 
         path = "reusable_templates/#{template_guid}"
 
-        response = RS4::Request.execute(path, :get)
+        response = RS4.configuration.request_handler.execute(path, :get)
 
-        if response.class == Net::HTTPOK
-          parsed_response = JSON.parse(response.read_body, symbolize_names: true)
+        unless response.class == RS4::RequestError || response.nil?
+          # parsed_response = JSON.parse(response.read_body, symbolize_names: true)
 
-          template_hash = parsed_response[:reusable_template]
+          template_hash = response.dig(:reusable_template)
 
           RS4::ReusableTemplate.new(template_hash)
-        else
-          RS4::RequestError.new(
-            response.code,
-            response.class,
-            JSON.parse(response.read_body)
-          )
         end
       end
 
@@ -72,7 +66,7 @@ module RS4
 
         path = query.empty? ? base_path : "#{base_path}?#{query}"
 
-        RS4::Request.execute(path, :get)
+        RS4.configuration.request_handler.execute(path, :get)
       end
 
       def send_document(template_guid, options = {})
@@ -82,23 +76,16 @@ module RS4
 
         body[:in_person] = true
 
-        response = RS4::Request.execute(path, :post, body)
+        response = RS4.configuration.request_handler.execute(path, :post, body)
 
         Rails.logger.info("RS4::ReusableTemplate::send_document:: #{response.inspect}")
 
-        if response.class == Net::HTTPOK
-          parsed_response = JSON.parse(response.read_body, symbolize_names: true)
+        unless response.class == RS4::RequestError || response.nil?
+          # parsed_response = JSON.parse(response.read_body, symbolize_names: true)
 
-          document_hash = parsed_response[:document]
+          document_hash = response.dig(:document)
 
           return RS4::Document.new(document_hash)
-
-        else
-          return RS4::RequestError.new(
-            response.code,
-            response.class,
-            JSON.parse(response.read_body)
-          )
         end
       end
     end

data/lib/rs4/version.rb

@@ -1,3 +1,3 @@
 module RS4
-  VERSION = "0.1.6"
+  VERSION = '0.2.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rs4
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.1
 platform: ruby
 authors:
 - donny
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-21 00:00:00.000000000 Z
+date: 2020-06-24 00:00:00.000000000 Z
 dependencies: []
 description: Provides ruby access to CRUD operations for RightSignature documents
   and reusable templates