apralib 0.0.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8e1c3d9ef8c6aa739c7be8d71899aedda2282086
-  data.tar.gz: d953aab95c39d1f878c069d01abfaba639b2d821
+SHA256:
+  metadata.gz: c622f4562613956c04bd339229bba76d93710f30e759857d5484a25a3e009124
+  data.tar.gz: dcfd5590999ac42db30d87ea0970cd5147f72d44a45d13ab0895f942bbda2f85
 SHA512:
-  metadata.gz: eaf017863402a9d98e217dbf68058f422fbad6aa4f9e240d1021c77c683c44cbf7ac33dba80c44eb110adf7bd455631384b5b1c7dd4ea05050865d54f56007eb
-  data.tar.gz: b3fc8bbf5d3c8ff312698df6cbfb62a0b346cf4078f454bb290302201d2ac8e52b7542f2a2f499430ef5d40e1bcc358568a0c7237c8282218c2effccf8ac6acb
+  metadata.gz: 20e87a804bb01d8c5823a3ed5f1c38c4b5e7a1f39a2e99fec1fbb1b8562f97a9ec6b1ea8b6d315410622fbb8e2c9fd84b0cf218a6926da2cd948ef55e881c038
+  data.tar.gz: ab964e22af2019bae50817f17462a686156a1b10c6e89a929fa1643cb34be6c4c0aa458f0b59d8711bd8d7c3b60318d5b4ac1f25b0aed85d2b8087e5e61d990c

data/.rubocop.yml

@@ -0,0 +1,3 @@
+Metrics/BlockLength:
+  Exclude:
+    - spec/**/*.rb

data/.ruby-version

@@ -0,0 +1 @@
+2.7.2

data/.travis.yml

@@ -1,8 +1,8 @@
 language: ruby
 rvm:
-- 2.1.3
-- 1.9.3
-env:
-  global:
-  - secure: XQ58eL4HELhYo0x1RgzyLkAF+XCBzTZLe3NIs4qsc4wIbeIUWVxb6chm/8ikbQn8ndk06EsJrZV/HC08EebUtgb1WTGeaEhyJGdyTVThO2dbLc+wKdrrGcmxiZEd1N6pg0G+4l8QsvMCTWJts6ZhrvVtmle6izGPfF467hLWIjM=
-  - secure: FY5lZvsTluLglsk0j4c4rPXj0BqN80PVUzCLwFtBzhZJ/Dic8c6IGGDy91RQPoR11bcsqQgUhEOeTh0LEjmuGijZ1WIm0/0PynLZe2rxM76OA/ph5KKmYIgi5OLEkWJ8mQRLSeOqpw2BeaqW35MfhX6uItcJbEztiSgVkx01Y4g=
+- 2.7.2
+- 2.4.0
+deploy:
+  provider: rubygems
+  edge: true
+

data/apralib.gemspec

@@ -17,10 +17,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
+  spec.required_ruby_version = '>= 2.4.0'
 
-  spec.add_development_dependency 'bundler', '~> 1.3'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec', '~> 3.1.0'
+  spec.add_development_dependency 'bundler', '~> 2.1'
+  spec.add_development_dependency 'rake', '~> 13.0.0'
+  spec.add_development_dependency 'rspec', '~> 3.10.0'
   spec.add_development_dependency 'yard'
-  spec.add_dependency 'savon', '~> 2.3.0'
+  spec.add_dependency 'savon', '~> 2.12.0'
+
 end

data/lib/apralib/apra_service.rb

@@ -1,36 +1,46 @@
+# frozen_string_literal: true
+
 require_relative 'notification'
 require_relative 'response'
 require 'savon'
 
 module ApraService
-
+  # The main entry point for the library
   class Client
+    def initialize(username, password, proxy = nil)
+      wsdl_file = File.expand_path('../wsdl/ApurahanSyotto.wsdl', __dir__)
 
-    def initialize(username, password)
-      @client = Savon.client(wsdl: 'https://palvelu.mela.fi/Apurahailmoitukset/ws/apurahanSyottoWS?wsdl',
+      @client = Savon.client(wsdl: wsdl_file,
                              wsse_auth: [username, password],
-                             endpoint: 'https://palvelu.mela.fi/Apurahailmoitukset/ws/apurahanSyottoWS')
+                             endpoint: 'https://palvelurajapinta.mela.fi/Apurahailmoitukset/ApurahanSyotto',
+                             proxy: proxy,
+                             follow_redirects: true)
+    end
+
+    def type_or_array_of_type(arg, type, message)
+      raise ArgumentError, 'object cannot be nil' unless arg
+
+      return if arg.is_a?(type) || (arg.is_a?(Array) && arg.all? { |i| i.is_a? type })
+
+      raise ArgumentError, message
     end
 
     def send_notifications(notifications)
