fastbound-ruby 1.1.4 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3234150290b474d2c48fa931dd0521b5dfbd2ec37c3667320e1a3aa4d81b33b
-  data.tar.gz: 32796d9b23c397033e9d6bd992c7ee3dda6d0a837e167b0c5fa832b780e61b47
+  metadata.gz: 31b5843e0ee1e182bba7b7cde61e1fc92e8138ec403bec8b2a912f5aafe22724
+  data.tar.gz: 057b27b313d77ac069c8b667ab39b9baa54722dac78448726fcb96a4b3acb820
 SHA512:
-  metadata.gz: 2c3806b5820f5a8f5bd4425320264e43af0a42b8e677d597055fe8f7a22b6f18a1558e54f07d2b0f558e3e893940b38dfb952ba9a3102bf8ecd17f2d852cd110
-  data.tar.gz: bc30fe452a020d9efee102eaeab2261713f79aa0de339fd4923c897b519517d21c1d509f662467a23b2de8bf27ad0026e28f8823ff71459d8d1e5cb978478614
+  metadata.gz: dcf2aeb6731c8cc1067aac4bcfa6e7c4272b42700ded3cf074ae38e3032c4f84a36dc688361b1f0830ba8375203fe65e06cfbaaf1af4d5819d69091b295dec13
+  data.tar.gz: cf8f4ae0a3ee11b31267b64c5735e22e6997c9442e31842daa99c73fe2c780f4c1d95704ccfa9877b1db2c022cc12661f6c167bf7950a21ab63ac2002ebf8d94

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,7 +59,6 @@ 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
 
@@ -89,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 = nil)
       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

@@ -28,7 +28,7 @@ module FastBound
           puts "-- DEBUG: #{self}: RequestError: #{@response.inspect}"
         end
 
-        raise FastBound::Error::RequestError.new(@response.body)
+        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.4"
+  VERSION = "1.1.7"
 end

metadata

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