apralib 0.0.2 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 224a37c92a5d6d226dc47de0b91306afea784f2b
-  data.tar.gz: d51148502133e9c5dd52597c85ef56482076f85f
+SHA256:
+  metadata.gz: c82771315862534107fdf877581a8acc4b834d57b3b162b4248784fc0476ea8f
+  data.tar.gz: 63cbc93ef71202087e605373b254da69cfee60bf072f3143e5c47f6f4ea43018
 SHA512:
-  metadata.gz: 9fbad13674a88ea3fe41e72b247a2d92cf5647b3714220fdffa81d36d9977865f3dabbf7cfcc78d8fc55932e690812d360fb226ec6535b7a56240758cc1639d0
-  data.tar.gz: 873b94bd5cc2a74753a97f84ae5f8d51dbc48f1bca7aed0ce83e5c806e4efe71d182ceaf223e392574e697e92f5ccc54e6f9b6ffb1710547c2e5287069743202
+  metadata.gz: b3b976bd086d348a024924fef2c9846910a842f1c39cd0892ec3a0d84bf89fd1f381d0b850b89119b106f138a4a437540e2a689be5c74491b97d41859b5df248
+  data.tar.gz: d54037f2eaf19b88077336da847dd3e7331fdf201be8f9a5ff841b434d95b198baf77cfef29f503248141cc436fea4101235304e309da552b09fc5fa04177fd0

data/.rubocop.yml

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

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

@@ -6,10 +6,12 @@ module ApraService
 
   class Client
 
-    def initialize(username, password)
+    def initialize(username, password, proxy = nil)
+
       @client = Savon.client(wsdl: 'https://palvelu.mela.fi/Apurahailmoitukset/ws/apurahanSyottoWS?wsdl',
                              wsse_auth: [username, password],
-                             endpoint: 'https://palvelu.mela.fi/Apurahailmoitukset/ws/apurahanSyottoWS')
+                             endpoint: 'https://palvelu.mela.fi/Apurahailmoitukset/ws/apurahanSyottoWS',
+                             proxy: proxy)
     end
 
     def send_notifications(notifications)

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 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,16 +26,20 @@ 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
     end
 
     def ssn=(ssn)
-      Grantee.verify_ssn!(ssn)
-      self.instance_variable_set('@ssn', ssn)
+      if ssn
+        Grantee.verify_ssn!(ssn.upcase)
+        self.instance_variable_set('@ssn', ssn.upcase)
+      else
+        self.instance_variable_set('@ssn', nil)
+      end
     end
 
     def self.verify_ssn!(ssn)

data/lib/apralib/version.rb

@@ -1,3 +1,3 @@
 module Apralib
-  VERSION = '0.0.2'
+  VERSION = '0.1.1'.freeze
 end

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

data/spec/lib/grantee_spec.rb

@@ -22,6 +22,28 @@ module ApraService
 
     end
 
+    describe 'ssn=' do
+
+      it 'should convert the code to uppercase' do
+
+        grantee = Grantee.new
+        grantee.ssn = '111111-111c'
+        expect(grantee.ssn).to eq('111111-111C')
+
+      end
+
+      it 'should set the value to nil when passed a nil value' do
+
+        grantee = Grantee.new
+        grantee.ssn = '111111-111C'
+        grantee.ssn = nil
+        expect(grantee.ssn).to be_nil
+
+      end
+
+
+    end
+
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apralib
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.1
 platform: ruby
 authors:
 - Marco Sandrini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-08 00:00:00.000000000 Z
+date: 2020-12-21 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,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
@@ -116,15 +117,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 +133,3 @@ test_files:
 - spec/lib/apra_service_spec.rb
 - spec/lib/grantee_spec.rb
 - spec/spec_helper.rb
-has_rdoc: