fastbound-ruby 1.1.2 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50df0cbbde2a5bddc6bf840dca3ea5e3427b513cde3a4536676b801916615246
-  data.tar.gz: 72d930597d1867d1583d7e7b80b3f6c273184c1966421aa2814b9cbb9421b850
+  metadata.gz: d852c62270f374ee9e8114027108e39f67d74dbef1ca33c8f5ef2be371b04af3
+  data.tar.gz: da98709eff4b8b3e4efefc218abaea16914fc0c7698ff5a044b8ce6fe4b38903
 SHA512:
-  metadata.gz: 27e08924d1543b95a0a28926160dee348fd9468c18563dd53ff9aa6bcd6298501108b8db5c38aeadf21e8adb7d32967e3dbbfb68e62bb1fd53ed008049ab7132
-  data.tar.gz: 9cfd6874dd9de4964031202086c9ec857402056544e365de6eddccb2b29b22c6166214ec7bd83effb4e88ba7047d341c99d386f0b5a4646e1eebb915559a644d
+  metadata.gz: 18a3f83fc9a13b909fa3cb0014f3b44d3c1e085b33abf3cb3095a54d847e085ccc0ba1977f5ff064e497dc010c551b3fdd21f7a9b1d274e3ba6e4c185f348382
+  data.tar.gz: 28f1071c6db244a90509b22bcd4c398797cea10018f806771abc9d59ad087bc22e03715aca63c8c4005e510b6d5e0cd35dc2bbb8f88355ba7beb11d5bfb8179d

data/lib/fastbound-ruby/acquisition.rb

@@ -82,12 +82,11 @@ module FastBound
     def create_and_commit(acquisition_data, item_data, contact_data)
       requires!(acquisition_data, *CREATE_AND_EDIT_ATTRS[:required])
       requires!(item_data, *Item::CREATE_AND_EDIT_ATTRS[:required])
-      requires!(contact_data, *Contact::CREATE_AND_EDIT_ATTRS[:required])
 
       endpoint = ENDPOINTS[:create_and_commit]
       acquisition_data = standardize_body_data(acquisition_data, CREATE_AND_EDIT_ATTRS[:permitted])
       item_data = standardize_body_data(item_data, Item::CREATE_AND_EDIT_ATTRS[:permitted])
