jofh22 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7dcdc2521319123e2c811fcf7a3cbb43c1ab4e003277e43d3cfb0cc15c0df09d
-  data.tar.gz: b384667c9c65ba2a6f36a00a84a78c2a8a81f7451b2c3d021df37365bbca8562
+  metadata.gz: 2f081a0a933c94d6c67de08abf988681217546e858ee9ed801454d3c3f4da16d
+  data.tar.gz: 1d7c5d78ad06fb948a1754d8eb29a954d1fcd9300d4380c4b66c86e415ff762b
 SHA512:
-  metadata.gz: 3721a5cfd7dac65d6c49c5dce0473f79a6c74b105145c50a6a35768543ce9566419a46e102c59528ff048d5d925a12e34fc29986f50a6e9f7c3fd9a374159807
-  data.tar.gz: 42749c78d3ec47283c6bdec4170dcabcdc8853198227e5aef4e96fa57de464ac71c388441d1058ff94690837471d0a6648f0107818560251ab133bdcea17300c
+  metadata.gz: cf5f21b6687f9963339a59c6bb17af7638da7d1fbfcaf84f69575c6b5dd9b4efba7846f243d8092172bc009200e6276636d8e1d7ee2199355f89df6b8cbfaf0a
+  data.tar.gz: 380f2f64f445bf1a51661751a24b9426d8da3fe144aec42981abe5e0852251065335c0a5302559b93a518025a49dc4c06ed34372c1033a78898d57c6c99554c8

data/data/nhs_scot.yaml

@@ -0,0 +1,37 @@
+---
+:title:
+- :select
+- //div[select/@name="cmdTitle"]
+:first_name:
+- :input
+- //input[@name="txtForename"]
+:last_name:
+- :input
+- //input[@name="txtSurname"]
+:postcode:
+- :input
+- //input[@name="txtHomePostcode"]
+:home_telephone:
+- :input
+- //input[@name="txtHomeTelephone"]
+:utamr:
+- :click
+- //input[@name="recoveryOption"]
+:email_address:
+- :input
+- //input[@name="txtHomeEmail"]
+:password:
+- :input
+- //input[@name="txtPassword"]
+:retype_password:
+- :input
+- //input[@name="txtPassword2"]
+:ayceb:
+- :select
+- //div[select/@name="cmbEmployed"]
+:ictih:
+- :click
+- //input[@name="Termscheckbox"]
+:register:
+- :click
+- //button[@type="submit"]

data/lib/jofh22.rb

@@ -6,14 +6,13 @@
 
 require 'yaml'
 require 'ferrumwizard'
-require 'nokorexi'
 
 
 module Jofh22
 
   class NHSScot
 
-    attr_reader :browser, :h, :doc
+    attr_reader :browser
 
     # notes:
     #
@@ -21,122 +20,61 @@ module Jofh22
     #     read a cookie file
     #   * the *yml* parameter refeference the YAML file containing the inputs
     #
-    def initialize(yml='/tmp/tmp.yaml', cookies: nil, debug: false)
+    def initialize(yml='/tmp/tmp.yaml', ofh22_filepath=nil,
+                   cookies: nil, debug: false)
 
-      @debug = debug
+      @cookies, @debug = cookies, debug
+      ofh22_filepath ||= File.join(File.dirname(__FILE__), '..', 'data',
+                                   'nhs_scot.yaml')
       url = 'https://apply.jobs.scot.nhs.uk/register.aspx'
+      cookies2 = cookies if File.exists? cookies
       @browser = browser = FerrumWizard.new(url,  headless: false,
-                                            cookies: cookies)
-      sleep 1
-      @doc = Nokorexi.new(browser.body).to_doc
+                                            cookies: cookies2)
       sleep 1
 
       filepath = yml
       @h = YAML.load(File.read(filepath))
 
+      if not @h['home_telephone'].to_s[0] == '+' then
+        @h['home_telephone'] = '+' + @h['home_telephone'].to_s
+      end
+
+      @ofh22 = YAML.load(File.read(ofh22_filepath))
+
     end
 
