czech_post_b2b_client 1.1.0 → 1.2.5

data/lib/czech_post_b2b_client/response_parsers/base_parser.rb

@@ -50,9 +50,7 @@ module CzechPostB2bClient
       end
 
       def response_root_node
-        if response_service_data.keys.include?(response_root_node_name)
-          return response_service_data.dig(response_root_node_name)
-        end
+        return response_service_data.dig(response_root_node_name) if response_service_data.keys.include?(response_root_node_name)
 
         errors.add(:xml, "Cannot find `#{response_root_node_name}` in `serviceData` node.")
         fail_on_structure_parsing

data/lib/czech_post_b2b_client/response_parsers/get_result_parcels_parser.rb

@@ -48,9 +48,7 @@ module CzechPostB2bClient
         # more parcel_codes for one parcel_id => probably errors
         old_p_code = value[:parcel_code]
         new_p_code = pd_hash[:parcel_code]
-        if old_p_code != new_p_code
-          raise "Two different parcel_codes [#{old_p_code}, #{new_p_code}] for parcel_id:'#{parcel_id}'"
-        end
+        raise "Two different parcel_codes [#{old_p_code}, #{new_p_code}] for parcel_id:'#{parcel_id}'" if old_p_code != new_p_code
 
         value
       end

data/lib/czech_post_b2b_client/response_parsers/parcel_service_sync_parser.rb

@@ -17,7 +17,7 @@ module CzechPostB2bClient
           parcel_id = parcel_parcel_id_from(rp_hash)
           result[parcel_id] = updated_result_value_for(result[parcel_id], rp_hash)
         end
-        pdh[parcel_id].merge!(print: print_data_from(response_print_hash))
+        pdh[parcel_id].merge!(printings: print_data_from(response_print_hash))
 
         pdh
       end
@@ -71,9 +71,7 @@ module CzechPostB2bClient
         # more parcel_codes for one parcel_id => probably errors
         old_p_code = value[:parcel_code]
         new_p_code = pd_hash[:parcel_code]
-        if old_p_code != new_p_code
-          raise "Two different parcel_codes [#{old_p_code}, #{new_p_code}] for parcel_id:'#{parcel_id}'"
-        end
+        raise "Two different parcel_codes [#{old_p_code}, #{new_p_code}] for parcel_id:'#{parcel_id}'" if old_p_code != new_p_code
 
         value
       end

data/lib/czech_post_b2b_client/services/api_caller.rb

@@ -55,7 +55,8 @@ module CzechPostB2bClient
         request = Net::HTTP::Post.new service_uri.request_uri, headers
         request.body = request_xml
 
-        debug_msg = "CzechPost B2B REQUEST: #{request} to #{service_uri.request_uri} with body:\n#{request.body}"
+        debug_msg = "CzechPost B2B REQUEST: #{request} to #{service_uri.request_uri}" \
+                    " with headers: #{headers}\n and body:\n#{request.body}"
         CzechPostB2bClient.logger.debug(debug_msg)
 
         request
@@ -74,6 +75,7 @@ module CzechPostB2bClient
           use_ssl: true,
           verify_mode: OpenSSL::SSL::VERIFY_PEER,
           keep_alive_timeout: 30,
+          ciphers: secure_and_available_ciphers,
           cert: OpenSSL::X509::Certificate.new(File.read(configuration.certificate_path)),
           # cert_password: configuration.certificate_password,
           key: OpenSSL::PKey::RSA.new(File.read(configuration.private_key_path), configuration.private_key_password),
@@ -105,7 +107,8 @@ module CzechPostB2bClient
         return 'error code not found in XML' unless error_match
 
         error_code = error_match[1].to_i
-        error = CzechPostB2bClient::B2BErrors.new_by_code(error_code)
+        error_details = result.xml.match(%r{<(?:\w+\:)?errorDescription>(.*)</(?:\w+\:)?errorDescription>})
+        error = CzechPostB2bClient::B2BErrors.new_by_code(error_code, error_details[1])
         return "error code [#{error_code}] is unknown" unless error
 
         error.message
@@ -116,6 +119,15 @@ module CzechPostB2bClient
         errors.add(:connection, "#{error.class} > #{service_uri} - #{error}")
         fail!
       end
