gus_bir1 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bab9a961d3ebdd2ad8f701e2033132f28d2ad70b8e3dcf962a9a5c204cd5dd07
-  data.tar.gz: 26a058ffdbee82f038f34054d484995f02a26cb415397dafb27071a95f90f813
+  metadata.gz: 303c6dcab16075513fc7d7ec639eaa506eb80e71285fef8b947af71d56a2ee35
+  data.tar.gz: 2a2ef444e5cbd513ed4843bfd0aa54036fca276807f66695c75b524acea833f0
 SHA512:
-  metadata.gz: 4f884cb07cba416c08d4f2f3d63f85d8a73e0c6b5059dc7971f3102c9f317b9e7a0769f38ec91dc21ae2eb6e89acce5561067532feb9b5acd08edef079adc8a7
-  data.tar.gz: 0bed9c8f84eb1816ea61e3de642f947fa5c19f7790a222743411135730a8541e31c2bcd4dda16467bc16f3c1c3335572764366ded7d3e500e21e683710be68a7
+  metadata.gz: 1e8d55e8934944df1de91e6ec513a30ae2973fbbe73157c112f92f5575a41daf37d7c06fe96435f9db8c899133971a03e3d5284ed81c4f72a0678147788bd8ea
+  data.tar.gz: fd3d7ffb44a5205bc36470d9a1cbfc517c9fd7861f89eff87069cf619b69df957ad317c1e9aee60afbfb12eded4b01a296aabea797cf1b736c9a1a8983945c53

data/.travis.yml

@@ -5,8 +5,8 @@ env:
 sudo: false
 language: ruby
 rvm:
-  - 2.4
-  - 2.6
+  - 2.7.7
+   -3.0.5
 before_install: gem install bundler
 
 before_script:

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.'
@@ -27,6 +27,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'simplecov'
 
-  spec.add_dependency 'savon', '~> 2.12'
-  spec.add_dependency 'savon-multipart--feb-2019', '~> 2.1', '>= 2.1.2'
+  spec.add_dependency 'savon', '~> 2.14'
+  spec.add_dependency 'savon-multipart'
 end

data/lib/gus_bir1/client.rb

@@ -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
 
@@ -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

data/lib/gus_bir1/response/search.rb

@@ -17,20 +17,23 @@ 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
 
@@ -47,6 +50,10 @@ module GusBir1
       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.1.0'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gus_bir1
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
-- Wacław Łuczak
+- Waclaw Luczak
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-23 00:00:00.000000000 Z
+date: 2023-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -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--feb-2019
+  name: savon-multipart
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        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.2
+        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,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.4.5
 signing_key: 
 specification_version: 4
 summary: Rails GUS API library based on official REGON SOAP api.