arbetsformedlingen 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a4e58a260599331e94848908320e079550f9418
-  data.tar.gz: ee0be5981d236c6e23bb0bf593b02f5c8874dffe
+  metadata.gz: c7974cf075a4b0845cf00e7c16a66f8d3112bdd3
+  data.tar.gz: a45d7d95bc4209c97f730f5f0711eff9f648fc7e
 SHA512:
-  metadata.gz: b37da20b192b30d9b097673ffd104ed0851398adefcb93fce1c1790a0551ccde0f716876ee15f82d70e3ec267e09ef388fb717335c275171b2c794d2dbef4e50
-  data.tar.gz: 7c5a7f8b2453d0bc84d8c813ae99a038cc59d1ada3d3dd28c64b81ff636253c427c4ded3794d4e6b433eb82bf2340d1fb6d861d0d97a0358f0a64f9831cfd6e8
+  metadata.gz: dcf06f2e719fc148022bf3bf18e66d029228e9c26ec657c6e6255a3f84b3a9a50bd1f4fac8f694dd9b3a047dab183d7d7a0c91b9424a168d444397b30e02ed8c
+  data.tar.gz: 34e13510b301ab04d176db5381144af159814c200fbc1e4d03725c0de1a17b0c55ab3065044b83e1edf7a63d4327e55cfe54e929601f56b4173fac3550e3f36b

data/.gitignore

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

data/README.md

@@ -1,6 +1,16 @@
-# Arbetsförmedlingen
+# Arbetsförmedlingen [![Build Status](https://travis-ci.org/buren/arbetsformedlingen.svg?branch=master)](https://travis-ci.org/buren/arbetsformedlingen)
 