+
+      def secure_and_available_ciphers
+        # Available non-weak suites for b2b.postaonline.cz (https://www.ssllabs.com/ssltest/analyze.html?d=b2b.postaonline.cz)
+        # TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (0xc030)   ECDH secp384r1 (eq. 7680 bits RSA)   FS	256
+        # TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (0xc02f)   ECDH secp384r1 (eq. 7680 bits RSA)   FS
+        # which have following names in OpenSSL (see `openssl ciphers`)
+
+        %w[ECDHE-RSA-AES256-GCM-SHA384 ECDHE-RSA-AES128-GCM-SHA256]
+      end
     end
   end
 end

data/lib/czech_post_b2b_client/services/delivering_inspector.rb

@@ -32,7 +32,6 @@ module CzechPostB2bClient
       end
 
       def build_result_from(response_hash)
-        puts("RESPONSE_HASH: #{response_hash}")
         result_hash = {}
         response_hash[:parcels].each_pair do |parcel_code, delivering_hash|
           result_hash[parcel_code] = {
@@ -42,7 +41,6 @@ module CzechPostB2bClient
             all_states: delivering_hash[:states]
           }
         end
-        puts("RESULT_HASH: #{result_hash}")
         result_hash
       end
     end

data/lib/czech_post_b2b_client/services/parcels_send_process_updater.rb

@@ -63,7 +63,7 @@ module CzechPostB2bClient
           response_code = response_state[:code]
           next if response_code == CzechPostB2bClient::ResponseCodes::Ok.code
 
-          errors.add(:parcels, "Parcel[#{parcel_id}] => #{CzechPostB2bClient::ResponseCodes.new_by_code(response_code)}") # rubocop:disable Layout/LineLength
+          errors.add(:parcels, "Parcel[#{parcel_id}] => #{CzechPostB2bClient::ResponseCodes.new_by_code(response_code)}")
         end
       end
     end

data/lib/czech_post_b2b_client/services/parcels_sync_sender.rb

@@ -53,6 +53,7 @@ module CzechPostB2bClient
 
       def build_result_from(response_hash)
         OpenStruct.new(parcels_hash: response_hash[:parcel],
+                       pdf_content: response_hash[:parcel].values.first.dig(:printings, :pdf_content),
                        state_text: response_hash.dig(:response, :state, :text),
                        state_code: response_hash.dig(:response, :state, :code))
       end
@@ -79,7 +80,7 @@ module CzechPostB2bClient
           response_code = response_state[:code]
           next if response_code == CzechPostB2bClient::ResponseCodes::Ok.code
 
-          errors.add(:parcels, "Parcel[#{parcel_id}] => #{CzechPostB2bClient::ResponseCodes.new_by_code(response_code)}") # rubocop:disable Layout/LineLength
+          errors.add(:parcels, "Parcel[#{parcel_id}] => #{CzechPostB2bClient::ResponseCodes.new_by_code(response_code)}")
         end
       end
     end

data/lib/czech_post_b2b_client/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CzechPostB2bClient
-  VERSION = '1.1.0'
+  VERSION = '1.2.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: czech_post_b2b_client
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.5
 platform: ruby
 authors:
 - Petr Mlčoch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-28 00:00:00.000000000 Z
+date: 2020-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ox
@@ -28,16 +28,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -168,6 +168,97 @@ files:
 - doc/CzechPostB2bClient/B2BErrors/UnauthorizedRoleAccessError.html
 - doc/CzechPostB2bClient/Configuration.html
 - doc/CzechPostB2bClient/Error.html
