arbetsformedlingen 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82e7c895eea69005d2e958c2f12571a6536b8a44896f6a421c2f45f309aea902
-  data.tar.gz: 7cc8792a58d149091cf8e2f5fd4481d09cbdda3f484120c7732d73a0e6f0adb6
+  metadata.gz: e3a327d58c944a64b80dc83c3eb7d76975e2aef1420850196402399e13ef37d6
+  data.tar.gz: 5c4dc5b645841519b196715a395dd27bcf9cccac7780c6efa2d928edb6afca4f
 SHA512:
-  metadata.gz: c7489eed85970fab8eed820938db13d7c644e0f84be0149c8813490620a6a390eeea0a2169a54941f8c6a99d94b61589903fb99b31f1e879f02c1bd09dd12ed8
-  data.tar.gz: e2a52e929c49f20a380e033c7d4037f42a02f16f61327a8fb9b6f04c01546ed4292771f35dcd98de68d918f434e5404709411ef0202638632d094fcf940c5865
+  metadata.gz: e3711ebeb2278561d658203eb9ea3488110c047c71cc10aa84242d8b80d014af9248d3e8c14e7cdc0d75e91d348df3121eefc2d80d7c727979ca7f7bdf6dfc5c
+  data.tar.gz: 96ad25ccd528a702bc1e0f3a7c918a236e86e74560f297dcef3966e30b5501dfc249e350adbfdb8ff5310bcc1f777298a8c9814f00a0160ff4458e983a835d72

data/.gitignore

@@ -15,5 +15,3 @@
 example.rb
 output.xml
 test.xml
-
-spec/cassettes

data/.travis.yml

@@ -1,5 +1,7 @@
 sudo: false
 language: ruby
 rvm:
+  - 2.3.0
   - 2.4.0
-before_install: gem install bundler -v 1.14.3
+  - 2.5.0
+before_install: gem install bundler -v 1.6.1

data/CHANGELOG.md

@@ -0,0 +1,15 @@
+# Change Log
+
+# v0.5.0
+
+* Upgrade `dry-valdation` dependency from `~> 0.11` to `~> 0.12`
+* Commit test vcr cassettes & fix test suite
+* Don't crash when no results are returned from API, return empty result
+* Make Ad/matchning `sista_ansokningsdag` key optional
+* Fix crash when ad data doesn't contain a `varaktighetsId` key
+
+---
+
+## v0.4.1..v0.1.0
+
+Is history..

data/README.md

@@ -1,4 +1,4 @@
-# Arbetsförmedlingen [![Build Status](https://travis-ci.org/buren/arbetsformedlingen.svg?branch=master)](https://travis-ci.org/buren/arbetsformedlingen)
+# Arbetsförmedlingen [![Build Status](https://travis-ci.org/buren/arbetsformedlingen.svg?branch=master)](https://travis-ci.org/buren/arbetsformedlingen) [![Gem Version](https://badge.fury.io/rb/arbetsformedlingen.svg)](https://badge.fury.io/rb/arbetsformedlingen)
 
 Arbetsförmedlingen API client (Swedish Public Employment Service).
 
