gus_bir1 1.0.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1dd6c529611bfd16350b95eb343a18c4f2ac8ac8
-  data.tar.gz: '09271b1f6eaef3ed8a1a318bf3bc2f3d01504d49'
+SHA256:
+  metadata.gz: 303c6dcab16075513fc7d7ec639eaa506eb80e71285fef8b947af71d56a2ee35
+  data.tar.gz: 2a2ef444e5cbd513ed4843bfd0aa54036fca276807f66695c75b524acea833f0
 SHA512:
-  metadata.gz: 36ae1e77385e1c30e9317112170b9480edc5a1b43e5405e55089466933c567cb40557b95769a050cc3ed8b8ede4d709337d202fbdee893cc498286629aa68e3d
-  data.tar.gz: fc72175a4a771bcddb76b8c94b79a8dcb938d028676906b4f2a0095f0ef765206b18cbc2b90b4876da40c068897b75cca261d276dc5cc8df188c2e5e5e2597e9
+  metadata.gz: 1e8d55e8934944df1de91e6ec513a30ae2973fbbe73157c112f92f5575a41daf37d7c06fe96435f9db8c899133971a03e3d5284ed81c4f72a0678147788bd8ea
+  data.tar.gz: fd3d7ffb44a5205bc36470d9a1cbfc517c9fd7861f89eff87069cf619b69df957ad317c1e9aee60afbfb12eded4b01a296aabea797cf1b736c9a1a8983945c53

data/.gitignore

@@ -9,3 +9,4 @@
 /tmp/
 .ruby-gemset
 .ruby-version
+.idea

data/.travis.yml

@@ -5,8 +5,9 @@ env:
 sudo: false
 language: ruby
 rvm:
-  - 2.4
-before_install: gem install bundler -v 1.14.6
+  - 2.7.7
+   -3.0.5
+before_install: gem install bundler
 
 before_script:
   - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter

data/README.md