+- doc/CzechPostB2bClient/PostServices.html
+- doc/CzechPostB2bClient/PostServices/AddreseeVerification.html
+- doc/CzechPostB2bClient/PostServices/AddresseeAlertOfArrivalByEmail.html
+- doc/CzechPostB2bClient/PostServices/AddresseeAlertOfArrivalBySms.html
+- doc/CzechPostB2bClient/PostServices/AddresseeAlertOfArrivalBySmsAndEmail.html
+- doc/CzechPostB2bClient/PostServices/AddresseeVerificationOnDelivery.html
+- doc/CzechPostB2bClient/PostServices/AfternoonDelivery.html
+- doc/CzechPostB2bClient/PostServices/Base.html
+- doc/CzechPostB2bClient/PostServices/CashOnDeliveryByPKA.html
+- doc/CzechPostB2bClient/PostServices/CashOnDeliveryByPKC.html
+- doc/CzechPostB2bClient/PostServices/CashOnDeliveryInternational.html
+- doc/CzechPostB2bClient/PostServices/CertificateOfDelivery.html
+- doc/CzechPostB2bClient/PostServices/CertificateOfDeliveryWithDeliverToAdresseeOnly.html
+- doc/CzechPostB2bClient/PostServices/CertificateOfDeliveryWithDeliverToAdresseePersonOnly.html
+- doc/CzechPostB2bClient/PostServices/CompanyRegisteredMail.html
+- doc/CzechPostB2bClient/PostServices/CompleteDelivery.html
+- doc/CzechPostB2bClient/PostServices/Consignment.html
+- doc/CzechPostB2bClient/PostServices/CumbersomeParcel.html
+- doc/CzechPostB2bClient/PostServices/DeliverToAdresseeOnly.html
+- doc/CzechPostB2bClient/PostServices/DeliverToAdresseePersonOnly.html
+- doc/CzechPostB2bClient/PostServices/DeliverToCompany.html
+- doc/CzechPostB2bClient/PostServices/DepositFor10Days.html
+- doc/CzechPostB2bClient/PostServices/DepositFor10WorkingDays.html
+- doc/CzechPostB2bClient/PostServices/DepositFor3Days.html
+- doc/CzechPostB2bClient/PostServices/DepositFor7Days.html
+- doc/CzechPostB2bClient/PostServices/DepositFor90Days.html
+- doc/CzechPostB2bClient/PostServices/DepositIfAdresseeIsUnreachable.html
+- doc/CzechPostB2bClient/PostServices/DiscountForCollectiveShippment.html
+- doc/CzechPostB2bClient/PostServices/DiscountForOnlinePosting.html
+- doc/CzechPostB2bClient/PostServices/DoNotDeposit.html
+- doc/CzechPostB2bClient/PostServices/DoNotExtendCollectionTime.html
+- doc/CzechPostB2bClient/PostServices/DoNotPutIntoMailbox.html
+- doc/CzechPostB2bClient/PostServices/DoNotResend.html
+- doc/CzechPostB2bClient/PostServices/DoNotReturnLeaveItInMailbox.html
+- doc/CzechPostB2bClient/PostServices/DoNotReturnToSender.html
+- doc/CzechPostB2bClient/PostServices/Document.html
+- doc/CzechPostB2bClient/PostServices/DocumentlessCashOnDelivery.html
+- doc/CzechPostB2bClient/PostServices/DocumentsSignedAtDelivery.html
+- doc/CzechPostB2bClient/PostServices/EAlertOfDeliveryEmail.html
+- doc/CzechPostB2bClient/PostServices/EAlertOfDeliverySms.html
+- doc/CzechPostB2bClient/PostServices/EAlertOfDeliverySmsAndEmail.html
+- doc/CzechPostB2bClient/PostServices/EconomyDelivery.html
+- doc/CzechPostB2bClient/PostServices/ExtendedCollectionTime.html
+- doc/CzechPostB2bClient/PostServices/ForenoonDelivery.html
+- doc/CzechPostB2bClient/PostServices/Fragile.html
+- doc/CzechPostB2bClient/PostServices/GiftOrNonCommercialGoods.html
+- doc/CzechPostB2bClient/PostServices/GoodsWithExportDocumentsProcessed.html
+- doc/CzechPostB2bClient/PostServices/GuaranteedDeliveryTimeAtSaturday.html
+- doc/CzechPostB2bClient/PostServices/GuaranteedDeliveryTimeAtWeekend.html
+- doc/CzechPostB2bClient/PostServices/GuaranteedDeliveryTimeTo2PM.html
+- doc/CzechPostB2bClient/PostServices/HeavyParcelDeliveryToHand.html
+- doc/CzechPostB2bClient/PostServices/InformSenderAboutDelivery.html
+- doc/CzechPostB2bClient/PostServices/InternationalMail.html
+- doc/CzechPostB2bClient/PostServices/InternationalMailForBlinds.html
+- doc/CzechPostB2bClient/PostServices/InternationalPrintedMatterBag.html
+- doc/CzechPostB2bClient/PostServices/InternationalRegisteredMail.html
+- doc/CzechPostB2bClient/PostServices/InternationalRegisteredMailForBlinds.html
+- doc/CzechPostB2bClient/PostServices/InternationalRegisteredPrintedMatterBag.html
+- doc/CzechPostB2bClient/PostServices/ListedPrice.html
+- doc/CzechPostB2bClient/PostServices/Missed.html
+- doc/CzechPostB2bClient/PostServices/Missive.html
+- doc/CzechPostB2bClient/PostServices/MissiveStandard.html
+- doc/CzechPostB2bClient/PostServices/MultiParcelShippment.html
+- doc/CzechPostB2bClient/PostServices/MultiParcelShippmentBig.html
+- doc/CzechPostB2bClient/PostServices/NonStandardPackage.html
+- doc/CzechPostB2bClient/PostServices/OldApplianceRemoval.html
+- doc/CzechPostB2bClient/PostServices/OnPalette.html
+- doc/CzechPostB2bClient/PostServices/ParcelSizeL.html
+- doc/CzechPostB2bClient/PostServices/ParcelSizeM.html
+- doc/CzechPostB2bClient/PostServices/ParcelSizeS.html
+- doc/CzechPostB2bClient/PostServices/ParcelSizeXL.html
+- doc/CzechPostB2bClient/PostServices/PickupByThirdPerson.html
+- doc/CzechPostB2bClient/PostServices/PosteRestante.html
+- doc/CzechPostB2bClient/PostServices/PreprocessedBySorting.html
+- doc/CzechPostB2bClient/PostServices/PrioritaireByAir.html
+- doc/CzechPostB2bClient/PostServices/RegisteredMail.html
+- doc/CzechPostB2bClient/PostServices/RegisteredMailForBlinds.html
+- doc/CzechPostB2bClient/PostServices/RegisteredMailStandard.html
+- doc/CzechPostB2bClient/PostServices/ResendToOtherAddress.html
+- doc/CzechPostB2bClient/PostServices/ResponseEnvelope.html
+- doc/CzechPostB2bClient/PostServices/ResponseShipment.html
+- doc/CzechPostB2bClient/PostServices/ReturnByAir.html
+- doc/CzechPostB2bClient/PostServices/ReturnEconomically.html
+- doc/CzechPostB2bClient/PostServices/ReturnOfGoods.html
+- doc/CzechPostB2bClient/PostServices/ReturnToSenderAfterXDays.html
+- doc/CzechPostB2bClient/PostServices/ReturnToSenderImmediately.html
+- doc/CzechPostB2bClient/PostServices/SaveKey.html
+- doc/CzechPostB2bClient/PostServices/SubmissionByPostbox.html
+- doc/CzechPostB2bClient/PostServices/SubmissionReceiptCopy.html
+- doc/CzechPostB2bClient/PostServices/ThisSideUp.html
+- doc/CzechPostB2bClient/PostServices/ValuableContent.html
 - doc/CzechPostB2bClient/PrintingTemplates.html
 - doc/CzechPostB2bClient/PrintingTemplates/AddressData3x8.html
 - doc/CzechPostB2bClient/PrintingTemplates/AdressLabel.html