@@ -11,8 +11,8 @@ __Features__
 __Index__
 * [Installation](#installation)
 * [API Client](#api-client)
-* [Post job ad](#post-ad)
-* [WSOccupation Client API](#wsoccupation-client-api)
+* [Post job ad](#post-job-ad)
+* [WSOccupation API Client](#wsoccupation-api-client)
 * [RDoc](http://www.rubydoc.info/gems/arbetsformedlingen/).
 
 ## Installation
@@ -61,7 +61,7 @@ countries.map do |country|
 end
 ```
 
-## Post ad
+## Post job ad
 
 __Complete example creating a packet__
 
@@ -174,7 +174,7 @@ client = API::Client.new(locale: 'sv')
 client.create_ad(packet)
 ```
 
-## WSOccupation API
+## WSOccupation API Client
 
 There is some support for Arbetsförmedlingen's `WSOccupation` SOAP API. See [PR#3](https://github.com/buren/arbetsformedlingen/pull/3).
 

data/arbetsformedlingen.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = %w[lib config]
 
   spec.add_dependency 'httparty', '~> 0.13' # Easy HTTP requests
-  spec.add_dependency 'dry-validation', '~> 0.10'
+  spec.add_dependency 'dry-validation', '~> 0.12'
   spec.add_dependency 'builder', '~> 3.2'
 
   spec.add_development_dependency 'nokogiri', '~> 1.8'

data/lib/arbetsformedlingen/api/client.rb

@@ -69,7 +69,7 @@ module Arbetsformedlingen
       def areas
         response = request.get('soklista/omrade')
 
-        SoklistaResult.build(response.json)
+        SoklistaResult.build(response.json, list_name: 'omrade')
       end
 
       # Fetch counties from API (countries => land)
@@ -81,7 +81,7 @@ module Arbetsformedlingen
         query = { omradeid: area_id }
         response = request.get('soklista/land', query: query)
 
-        SoklistaResult.build(response.json)
+        SoklistaResult.build(response.json, list_name: 'land')
       end
 
       # Fetch municipalities from API (municipality => kommun)
@@ -95,7 +95,7 @@ module Arbetsformedlingen
         query = { lanid: county_id }
         response = request.get('soklista/kommuner', query: query)
 
-        SoklistaResult.build(response.json)
+        SoklistaResult.build(response.json, list_name: 'kommuner')
       end
 
       # Fetch counties from API (county => län)
@@ -105,7 +105,7 @@ module Arbetsformedlingen
       def counties
         response = request.get('soklista/lan')
 
-        SoklistaResult.build(response.json)
+        SoklistaResult.build(response.json, list_name: 'lan')
       end
 
       # Fetch counties2 from API (county2 => län2)
@@ -115,7 +115,7 @@ module Arbetsformedlingen
       def counties2
         response = request.get('soklista/lan2')
 
-        SoklistaResult.build(response.json)
+        SoklistaResult.build(response.json, list_name: 'lan2')
       end
 
       # Fetch occupational fields from API (occupational_fields => yrkesområde)
@@ -125,7 +125,7 @@ module Arbetsformedlingen
       def occupational_fields
         response = request.get('soklista/yrkesomraden')
 
-        SoklistaResult.build(response.json)
+        SoklistaResult.build(response.json, list_name: 'yrkesomraden')
       end
 
       # Fetch occupational group from API (occupational_group => yrkesgrupp)
@@ -141,7 +141,7 @@ module Arbetsformedlingen
         query = { yrkesomradeid: occupational_field_id }
         response = request.get('soklista/yrkesgrupper', query: query)
 
-        SoklistaResult.build(response.json)
+        SoklistaResult.build(response.json, list_name: 'yrkesgrupper')
       end
 
       # Fetch occupation from API (occupation => yrkesnamn)
@@ -152,7 +152,7 @@ module Arbetsformedlingen
       def occupation(name:)
         response = request.get("soklista/yrken/#{URI.encode(name)}")
 
-        SoklistaResult.build(response.json)
+        SoklistaResult.build(response.json, list_name: 'Yrken')
       end
 
       # Fetch occupations from API (occupation => yrkesnamn)
@@ -168,7 +168,7 @@ module Arbetsformedlingen
         query = { yrkesgruppid: occupational_group_id }
         response = request.get('soklista/yrken', query: query)
 
-        SoklistaResult.build(response.json)
+        SoklistaResult.build(response.json, list_name: 'yrken')
       end
     end
   end

data/lib/arbetsformedlingen/api/results/ad_result.rb

@@ -43,7 +43,7 @@ module Arbetsformedlingen
           reference: data['referens'],
           application_url: data.fetch('webbplats'),
           email: data['epostadress'],
-          last_application_at: data.fetch('sista_ansokningsdag'),
+          last_application_at: data.fetch('sista_ansokningsdag', nil),
           application_comment: data.fetch('ovrigt_om_ansokan')
         )
       end

data/lib/arbetsformedlingen/api/results/matchning_result.rb

@@ -28,12 +28,12 @@ module Arbetsformedlingen
           municipalities: ad_data.fetch('kommunnamn'),
           municipality_id: ad_data.fetch('kommunkod'),
           published_at: ad_data.fetch('publiceraddatum'),
-          last_application_at: ad_data.fetch('sista_ansokningsdag'),
+          last_application_at: ad_data.fetch('sista_ansokningsdag', nil),
           url: ad_data.fetch('annonsurl'),
           relevance: ad_data.fetch('relevans'),
           total_vacancies: ad_data.fetch('antalplatser'),
           total_vacancies_with_visa: ad_data.fetch('antalPlatserVisa'),
-          duration_id: ad_data.fetch('varaktighetId'),
+          duration_id: ad_data.fetch('varaktighetId', nil),
           counties: ad_data.fetch('lan'),
           country_id: ad_data.fetch('lanid'),
           employment_type: ad_data.fetch('anstallningstyp')

data/lib/arbetsformedlingen/api/results/soklista_result.rb

@@ -3,24 +3,28 @@ require 'arbetsformedlingen/api/values/soklista_values'
 module Arbetsformedlingen
   module API
     module SoklistaResult
-      def self.build(response_data)
-        data = response_data.fetch('soklista')
+      def self.build(response_data, list_name: nil)
+        data = response_data.fetch('soklista', {})
 
         Values::SoklistaPage.new(
-          list_name: data.fetch('listnamn'),
-          total_ads: data.fetch('totalt_antal_platsannonser'),
-          total_vacancies: data.fetch('totalt_antal_ledigajobb'),
+          list_name: data.fetch('listnamn', list_name),
+          total_ads: data.fetch('totalt_antal_platsannonser', 0),
+          total_vacancies: data.fetch('totalt_antal_ledigajobb', 0),
           raw_data: response_data,
-          data: data.fetch('sokdata').map do |result|
-            Values::SoklistaResult.new(
-              id: result.fetch('id'),
-              name: result.fetch('namn'),
-              total_ads: result.fetch('antal_platsannonser'),
-              total_vacancies: result.fetch('antal_ledigajobb')
-            )
+          data: data.fetch('sokdata', []).map do |result|
+            build_search_result(result)
           end
         )
       end
+
+      def self.build_search_result(result)
+        Values::SoklistaResult.new(
+          id: result.fetch('id'),
+          name: result.fetch('namn'),
+          total_ads: result.fetch('antal_platsannonser'),
+          total_vacancies: result.fetch('antal_ledigajobb')
+        )
+      end
     end
   end
 end

data/lib/arbetsformedlingen/models/application_method.rb

@@ -1,5 +1,5 @@
 module Arbetsformedlingen
-  ApplicationMethodSchema = Dry::Validation.Form do
+  ApplicationMethodSchema = Dry::Validation.Params do
     configure do
       config.type_specs = true
       config.messages_file = File.expand_path('../../../../config/locales/errors.yml', __FILE__)

data/lib/arbetsformedlingen/models/company.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Arbetsformedlingen
-  CompanySchema = Dry::Validation.Form do
+  CompanySchema = Dry::Validation.Params do
     configure do
       config.type_specs = true
       config.messages_file = File.expand_path('../../../../config/locales/errors.yml', __FILE__)

data/lib/arbetsformedlingen/models/document.rb

@@ -1,7 +1,7 @@
 require 'securerandom'
 
 module Arbetsformedlingen
-  DocumentSchema = Dry::Validation.Form do
+  DocumentSchema = Dry::Validation.Params do
     configure do
       config.type_specs = true
       config.messages_file = File.expand_path('../../../../config/locales/errors.yml', __FILE__)

data/lib/arbetsformedlingen/models/dry/types.rb

@@ -23,7 +23,7 @@ module Arbetsformedlingen
     Occupation = Types::Strict::String.constructor do |string|
       OccupationCode.to_code(string)
     end
-    PositionDuration = Types::Strict::Int
+    PositionDuration = Types::Strict::Integer
     DriversLicense = Types::Strict::String.constructor do |value|
       DriversLicenseCode.to_code(value)
     end

data/lib/arbetsformedlingen/models/packet.rb

@@ -2,7 +2,7 @@ require 'builder'
 require 'arbetsformedlingen/models/packet_xml_builder'
 
 module Arbetsformedlingen
-  PacketSchema = Dry::Validation.Form do
+  PacketSchema = Dry::Validation.Params do
     configure do
       config.type_specs = true
       config.messages_file = File.expand_path('../../../../config/locales/errors.yml', __FILE__)
@@ -13,7 +13,7 @@ module Arbetsformedlingen
     required(:active, Types::Bool).filled
     required(:job_id, Types::StrippedString).filled
     required(:id, Types::StrippedString).filled
-    required(:number_to_fill, Types::Int).filled(gt?: 0)
+    required(:number_to_fill, Types::Integer).filled(gt?: 0)
     required(:occupation, Types::Occupation).filled(:occupation_code?)
   end
 

data/lib/arbetsformedlingen/models/position.rb

@@ -1,5 +1,5 @@
 module Arbetsformedlingen
-  PositionSchema = Dry::Validation.Form do
+  PositionSchema = Dry::Validation.Params do
     configure do
       config.type_specs = true
       config.messages_file = File.expand_path('../../../../config/locales/errors.yml', __FILE__)

data/lib/arbetsformedlingen/models/publication.rb

@@ -1,5 +1,5 @@
 module Arbetsformedlingen
-  PublicationSchema = Dry::Validation.Form do
+  PublicationSchema = Dry::Validation.Params do
     configure do
       config.type_specs = true
       config.messages_file = File.expand_path('../../../../config/locales/errors.yml', __FILE__)

data/lib/arbetsformedlingen/models/qualification.rb

@@ -1,5 +1,5 @@
 module Arbetsformedlingen
-  QualificationSchema = Dry::Validation.Form do
+  QualificationSchema = Dry::Validation.Params do
     configure do
       config.type_specs = true
       config.messages_file = File.expand_path('../../../../config/locales/errors.yml', __FILE__)

data/lib/arbetsformedlingen/models/salary.rb

@@ -1,5 +1,5 @@
 module Arbetsformedlingen
-  SalarySchema = Dry::Validation.Form do
+  SalarySchema = Dry::Validation.Params do
     configure do
       config.type_specs = true
       config.messages_file = File.expand_path('../../../../config/locales/errors.yml', __FILE__)

data/lib/arbetsformedlingen/models/schedule.rb

@@ -1,5 +1,5 @@
 module Arbetsformedlingen
-  ScheduleSchema = Dry::Validation.Form do
+  ScheduleSchema = Dry::Validation.Params do
     configure do
       config.type_specs = true
       config.messages_file = File.expand_path('../../../../config/locales/errors.yml', __FILE__)

data/lib/arbetsformedlingen/version.rb

@@ -1,3 +1,3 @@
 module Arbetsformedlingen
-  VERSION = '0.4.1'.freeze
+  VERSION = '0.5.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arbetsformedlingen
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Jacob Burenstam
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-08 00:00:00.000000000 Z
+date: 2018-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
@@ -160,6 +160,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md