-      raise ArgumentError, 'notifications object cannot be nil' unless notifications
-      raise ArgumentError, 'notifications object must be either a Notification object or an array of Notification objects' unless
-          (notifications.is_a? Notification or (notifications.is_a? Array and notifications.detect {|n| !n.is_a? Notification}.nil?))
+
+      type_or_array_of_type(notifications, Notification,
+                            'notifications object must be either a Notification object' + 
+                              'or an array of Notification objects')
+
       notifications = [notifications] unless notifications.is_a? Array
-      if notifications.count > 0
-        message = {}
-        message[:arg0] = notifications.map {|notification| notification.to_hash}
-        response = @client.call(:lisaa_apurahat, :message => message)
-        raise RuntimeError, 'An error occurred while submitting the notification' unless response.success?
+      if notifications.count.positive?
+        message = { apurahailmoitustiedot: notifications.map(&:to_hash) }
+        response = @client.call(:lisaa_apurahat, message: message)
+        raise 'An error occurred while submitting the notification' unless response.success?
+
         Response.from_hash(response.body)
       else
         Response.new
       end
     end
-
-
-
   end
-
-
-end
+end

data/lib/apralib/grantee.rb

@@ -2,8 +2,8 @@ module ApraService
 
   class Grantee
 
-    SSN_REGEX = /(\d{6})([-+A])(\d{3})([0-9ABCDEFHJKLMNPRSTUVWXY])/
-    CHECK_DIGITS = %w(0 1 2 3 4 5 6 7 8 9 A B C D E F H J K L M N P R S T U V W X Y)
+    SSN_REGEX = /(\d{6})([-+A])(\d{3})([0-9ABCDEFHJKLMNPRSTUVWXY])/.freeze
+    CHECK_DIGITS = %w[0 1 2 3 4 5 6 7 8 9 A B C D E F H J K L M N P R S T U V W X Y].freeze
 
     attr_accessor :first_names, :last_name, :ssn, :address, :zip
 
@@ -26,8 +26,8 @@ module ApraService
       grantee.address = hash[:apurahansaajanosoite]
       grantee.zip = hash[:apurahansaajanpostinumero]
       grantee.first_names = [hash[:etunimi1]]
-      grantee.first_name << hash[:etunimi2] if hash[:etunimi2]
-      grantee.first_name << hash[:etunimi3] if hash[:etunimi3]
+      grantee.first_names << hash[:etunimi2] if hash[:etunimi2]
+      grantee.first_names << hash[:etunimi3] if hash[:etunimi3]
       grantee.ssn = hash[:henkilotunnus]
       grantee.last_name = hash[:sukunimi]
       grantee

data/lib/apralib/notification.rb

@@ -7,8 +7,8 @@ module ApraService
                   :work_end_date, :reference, :work_duration_months, :work_duration_days,
                   :work_duration_years, :ignore_work_duration
 
-    NON_NILLABLE_KEYS = [:purpose, :expense_amount, :grant_date, :granted_to_group, :work_duration_months,
-                        :work_duration_days, :work_duration_years, :grantee, :amount, :ignore_work_duration]
+    NON_NILLABLE_KEYS = %i[purpose expense_amount grant_date granted_to_group work_duration_months
+                           work_duration_days work_duration_years grantee amount ignore_work_duration].freeze
 
 
     def initialize
@@ -22,7 +22,7 @@ module ApraService
 
     def to_hash
       NON_NILLABLE_KEYS.each do |key|
-        raise RuntimeError, "Variable #{key.to_s} cannot be nil" if self.instance_variable_get("@#{key.to_s}").nil?
+        raise "Variable #{key} cannot be nil" if instance_variable_get("@#{key}").nil?
       end
       result = {}
       result[:kayttotarkoitus] = purpose
@@ -33,7 +33,7 @@ module ApraService
       result[:onko_myonnetty_tyoryhmalle] = granted_to_group
       result[:rahamaara] = amount
       result[:saajatiedot] = grantee.to_hash
-      result[:sisaltaako_kuluja] = (expense_amount > 0)
+      result[:sisaltaako_kuluja] = expense_amount.positive?
 
       if ignore_work_duration
         result[:tyon_kesto_kuukausia] = 0

data/lib/apralib/response.rb

@@ -1,14 +1,14 @@
-module ApraService
+# frozen_string_literal: true
 
+module ApraService
+  # The response received from the WebService
   class Response
-
     attr_accessor :failed_notifications
 
     def initialize
       @failed_notifications = []
     end
 
-
     def self.from_hash(hash)
       puts hash.inspect
       response = Response.new
@@ -16,15 +16,9 @@ module ApraService
       failures = raw_response[:epaonnistuneet_ilmoitukset]
       if failures
         failures = [failures] unless failures.is_a? Array