@@ -177,7 +268,10 @@ files:
 - doc/CzechPostB2bClient/PrintingTemplates/AdressLabel/ForeignPackage.html
 - doc/CzechPostB2bClient/PrintingTemplates/AdressLabel/ForeignPackage/EMS.html
 - doc/CzechPostB2bClient/PrintingTemplates/AdressLabel/ForeignPackage/EMS2x4.html
+- doc/CzechPostB2bClient/PrintingTemplates/AdressLabel/ForeignPackage/HarmonizedLabel.html
+- doc/CzechPostB2bClient/PrintingTemplates/AdressLabel/ForeignPackage/HarmonizedLabel4OnPage.html
 - doc/CzechPostB2bClient/PrintingTemplates/AdressLabel/ForeignPackage/Standard.html
+- doc/CzechPostB2bClient/PrintingTemplates/AdressLabel/ForeignPackage/Standard2OnPage.html
 - doc/CzechPostB2bClient/PrintingTemplates/AdressLabel/ForeignPackage/Standard4OnPage.html
 - doc/CzechPostB2bClient/PrintingTemplates/AdressLabel/ForeignPackage/Valuable.html
 - doc/CzechPostB2bClient/PrintingTemplates/AdressLabel/ForeignPackage/Valuable4OnPage.html
@@ -188,6 +282,12 @@ files:
 - doc/CzechPostB2bClient/PrintingTemplates/CODVoucherA3OnPage.html
 - doc/CzechPostB2bClient/PrintingTemplates/CODVoucherC.html
 - doc/CzechPostB2bClient/PrintingTemplates/CODVoucherForCSOB.html
+- doc/CzechPostB2bClient/PrintingTemplates/CustomDeclaration.html
+- doc/CzechPostB2bClient/PrintingTemplates/CustomDeclaration/CN22.html
+- doc/CzechPostB2bClient/PrintingTemplates/CustomDeclaration/CN224OnPage.html
+- doc/CzechPostB2bClient/PrintingTemplates/CustomDeclaration/CN22WithCK.html
+- doc/CzechPostB2bClient/PrintingTemplates/CustomDeclaration/CN22WithCK4OnPage.html
+- doc/CzechPostB2bClient/PrintingTemplates/CustomDeclaration/CN23.html
 - doc/CzechPostB2bClient/PrintingTemplates/CustomDeclarationCN22.html
 - doc/CzechPostB2bClient/PrintingTemplates/CustomDeclarationCN23.html
 - doc/CzechPostB2bClient/PrintingTemplates/DeliveryTicket.html
@@ -206,6 +306,7 @@ files:
 - doc/CzechPostB2bClient/RequestBuilders/GetParcelsPrintingBuilder.html
 - doc/CzechPostB2bClient/RequestBuilders/GetResultParcelsBuilder.html
 - doc/CzechPostB2bClient/RequestBuilders/GetStatsBuilder.html
+- doc/CzechPostB2bClient/RequestBuilders/ParcelServiceSyncBuilder.html
 - doc/CzechPostB2bClient/RequestBuilders/SendParcelsBuilder.html
 - doc/CzechPostB2bClient/ResponseCodes.html
 - doc/CzechPostB2bClient/ResponseCodes/AddressAllowedForBalikovnaOnly.html
@@ -287,6 +388,7 @@ files:
 - doc/CzechPostB2bClient/ResponseCodes/InfoCancelService5C.html
 - doc/CzechPostB2bClient/ResponseCodes/InfoCancelService5CAnd5D.html
 - doc/CzechPostB2bClient/ResponseCodes/InfoCancelService5D.html
+- doc/CzechPostB2bClient/ResponseCodes/InfoCancelService9.html
 - doc/CzechPostB2bClient/ResponseCodes/InfoCancelVSVoucher.html
 - doc/CzechPostB2bClient/ResponseCodes/InfoCancelWidth.html
 - doc/CzechPostB2bClient/ResponseCodes/InfoCityChanged.html
@@ -477,6 +579,7 @@ files:
 - doc/CzechPostB2bClient/ResponseParsers/GetParcelsPrintingParser.html
 - doc/CzechPostB2bClient/ResponseParsers/GetResultParcelsParser.html
 - doc/CzechPostB2bClient/ResponseParsers/GetStatsParser.html
+- doc/CzechPostB2bClient/ResponseParsers/ParcelServiceSyncParser.html
 - doc/CzechPostB2bClient/ResponseParsers/SendParcelsParser.html
 - doc/CzechPostB2bClient/Services.html
 - doc/CzechPostB2bClient/Services/AddressSheetsGenerator.html
@@ -484,10 +587,13 @@ files:
 - doc/CzechPostB2bClient/Services/Communicator.html
 - doc/CzechPostB2bClient/Services/DeliveringInspector.html
 - doc/CzechPostB2bClient/Services/Orchestrator.html
+- doc/CzechPostB2bClient/Services/ParcelsAsyncSender.html
 - doc/CzechPostB2bClient/Services/ParcelsSendProcessUpdater.html
 - doc/CzechPostB2bClient/Services/ParcelsSender.html
 - doc/CzechPostB2bClient/Services/ParcelsSubmissionCloser.html
+- doc/CzechPostB2bClient/Services/ParcelsSyncSender.html
 - doc/CzechPostB2bClient/Services/TimePeriodStatisticator.html
+- doc/CzechPostB2bClient/Services/XsdsDownloader.html
 - doc/SteppedService.html
 - doc/SteppedService/Base.html
 - doc/SteppedService/Errors.html
@@ -508,6 +614,7 @@ files:
 - lib/czech_post_b2b_client.rb
 - lib/czech_post_b2b_client/b2b_errors.rb
 - lib/czech_post_b2b_client/configuration.rb
+- lib/czech_post_b2b_client/logger.rb
 - lib/czech_post_b2b_client/post_services.rb
 - lib/czech_post_b2b_client/printing_templates.rb
 - lib/czech_post_b2b_client/request_builders.rb
@@ -568,8 +675,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Accessing B2B API of Czech Post for bulk processing of packages ("B2B - WS