-      contact_data = standardize_body_data(contact_data, Contact::CREATE_AND_EDIT_ATTRS[:permitted])
+      contact_data = standardize_body_data(contact_data, Contact::CREATE_AND_EDIT_ATTRS)
       request_data = acquisition_data.merge(
         contact: contact_data,
         items: [item_data]

data/lib/fastbound-ruby/api.rb

@@ -13,38 +13,41 @@ module FastBound
     def get_request(client, endpoint)
       request = Net::HTTP::Get.new(request_url(client, endpoint))
 
+      set_request_headers(client, request)
       submit_request(client, request)
     end
 
     def post_request(client, endpoint, data = {})
       request = Net::HTTP::Post.new(request_url(client, endpoint))
 
+      set_request_headers(client, request, 'application/json')
       submit_request(client, request, data)
     end
 
     def put_request(client, endpoint, data = {})
       request = Net::HTTP::Put.new(request_url(client, endpoint))
 
+      set_request_headers(client, request, 'application/json')
       submit_request(client, request, data)
     end
 
     def delete_request(client, endpoint)
       request = Net::HTTP::Delete.new(request_url(client, endpoint))
 
+      set_request_headers(client, request)
       submit_request(client, request)
     end
 
     def post_file_request(client, endpoint, file_data)
       request = Net::HTTP::Post.new(request_url(client, endpoint))
 
+      set_request_headers(client, request)
       submit_file_request(client, request, file_data)
     end
 
     private
 
     def submit_request(client, request, data = {})
-      set_request_headers(client, request)
-
       request.body = data.is_a?(Hash) ? data.to_json : data
 
       process_request(request)
@@ -56,14 +59,14 @@ module FastBound
       headers.merge!(content_type_header("multipart/form-data; boundary=#{boundary}"))
 
       build_multipart_request_body(request, file_data, boundary)
-      set_request_headers(client, request)
       process_request(request)
     end
 
     def process_request(request)
       uri = URI(request.path)
-      http = Net::HTTP.new(uri.host, uri.port, use_ssl: true)
+      http = Net::HTTP.new(uri.host, uri.port)
 
+      http.use_ssl = true
       http.set_debug_output($stdout) if FastBound.config.full_debug?
 
       response = http.start { |_http| _http.request(request) }
@@ -88,10 +91,11 @@ module FastBound
       request.body = body.join
     end
 
-    def set_request_headers(client, request)
+    def set_request_headers(client, request, content_type = nil)
       request['User-Agent'] = USER_AGENT
       request['Authorization'] = ['Basic', Base64.strict_encode64(client.api_key + ':')].join(' ')
       request['X-AuditUser'] = client.account_email
+      request['Content-Type'] = content_type if content_type.present?
     end
 
     def request_url(client, endpoint)

data/lib/fastbound-ruby/contact.rb

@@ -5,14 +5,11 @@ module FastBound
 
     include FastBound::API
 
-    CREATE_AND_EDIT_ATTRS = {
-      permitted: %i(
-        external_id ffl_number ffl_expires lookup_ffl license_name trade_name sotein sot_class business_type
-        organization_name first_name middle_name last_name premise_address_1 premise_address_2 premise_city
-        premise_county premise_state premise_zip_code premise_country phone_number fax email_address
-      ).freeze,
-      required:  %i( ffl_number ffl_expires premise_address_1 premise_city premise_state premise_zip_code ).freeze
-    }
+    CREATE_AND_EDIT_ATTRS = %i(
+      external_id ffl_number ffl_expires lookup_ffl license_name trade_name sotein sot_class business_type
+      organization_name first_name middle_name last_name premise_address_1 premise_address_2 premise_city
+      premise_county premise_state premise_zip_code premise_country phone_number fax email_address
+    ).freeze
 
     CREATE_AND_EDIT_LICENSE_ATTRS = {
       permitted: %i( type number expiration copy_on_file ).freeze,
@@ -49,17 +46,15 @@ module FastBound
     end
 
     def create(contact_data)
-      requires!(contact_data, *CREATE_AND_EDIT_ATTRS[:required])
-
       endpoint = ENDPOINTS[:create]
-      contact_data = standardize_body_data(contact_data, CREATE_AND_EDIT_ATTRS[:permitted])
+      contact_data = standardize_body_data(contact_data, CREATE_AND_EDIT_ATTRS)
 
       post_request(@client, endpoint, contact_data)
     end
 
     def edit(contact_id, contact_data)
       endpoint = ENDPOINTS[:edit] % contact_id
-      contact_data = standardize_body_data(contact_data, CREATE_AND_EDIT_ATTRS[:permitted])
+      contact_data = standardize_body_data(contact_data, CREATE_AND_EDIT_ATTRS)
 
       put_request(@client, endpoint, contact_data)
     end

data/lib/fastbound-ruby/disposition.rb

@@ -152,19 +152,18 @@ module FastBound
       post_request(@client, endpoint, commit_data)
     end
 
-    def create_and_commit(disposition_data, items_data, contact_data, commit_data = {})
-      requires!(contact_data, *Contact::CREATE_AND_EDIT_ATTRS[:required])
+    def create_and_commit(disposition_data, items_data, contact_data = {}, commit_data = {})
       items_data.each { |item| requires!(item, :id) }
 
       endpoint = ENDPOINTS[:create_and_commit]
       disposition_data = standardize_body_data(disposition_data, EDIT_AND_CREATE_COMMIT_ATTRS)
       items_data = items_data.map { |item| standardize_body_data(item, ITEM_ATTRS[:add]) }
-      contact_data = standardize_body_data(contact_data, Contact::CREATE_AND_EDIT_ATTRS[:permitted])
+      contact_data = standardize_body_data(contact_data, Contact::CREATE_AND_EDIT_ATTRS)
       request_data = disposition_data.merge(
         contact: contact_data,
         items: items_data,
         manufacturingChanges: commit_data
-      )
+      ).compact
 
       post_request(@client, endpoint, request_data)
     end

data/lib/fastbound-ruby/response.rb

@@ -24,7 +24,11 @@ module FastBound
           _data.map(&:deep_symbolize_keys)
         end
       else
-        raise FastBound::Error::RequestError.new(@response.body)
+        if FastBound.config.full_debug?
+          puts "-- DEBUG: #{self}: RequestError: #{@response.inspect}"
+        end
+
+        raise FastBound::Error::RequestError.new([@response.body, @response.message].reject(&:blank?).join(" | "))
       end
     end
 

data/lib/fastbound-ruby/version.rb

@@ -1,3 +1,3 @@
 module FastBound
-  VERSION = "1.1.2"
+  VERSION = "1.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastbound-ruby
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.6
 platform: ruby
 authors:
 - Jeffrey Dill
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-14 00:00:00.000000000 Z
+date: 2022-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler