arbetsformedlingen 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c7974cf075a4b0845cf00e7c16a66f8d3112bdd3
-  data.tar.gz: a45d7d95bc4209c97f730f5f0711eff9f648fc7e
+SHA256:
+  metadata.gz: b2eac8d60cee1157e1d0f8ff6f436e4af26d9b12761577edaf0593490487dd9e
+  data.tar.gz: 3026994403965b85670d69d74dd4f828c376bff2342823aad11dacb9c61afcda
 SHA512:
-  metadata.gz: dcf06f2e719fc148022bf3bf18e66d029228e9c26ec657c6e6255a3f84b3a9a50bd1f4fac8f694dd9b3a047dab183d7d7a0c91b9424a168d444397b30e02ed8c
-  data.tar.gz: 34e13510b301ab04d176db5381144af159814c200fbc1e4d03725c0de1a17b0c55ab3065044b83e1edf7a63d4327e55cfe54e929601f56b4173fac3550e3f36b
+  metadata.gz: 8a9de52e5906afecff66c7cdbba74f0227643a3a99b8efc5ee2890b3eee83d3deeb13957beb5fa2528c0996b2de6e073f719c1d0442fd4897086c61350753ce2
+  data.tar.gz: 88a9ab08e8e78d7404a47153946aa50ec9ab1e7779d5bf49348bbe2237e69f414f93a3d4b5b4298556a0d0347d12665de2ee45b6e862bd06a31e0809d301f537

data/README.md

@@ -181,8 +181,8 @@ Some requests had to be made to Arbetsförmedlingens TaxonomyService in order to
 
 This gem has translated the attribute names in Arbetsförmedlingens (AF) API from Swedish to English. You can find the translations below.
 
-| AF Term              | Gem term           |
-|--------------------- |--------------------|
+| Arbetsförmedlingen Term | Gem term           |
+|------------------------ |--------------------|
 | landområde/värdsdel | areas |
 | kommun | municipality |
 | län | counties |

data/arbetsformedlingen.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'dry-validation', '~> 0.10'
   spec.add_dependency 'builder', '~> 3.2'
 
+  spec.add_development_dependency 'nokogiri', '~> 1.8'
   spec.add_development_dependency 'bundler', '~> 1.14'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'

data/lib/arbetsformedlingen/api/matchning_client.rb

@@ -60,6 +60,10 @@ module Arbetsformedlingen
         end
 
         # TODO: Should we validate the IDs passed? What if they're invalid? Do we crash?
+        #
+        #       Currently when an invalid value is passed MatchningResult::build returns
+        #         => KeyError: key not found: "matchningslista"
+        #       which isn't really helpful..
 
         query = {
           lanid: county_id,

data/lib/arbetsformedlingen/api/request.rb

@@ -7,11 +7,6 @@ module Arbetsformedlingen
     class Request
       Response = KeyStruct.new(:code, :body, :json)
 
-      HEADERS = {
-        'Content-Type' => 'application/json',
-        'Accept-Language' => 'sv'
-      }.freeze
-
       attr_reader :locale, :base_url
 
       def initialize(base_url: '', locale: 'sv')
@@ -25,7 +20,7 @@ module Arbetsformedlingen
         http = Net::HTTP.new(uri.host, uri.port)
 
         request = Net::HTTP::Get.new(uri)
-        request['Content-Type'] = HEADERS['Content-Type']
+        request['Content-Type'] = 'application/json'
         request['Accept-Language'] = locale
 
         response = http.request(request)

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

@@ -40,7 +40,7 @@ module Arbetsformedlingen
 
       def self.build_application(data)
         Values::Application.new(
-          reference: data.fetch('referens'),
+          reference: data['referens'],
           application_url: data.fetch('webbplats'),
           email: data['epostadress'],
           last_application_at: data.fetch('sista_ansokningsdag'),

data/lib/arbetsformedlingen/api/soap_request.rb

@@ -0,0 +1,49 @@
+require 'uri'
+require 'net/http'
+
+begin
+  require 'nokogiri'
+rescue LoadError
+end
+
+module Arbetsformedlingen
+  module API
+    class SOAPRequest
+      Response = KeyStruct.new(:code, :body, :xml)
+
+      attr_reader :locale, :uri, :url
+
+      def initialize(url, locale: nil)
+        unless Object.const_defined?(:Nokogiri)
+          raise(ArgumentError, "unable to require 'nokogiri' gem, please install it")
+        end
+
+        @url = url
+        @uri = URI(url)
+        @locale = locale
+      end
+
+      def post(body)
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.use_ssl = true if uri.scheme == 'https'
+
+        request = Net::HTTP::Post.new(uri)
+        request['Content-Type'] = 'text/xml'
+        request['Accept-Language'] = locale if locale
+        request.body = body
+
+        response = http.request(request)
+
+        Response.new(
+          code: response.code,
+          body: response.read_body,
+          xml: parse_xml(response.read_body)
+        )
+      end
+
+      def parse_xml(string)
+        Nokogiri::XML(string).tap { |doc| doc.remove_namespaces! }
+      end
+    end
+  end
+end

data/lib/arbetsformedlingen/api/ws_occupation_client.rb

@@ -0,0 +1,60 @@
+require 'arbetsformedlingen/soap_builder'
+require 'arbetsformedlingen/api/soap_request'
+
+module Arbetsformedlingen
+  module API
+    class WSOccupationClient
+      attr_reader :request
+
+      SERVICE_URL = 'https://api.arbetsformedlingen.se/af/v0/Occupation/wsoccupation.asmx'.freeze
+
+      def initialize
+        @request = request || SOAPRequest.new(SERVICE_URL)
+      end
+
+      def occupation(id)
+        soap_body = SOAPBuilder.wrap do |body|
+          body.GetOccupationById(xmlns: 'urn:ams.se:wsoccupation') do |node|
+            node.occupationId(id)
+          end
+        end
+
+        request.post(soap_body.to_xml)
+      end
+
+      def find_occupations(name)
+        soap_body = SOAPBuilder.wrap do |body|
+          body.FindOccupation(xmlns: 'urn:ams.se:wsoccupation') do |node|
+            node.name(name)
+          end
+        end
+
+        request.post(soap_body.to_xml)
+      end
+
+      def occupations
+        soap_body = SOAPBuilder.wrap do |body|
+          body.GetAllOccupations(xmlns: 'urn:ams.se:wsoccupation')
+        end
+
+        request.post(soap_body.to_xml)
+      end
+
+      def occupations_short
+        soap_body = SOAPBuilder.wrap do |body|
+          body.GetAllOccupationsShort(xmlns: 'urn:ams.se:wsoccupation')
+        end
+
+        request.post(soap_body.to_xml)
+      end
+
+      def occupations_detailed
+        soap_body = SOAPBuilder.wrap do |body|
+          body.GetAllOccupationsDetailed(xmlns: 'urn:ams.se:wsoccupation')
+        end
+
+        request.post(soap_body.to_xml)
+      end
+    end
+  end
+end

data/lib/arbetsformedlingen/soap_builder.rb

@@ -0,0 +1,34 @@
+require 'builder'
+
+module Arbetsformedlingen
+  class SOAPBuilder
+    SOAP_ATTRIBUTES = {
+      'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
+      'xmlns:xsd' => 'http://www.w3.org/2001/XMLSchema',
+      'xmlns:soap12' => 'http://www.w3.org/2003/05/soap-envelope'
+    }.freeze
+
+    def self.wrap(&block)
+      new.wrap(&block)
+    end
+
+    def initialize
+      @builder = Builder::XmlMarkup.new(indent: 2)
+      @builder.instruct!
+
+      yield self if block_given?
+    end
+
+    def wrap
+      @builder.soap12(:Envelope, SOAP_ATTRIBUTES) do |envelope|
+        envelope.soap12(:Body) { |body| yield(body) }
+      end
+
+      self
+    end
+
+    def to_xml
+      @builder.target!
+    end
+  end
+end

data/lib/arbetsformedlingen/version.rb

@@ -1,3 +1,3 @@
 module Arbetsformedlingen
-  VERSION = '0.3.0'.freeze
+  VERSION = '0.4.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arbetsformedlingen
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Jacob Burenstam
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-24 00:00:00.000000000 Z
+date: 2018-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -165,10 +179,12 @@ files:
 - lib/arbetsformedlingen/api/results/ad_result.rb
 - lib/arbetsformedlingen/api/results/matchning_result.rb
 - lib/arbetsformedlingen/api/results/soklista_result.rb
+- lib/arbetsformedlingen/api/soap_request.rb
 - lib/arbetsformedlingen/api/values/ad_result_values.rb
 - lib/arbetsformedlingen/api/values/create_ad_page.rb
 - lib/arbetsformedlingen/api/values/matchning_result_values.rb
 - lib/arbetsformedlingen/api/values/soklista_values.rb
+- lib/arbetsformedlingen/api/ws_occupation_client.rb
 - lib/arbetsformedlingen/codes/country_code.rb
 - lib/arbetsformedlingen/codes/drivers_license_code.rb
 - lib/arbetsformedlingen/codes/experience_required_code.rb
@@ -189,6 +205,7 @@ files:
 - lib/arbetsformedlingen/models/qualification.rb
 - lib/arbetsformedlingen/models/salary.rb
 - lib/arbetsformedlingen/models/schedule.rb
+- lib/arbetsformedlingen/soap_builder.rb
 - lib/arbetsformedlingen/version.rb
 homepage: https://github.com/buren/arbetsformedlingen
 licenses:
@@ -211,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Arbetsförmedlingen API client