-    def populate_form()
-
-      h, browser = @h, @browser
-      r = browser.at_xpath('//select[@name="cmdTitle"]')
-
-      # Title
-      # options: , Councillor, Doctor, Father, Friar, Lady, Lord, Major,
-      #            Miss, Mr., Mrs., Ms., Mx., Professor, Reverend, Sir
-      title = h['title']
-      titles = %w( Councillor Doctor Father Friar Lady Lord Major Miss Mr.) +
-          %w(Mrs. Ms. Mx. Professor Reverend Sir)
-      r = titles.grep /#{title}/i
-      n = titles.index(r.first) + 1
-      r = browser.at_xpath('//div[select/@name="cmdTitle"]')
-      r.focus
-      n.times { r.type(:down); sleep 0.4}
-      r.click
-      sleep 0.5
-
-      r = browser.at_xpath('//input[@name="txtForename"]')
-
-      # First name
-      first_name = h['first_name']
-      r.focus.type first_name
-      sleep 0.5
-
-      r = browser.at_xpath('//input[@name="txtSurname"]')
-
-      # Last name
-      last_name = h['last_name']
-      r.focus.type last_name
-      sleep 0.5
-
-      r = browser.at_xpath('//input[@name="txtHomePostcode"]')
-
-      # Postcode
-      postcode = h['postcode']
-      r.focus.type postcode
-      sleep 0.5
-
-      r = browser.at_xpath('//input[@name="txtHomeTelephone"]')
-
-      # Home Telephone
-      home_telephone = h['home_telephone']
-      r.focus.type '+' + home_telephone.to_s.sub(/^\+/,'')
-      sleep 0.5
-
-      r = browser.at_xpath('//input[@name="recoveryOption"]')
-      r.focus.click
-
-      r = browser.at_xpath('//input[@name="txtHomeEmail"]')
-
-      # Email address
-      email_address = h['email_address']
-      r.focus.type email_address
-      sleep 0.5
-
-      r = browser.at_xpath('//input[@name="txtPassword"]')
-
-      # Password
-      password = h['password']
-      r.focus.type password
-      sleep 0.5
-
-      r = browser.at_xpath('//input[@name="txtPassword2"]')
-
-      # Re-type password
-      retype_password = h['retype_password']
-      r.focus.type retype_password
-      sleep 0.5
-
-      r = browser.at_xpath('//select[@name="cmbEmployed"]')
-      sleep 0.5
-      # Are you currently employed by NHS Scotland?
-      # options: Please select, Yes, No
-      ayceb = h['ayceb']
-      titles = ['Please select', 'Yes', 'No']
-      puts 'ayceb: ' + ayceb.inspect if @debug
-      puts 'titles: ' + titles.inspect if @debug
-
-      r2 = titles.grep /#{ayceb}/i
-      puts 'r2: ' + r2.inspect if @debug
-      n = titles.index(r2.first) + 1
-      r = browser.at_xpath('//div[select/@name="cmbEmployed"]')
-      r.focus
-      n.times { r.type(:down); sleep 0.4}
-      r.click
-      sleep 0.5
-
-      r = browser.at_xpath('//input[@name="Termscheckbox"]')
-      r.focus.click
-
-      r = browser.at_xpath('//button[@type="submit"]')
-      r.focus.click
-
-      #r.focus.type(:enter)
-      sleep 2
-      browser.save_cookies(cookie_filepath)
+    # used for the registration process for new applicants
+    #
+    def populate_form(cookie_filepath=@cookies)
+
+      @ofh22.each do |key, x|
+
+        if @debug then
+          puts 'key: ' + key.inspect
+          puts 'x: ' + x.inspect
+        end
+
+        type, xpath = x
+
+        if type == :input or type == :select then
+          @browser.method(type).call(xpath, @h[key.to_s])
+        elsif type == :click
+          @browser.method(type).call(xpath)
+        end
+
+      end
+
+      @browser.save_cookies(cookie_filepath)
       puts 'cookies saved to ' + cookie_filepath
 
+    end
+
+    def to_h()
+      @h
+    end
 
+    def to_ofh22()
+      @ofh22
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jofh22
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   cf1DJMYHlnirwc8n9E70PSbNohM3s47lbjLfbQRTb18TFrHi4OHXv7M9xaYxVQhQ
   /FCeM970TfCe+6ZwjFwlykWw
   -----END CERTIFICATE-----
-date: 2022-05-29 00:00:00.000000000 Z
+date: 2022-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ferrumwizard
@@ -46,7 +46,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -56,33 +56,14 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.3
-- !ruby/object:Gem::Dependency
-  name: nokorexi
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.7.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.3.4
 description: 
 email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- data/nhs_scot.yaml
 - lib/jofh22.rb
 homepage: https://github.com/jrobertson/jofh22
 licenses: