belpost 0.4.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d81d235b373255e2bff25ee56958cd6658a44e9546560ae96486986d278c1f0b
-  data.tar.gz: a155cca07102f767c12b05bf2c574fdb827f46cae00357e0b213c4daf0d35c84
+  metadata.gz: 9573611d63a9e36e61ada02613b8e8764fb2a45125a17f5938f2521b0a80586d
+  data.tar.gz: 1db61fe84045560aac6dc7e362aeb5698413851d23851c1b2601f84ca1ff6bc3
 SHA512:
-  metadata.gz: cf7a95cd9ae059a9f0d4e10c3ac7e24cf7f94447817d9d104a58a2d2eb9382f4c13ea1fe5bb512589a9e92141ea92100632864a0637ac47150eed848af1d11d7
-  data.tar.gz: 4fa75a2f2af404733bcf1eff337ac0c102629d8c8ae67085e44858174e9f17975ffb70cced4e5444834801419391e484c340e5d9c87813ec1ce105f9616e2687
+  metadata.gz: 4ee356c1da9fad9db8b62a6d5bbe135c317b4c49cd818e856f8a81e70c8452dc98deeb03ffc59dd4d108efac8434c4ed1e9ce0ba5dcca41b23485f327255a26c
+  data.tar.gz: 40826b94cf8e911fc7930c5dae67412f4688ccc68f43bed53d5d5317d3146c848fd0f95111e24706cca2a5907b76d54fadf3d53c93eaa6a91aef8dc11f7190f9

data/CHANGELOG.md

@@ -1,5 +1,50 @@
 # Changelog
 
+## [0.9.0] - 2025-04-15
+
+### Changed
+- Refactored API paths into a separate module `Belpost::ApiPaths` for better maintainability
+- Moved all hardcoded API endpoints into constants in `api_paths.rb`
+- Updated all client methods to use the new API path constants
+- Updated tests to use the new API path constants
+
+### Added
+- Added batch retrieval functionality via `find_batch_by_id` method
+- Support for finding batch mailings by their ID with validation
+- New module `Belpost::ApiPaths` with organized API endpoint constants:
+  - Batch mailing paths
+  - Postal deliveries paths
+  - Geo directory paths
+
+## [0.8.0] - 2025-04-14
+### Added
+- Added batch mailing functionality via `create_batch` method
+- Support for creating batch mailings with various delivery types
+- Added comprehensive validation for batch mailing data
+- Added new models and schemas for batch mailing
+- Added tests for batch mailing functionality
+
+## [0.7.0] - 2025-04-01
+### Added
+- Added postal code search functionality via `search_postcode` method
+- Support for searching postal codes by city, street, and building number
+- Added comprehensive tests for the new postal code search endpoint
+
+## [0.6.0] - 2025-04-01
+### Added
+- Added search addresses search functionality via `find_address_by_string` method
+
+## [0.5.1] - 2025-04-01
+### Fixed
+- Improved error handling for invalid timeout environment variable
+- Added fallback for BELPOST_API_URL environment variable to make tests more robust
+- Fixed Configuration class by implementing `validate!` and `to_h` methods
+
+## [0.5.0] - 2025-04-01
+### Added
+- Added address search functionality via `find_address_by_string` method
+- Support for query parameters in GET requests
+
 ## [0.4.0] - 2025-04-01
 ### Added
 - Added configuration via environment variables

data/README.md

@@ -295,6 +295,27 @@ hs_codes = client.fetch_hs_codes
 puts hs_codes
 ```
 
+### Searching for postal codes
+
+```ruby
+client = Belpost::Client.new
+postcodes = client.search_postcode(
+  city: "Витебск",
+  street: "Ильинского",
+  building: "51/1",  # optional
+  limit: 50          # optional, default: 50, range: 1-200
+)
+puts postcodes
+```
+
+### Finding a batch by ID
+
+```ruby
+client = Belpost::Client.new
+batch = client.find_batch_by_id(123)
+puts batch
+```
+
 ## Error handling
 
 The client may throw the following exceptions:

data/belpost.gemspec

@@ -34,4 +34,5 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "dotenv"
   spec.add_dependency "dry-validation", "~> 1.0"
+  spec.add_dependency "dry-schema", "~> 1.0"
 end

data/lib/belpost/api_paths.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Belpost
+  # Constants for API paths
+  module ApiPaths
+    # Batch mailing paths
+    BATCH_MAILING_LIST = "/api/v1/business/batch-mailing/list"
+    BATCH_MAILING_DOCUMENTS = "/api/v1/business/batch-mailing/documents"
+    BATCH_MAILING_ITEM = "/api/v1/business/batch-mailing/item"
+    BATCH_MAILING_DUPLICATE = "/api/v1/business/batch-mailing/list/:id/duplicate"
+    BATCH_MAILING_DUPLICATE_FULL = "/api/v1/business/batch-mailing/list/:id/duplicate-full"
+    BATCH_MAILING_COMMIT = "/api/v1/business/batch-mailing/list/:id/commit"
+    BATCH_MAILING_GENERATE_BLANK = "/api/v1/business/batch-mailing/list/:id/generate-blank"
+
+    # Postal deliveries paths
+    POSTAL_DELIVERIES = "/api/v1/business/postal-deliveries"
+    POSTAL_DELIVERIES_HS_CODES = "/api/v1/business/postal-deliveries/hs-codes/list"
+    POSTAL_DELIVERIES_VALIDATION = "/api/v1/business/postal-deliveries/validation"
+    POSTAL_DELIVERIES_COUNTRIES = "/api/v1/business/postal-deliveries/countries"
+
+    # Geo directory paths
+    GEO_DIRECTORY_SEARCH_ADDRESS = "/api/v1/business/geo-directory/search-address"
+    GEO_DIRECTORY_POSTCODE = "/api/v1/business/geo-directory/postcode"
+  end
+end 

data/lib/belpost/api_service.rb

@@ -23,10 +23,12 @@ module Belpost
     # Performs a GET request to the specified path.
     #
     # @param path [String] The API endpoint path.
+    # @param params [Hash] The query parameters (default: {}).
     # @return [Models::ApiResponse] The parsed JSON response from the API.
-    def get(path)
+    def get(path, params = {})
       Retry.with_retry do
         uri = URI("#{@base_url}#{path}")
+        uri.query = URI.encode_www_form(params) unless params.empty?
         request = Net::HTTP::Get.new(uri)
         add_headers(request)
 
@@ -149,7 +151,6 @@ module Belpost
       http = Net::HTTP.new(uri.host, uri.port)
       http.use_ssl = true if uri.scheme == "https"
       http.read_timeout = @timeout
-
       begin
         response = http.request(request)
         handle_response(response)
@@ -189,7 +190,7 @@ module Belpost
 
     def handle_response(response)
       case response.code
-      when "200"
+      when "200", "201"
         response
       when "401", "403"
         raise AuthenticationError.new(

data/lib/belpost/client.rb

@@ -2,7 +2,11 @@
 
 require_relative "api_service"
 require_relative "models/parcel"
+require_relative "models/batch"
 require_relative "models/api_response"
+require_relative "validations/address_schema"
+require_relative "validations/batch_schema"
+require_relative "api_paths"
 
 module Belpost
   # Main client class for interacting with the BelPost API.
@@ -22,6 +26,23 @@ module Belpost
       )
     end
 
+    # Creates a new batch mailing by sending a POST request to the API.
+    #
+    # @param batch_data [Hash] The data for the batch mailing.
+    # @return [Hash] The parsed JSON response from the API.
+    # @raise [Belpost::InvalidRequestError] If the request data is invalid.
+    # @raise [Belpost::ApiError] If the API returns an error response.
+    def create_batch(batch_data)
+      validation_result = Validation::BatchSchema.new.call(batch_data)
+      unless validation_result.success?
+        raise ValidationError, "Invalid batch data: #{validation_result.errors.to_h}"
+      end
+
+      batch = Models::Batch.new(batch_data)
+      response = @api_service.post(ApiPaths::BATCH_MAILING_LIST, batch.to_h)
+      response.to_h
+    end
+
     # Creates a new postal parcel by sending a POST request to the API.
     #
     # @param parcel_data [Hash] The data for the postal parcel.
@@ -35,7 +56,7 @@ module Belpost
       end
 
       parcel = Models::Parcel.new(parcel_data)
-      response = @api_service.post("/api/v1/business/postal-deliveries", parcel.to_h)
+      response = @api_service.post(ApiPaths::POSTAL_DELIVERIES, parcel.to_h)
       response.to_h
     end
 
@@ -44,7 +65,7 @@ module Belpost
     # @return [Array<Hash>] The HS codes tree as an array of hashes.
     # @raise [Belpost::ApiError] If the API returns an error response.
     def fetch_hs_codes
-      response = @api_service.get("/api/v1/business/postal-deliveries/hs-codes/list")
+      response = @api_service.get(ApiPaths::POSTAL_DELIVERIES_HS_CODES)
       response.to_h
     end
 
@@ -55,7 +76,7 @@ module Belpost
     # @raise [Belpost::ApiError] If the API returns an error response.
     def validate_postal_delivery(country_code)
       country_code = country_code.upcase
-      response = @api_service.get("/api/v1/business/postal-deliveries/validation/#{country_code}")
+      response = @api_service.get("#{ApiPaths::POSTAL_DELIVERIES_VALIDATION}/#{country_code}")
       response.to_h
     end
 
@@ -64,8 +85,91 @@ module Belpost
     # @return [Hash] The parsed JSON response containing available countries.
     # @raise [Belpost::ApiError] If the API returns an error response.
     def fetch_available_countries
-      response = @api_service.get("/api/v1/business/postal-deliveries/countries")
+      response = @api_service.get(ApiPaths::POSTAL_DELIVERIES_COUNTRIES)
       response.to_h
     end
+
+    # Finds a batch by its ID.
+    #
+    # @param id [Integer] The ID of the batch to find.
+    # @return [Hash] The batch data if found.
+    # @raise [Belpost::ApiError] If the API returns an error response.
+    def find_batch_by_id(id)
+      raise ValidationError, "ID must be provided" if id.nil?
+      raise ValidationError, "ID must be a positive integer" unless id.is_a?(Integer) && id.positive?
+
+      response = @api_service.get("#{ApiPaths::BATCH_MAILING_LIST}/#{id}")
+      response.to_h
+    end
+
+    # Allows you to find an address by a string.
+    #
+    # Accepts a string with an address in any form and returns found addresses (up to 50 records).
+    # Building numbers should be specified without spaces: "building number""letter""building".
+    # The letter should be uppercase, and "building" (or "корп", "кор", "к") should be replaced with "/".
+    # Example: "город Минск улица Автодоровская 3Е корпус 4" should be transformed to "город Минск улица Автодоровская 3Е/4".
+    #
+    # @param address [String] The address string to search for.
+    # @return [Array<Hash>] An array of found addresses with postcode, region, city, street and other information.
+    # @raise [Belpost::ApiError] If the API returns an error response.
+    # @raise [Belpost::InvalidRequestError] If the address parameter is missing or has an incorrect format.
+    def find_address_by_string(address)
+      raise ValidationError, "Address must be filled" if address.nil?
+      raise ValidationError, "Address must be a string" unless address.is_a?(String)
+      raise ValidationError, "Address must be filled" if address.empty?
+
+      formatted_address = format_address(address)
+      response = @api_service.get(ApiPaths::GEO_DIRECTORY_SEARCH_ADDRESS, { search: formatted_address })
+      response.to_h
+    end
+
+    # Searches for postal codes by city, street, and building number.
+    #
+    # @param city [String] The city name (required)
+    # @param street [String] The street name (required)
+    # @param building [String] The building number (optional)
+    # @param limit [Integer] Maximum number of results (optional, default: 50, range: 1-200)
+    # @return [Array<Hash>] An array of found addresses with postcode, region, city, street and other information
+    # @raise [Belpost::ValidationError] If required parameters are missing or invalid
+    # @raise [Belpost::ApiError] If the API returns an error response
+    def search_postcode(city:, street:, building: nil, limit: 50)
+      raise ValidationError, "City must be filled" if city.nil?
+      raise ValidationError, "City must be a string" unless city.is_a?(String)
+      raise ValidationError, "City must be filled" if city.empty?
+      raise ValidationError, "Street must be filled" if street.nil?
+      raise ValidationError, "Street must be a string" unless street.is_a?(String)
+      raise ValidationError, "Street must be filled" if street.empty?
+      raise ValidationError, "Building must be a string" if building && !building.is_a?(String)
+      raise ValidationError, "Limit must be between 1 and 200" if limit < 1 || limit > 200
+
+      params = { city: city, street: street }
+      params[:building] = format_building_number(building) if building
+      params[:limit] = limit
+
+      response = @api_service.get(ApiPaths::GEO_DIRECTORY_POSTCODE, params)
+      response.to_h
+    end
+
+    private
+
+    def format_address(address)
+      address.gsub(/\s+/, " ")
+             .gsub(/\s*корпус\s*(\d+)\s*/i, '/\1')
+             .gsub(/\s*корп\s*(\d+)\s*/i, '/\1')
+             .gsub(/\s*кор\s*(\d+)\s*/i, '/\1')
+             .gsub(/\s*к\s*(\d+)\s*/i, '/\1')
+             .strip
+    end
+
+    def format_building_number(building)
+      return building unless building
+
+      building.gsub(/\s+/, " ")
+             .gsub(/\s*корпус\s*(\d+)\s*/i, '/\1')
+             .gsub(/\s*корп\s*(\d+)\s*/i, '/\1')
+             .gsub(/\s*кор\s*(\d+)\s*/i, '/\1')
+             .gsub(/\s*к\s*(\d+)\s*/i, '/\1')
+             .strip
+    end
   end
 end

data/lib/belpost/configuration.rb

@@ -7,9 +7,32 @@ module Belpost
     attr_accessor :base_url, :jwt_token, :timeout
 
     def initialize
-      @base_url = ENV.fetch("BELPOST_API_URL")
+      @base_url = ENV.fetch("BELPOST_API_URL", "https://api.belpost.by")
       @jwt_token = ENV.fetch("BELPOST_JWT_TOKEN", nil)
-      @timeout = ENV.fetch("BELPOST_TIMEOUT", 10).to_i
+      
+      # Convert timeout to integer with a fallback to default
+      begin
+        @timeout = Integer(ENV.fetch("BELPOST_TIMEOUT", 10))
+      rescue ArgumentError
+        @timeout = 10
+      end
+    end
+    
+    # Validates that all required configuration is present
+    # @raise [Belpost::ConfigurationError] If required configuration is missing
+    def validate!
+      raise ConfigurationError, "Base URL is required" if base_url.nil?
+      raise ConfigurationError, "JWT token is required" if jwt_token.nil?
+    end
+    
+    # Returns a hash representation of the configuration
+    # @return [Hash] The configuration as a hash
+    def to_h
+      {
+        base_url: base_url,
+        jwt_token: jwt_token,
+        timeout: timeout
+      }
     end
   end
 end

data/lib/belpost/models/batch.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Belpost
+  module Models
+    # Model class for batch mailing
+    class Batch
+      attr_reader :postal_delivery_type, :direction, :payment_type, :negotiated_rate,
+                  :name, :card_number, :postal_items_in_ops, :category, :is_document,
+                  :is_declared_value, :is_partial_receipt
+
+      def initialize(data)
+        @postal_delivery_type = data[:postal_delivery_type]
+        @direction = data[:direction]
+        @payment_type = data[:payment_type]
+        @negotiated_rate = data[:negotiated_rate]
+        @name = data[:name]
+        @card_number = data[:card_number]
+        @postal_items_in_ops = data[:postal_items_in_ops]
+        @category = data[:category]
+        @is_document = data[:is_document]
+        @is_declared_value = data[:is_declared_value]
+        @is_partial_receipt = data[:is_partial_receipt]
+      end
+
+      def to_h
+        {
+          postal_delivery_type: @postal_delivery_type,
+          direction: @direction,
+          payment_type: @payment_type,
+          negotiated_rate: @negotiated_rate,
+          name: @name,
+          card_number: @card_number,
+          postal_items_in_ops: @postal_items_in_ops,
+          category: @category,
+          is_document: @is_document,
+          is_declared_value: @is_declared_value,
+          is_partial_receipt: @is_partial_receipt
+        }.compact
+      end
+    end
+  end
+end 

data/lib/belpost/validations/address_schema.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require "dry-validation"
+
+module Belpost
+  module Validation
+    # Schema for validating and formatting address strings
+    class AddressSchema < Dry::Validation::Contract
+      params do
+        required(:address).filled(:string)
+      end
+
+      rule(:address) do
+        # Remove extra spaces
+        address = value.gsub(/\s+/, " ").strip
+        
+        # Replace building indicators with "/"
+        address = address.gsub(/\s+(корпус|корп|кор|к)\s+/, "/")
+        
+        # Ensure building number format (no spaces between number, letter, and building)
+        address = address.gsub(/(\d+)\s*([А-Я])\s*(\d+)/, '\1\2/\3')
+        
+        # Ensure letter is uppercase
+        address = address.gsub(/(\d+)([а-я])(\/\d+)/) { |m| "#{$1}#{$2.upcase}#{$3}" }
+        
+        key.failure(address)
+      end
+    end
+  end
+end 

data/lib/belpost/validations/batch_schema.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+require "dry-validation"
+
+module Belpost
+  module Validation
+    # Schema for validating batch mailing data
+    class BatchSchema < Dry::Validation::Contract
+      params do
+        required(:postal_delivery_type).filled(:str?).value(
+          included_in?: %w[
+            ordered_small_package
+            letter_declare_value
+            package
+            ems
+            ordered_parcel_post
+            ordered_letter
+            ordered_postcard
+            small_package_declare_value
+            package_declare_value
+            ecommerce_economical
+            ecommerce_standard
+            ecommerce_elite
+            ecommerce_express
+            ecommerce_light
+            ecommerce_optima
+          ]
+        )
+
+        required(:direction).filled(:str?).value(
+          included_in?: %w[internal CIS international]
+        )
+
+        required(:payment_type).filled(:str?).value(
+          included_in?: %w[
+            not_specified
+            cash
+            payment_order
+            electronic_personal_account
+            4
+            5
+            commitment_letter
+          ]
+        )
+
+        required(:negotiated_rate).filled(:bool?)
+
+        optional(:name).maybe(:str?)
+        optional(:card_number).maybe(:str?)
+        optional(:postal_items_in_ops).maybe(:bool?)
+        optional(:category).maybe(:int?)
+        optional(:is_document).maybe(:bool?)
+        optional(:is_declared_value).maybe(:bool?)
+        optional(:is_partial_receipt).maybe(:bool?)
+      end
+    end
+  end
+end 

data/lib/belpost/validations/parcel_schema.rb

@@ -1,154 +1,172 @@
 # frozen_string_literal: true
 
-require "dry/schema"
+require "dry-validation"
 
 module Belpost
   # rubocop:disable Metrics/ModuleLength
   module Validation
     # Validation schema for parcel_data
     # rubocop:disable Metrics/BlockLength
-    ParcelSchema = Dry::Schema.JSON do
-      required(:parcel).hash do
-        required(:type).filled(:string, included_in?: %w[package small_package small_valued_package ems])
-        required(:attachment_type).filled(:string, included_in?: %w[products documents])
-        required(:measures).hash do
-          required(:weight).filled(:integer, gt?: 0)
-          optional(:long).value(:integer, gt?: 0)
-          optional(:width).value(:integer, gt?: 0)
-          optional(:height).value(:integer, gt?: 0)
-        end
-        required(:departure).hash do
-          required(:country).filled(:string, eql?: "BY")
-          required(:place).filled(:string, included_in?: %w[post_office])
-          optional(:place_uuid).maybe(:string)
-        end
-        required(:arrival).hash do
-          required(:country).filled(:string)
-          required(:place).filled(:string, included_in?: %w[post_office])
-          optional(:place_uuid).maybe(:string)
+    class ParcelSchema < Dry::Validation::Contract
+      params do
+        required(:parcel).hash do
+          required(:type).filled(:string, included_in?: %w[package small_package small_valued_package ems])
+          required(:attachment_type).filled(:string, included_in?: %w[products documents])
+          required(:measures).hash do
+            required(:weight).filled(:integer, gt?: 0)
+            optional(:long).value(:integer, gt?: 0)
+            optional(:width).value(:integer, gt?: 0)
+            optional(:height).value(:integer, gt?: 0)
+          end
+          required(:departure).hash do
+            required(:country).filled(:string, eql?: "BY")
+            required(:place).filled(:string, included_in?: %w[post_office])
+            optional(:place_uuid).maybe(:string)
+          end
+          required(:arrival).hash do
+            required(:country).filled(:string)
+            required(:place).filled(:string, included_in?: %w[post_office])
+            optional(:place_uuid).maybe(:string)
+          end
+          optional(:s10code).maybe(:string)
         end
-        optional(:s10code).maybe(:string)
-      end
 
-      optional(:addons).hash do
-        optional(:cash_on_delivery).maybe(:hash) do
-          required(:currency).filled(:string, eql?: "BYN")
-          required(:value).filled(:float, gt?: 0)
-        end
-        optional(:declared_value).maybe(:hash) do
-          required(:currency).filled(:string, eql?: "BYN")
-          required(:value).filled(:float, gt?: 0)
-        end
-        optional(:IOSS).maybe(:string)
-        optional(:registered_notification).maybe(:string)
-        optional(:simple_notification).maybe(:bool)
-        optional(:sms_notification).maybe(:bool)
-        optional(:email_notification).maybe(:bool)
-        optional(:priority_parcel).maybe(:bool)
-        optional(:attachment_inventory).maybe(:bool)
-        optional(:paid_shipping).maybe(:bool)
-        optional(:careful_fragile).maybe(:bool)
-        optional(:bulky).maybe(:bool)
-        optional(:ponderous).maybe(:bool)
-        optional(:payment_upon_receipt).maybe(:bool)
-        optional(:hand_over_personally).maybe(:bool)
-        optional(:return_of_documents).maybe(:bool)
-        optional(:open_upon_delivery).maybe(:bool)
-        optional(:delivery_to_work).maybe(:bool)
-        optional(:time_of_delivery).maybe(:hash) do
-          required(:type).filled(:string, included_in?: %w[level1 level2 level3 level4])
-          optional(:time_interval).hash do
-            required(:from).filled(:string)
-            required(:to).filled(:string)
+        optional(:addons).hash do
+          optional(:cash_on_delivery).maybe(:hash) do
+            required(:currency).filled(:string, eql?: "BYN")
+            required(:value).filled(:float, gt?: 0)
+          end
+          optional(:declared_value).maybe(:hash) do
+            required(:currency).filled(:string, eql?: "BYN")
+            required(:value).filled(:float, gt?: 0)
+          end
+          optional(:IOSS).maybe(:string)
+          optional(:registered_notification).maybe(:string)
+          optional(:simple_notification).maybe(:bool)
+          optional(:sms_notification).maybe(:bool)
+          optional(:email_notification).maybe(:bool)
+          optional(:priority_parcel).maybe(:bool)
+          optional(:attachment_inventory).maybe(:bool)
+          optional(:paid_shipping).maybe(:bool)
+          optional(:careful_fragile).maybe(:bool)
+          optional(:bulky).maybe(:bool)
+          optional(:ponderous).maybe(:bool)
+          optional(:payment_upon_receipt).maybe(:bool)
+          optional(:hand_over_personally).maybe(:bool)
+          optional(:return_of_documents).maybe(:bool)
+          optional(:open_upon_delivery).maybe(:bool)
+          optional(:delivery_to_work).maybe(:bool)
+          optional(:time_of_delivery).maybe(:hash) do
+            required(:type).filled(:string, included_in?: %w[level1 level2 level3 level4])
+            optional(:time_interval).hash do
+              required(:from).filled(:string)
+              required(:to).filled(:string)
+            end
           end
         end
-      end
 
-      required(:sender).hash do
-        required(:type).filled(:string, included_in?: %w[legal_person sole_proprietor])
-        required(:info).hash do
-          required(:organization_name).filled(:string)
-          optional(:taxpayer_number).maybe(:string)
-          optional(:bank).maybe(:string)
-          optional(:IBAN).maybe(:string)
-          optional(:BIC).maybe(:string)
-        end
-        required(:location).hash do
-          required(:code).filled(:string)
-          required(:region).filled(:string)
-          required(:district).filled(:string)
-          required(:locality).hash do
-            required(:type).filled(:string)
-            required(:name).filled(:string)
+        optional(:sender).hash do
+          required(:type).filled(:string, included_in?: %w[legal_person natural_person])
+          required(:info).hash do
+            optional(:organization_name).maybe(:string)
+            optional(:taxpayer_number).maybe(:string)
+            optional(:IBAN).maybe(:string)
+            optional(:BIC).maybe(:string)
+            optional(:bank).maybe(:string)
+            optional(:first_name).maybe(:string)
+            optional(:second_name).maybe(:string)
+            optional(:last_name).maybe(:string)
           end
-          required(:road).hash do
-            required(:type).filled(:string)
-            required(:name).filled(:string)
+          required(:location).hash do
+            required(:code).filled(:string)
+            required(:region).filled(:string)
+            required(:district).filled(:string)
+            required(:locality).hash do
+              required(:type).filled(:string)
+              required(:name).filled(:string)
+            end
+            required(:road).hash do
+              required(:type).filled(:string)
+              required(:name).filled(:string)
+            end
+            required(:building).filled(:string)
+            optional(:housing).maybe(:string)
+            optional(:apartment).maybe(:string)
           end
-          required(:building).filled(:string)
-          optional(:housing).maybe(:string)
-          optional(:apartment).maybe(:string)
+          optional(:email).maybe(:string)
+          optional(:phone).maybe(:string)
         end
-        required(:email).filled(:string)
-        required(:phone).filled(:string)
-      end
 
-      required(:recipient).hash do
-        required(:type).filled(:string, included_in?: %w[natural_person legal_person sole_proprietor])
-        required(:info).hash do
-          optional(:organization_name).maybe(:string)
-          optional(:first_name).maybe(:string)
-          optional(:second_name).maybe(:string)
-          optional(:last_name).maybe(:string)
-        end
-        required(:location).hash do
-          optional(:code).maybe(:string)
-          optional(:region).maybe(:string)
-          optional(:district).maybe(:string)
-          optional(:locality).maybe(:hash) do
-            optional(:type).maybe(:string)
-            optional(:name).maybe(:string)
+        optional(:recipient).hash do
+          required(:type).filled(:string, included_in?: %w[legal_person natural_person])
+          required(:info).hash do
+            optional(:organization_name).maybe(:string)
+            optional(:taxpayer_number).maybe(:string)
+            optional(:IBAN).maybe(:string)
+            optional(:BIC).maybe(:string)
+            optional(:bank).maybe(:string)
+            optional(:first_name).maybe(:string)
+            optional(:second_name).maybe(:string)
+            optional(:last_name).maybe(:string)
           end
-          optional(:road).maybe(:hash) do
-            optional(:type).maybe(:string)
-            optional(:name).maybe(:string)
+          required(:location).hash do
+            required(:code).filled(:string)
+            required(:region).filled(:string)
+            required(:district).filled(:string)
+            required(:locality).hash do
+              required(:type).filled(:string)
+              required(:name).filled(:string)
+            end
+            required(:road).hash do
+              required(:type).filled(:string)
+              required(:name).filled(:string)
+            end
+            required(:building).filled(:string)
+            optional(:housing).maybe(:string)
+            optional(:apartment).maybe(:string)
           end
-          optional(:building).maybe(:string)
-          optional(:housing).maybe(:string)
-          optional(:apartment).maybe(:string)
-          optional(:address).maybe(:string)
+          optional(:email).maybe(:string)
+          optional(:phone).maybe(:string)
         end
-        optional(:email).maybe(:string)
-        required(:phone).filled(:string)
-      end
 
-      optional(:cp72).hash do
-        optional(:items).array(:hash) do
-          required(:name).filled(:string)
-          required(:local).filled(:string)
-          required(:unit).hash do
+        optional(:cp72).hash do
+          optional(:items).array(:hash) do
+            required(:name).filled(:string)
             required(:local).filled(:string)
-            required(:en).filled(:string)
+            required(:unit).hash do
+              required(:local).filled(:string)
+              required(:en).filled(:string)
+            end
+            required(:count).filled(:integer, gt?: 0)
+            required(:weight).filled(:integer, gt?: 0)
+            required(:price).hash do
+              required(:currency).filled(:string)
+              required(:value).filled(:float, gt?: 0)
+            end
+            optional(:code).maybe(:string)
+            optional(:country).maybe(:string)
           end
-          required(:count).filled(:integer, gt?: 0)
-          required(:weight).filled(:integer, gt?: 0)
-          required(:price).hash do
+          optional(:price).hash do
             required(:currency).filled(:string)
             required(:value).filled(:float, gt?: 0)
           end
-          optional(:code).maybe(:string)
-          optional(:country).maybe(:string)
-        end
-        optional(:price).hash do
-          required(:currency).filled(:string)
-          required(:value).filled(:float, gt?: 0)
+          optional(:category).filled(:string, included_in?: %w[gift documents sample returned_goods merchandise other])
+          optional(:explanation).maybe(:string)
+          optional(:comments).maybe(:string)
+          optional(:invoice).maybe(:string)
+          optional(:licences).array(:string)
+          optional(:certificates).array(:string)
         end
-        optional(:category).filled(:string, included_in?: %w[gift documents sample returned_goods merchandise other])
-        optional(:explanation).maybe(:string)
-        optional(:comments).maybe(:string)
-        optional(:invoice).maybe(:string)
-        optional(:licences).array(:string)
-        optional(:certificates).array(:string)
+      end
+
+      # Add class method to make it compatible with the tests
+      def self.call(params)
+        new.call(params)
+      end
+
+      # Add validation rule for organization_name when sender type is legal_person
+      rule('sender.info.organization_name') do
+        key.failure('must be filled') if values[:sender] && values[:sender][:type] == 'legal_person' && !values.dig(:sender, :info, :organization_name)
       end
     end
     # rubocop:enable Metrics/BlockLength

data/lib/belpost/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Belpost
-  VERSION = "0.4.0"
+  VERSION = "0.9.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: belpost
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.9.0
 platform: ruby
 authors:
 - KuberLite
 bindir: exe
 cert_chain: []
-date: 2025-04-01 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -37,6 +37,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: dry-schema
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: Gem for working with the 'Belpost' delivery service via API
 email:
 - kuberlite@gmail.com
@@ -55,15 +69,19 @@ files:
 - Rakefile
 - belpost.gemspec
 - lib/belpost.rb
+- lib/belpost/api_paths.rb
 - lib/belpost/api_service.rb
 - lib/belpost/client.rb
 - lib/belpost/configuration.rb
 - lib/belpost/errors.rb
 - lib/belpost/models/api_response.rb
+- lib/belpost/models/batch.rb
 - lib/belpost/models/customs_declaration.rb
 - lib/belpost/models/parcel.rb
 - lib/belpost/models/parcel_builder.rb
 - lib/belpost/retry.rb
+- lib/belpost/validations/address_schema.rb
+- lib/belpost/validations/batch_schema.rb
 - lib/belpost/validations/parcel_schema.rb
 - lib/belpost/version.rb
 homepage: https://github.com/KuberLite/belpost
@@ -89,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Belpost API wrapper
 test_files: []