-Post job ads to the Swedish employment agency (Arbetsförmedlingen).
+Arbetsförmedlingen API client (Swedish Public Employment Service).
+
+__Features__
+* Post job ad (a.k.a Direktöverförda annonser)
+* Platsannons API Client
+
+
+__Index__
+* [Installation](#installation)
+* [API usage](#api-usage)
+* [Post ad usage](#post-ad-usage)
 
 ## Installation
 
@@ -18,15 +28,47 @@ Or install it yourself as:
 
     $ gem install arbetsformedlingen
 
-## Usage
+## API usage
+
+__Create a client:__
+
+```ruby
+client = Arbetsformedlingen::API::Client.new(locale: 'en')
+```
+
+__Fetch all ads containing specified keyword:__
+```ruby
+ads = client.ads(keywords: 'ruby')
+ads.map(&:title)
+```
+
+__Fetch one ad:__
+```ruby
+ad = client.ad(id: 7408089)
+ad.title
+ad.occupation
+ad.application.last_application_at
+```
+
+__Fetch countries in area:__
+```ruby
+countries = client.countries(area_id: 2)
+countries.map do |country|
+  "#{country.name} has #{country.total_vacancies} total vacancies."
+end
+```
+
+## Post ad usage
 
-__Complete example__
+__Complete example creating a packet__
+
+:information_source: There is quite a lot of data you can/must send to the API when creating an ad.
 
 ```ruby
 require 'date'
 require 'arbetsformedlingen'
 
-include Arbetsformedlingen
+include Arbetsformedlingen # just for brevity
 
 document = Document.new(
   customer_id: 'XXXYYYZZZ',
@@ -125,8 +167,8 @@ puts "application_method.valid?: #{application_method.valid?}"
 puts "position.valid?: #{position.valid?}"
 puts "packet.valid?: #{packet.valid?}"
 
-output = OutputBuilder.new(packet)
-File.write('output.xml', output.to_xml)
+client = API::Client.new(locale: 'sv')
+client.create_ad(packet)
 ```
 
 ## Arbetsförmedlingen TaxonomyService
@@ -135,6 +177,22 @@ Some requests had to be made to Arbetsförmedlingens TaxonomyService in order to
 
 [![Postman](https://run.pstmn.io/button.svg)](https://app.getpostman.com/run-collection/9a27ec2518c1005f8aea)
 
+## Terms translation table
+
+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           |
+|--------------------- |--------------------|
+| landområde/värdsdel | areas |
+| kommun | municipality |
+| län | counties |
+| län2 | counties2 |
+| yrkesområde | occupational_fields |
+| yrkesgrupp | occupational_group |
+| yrkesgrupp | occupational_group |
+| yrkesnamn | occupation |
+
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/arbetsformedlingen.gemspec

@@ -29,5 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.14'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'webmock', '~> 3.1'
+  spec.add_development_dependency 'vcr', '~> 3.0'
   spec.add_development_dependency 'byebug'
 end

data/lib/arbetsformedlingen.rb

@@ -7,6 +7,8 @@ require 'dry-types'
 
 require 'arbetsformedlingen/version'
 
+require 'arbetsformedlingen/key_struct'
+
 require 'arbetsformedlingen/codes/country_code'
 require 'arbetsformedlingen/codes/drivers_license_code'
 require 'arbetsformedlingen/codes/experience_required_code'
@@ -17,9 +19,6 @@ require 'arbetsformedlingen/codes/salary_type_code'
 require 'arbetsformedlingen/models/dry/types'
 require 'arbetsformedlingen/models/dry/predicates'
 
-require 'arbetsformedlingen/output_builder'
-require 'arbetsformedlingen/client'
-
 require 'arbetsformedlingen/models/model'
 require 'arbetsformedlingen/models/document'
 require 'arbetsformedlingen/models/company'
@@ -31,11 +30,10 @@ require 'arbetsformedlingen/models/schedule'
 require 'arbetsformedlingen/models/application_method'
 require 'arbetsformedlingen/models/packet'
 
-module Arbetsformedlingen
-  def self.post_job(packet)
-    Client.post_job(OutputBuilder.new(packet).to_xml)
-  end
+# API Client
+require 'arbetsformedlingen/api/client'
 
+module Arbetsformedlingen
   class << self
     attr_accessor :config
   end

data/lib/arbetsformedlingen/api/client.rb

@@ -0,0 +1,175 @@
+require 'uri'
+require 'net/http'
+require 'json'
+
+require 'arbetsformedlingen/api/request'
+
+require 'arbetsformedlingen/api/results/ad_result'
+require 'arbetsformedlingen/api/results/matchning_result'
+require 'arbetsformedlingen/api/results/soklista_result'
+
+# Sub-clients
+require 'arbetsformedlingen/api/matchning_client'
+require 'arbetsformedlingen/api/ledigtarbete_client'
+
+module Arbetsformedlingen
+  module API
+    class Client
+      BASE_URL = 'http://api.arbetsformedlingen.se/af/v0/platsannonser/'.freeze
+
+      attr_reader :request, :locale
+
+      def initialize(locale: 'sv')
+        @request = Request.new(base_url: BASE_URL, locale: locale)
+        @locale = locale
+      end
+
+      # Get version of API
+      # @return [String] the version of the API.
+      # @example Get API version
+      #    client.version
+      def version
+        request.get('version').body
+      end
+
+      # Post ad to API (ad => annons)
+      # @return [AdResult] the result.
+      # @param [Arbetsformedlingen::Packet] Packet object.
+      # @example Post ad
+      #    client.ad(packet)
+      def create_ad(packet)
+        client = LedigtarbeteClient.new
+        client.create_ad(packet)
+      end
+
+      # Fetch ad from API (ad => annons)
+      # @return [AdResult] the result.
+      # @param id [String] Ad ID.
+      # @example Get ad
+      #    client.ad(id: id)
+      def ad(id:)
+        response = request.get(id)
+
+        AdResult.build(response.json)
+      end
+
+      # Fetch areas from API (areas => landområde/värdsdel)
+      # @return [MatchningResult] the result.
+      # @see MatchningClient#ads
+      # @see MatchningResult#build
+      def ads(**args)
+        client = MatchningClient.new(request: request)
+        client.ads(**args)
+      end
+
+      # Fetch areas from API (areas => landområde/värdsdel)
+      # @return [AdResult] the result.
+      # @example Get areas
+      #    client.areas
+      def areas
+        response = request.get('soklista/omrade')
+
+        SoklistaResult.build(response.json)
+      end
+
+      # Fetch counties from API (countries => land)
+      # @return [AdResult] the result.
+      # @param area_id [String] Area ID.
+      # @example Get countries within area
+      #    client.countries(area_id: id)
+      def countries(area_id:)
+        query = { omradeid: area_id }
+        response = request.get('soklista/land', query: query)
+
+        SoklistaResult.build(response.json)
+      end
+
+      # Fetch municipalities from API (municipality => kommun)
+      # @return [AdResult] the result.
+      # @param county_id [String] County ID.
+      # @example Get counties
+      #    client.counties
+      def municipalities(county_id: nil)
+        # NOTE: Due to a quirck in the API the lanid-param
+        #       *must* be present though it *can* be nil
+        query = { lanid: county_id }
+        response = request.get('soklista/kommuner', query: query)
+
+        SoklistaResult.build(response.json)
+      end
+
+      # Fetch counties from API (county => län)
+      # @return [AdResult] the result.
+      # @example Get counties
+      #    client.counties
+      def counties
+        response = request.get('soklista/lan')
+
+        SoklistaResult.build(response.json)
+      end
+
+      # Fetch counties2 from API (county2 => län2)
+      # @return [AdResult] the result.
+      # @example Get counties2
+      #    client.counties2
+      def counties2
+        response = request.get('soklista/lan2')
+
+        SoklistaResult.build(response.json)
+      end
+
+      # Fetch occupational fields from API (occupational_fields => yrkesområde)
+      # @return [AdResult] the result.
+      # @example Get occupational fields
+      #    client.occupational_field
+      def occupational_fields
+        response = request.get('soklista/yrkesomraden')
+
+        SoklistaResult.build(response.json)
+      end
+
+      # Fetch occupational group from API (occupational_group => yrkesgrupp)
+      # @return [AdResult] the result.
+      # @param occupational_field_id [String] Occupational field ID.
+      # @example Get all occupational group
+      #    client.occupational_group
+      # @example Get occupational group within occupational field
+      #    client.occupational_group(occupational_field_id: id)
+      def occupational_group(occupational_field_id: nil)
+        # NOTE: Due to a quirck in the API the yrkesomradeid-param
+        #       *must* be present though it *can* be nil
+        query = { yrkesomradeid: occupational_field_id }
+        response = request.get('soklista/yrkesgrupper', query: query)
+
+        SoklistaResult.build(response.json)
+      end
+
+      # Fetch occupation from API (occupation => yrkesnamn)
+      # @return [AdResult] the result.
+      # @param name [String] Name of the occupation.
+      # @example Get occupation
+      #    client.occupation(name: 'Marknadskommunikatör')
+      def occupation(name:)
+        response = request.get("soklista/yrken/#{URI.encode(name)}")
+
+        SoklistaResult.build(response.json)
+      end
+
+      # Fetch occupations from API (occupation => yrkesnamn)
+      # @return [AdResult] the result.
+      # @param occupational_group_id [String] Occupational group ID.
+      # @example Get stats of available positions for all occupations
+      #    client.occupations
+      # @example Get stats of available positions for some occupations
+      #    client.occupations(occupational_group_id: id)
+      def occupations(occupational_group_id: nil)
+        # NOTE: Due to a quirck in the API the yrkesgruppid-param
+        #       *must* be present though it *can* be nil
+        query = { yrkesgruppid: occupational_group_id }
+        response = request.get('soklista/yrken', query: query)
+
+        SoklistaResult.build(response.json)
+      end
+    end
+  end
+end

data/lib/arbetsformedlingen/api/ledigtarbete_client.rb

@@ -0,0 +1,30 @@
+require 'arbetsformedlingen/api/request'
+require 'arbetsformedlingen/api/values/create_ad_page'
+
+module Arbetsformedlingen
+  module API
+    class LedigtarbeteClient
+      BASE_URL = 'http://api.arbetsformedlingen.se/ledigtarbete'.freeze
+
+      HEADERS = {
+        'Content-type' => 'text/xml'
+      }.freeze
+
+      # Post ad to API
+      # @param [Arbetsformedlingen::Packet, #to_xml] the data to be sent
+      # @return [Values::CreateAdPage] the API result
+      def create_ad(packet)
+        xml = packet.to_xml
+
+        url = if Arbetsformedlingen.config.test
+                'apiledigtarbete/test/hrxml'
+              else
+                'apiledigtarbete/hrxml'
+              end
+
+        response = HTTParty.post("#{BASE_URL}/#{url}", body: xml, headers: HEADERS)
+        Values::CreateAdPage.new(response, xml)
+      end
+    end
+  end
+end

data/lib/arbetsformedlingen/api/matchning_client.rb

@@ -0,0 +1,127 @@
+require 'date'
+require 'time'
+require 'arbetsformedlingen/api/request'
+require 'arbetsformedlingen/api/results/matchning_result'
+
+module Arbetsformedlingen
+  module API
+    class MatchningClient
+      attr_reader :request
+
+      def initialize(request: Request.new)
+        @request = request
+      end
+
+      # Find matching ads from API
+      # @return [MatchningResult] the result.
+      # @param area_id [String] Area ID.
+      # @param county_id [String] County ID.
+      # @param municipality_id [String] Municipality ID.
+      # @param occupation_id [String] Occupation ID.
+      # @param keywords [String] Keywords.
+      # @param page [Integer] Page ID.
+      # @param page_size [Integer] Page size ID.
+      # @param occupation_group_id [String] Occupation_group ID.
+      # @param employment_type [String] Employment type ID.
+      # @param occupation_field_id [String] Occupation field ID.
+      # @param published_after [Time, Date, String] Published after ID (ISO8601 format: YYYY-MM-DDThh:mm:ssTZD).
+      # @param organization_number [String] Organization_number ID.
+      # @example Get ads within county
+      #    client.ads(county: id)
+      # @example Get ads within municipality
+      #    client.ads(municipality: id)
+      # @example Get ads with keyword
+      #    client.ads(keywrods: 'ruby')
+      # @example Get ads with keyword on page 3 and with a page size of 10
+      #    client.ads(keywrods: 'ruby', page: 3, page_size: 10)
+      # @example Get ads with keyword and organsiation numer
+      #    client.ads(keywrods: 'ruby', organization_number: org_no)
+      def ads(
+        # one of these must be present
+        county_id: nil,
+        municipality_id: nil,
+        occupation_id: nil,
+        keywords: nil,
+        # optional
+        page: 1,
+        page_size: 30,
+        area_id: nil,
+        occupation_group_id: nil,
+        employment_type: nil,
+        occupation_field_id: nil,
+        published_after: nil,
+        organization_number: nil
+      )
+
+        one_of_required = [county_id, municipality_id, occupation_id, keywords]
+        if one_of_required.all?(&:nil?)
+          error_message = 'One of: county_id, municipality_id, occupation_id, keywords is required'
+          raise ArgumentError, error_message
+        end
+
+        # TODO: Should we validate the IDs passed? What if they're invalid? Do we crash?
+
+        query = {
+          lanid: county_id,
+          kommunid: municipality_id,
+          yrkesid: occupation_id,
+          nyckelord: santize_keywords_query(keywords),
+          sida: page,
+          antalrader: page_size,
+          omradeid: area_id,
+          yrkesgruppid: occupation_group_id,
+          anstallningstyp: santize_employment_type_query(employment_type),
+          yrkesomradeid: occupation_field_id,
+          sokdatum: normalize_date_to_iso8601(published_after),
+          organisationsnummer: organization_number
+        }
+
+        response = request.get('matchning', query: query)
+
+        MatchningResult.build(response.json)
+      end
+
+      private
+
+      # @raise [ArgumentError] raises error if passed invalid value
+      def normalize_date_to_iso8601(date_time_or_string)
+        return unless date_time_or_string
+
+        time = date_time_or_string
+        time = time.to_time if time.is_a?(Date)
+        time = Time.parse(time) if time.is_a?(String)
+
+        time.iso8601
+      end
+
+      def santize_employment_type_query(employment_type)
+        # Sökkriterier anställningstyp.
+        # Värdena ska ligga mellan 1 och 3.
+        # 1 är XXX (EJ DOKUMENTERAT)
+        # 2 är somarjobb / feriejobb
+        # 3 är utlandsjobb
+
+        # TODO: The question is what we do if an invalid parameter is passed
+        #       should we crash?
+
+        employment_type
+      end
+
+      def santize_keywords_query(keywords)
+        #
+        # Sökord kan separeras eller kombineras med något av följande exempel:
+        # mellanslag (” ”)
+        #
+        # [Example]
+        # /matchning?nyckelord="bagare""test"
+        # /matchning?nyckelord="bagare"OR"test" /matchning?nyckelord="automatisk"AND"test"
+
+        # Valid characters
+        # abcdefghijklmnopqrstuvwxyzåäö0123456789: ,.-"
+
+        # TODO: What do we do if invalid characters are passed? Crash?
+        keywords
+      end
+    end
+  end
+end

data/lib/arbetsformedlingen/api/request.rb

@@ -0,0 +1,47 @@
+require 'uri'
+require 'net/http'
+require 'json'
+
+module Arbetsformedlingen
+  module API
+    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')
+        @base_url = base_url
+        @locale = locale
+      end
+
+      def get(url, query: {})
+        uri = URI("#{base_url}#{url}?#{URI.encode_www_form(query.to_a)}")
+
+        http = Net::HTTP.new(uri.host, uri.port)
+
+        request = Net::HTTP::Get.new(uri)
+        request['Content-Type'] = HEADERS['Content-Type']
+        request['Accept-Language'] = locale
+
+        response = http.request(request)
+
+        Response.new(
+          code: response.code,
+          body: response.read_body,
+          json: parse_json(response.read_body)
+        )
+      end
+
+      def parse_json(string)
+        JSON.parse(string.to_s)
+      rescue JSON::ParserError => _e
+        {}
+      end
+    end
+  end
+end

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

@@ -0,0 +1,91 @@
+require 'arbetsformedlingen/api/values/ad_result_values'
+
+module Arbetsformedlingen
+  module API
+    module AdResult
+      def self.build(response_data)
+        data = response_data.fetch('platsannons')
+
+        ad_data = data.fetch('annons')
+
+        Values::Ad.new(
+          id: ad_data.fetch('annonsid'),
+          url: ad_data.fetch('platsannonsUrl'),
+          title: ad_data.fetch('annonsrubrik'),
+          body: ad_data.fetch('annonstext'),
+          occupation: ad_data.fetch('yrkesbenamning'),
+          occupation_id: ad_data.fetch('yrkesid'),
+          published_at: ad_data.fetch('publiceraddatum'),
+          total_vacancies: ad_data.fetch('antal_platser'),
+          municipalities: ad_data.fetch('kommunnamn'),
+          municipality_id: ad_data.fetch('kommunkod'),
+          total_vacancies_with_visa: ad_data.fetch('antalplatserVisa'),
+          employment_type: ad_data.fetch('anstallningstyp'),
+          terms: build_terms(data.fetch('villkor')),
+          application: build_application(data.fetch('ansokan')),
+          workplace: build_workplace(data.fetch('arbetsplats')),
+          requirements: build_requirements(data.fetch('krav'))
+        )
+      end
+
+      def self.build_terms(data)
+        Values::Terms.new(
+          duration: data.fetch('varaktighet'),
+          working_hours: data.fetch('arbetstid'),
+          working_hours_description: data.fetch('arbetstidvaraktighet'),
+          salary_type: data.fetch('lonetyp'),
+          salary_form: data.fetch('loneform')
+        )
+      end
+
+      def self.build_application(data)
+        Values::Application.new(
+          reference: data.fetch('referens'),
+          application_url: data.fetch('webbplats'),
+          email: data['epostadress'],
+          last_application_at: data.fetch('sista_ansokningsdag'),
+          application_comment: data.fetch('ovrigt_om_ansokan')
+        )
+      end
+
+      def self.build_workplace(data)
+        Values::Workplace.new(
+          name: data.fetch('arbetsplatsnamn'),
+          postal: build_postal(data),
+          country: data.fetch('land'),
+          visit_address: data.fetch('besoksadress'),
+          logotype_url: data.fetch('logotypurl'),
+          website: data.fetch('hemsida'),
+          contacts: (
+            data.dig('kontaktpersonlista', 'kontaktpersonlista') || []
+          ).map do |contact_data|
+            build_workplace_contacts(contact_data)
+          end
+        )
+      end
+
+      def self.build_postal(data)
+        Values::Postal.new(
+          code: data.fetch('postnummer'),
+          address: data.fetch('postadress'),
+          city: data.fetch('postort'),
+          country: data.fetch('postland')
+        )
+      end
+
+      def self.build_workplace_contacts(data)
+        Values::Contact.new(
+          name: data['namn'],
+          title: data['titel'],
+          phone: data['telefonnummer']
+        )
+      end
+
+      def self.build_requirements(data)
+        Values::Requirements.new(
+          own_car: data.fetch('egenbil')
+        )
+      end
+    end
+  end
+end

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

@@ -0,0 +1,44 @@
+require 'arbetsformedlingen/api/values/matchning_result_values'
+
+module Arbetsformedlingen
+  module API
+    module MatchningResult
+      def self.build(response_data)
+        data = response_data.fetch('matchningslista')
+
+        Values::MatchningPage.new(
+          list_name: 'annonser',
+          total_ads: data.fetch('antal_platsannonser'),
+          total_ads_exact: data.fetch('antal_platsannonser_exakta'),
+          total_ads_nearby: data.fetch('antal_platsannonser_narliggande'),
+          total_vacancies_on_page: data.fetch('antal_platserTotal'),
+          total_pages: data.fetch('antal_sidor'),
+          raw_data: response_data,
+          data: data.fetch('matchningdata').map { |ad_data| build_ad_result(ad_data) }
+        )
+      end
+
+      def self.build_ad_result(ad_data)
+        Values::MatchningAd.new(
+          id: ad_data.fetch('annonsid'),
+          title: ad_data.fetch('annonsrubrik'),
+          occupation: ad_data.fetch('yrkesbenamning'),
+          occupation_id: ad_data.fetch('yrkesbenamningId'),
+          company: ad_data.fetch('arbetsplatsnamn'),
+          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'),
+          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'),
+          counties: ad_data.fetch('lan'),
+          country_id: ad_data.fetch('lanid'),
+          employment_type: ad_data.fetch('anstallningstyp')
+        )
+      end
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+require 'arbetsformedlingen/api/values/soklista_values'
+
+module Arbetsformedlingen
+  module API
+    module SoklistaResult
+      def self.build(response_data)
+        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'),
+          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')
+            )
+          end
+        )
+      end
+    end
+  end
+end

data/lib/arbetsformedlingen/api/values/ad_result_values.rb

@@ -0,0 +1,70 @@
+module Arbetsformedlingen
+  module API
+    module Values
+      Ad = KeyStruct.new(
+        :id,
+        :url,
+        :title,
+        :body,
+        :occupation,
+        :occupation_id,
+        :published_at,
+        :total_vacancies,
+        :municipalities,
+        :municipality_id,
+        :total_vacancies_with_visa,
+        :employment_type,
+        :terms,
+        :application,
+        :workplace,
+        :requirements
+      )
+      class Ad
+        def to_h
+          hash = super.to_h
+          hash[:terms] = hash[:terms].to_h
+          hash[:application] = hash[:application].to_h
+          hash[:workplace] = hash[:workplace].to_h
+          hash[:requirements] = hash[:requirements].to_h
+          hash
+        end
+      end
+
+      Terms = KeyStruct.new(
+        :duration,
+        :working_hours,
+        :working_hours_description,
+        :salary_type,
+        :salary_form
+      )
+
+      Application = KeyStruct.new(
+        :reference,
+        :application_url,
+        :email,
+        :last_application_at,
+        :application_comment
+      )
+
+      Workplace = KeyStruct.new(
+        :name,
+        :postal,
+        :country,
+        :visit_address,
+        :logotype_url,
+        :website,
+        :contacts
+      )
+      class Workplace
+        def to_h
+          data = super.to_h
+          data[:postal] = data[:postal].to_h
+          data
+        end
+      end
+
+      Postal = KeyStruct.new(:code, :address, :city, :country)
+      Requirements = KeyStruct.new(:own_car)
+    end
+  end
+end

data/lib/arbetsformedlingen/api/values/create_ad_page.rb

@@ -0,0 +1,40 @@
+module Arbetsformedlingen
+  module API
+    module Values
+      class CreateAdPage
+        ResponseMessage = KeyStruct.new(:detail, :error_code)
+
+        attr_reader :code, :messages, :body, :request_body
+
+        def initialize(httparty_response, request_boby)
+          @code = httparty_response.code
+          @body = httparty_response.body
+          @request_body = request_body
+          @valid = @code == 202
+          @messages = build_messages(httparty_response.to_a)
+        end
+
+        def valid?
+          @valid
+        end
+
+        private
+
+        def build_messages(messages)
+          messages.map do |message|
+            # HTTParty returns an array if there is only one key-value pair in the response
+            # so we need to check for it here and normalize
+            if message.is_a?(Array)
+              ResponseMessage.new(detail: message.last, error_code: nil)
+            else
+              error_code = message['ErrorCode']
+              @valid = false if error_code
+
+              ResponseMessage.new(detail: message['Message'], error_code: error_code)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/arbetsformedlingen/api/values/matchning_result_values.rb

@@ -0,0 +1,50 @@
+module Arbetsformedlingen
+  module API
+    module Values
+      MatchningPage = KeyStruct.new(
+        :list_name,
+        :total_ads,
+        :total_ads_exact,
+        :total_ads_nearby,
+        :total_vacancies_on_page,
+        :total_places_total,
+        :total_pages,
+        :data,
+        :raw_data
+      )
+      class MatchningPage
+        include Enumerable
+
+        def each(&block)
+          data.each(&block)
+        end
+
+        def to_h
+          hash = super.to_h
+          hash[:data].map!(&:to_h)
+          hash
+        end
+      end
+
+      MatchningAd = KeyStruct.new(
+        :id,
+        :title,
+        :occupation,
+        :occupation_id,
+        :company,
+        :municipalities,
+        :municipality_id,
+        :published_at,
+        :last_application_at,
+        :url,
+        :relevance,
+        :total_vacancies,
+        :total_vacancies_with_visa,
+        :duration_id,
+        :counties,
+        :country_id,
+        :employment_type
+      )
+    end
+  end
+end

data/lib/arbetsformedlingen/api/values/soklista_values.rb

@@ -0,0 +1,33 @@
+module Arbetsformedlingen
+  module API
+    module Values
+      SoklistaPage = KeyStruct.new(
+        :list_name,
+        :total_ads,
+        :total_vacancies,
+        :data,
+        :raw_data
+      )
+      class SoklistaPage
+        include Enumerable
+
+        def each(&block)
+          data.each(&block)
+        end
+
+        def to_h
+          hash = super.to_h
+          hash[:data].map!(&:to_h)
+          hash
+        end
+      end
+
+      SoklistaResult = KeyStruct.new(
+        :id,
+        :name,
+        :total_ads,
+        :total_vacancies
+      )
+    end
+  end
+end

data/lib/arbetsformedlingen/key_struct.rb

@@ -0,0 +1,13 @@
+module Arbetsformedlingen
+  class KeyStruct < Struct
+    def initialize(**keyword_args)
+      keyword_args.each do |key, value|
+        if members.include?(key)
+          self[key] = value
+        else
+          raise ArgumentError, "Unknown key struct member: #{key}"
+        end
+      end
+    end
+  end
+end

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

@@ -1,3 +1,5 @@
+require 'time'
+
 module Arbetsformedlingen
   module Predicates
     include Dry::Logic::Predicates

data/lib/arbetsformedlingen/models/packet.rb

@@ -1,4 +1,5 @@
 require 'builder'
+require 'arbetsformedlingen/models/packet_xml_builder'
 
 module Arbetsformedlingen
   PacketSchema = Dry::Validation.Form do
@@ -35,5 +36,9 @@ module Arbetsformedlingen
       hash[:position] = @position.to_h
       hash
     end
+
+    def to_xml
+      PacketXMLBuilder.new(self).to_xml
+    end
   end
 end

data/lib/arbetsformedlingen/{output_builder.rb → models/packet_xml_builder.rb}

@@ -1,15 +1,17 @@
 require 'builder'
 
 module Arbetsformedlingen
-  class OutputBuilder
+  class PacketXMLBuilder
     def initialize(packet)
       @packet = packet
     end
 
     def to_xml
-      # TODO: Set option so that åäö isn't encoded
-      builder = Builder::XmlMarkup.new(indent: 2)
-      append_envelope(builder, @packet.to_h)
+      @xml ||= begin
+        # TODO: Set option so that åäö isn't encoded
+        builder = Builder::XmlMarkup.new(indent: 2)
+        append_envelope(builder, @packet.to_h)
+      end
     end
 
     private

data/lib/arbetsformedlingen/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arbetsformedlingen
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Jacob Burenstam
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-28 00:00:00.000000000 Z
+date: 2017-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -94,6 +94,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -130,13 +158,24 @@ files:
 - data/municipality-codes.csv
 - data/occupation-codes.csv
 - lib/arbetsformedlingen.rb
-- lib/arbetsformedlingen/client.rb
+- lib/arbetsformedlingen/api/client.rb
+- lib/arbetsformedlingen/api/ledigtarbete_client.rb
+- lib/arbetsformedlingen/api/matchning_client.rb
+- lib/arbetsformedlingen/api/request.rb
+- lib/arbetsformedlingen/api/results/ad_result.rb
+- lib/arbetsformedlingen/api/results/matchning_result.rb
+- lib/arbetsformedlingen/api/results/soklista_result.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/codes/country_code.rb
 - lib/arbetsformedlingen/codes/drivers_license_code.rb
 - lib/arbetsformedlingen/codes/experience_required_code.rb
 - lib/arbetsformedlingen/codes/municipality_code.rb
 - lib/arbetsformedlingen/codes/occupation_code.rb
 - lib/arbetsformedlingen/codes/salary_type_code.rb
+- lib/arbetsformedlingen/key_struct.rb
 - lib/arbetsformedlingen/models/application_method.rb
 - lib/arbetsformedlingen/models/company.rb
 - lib/arbetsformedlingen/models/document.rb
@@ -144,13 +183,12 @@ files:
 - lib/arbetsformedlingen/models/dry/types.rb
 - lib/arbetsformedlingen/models/model.rb
 - lib/arbetsformedlingen/models/packet.rb
+- lib/arbetsformedlingen/models/packet_xml_builder.rb
 - lib/arbetsformedlingen/models/position.rb
 - lib/arbetsformedlingen/models/publication.rb
 - lib/arbetsformedlingen/models/qualification.rb
 - lib/arbetsformedlingen/models/salary.rb
 - lib/arbetsformedlingen/models/schedule.rb
-- lib/arbetsformedlingen/output_builder.rb
-- lib/arbetsformedlingen/response.rb
 - lib/arbetsformedlingen/version.rb
 homepage: https://github.com/buren/arbetsformedlingen
 licenses:

data/lib/arbetsformedlingen/client.rb

@@ -1,25 +0,0 @@
-require 'arbetsformedlingen/response'
-
-module Arbetsformedlingen
-  class Client
-    BASE_URL = 'http://api.arbetsformedlingen.se/ledigtarbete'.freeze
-    ROUTES = {
-      post_job_url: "#{BASE_URL}/apiledigtarbete/hrxml",
-      test_post_job_url: "#{BASE_URL}/apiledigtarbete/test/hrxml"
-    }.freeze
-
-    HEADERS = {
-      'Content-type' => 'text/xml'
-    }.freeze
-
-    def self.post_job(xml)
-      response = HTTParty.post(post_job_url, body: xml, headers: HEADERS)
-      Response.new(response, xml)
-    end
-
-    def self.post_job_url
-      return ROUTES.fetch(:test_post_job_url) if Arbetsformedlingen.config.test
-      ROUTES.fetch(:post_job_url)
-    end
-  end
-end

data/lib/arbetsformedlingen/response.rb

@@ -1,34 +0,0 @@
-module Arbetsformedlingen
-  class Response
-    attr_reader :code, :messages, :body, :request_body
-
-    def initialize(httparty_response, request_boby)
-      @code = httparty_response.code
-      @body = httparty_response.body
-      @request_body = request_body
-      @valid = @code == 202
-      @messages = build_messages(httparty_response.to_a)
-    end
-
-    def valid?
-      @valid
-    end
-
-    private
-
-    def build_messages(messages)
-      messages.map do |message|
-        # HTTParty returns an array if there is only one key-value pair in the response
-        # so we need to check for it here and normalize
-        if message.is_a?(Array)
-          { message: message.last, error_code: nil }
-        else
-          error_code = message['ErrorCode']
-          @valid = false if error_code
-
-          { message: message['Message'], error_code: error_code }
-        end
-      end
-    end
-  end
-end