evropochta 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95c05e20fa1d3a300d89e9364bc7ec5644756a47f617b780746d0fee0e5c6fc8
-  data.tar.gz: b225700ca8d1ef4ad165bcfb618be9f62539d13adec52a61c19cdb85f285366a
+  metadata.gz: 43fb3aa9657f28f006bf89b5bae8fcb0485bf13fb7c2f19af29465a5d4ba8b9f
+  data.tar.gz: bfc6977882aad03b2d34b47c1b7e97725ab5672566fbd7af370c7b6f1bcada88
 SHA512:
-  metadata.gz: 5756637c37eb45945dc74356ee99f6d09ec46f29fbd73d291e1208268c2fa0974c4270fb5c0d0edcf23b34cab3f4649c8f8f7e266c8fd7e21a2ed181d927cef9
-  data.tar.gz: 60a29f4b2f30602c6fdecb8a4b82facadd1b558398f2bcba957597af824ae1e43d0c44e5ad5913deb0f5202e5c3f57b9bd3a9a49c959f4b63b7242295d9cb975
+  metadata.gz: bca92ab1f4dd47874d85b907ae3992a37edd50ff750a4baaf859dd2bb7bb608e27fe21a9966af4a49118cd8b2b56c23220658a7f264939e10cc3b7a7237e3032
+  data.tar.gz: 1bb52b3eada3946741ff0cb3b07367115b1d41f76bdce19581e3fd7234f6ab997dbcafa5373000cb7a8b11f1bfec19b1d9f2c139e14cbde0bce46a40d60f674e

data/README.md

