arbetsformedlingen 0.6.0 → 0.7.0

data/lib/arbetsformedlingen/api/ws_occupation_client.rb

@@ -1,84 +1,100 @@
 # frozen_string_literal: true
 
-require 'arbetsformedlingen/soap_builder'
-require 'arbetsformedlingen/api/soap_request'
+require 'arbetsformedlingen/api/base_soap_client'
 
 module Arbetsformedlingen
   module API
     # WsOccupation API client
-    class WSOccupationClient
-      attr_reader :request
-
+    # @see https://api.arbetsformedlingen.se/af/v0/Occupation/wsoccupation.asmx
+    class WSOccupationClient < BaseSOAPClient
       # Service URL
       SERVICE_URL = 'https://api.arbetsformedlingen.se/af/v0/Occupation/wsoccupation.asmx'.freeze
 
+      # Namespace
+      NAMESPACE = 'urn:ams.se:wsoccupation'
+
       # Initialize client
       def initialize
-        @request = SOAPRequest.new(SERVICE_URL)
+        super(SERVICE_URL, NAMESPACE)
       end
 
-      # Returns occupation response with specified id
+      # Returns occupation with specified id
       # @return [Response] the response
       # @see Response
-      # @see Response#xml
+      # @see https://api.arbetsformedlingen.se/af/v0/Occupation/wsoccupation.asmx?op=GetOccupationById
       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)
+        client_request('GetOccupationById', args: { occupationId: id })
       end
 
-      # Returns occupations response with specified name
+      # Returns occupations
       # @return [Response] the response
       # @see Response
-      # @see Response#xml
+      # @see https://api.arbetsformedlingen.se/af/v0/Occupation/wsoccupation.asmx?op=FindOccupation
       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)
+        client_request('FindOccupation', args: { name: name })
       end
 
       # Returns occupations response
       # @return [Response] the response
       # @see Response
-      # @see Response#xml
+      # @see https://api.arbetsformedlingen.se/af/v0/Occupation/wsoccupation.asmx?op=GetAllOccupations
       def occupations
-        soap_body = SOAPBuilder.wrap do |body|
-          body.GetAllOccupations(xmlns: 'urn:ams.se:wsoccupation')
-        end
-
-        request.post(soap_body.to_xml)
+        client_request('GetAllOccupations')
       end
 
-      # Returns occupations short response with specified id
+      # Returns occupations short
       # @return [Response] the response
       # @see Response
-      # @see Response#xml
+      # @see https://api.arbetsformedlingen.se/af/v0/Occupation/wsoccupation.asmx?op=GetAllOccupationsShort
       def occupations_short
-        soap_body = SOAPBuilder.wrap do |body|
-          body.GetAllOccupationsShort(xmlns: 'urn:ams.se:wsoccupation')
-        end
-
-        request.post(soap_body.to_xml)
+        client_request('GetAllOccupationsShort')
       end
 
-      # Returns occupations detailed response with specified id
+      # Returns occupations detailed
       # @return [Response] the response
       # @see Response
-      # @see Response#xml
       def occupations_detailed
-        soap_body = SOAPBuilder.wrap do |body|
-          body.GetAllOccupationsDetailed(xmlns: 'urn:ams.se:wsoccupation')
-        end
+        client_request('GetAllOccupationsDetailed')
+      end
 