-        response.failed_notifications = failures.map {|notification| NotificationResponse.from_hash(notification) }
+        response.failed_notifications = failures.map { |notification| NotificationResponse.from_hash(notification) }
       end
       response
     end
-
-
   end
-
-
-
-
-end
+end

data/lib/apralib/version.rb

@@ -1,3 +1,3 @@
 module Apralib
-  VERSION = '0.0.3'
+  VERSION = '1.0.0'.freeze
 end

data/lib/wsdl/ApurahanSyotto.wsdl

@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<wsdl:definitions name="ApurahanSyotto"
+	xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+	xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+	xmlns:tns="http://palvelurajapinta.mela.fi/WebService/" 
+	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+	targetNamespace="http://palvelurajapinta.mela.fi/WebService/">
+	<wsdl:types>
+		<xs:schema xmlns:tns="http://palvelurajapinta.mela.fi/WebService/"
+			targetNamespace="http://palvelurajapinta.mela.fi/WebService/"
+			xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified"
+			attributeFormDefault="unqualified">
+			<xs:element type="tns:lisaaApurahat" name="lisaaApurahat" />
+			<xs:element type="tns:lisaaApurahatResponse" name="lisaaApurahatResponse" />
+			
+			<xs:complexType name="lisaaApurahat">
+				<xs:sequence>
+					<xs:element type="tns:apurahailmoitustiedot" name="apurahailmoitustiedot" minOccurs="0" maxOccurs="unbounded" />
+				</xs:sequence>
+			</xs:complexType>
+			<xs:complexType name="apurahailmoitustiedot">
+				<xs:sequence>
+					<xs:element type="xs:string" name="kayttotarkoitus" />
+					<xs:element type="xs:string" name="kayttotarkoitustarkenne" minOccurs="0" />
+					<xs:element type="xs:decimal" name="kuluosuusrahamaara" minOccurs="0" />
+					<xs:element type="xs:string" name="kuluosuusteksti" minOccurs="0" />
+					<xs:element type="xs:dateTime" name="myontopaatoksenAntopvm" />
+					<xs:element type="xs:boolean" name="onkoMyonnettyTyoryhmalle" />
+					<xs:element type="xs:decimal" name="rahamaara" />
+					<xs:element type="tns:saajatiedot" name="saajatiedot" />
+					<xs:element type="xs:boolean" name="sisaltaakoKuluja" />
+					<xs:element type="xs:int" name="tyonKestoKuukausia" />
+					<xs:element type="xs:int" name="tyonKestoPaivia" />
+					<xs:element type="xs:int" name="tyonKestoVuosia" />
+					<xs:element type="xs:string" name="tyonkestoeikantaa" minOccurs="0" />
+					<xs:element type="xs:dateTime" name="tyoskentelynAlkamispvm" minOccurs="0" />
+					<xs:element type="xs:dateTime" name="tyoskentelynPaattymispvm" minOccurs="0" />
+					<xs:element type="xs:string" name="viite" minOccurs="0" />
+				</xs:sequence>
+			</xs:complexType>
+			<xs:complexType name="saajatiedot">
+				<xs:sequence>
+					<xs:element type="xs:string" name="apurahansaajanosoite" minOccurs="0" />
+					<xs:element type="xs:string" name="apurahansaajanpostinumero" minOccurs="0" />
+					<xs:element type="xs:string" name="etunimi1" />
+					<xs:element type="xs:string" name="etunimi2" minOccurs="0" />
+					<xs:element type="xs:string" name="etunimi3" minOccurs="0" />
+					<xs:element type="tns:HenkilotunnusTyyppi" name="henkilotunnus" />
+					<xs:element type="xs:string" name="sukunimi" />
+				</xs:sequence>
+			</xs:complexType>
+			<xs:complexType name="lisaaApurahatResponse">
+				<xs:sequence>
+					<xs:element type="tns:epaonnistunutIlmoitus" name="epaonnistuneetIlmoitukset" minOccurs="0" maxOccurs="unbounded" />
+				</xs:sequence>
+			</xs:complexType>
+			<xs:complexType name="epaonnistunutIlmoitus">
+				<xs:sequence>
+					<xs:element type="tns:apurahailmoitustiedot" name="ilmoitus" />
+					<xs:element type="xs:string" name="virhe" />
+				</xs:sequence>
+			</xs:complexType>
+			<xs:simpleType name="HenkilotunnusTyyppi">
+				<xs:restriction base="xs:string">
+					<xsd:pattern value="[0-3]\d[01]\d{3}[+\-A]\d{3}[0-9A-FHJ-NPR-Y]"/>
+				</xs:restriction>
+			</xs:simpleType>
+		</xs:schema>
+	</wsdl:types>
+	<wsdl:message name="lisaaApurahatResponse">
+		<wsdl:part name="parameters" element="tns:lisaaApurahatResponse">
+		</wsdl:part>
+	</wsdl:message>
+	<wsdl:message name="lisaaApurahat">
+		<wsdl:part name="parameters" element="tns:lisaaApurahat">
+		</wsdl:part>
+	</wsdl:message>
+	<wsdl:portType name="ApurahanSyotto">
+		<wsdl:operation name="lisaaApurahat">
+			<wsdl:input name="lisaaApurahat" message="tns:lisaaApurahat">
+			</wsdl:input>
+			<wsdl:output name="lisaaApurahatResponse" message="tns:lisaaApurahatResponse">
+			</wsdl:output>
+		</wsdl:operation>
+	</wsdl:portType>
+	<wsdl:binding type="tns:ApurahanSyotto" name="ApurahanSyottoSoapBinding">
+		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
+		<wsdl:operation name="lisaaApurahat">
+			<soap:operation style="document" soapAction="http://palvelurajapinta.mela.fi/WebService/lisaaApurahat" />
+			<wsdl:input name="lisaaApurahat">
+				<soap:body use="literal" />
+			</wsdl:input>
+			<wsdl:output name="lisaaApurahatResponse">
+				<soap:body use="literal" />
+			</wsdl:output>
+		</wsdl:operation>
+	</wsdl:binding>
+	<wsdl:service name="ApurahanSyotto">
+		<wsdl:port name="ApurahanSyottoImplPort" binding="tns:ApurahanSyottoSoapBinding">
+			<soap:address location="http://palvelurajapinta.mela.fi/Apurahailmoitukset/ApurahanSyotto"/>
+		</wsdl:port>
+	</wsdl:service>
+</wsdl:definitions>

