gus_bir1 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9680b3fb20b4b3c9e2709a6983408db4d0a7ae0c44a785e9091d6517565642d8
-  data.tar.gz: f546c8a9fcb50cc6be2347a55f4020e5099a480b91876013cb4eeae52bf58321
+  metadata.gz: e150cc608515def79527b5145c7d97acf9327c4fbb6fb94e164bb4a81d2d3ca0
+  data.tar.gz: 4f9fdb5c6997aef43a11726a0e745f5dc76ed4d273e8043da68ef90279a9cb4d
 SHA512:
-  metadata.gz: 9eca81e9d55c9964f14579eab5dc36cabedbcf479a291a4ada75c4c8982ba9ac73daccf93bc3bc68e9470fe239047f84612df0497f58b6408664cdde9aed7b1b
-  data.tar.gz: 1dbe40541fa79eaff76e1a7719d1a3d90555e161120e9dbcf7f661b9faa182485bbc3d34f1789337041bb46492442545b824cbc35d1a4d19deb5cf508f8a5b65
+  metadata.gz: 5babed383a6565f4ade0d8b6cc1ee94df17ff8db43958a28d39e4029b71ae04bc00faa90cfc01fbadfb65765ebb26b5fad6749db8d353cd925956d0c7986bf13
+  data.tar.gz: 37eee6c052217ebe11b5ef965bee6da2490241c26fdd90057efe0299e3eeeb4dc6671c67f88d2cf3aee2fa1b84bb86e187ff2682031480d5d35c3a7030a8df7e

data/.github/workflows/ci.yml

@@ -13,7 +13,7 @@ jobs:
       CI: true
     strategy:
       matrix:
-        ruby-version: ['3.2', '3.3', '3.4']
+        ruby-version: ['3.2', '3.3', '3.4', '4.0']
     steps:
       - name: Checkout code
         uses: actions/checkout@v3

data/README.md

@@ -35,6 +35,10 @@ Or install it yourself as:
 # TEST CONF
 GusBir1.production = false
 GusBir1.client_key = 'abcde12345abcde12345'
+
+# Optional, disabled by default. Enable Savon/HTTPI debug logging:
+GusBir1.logging = true
+GusBir1.log_level = :debug
 ```
 
 ### General info

data/gus_bir1.gemspec

@@ -13,6 +13,7 @@ Gem::Specification.new do |spec|
   spec.summary       = 'Rails GUS API library based on official REGON SOAP api.'
   spec.homepage      = 'https://github.com/espago/gus_bir1'
   spec.license       = 'MIT'
+  spec.required_ruby_version = '>= 3.2.0'
 
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
@@ -27,6 +28,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'simplecov'
 
-  spec.add_dependency 'savon', '~> 2.15'
-  spec.add_dependency 'savon-multipart'
+  spec.add_dependency 'savon', '~> 2.17.4'
 end

data/lib/gus_bir1/client.rb

@@ -1,10 +1,24 @@
 # frozen_string_literal: true
 
+require 'savon'
+
 module GusBir1
   class Client
     SESSION_TIMEOUT = 3600
+    PUBL_OPERATIONS = %i[
+      wyloguj
+      dane_szukaj_podmioty
+      dane_pobierz_pelny_raport
+      dane_komunikat
+      zaloguj
+    ].freeze
+
     attr_accessor :production, :client_key, :log_level, :logging
 
+    def initialize
+      @logging = false
+    end
+
     def service_status
       v = get_value(Constants::PARAM_PARAM_NAME => Constants::PARAM_SERVICE_STATUS)
       Response::Simple.new(v, Constants::PARAM_SERVICE_STATUS)
@@ -25,6 +39,7 @@ module GusBir1
       types = [nip, regon, krs, nips, krss, regons14, regons9].compact
       raise TooMuchTypesSelected if types.size > 1
       raise NoOneTypeSelected if types.empty?
+
       if nip
         search_by Constants::SEARCH_TYPE_NIP, nip
       elsif regon
@@ -73,13 +88,14 @@ module GusBir1
 
     def namespaces(publ: true)
       {
-        'xmlns:ns' =>  publ ? Constants::WSDL_NS_PUBL : Constants::WSDL_NS,
+        'xmlns:ns' => publ ? Constants::WSDL_NS_PUBL : Constants::WSDL_NS,
         'xmlns:dat' => Constants::WSDL_NS_DATA_CONTRACT
       }
     end
 
     def endpoint
       return Constants::WSDL_ADDRESS if @production
+
       Constants::WSDL_ADDRESS_TEST
     end
 
@@ -93,21 +109,13 @@ module GusBir1
     end
 
     def call(method, message)
-      case method
-      when
-          :wyloguj,
-          :dane_szukaj_podmioty,
-          :dane_pobierz_pelny_raport,
-          :dane_komunikat,
-          :zaloguj
-        savon_client_publ.call(method, message: message)
-      else
-        savon_client.call(method, message: message)
-      end
+      client = PUBL_OPERATIONS.include?(method) ? savon_client_publ : savon_client
+      client.call(method, message: message)
     end
 
     def set_session_id
       return @sid if sid_active
+
       @sid_exp = Time.now + SESSION_TIMEOUT
       @sid = zaloguj(Constants::PARAM_USER_KEY => @client_key)
       clear_savon_clients
@@ -126,15 +134,20 @@ module GusBir1
 
     def logout
       return unless sid_active
+
       wyloguj(Constants::PARAM_SESSION_ID => @sid)
     end
 
     def savon_client_publ
-      @savon_client_publ ||= Savon.client(savon_options(publ: true))
+      @savon_client_publ ||= build_savon_client(publ: true)
     end
 
     def savon_client
-      @savon_client ||= Savon.client(savon_options)
+      @savon_client ||= build_savon_client(publ: false)
+    end
+
+    def build_savon_client(publ: false)
+      Savon.client(savon_options(publ: publ))
     end
 
     def savon_options(publ: false)
@@ -146,14 +159,11 @@ module GusBir1
         soap_version: 2,
         namespace_identifier: :ns,
         element_form_default: :qualified,
-        multipart: true,
         log_level: @log_level,
         log: @logging,
         proxy: ENV['GUS_BIR_PROXY_URL']
       }
-      if defined?(@sid) && @sid.nil? == false
-        params.merge!({headers: { sid: @sid } })
-      end
+      params.merge!({ headers: { sid: @sid } }) if defined?(@sid) && @sid.nil? == false
       params
     end
 
@@ -161,11 +171,5 @@ module GusBir1
       @savon_client = nil
       @savon_client_publ = nil
     end
-
-    def savon_api_client
-      @savon_api_client ||= GusBir1::SavonApiClient.new
-    end
   end
 end
-require 'savon'
-require 'savon-multipart'

data/lib/gus_bir1/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GusBir1
-  VERSION = '1.3.0'
+  VERSION = '1.4.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gus_bir1
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Waclaw Luczak
@@ -85,28 +85,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.15'
+        version: 2.17.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.15'
-- !ruby/object:Gem::Dependency
-  name: savon-multipart
-  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'
+        version: 2.17.4
 email:
 - waclaw@luczak.it
 executables: []
@@ -146,14 +132,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Rails GUS API library based on official REGON SOAP api.
 test_files: []