@@ -4,8 +4,8 @@
 [![Code Climate](https://codeclimate.com/github/espago/gus_bir1/badges/gpa.svg)](https://codeclimate.com/github/espago/gus_bir1)
 [![Test Coverage](https://codeclimate.com/github/espago/gus_bir1/badges/coverage.svg)](https://codeclimate.com/github/espago/gus_bir1)
 
-Simple, ruby wrapper for REGON database (Baza Internetowa Regon (BIR))(web frontend is reachable at https://wyszukiwarkaregon.stat.gov.pl/appBIR/index.aspx). To access its SOAP API, one needs an USER_KEY issued by REGON administrators available at Regon_Bir@stat.gov.pl.
-Official GUS docs http://bip.stat.gov.pl/dzialalnosc-statystyki-publicznej/rejestr-regon/interfejsyapi/jak-skorzystac-informacja-dla-podmiotow-komercyjnych/
+Simple, ruby wrapper for REGON database (Baza Internetowa Regon (BIR))(web frontend is reachable at https://wyszukiwarkaregon.stat.gov.pl/appBIR/index.aspx). To access its SOAP API, one needs an USER_KEY issued by REGON administrators available at regon_bir@stat.gov.pl.
+Official GUS docs https://api.stat.gov.pl/Home/RegonApi
 
 
 ## Installation

data/bin/test

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+bundle exec rake test

data/gus_bir1.gemspec

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'gus_bir1/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'gus_bir1'
   spec.version       = GusBir1::VERSION
-  spec.authors       = ['Wacław Łuczak']
+  spec.authors       = ['Waclaw Luczak']
   spec.email         = ['waclaw@luczak.it']
 
   spec.summary       = 'Rails GUS API library based on official REGON SOAP api.'
@@ -21,12 +21,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.14'
-  spec.add_development_dependency 'minitest', '~> 5.0'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rubocop', '~> 0.52'
-  spec.add_development_dependency 'simplecov', '~> 0'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'minitest'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'simplecov'
 
-  spec.add_dependency 'savon', '~> 2.12'
-  spec.add_dependency 'savon-multipart', '~> 2.1', '>= 2.1.1'
+  spec.add_dependency 'savon', '~> 2.14'
+  spec.add_dependency 'savon-multipart'
 end

data/lib/gus_bir1/client.rb

@@ -42,7 +42,7 @@ module GusBir1
       end
     end
 
-    def get_full_data(regon, report = 'PublDaneRaportPrawna')
+    def get_full_data(regon, report = 'BIR11OsPrawna')
       set_session_id
       Response::FullData.new dane_pobierz_pelny_raport(
         Constants::PARAM_REGON => regon,
@@ -58,7 +58,7 @@ module GusBir1
     end
 
     def find_and_get_full_data(hash)
-      r = find_by(hash)
+      r = find_by(**hash)
       r.map { |h| get_full_data_from_response(h) }
     end
 
@@ -67,7 +67,7 @@ module GusBir1
     def search_by(search_by, search)
       set_session_id
       Response::Search.new(
-        dane_szukaj(Constants::PARAM_SEARCH => { search_by => search })
+        dane_szukaj_podmioty(Constants::PARAM_SEARCH => { search_by => search })
       ).array
     end
 
@@ -85,7 +85,7 @@ module GusBir1
 
     def method_missing(method, *args)
       if savon_client.operations.include? method
-        response_hash = call(method, args[0]).hash
+        response_hash = call(method, args[0]).full_hash
         response_hash.dig(:envelope, :body, "#{method}_response".to_sym, "#{method}_result".to_sym)
       else
         super
@@ -96,7 +96,7 @@ module GusBir1
       case method
       when
           :wyloguj,
-          :dane_szukaj,
+          :dane_szukaj_podmioty,
           :dane_pobierz_pelny_raport,
           :dane_komunikat,
           :zaloguj
@@ -139,9 +139,8 @@ module GusBir1
 
     def savon_options(publ: false)
       params = {
-        wsdl: Constants::WSDL_URL,
+        wsdl: endpoint,
         namespaces: namespaces(publ: publ),
-        endpoint: endpoint,
         env_namespace: :soap,
         use_wsa_headers: true,
         soap_version: 2,
@@ -149,7 +148,8 @@ module GusBir1
         element_form_default: :qualified,
         multipart: true,
         log_level: @log_level,
-        log: @logging
+        log: @logging,
+        proxy: ENV['GUS_BIR_PROXY_URL']
       }
       if defined?(@sid) && @sid.nil? == false
         params.merge!({headers: { sid: @sid } })

data/lib/gus_bir1/constants.rb

@@ -2,9 +2,8 @@
 
 module GusBir1
   class Constants
-    WSDL_URL = 'https://wyszukiwarkaregontest.stat.gov.pl/wsBIR/wsdl/UslugaBIRzewnPubl.xsd'
-    WSDL_ADDRESS_TEST = 'https://Wyszukiwarkaregontest.stat.gov.pl/wsBIR/UslugaBIRzewnPubl.svc'
-    WSDL_ADDRESS = 'https://wyszukiwarkaregon.stat.gov.pl/wsBIR/UslugaBIRzewnPubl.svc'
+    WSDL_ADDRESS_TEST = 'https://wyszukiwarkaregontest.stat.gov.pl/wsBIR/wsdl/UslugaBIRzewnPubl-ver11-test.wsdl'
+    WSDL_ADDRESS = 'https://wyszukiwarkaregon.stat.gov.pl/wsBIR/wsdl/UslugaBIRzewnPubl-ver11-prod.wsdl'
 
     WSDL_NS_PUBL = 'http://CIS/BIR/PUBL/2014/07'
     WSDL_NS = 'http://CIS/BIR/2014/07'

data/lib/gus_bir1/report/type_mapper.rb

@@ -9,6 +9,8 @@ module GusBir1
           typ = search_report.type
           silos_id = search_report.silos_id
           method = "type_#{typ.to_s.downcase}"
+          return unless typ
+
           send(method, silos_id)
         end
 

data/lib/gus_bir1/response/search.rb

@@ -17,34 +17,43 @@ module GusBir1
       private
 
       def parse_dane(hash)
-        search_result            = OpenStruct.new
-        search_result.name       = hash['Nazwa']
-        search_result.regon      = hash['Regon']
-        search_result.province   = hash['Wojewodztwo']
-        search_result.district   = hash['Powiat']
-        search_result.community  = hash['Gmina']
-        search_result.city       = hash['Miejscowosc']
-        search_result.zip_code   = hash['KodPocztowy']
-        search_result.street     = hash['Ulica']
-        search_result.type       = hash['Typ']
-        search_result.silos_id   = hash['SilosID']
-        search_result.type_desc  = type_info(search_result)
-        search_result.silos_desc = silos_info(search_result)
-        search_result.report     = report_info(search_result)
+        search_result                = OpenStruct.new
+        search_result.name           = hash['Nazwa']
+        search_result.regon          = hash['Regon']
+        search_result.province       = hash['Wojewodztwo']
+        search_result.district       = hash['Powiat']
+        search_result.community      = hash['Gmina']
+        search_result.city           = hash['Miejscowosc']
+        search_result.zip_code       = hash['KodPocztowy']
+        search_result.street         = hash['Ulica']
+        search_result.street_number  = hash['NrNieruchomosci']
+        search_result.house_number   = hash['NrLokalu']
+        search_result.street_address = street_address_from(hash)
+        search_result.type           = hash['Typ']
+        search_result.silos_id       = hash['SilosID']
+        search_result.type_desc      = type_info(search_result)
+        search_result.silos_desc     = silos_info(search_result)
+        search_result.report         = report_info(search_result)
         search_result
       end
 
       def type_info(search_result)
+        return unless search_result.type
         Dictionary.szukaj_typ[search_result.type.to_sym]
       end
 
       def silos_info(search_result)
+        return unless search_result.silos_id
         Dictionary.szukaj_silos_id[search_result.silos_id.to_sym]
       end
 
       def report_info(search_result)
         Report::TypeMapper.get_report_type(search_result)
       end
+
+      def street_address_from(data)
+        [data['Ulica'], [data['NrNieruchomosci'], data['NrLokalu']].compact.join('/')].join(' ')
+      end
     end
   end
 end

data/lib/gus_bir1/version.rb

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

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: gus_bir1
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.2.0
 platform: ruby
 authors:
-- Wacław Łuczak
+- Waclaw Luczak
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-07 00:00:00.000000000 Z
+date: 2023-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.52'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.52'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -86,34 +86,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '2.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.12'
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: savon-multipart
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: '0'
 description: 
 email:
 - waclaw@luczak.it
@@ -129,6 +123,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- bin/test
 - gus_bir1.gemspec
 - lib/gus_bir1.rb
 - lib/gus_bir1/client.rb
@@ -160,8 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.4.5
 signing_key: 
 specification_version: 4
 summary: Rails GUS API library based on official REGON SOAP api.