@@ -1,2 +1,67 @@
-# Evropochta
-Gem for working with the "Evropochta" delivery service via API
+Evropochta Ruby Client
+=================
+
+A Ruby client for the Evropochta (https://evropochta.by/) API.
+
+<img src="https://avatars.mds.yandex.net/get-altay/14020851/2a00000191f166d6c586803a961a45011a4d/orig" alt="Evropochta Logo" width="300" height="200">
+
+## Installation
+
+Add to Gemfile.
+
+```
+gem 'evropochta'
+```
+
+Run `bundle install`.
+
+## Usage
+1. Add gem to your project
+2. Get your SERVICE_NUMBER and LOGIN_NAME/PASSWORD:
+   - SERVICE_NUMBER provides by Evropochta manager.
+   - LOGIN_NAME/PASSWORD - credentials for your bussines account.
+3. Create a .env file
+
+```bash
+API_URL=
+API_PORT=
+SERVICE_NUMBER=
+USER_LOGIN_NAME=
+USER_PASSWORD=
+USER_LOGIN_NAME_TYPE_ID=<1 
+```
+
+
+
+
+
+
+## Quick start
+
+```
+gem install evropochta
+```
+
+```ruby
+require "evropochta"
+```
+
+```ruby
+gem "evropochta"
+```
+
+## Support
+
+If you want to report a bug, or have ideas, feedback or questions about the gem, [let me know via GitHub issues](https://github.com/mattbrictson/gem/issues/new) and I will do my best to provide a helpful answer. Happy hacking!
+
+## License
+
+The gem is available as open source under the terms of the [MIT License](LICENSE.txt).
+
+## Code of conduct
+
+Everyone interacting in this project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](CODE_OF_CONDUCT.md).
+
+## Contribution guide
+
+Pull requests are welcome!

data/exe/evropochta

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
 
-require "evropochta"
+require "evropochta"

data/lib/evropochta/addresses/search4.rb

@@ -3,7 +3,14 @@ module Evropochta
     module Search4
       module_function
 
+      MAX_LIMIT = 50
+
       def call(address: "", limit_addresses: 10, address4_id: 0)
+        if limit_addresses.zero? || limit_addresses > MAX_LIMIT
+          LOG.error("Incorrect limit addresses (#{limit_addresses}). Should be in range 1 to 50")
+          return []
+        end
+
         Services::Shared.request(
           "Addresses.Search4",
           {

data/lib/evropochta/postal/base.rb

@@ -0,0 +1,12 @@
+module Evropochta
+  module Postal
+    module Base
+      def validate_required_keys(opts)
+        missing_keys = self::REQUIRED_KEYS.select { |key| opts[key].nil? }
+        return unless missing_keys.any?
+
+        raise ArgumentError, "Missing required keys: #{missing_keys.map(&:to_s).join(', ')}"
+      end
+    end
+  end
+end

data/lib/evropochta/postal/delivery_time.rb

@@ -7,7 +7,7 @@ module Evropochta
         Services::Shared.request(
           "Postal.DeliveryTime",
           Number: track_number,
-          Address1IdReciever: address1_id_reciever,
+          Address1IdReciever: address1_id_reciever
         )
       end
     end

data/lib/evropochta/postal/group_order.rb

@@ -9,7 +9,7 @@ module Evropochta
           {
             PostalItemExternalId: postal_item_external_ids,
             SerialNumber: serial_numbers,
-            DateTransfer: date_transfer,
+            DateTransfer: date_transfer
           }
         )
       end

data/lib/evropochta/postal/put_order.rb

@@ -1,44 +1,60 @@
 module Evropochta
   module Postal
     module PutOrder
+      extend Base
+
       module_function
 
+      REQUIRED_KEYS = %i[
+        goods_id
+        post_delivery_type_id
+        postal_weight_id
+        warehouse_id_start
+        phone_number_reciever
+        name1_reciever
+        name2_reciever
+      ].freeze
+
       def call(opts: {})
+        validate_required_keys(opts)
+
+        data = {
+          GoodsId: opts[:goods_id],
+          PostDeliveryTypeId: opts[:post_delivery_type_id],
+          PostalWeightId: opts[:postal_weight_id],
+          IsFragile: opts[:is_fragile],
+          IsInventory: opts[:is_inventory],
+          IsCompletenessCheck: opts[:is_completeness_check],
+          CashOnDeliverySum: opts[:cash_on_delivery_sum],
+          CashOnDeliveryDeclareValueSum: opts[:cash_on_delivery_declare_value_sum],
+          WarehouseIdStart: opts[:warehouse_id_start],
+          WarehouseIdFinish: opts[:warehouse_id_finish],
+          Adress1IdReciever: opts[:adress1_id_reciever],
+          PhoneNumberReciever: opts[:phone_number_reciever],
+          EMailReciever: opts[:email_reciever],
+          Name1Reciever: opts[:name1_reciever],
+          Name2Reciever: opts[:name2_reciever],
+          Name3Reciever: opts[:name3_reciever],
+          CashOnDeliveryMoneyBackId: opts[:cash_on_delivery_money_back_id],
+          InfoSender: opts[:info_sender],
+          PostalItemExternalId: opts[:postal_item_external_id],
+          IsOversize: opts[:is_oversize],
+          PostalHeight: opts[:postal_height],
+          PostalWidth: opts[:postal_width],
+          PostalLength: opts[:postal_length],
+          IsAutoDeliveryFlag: opts[:is_auto_delivery_flag],
+          AutoDeliveryTimeFrom: opts[:auto_delivery_time_from],
+          AutoDeliveryTimeTo: opts[:auto_delivery_time_to],
+          IsRelabeling: opts[:is_relabeling],
+          IsRecieverShipping: opts[:is_reciever_shipping],
+          IsRecieverPackaging: opts[:is_reciever_packaging],
+          IsRecieverCashOnDelivery: opts[:is_reciever_cash_on_delivery],
+          AgreementTypeId: opts[:agreement_type_id]
+        }
+
         Services::Shared.request(
           "Postal.PutOrder",
-          {
-            GoodsId: opts[:goods_id],
-            PostDeliveryTypeId: opts[:post_delivery_type_id],
-            PostalWeightId: opts[:postal_weight_id],
-            IsFragile: opts[:is_fragile],
-            IsInventory: opts[:is_inventory],
-            IsCompletenessCheck: opts[:is_completeness_check],
-            CashOnDeliverySum: opts[:cash_on_delivery_sum],
-            CashOnDeliveryDeclareValueSum: opts[:cash_on_delivery_declare_value_sum],
-            WarehouseIdStart: opts[:warehouse_id_start],
-            WarehouseIdFinish: opts[:warehouse_id_finish],
-            Adress1IdReciever: opts[:adress1_id_reciever],
-            PhoneNumberReciever: opts[:phone_number_reciever],
-            EMailReciever: opts[:email_reciever],
-            Name1Reciever: opts[:name1_reciever],
-            Name2Reciever: opts[:name2_reciever],
-            Name3Reciever: opts[:name3_reciever],
-            CashOnDeliveryMoneyBackId: opts[:cash_on_delivery_money_back_id],
-            InfoSender: opts[:info_sender],
-            PostalItemExternalId: opts[:postal_item_external_id],
-            IsOversize: opts[:is_oversize],
-            PostalHeight: opts[:postal_height],
-            PostalWidth: opts[:postal_width],
-            PostalLength: opts[:postal_length],
-            IsAutoDeliveryFlag: opts[:is_auto_delivery_flag],
-            AutoDeliveryTimeFrom: opts[:auto_delivery_time_from],
-            AutoDeliveryTimeTo: opts[:auto_delivery_time_to],
-            IsRelabeling: opts[:is_relabeling],
-            IsRecieverShipping: opts[:is_reciever_shipping],
-            IsRecieverPackaging: opts[:is_reciever_packaging],
-            IsRecieverCashOnDelivery: opts[:is_reciever_cash_on_delivery],
-            AgreementTypeId: opts[:agreement_type_id]
-          }
+          data.compact
         )
       end
     end

data/lib/evropochta/version.rb

@@ -1,3 +1,3 @@
 module Evropochta
-  VERSION = "0.2.0".freeze
+  VERSION = "0.3.0".freeze
 end

data/lib/evropochta.rb

@@ -1,4 +1,5 @@
 require "dotenv/load"
+require "logger"
 require_relative "evropochta/version"
 require_relative "evropochta/config"
 require_relative "evropochta/services/api_service"
@@ -8,6 +9,7 @@ require_relative "evropochta/services/shared"
 require_relative "evropochta/addresses/search4"
 require_relative "evropochta/addresses/get_address_id"
 
+require_relative "evropochta/postal/base"
 require_relative "evropochta/postal/delivery_type_dir"
 require_relative "evropochta/postal/types_dir"
 require_relative "evropochta/postal/weight_type_dir"
@@ -24,4 +26,5 @@ require_relative "evropochta/postal/group_order"
 require_relative "evropochta/postal/delivery_time"
 
 module Evropochta
+  LOG = Logger.new($stdout, level: :warn)
 end

metadata

@@ -1,16 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: evropochta
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Denis Grahovskiy
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-11-02 00:00:00.000000000 Z
-dependencies: []
-description: 
+date: 2025-03-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description:
 email:
 - kuberlite@gmail.com
 executables:
@@ -25,6 +39,7 @@ files:
 - lib/evropochta/addresses/search4.rb
 - lib/evropochta/auth/jwt.rb
 - lib/evropochta/config.rb
+- lib/evropochta/postal/base.rb
 - lib/evropochta/postal/calculation_tariff.rb
 - lib/evropochta/postal/change_order.rb
 - lib/evropochta/postal/delivery_time.rb
@@ -51,7 +66,7 @@ metadata:
   source_code_uri: https://github.com/KuberLite/evropochta
   homepage_uri: https://github.com/KuberLite/evropochta
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -66,8 +81,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
-signing_key: 
+rubygems_version: 3.5.3
+signing_key:
 specification_version: 4
 summary: Evropochta API wrapper
 test_files: []