-        request.post(soap_body.to_xml)
+      # Returns locale groups
+      # @return [Response] the response
+      # @see Response
+      # @see https://api.arbetsformedlingen.se/af/v0/Occupation/wsoccupation.asmx?op=GetLocaleGroups
+      def locale_groups(id)
+        client_request('GetLocaleGroups', args: { occupationId: id })
+      end
+
+      # Returns platsbanken link for specified locale group id
+      # @return [Response] the response
+      # @see Response
+      # @see https://api.arbetsformedlingen.se/af/v0/Occupation/wsoccupation.asmx?op=GetPlatsbankenLink
+      def platsbanken_link(id)
+        client_request('GetPlatsbankenLink', args: { localegroupid: id })
+      end
+
+      # Returns education connections
+      # @return [Response] the response
+      # @see Response
+      # @see https://api.arbetsformedlingen.se/af/v0/Occupation/wsoccupation.asmx?op=LoadAllEducationConnections
+      def education_connections
+        client_request('LoadAllEducationConnections')
+      end
+
+      # Returns occupations containing id and name information
+      # @return [Response] the response
+      # @see Response
+      # @see https://api.arbetsformedlingen.se/af/v0/Occupation/wsoccupation.asmx?op=LoadAllOccupationIdAndName
+      def occupations_id_and_name
+        client_request('LoadAllOccupationIdAndName')
+      end
+
+      # Returns article
+      # @return [Response] the response
+      # @see Response
+      # @see https://api.arbetsformedlingen.se/af/v0/Occupation/wsoccupation.asmx?op=GetArticle
+      def article(id)
+        client_request('GetArticle', args: { articleId: id })
       end
     end
   end

data/lib/arbetsformedlingen/codes/occupation_code.rb

@@ -4,9 +4,8 @@ require 'csv'
 
 module Arbetsformedlingen
   class OccupationCode
-    CODE_MAP = CSV.read(
-      File.expand_path('../../../data/occupation-codes.csv', __dir__)
-    ).to_h.invert.freeze
+    DATA_PATH = File.expand_path('../../../data/occupation-codes.csv', __dir__)
+    CODE_MAP = CSV.read(DATA_PATH).to_h.invert.freeze
     CODES_MAP_INVERTED = CODE_MAP.invert.freeze
 
     def self.to_code(name)

data/lib/arbetsformedlingen/soap_builder.rb

@@ -3,17 +3,22 @@
 require 'builder'
 
 module Arbetsformedlingen
+  # SOAP Envelope XML builder
   class SOAPBuilder
+    # SOAP attributes
     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
 
+    # Wrap block
+    # @see #wrap
     def self.wrap(&block)
       new.wrap(&block)
     end
 
+    # Initialize object
     def initialize
       @builder = Builder::XmlMarkup.new(indent: 2)
       @builder.instruct!
@@ -21,6 +26,8 @@ module Arbetsformedlingen
       yield self if block_given?
     end
 
+    # Wrap block in SOAP envelope
+    # @return [SOAPBuilder]
     def wrap
       @builder.soap12(:Envelope, SOAP_ATTRIBUTES) do |envelope|
         envelope.soap12(:Body) { |body| yield(body) }

data/lib/arbetsformedlingen/version.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
 module Arbetsformedlingen
-  VERSION = '0.6.0'.freeze
+  # Gem version
+  VERSION = '0.7.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arbetsformedlingen
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Jacob Burenstam
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-18 00:00:00.000000000 Z
+date: 2018-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -173,6 +173,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".hound.yml"
 - ".rspec"
 - ".rubocop.yml"
 - ".ruby-style-guide.yml"
@@ -184,21 +185,26 @@ files:
 - Rakefile
 - arbetsformedlingen.gemspec
 - bin/console
+- bin/seed
 - bin/setup
 - config/locales/errors.yml
 - data/country-codes.csv
 - data/municipality-codes.csv
 - data/occupation-codes.csv
+- examples/post_job_ad.rb
 - lib/arbetsformedlingen.rb
+- lib/arbetsformedlingen/api/base_soap_client.rb
 - lib/arbetsformedlingen/api/client.rb
 - lib/arbetsformedlingen/api/ledigtarbete_client.rb
 - lib/arbetsformedlingen/api/matchning_client.rb
+- lib/arbetsformedlingen/api/ontology_client.rb
 - lib/arbetsformedlingen/api/request.rb
 - lib/arbetsformedlingen/api/response.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/soap_request.rb
+- lib/arbetsformedlingen/api/taxonomy_client.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