data/spec/lib/apra_service_spec.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 require 'apralib'
+require 'securerandom'
 
 module ApraService
 
@@ -9,10 +10,11 @@ module ApraService
     def get_client
       credentials = {}
       credentials_file = File.join(File.dirname(__FILE__), 'apra_credentials.yml')
-      credentials = YAML.load(File.read(credentials_file)) if File.exists?(credentials_file)
+      credentials = YAML.load(File.read(credentials_file)) if File.exist?(credentials_file)
       user = credentials['user'] || ENV['APRA_USER']
       password = credentials['password'] || ENV['APRA_PASSWORD']
-      Client.new(user, password)
+      proxy = credentials['proxy'] || ENV['PROXY_URL']
+      Client.new(user, password, proxy)
     end
 
 
@@ -20,7 +22,7 @@ module ApraService
 
       it 'should create a valid object' do
 
-        service = Client.new('user','password')
+        service = Client.new('user', 'password')
         expect(service).not_to be_nil
 
       end
@@ -51,7 +53,11 @@ module ApraService
         notification.work_start_date = Date.today
         notification.work_end_date = Date.today >> 1
         notification1 = Notification.new
-        notification1.grantee = grantee
+        grantee1 = Grantee.new
+        grantee1.first_names='Matti'
+        grantee1.last_name = 'Matelija'
+        grantee1.ssn = '111111-111C'
+        notification1.grantee = grantee1
         notification1.granted_to_group = false
         notification1.expense_amount = 0
         notification1.amount = 10000
@@ -67,9 +73,11 @@ module ApraService
         response = service.send_notifications([notification, notification1])
         expect(response).not_to be_nil
         failed_notifications = response.failed_notifications
+        puts(failed_notifications)
         expect(failed_notifications).not_to be_nil
         expect(failed_notifications).to be_a Array
         expect(failed_notifications.count).to eq(1)
+
         notification_response = failed_notifications[0]
         expect(notification_response.error).not_to be_nil
         expect(notification_response.notification.reference).to eq(notification.reference)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apralib
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Marco Sandrini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-02 00:00:00.000000000 Z
+date: 2021-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 13.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 13.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.10.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.12.0
 description: A Ruby client for the Apra Service
 email:
 - nessche@gmail.com
@@ -88,6 +88,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
+- ".ruby-version"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
@@ -101,6 +103,7 @@ files:
 - lib/apralib/notification_response.rb
 - lib/apralib/response.rb
 - lib/apralib/version.rb
+- lib/wsdl/ApurahanSyotto.wsdl
 - spec/lib/apra_service_spec.rb
 - spec/lib/grantee_spec.rb
 - spec/spec_helper.rb
@@ -116,15 +119,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: A Ruby library to submit documents to the Apra Service run by Maatalousyrittäjien
@@ -133,4 +135,3 @@ test_files:
 - spec/lib/apra_service_spec.rb
 - spec/lib/grantee_spec.rb
 - spec/spec_helper.rb
-has_rdoc: