renalware-forms 0.1.9 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5df0b0ba9f2bb73e2a220a8b61d42265b1c3059d652fcfbf234df628baae092f
-  data.tar.gz: 9e2659fd0d9a73acfa28ee84d314d205895b6e81c9ba20b83d554c888d17f972
+  metadata.gz: 181086d1ec5a5fc79aeb1f31ee96d41783421214068279e7685c32b0310b08c1
+  data.tar.gz: 124fa4c1c4b5f8a7a7c9aa6653b194f2ebd773664dded89be7a9c163681ae677
 SHA512:
-  metadata.gz: dfd13861f1506b62a0f793e5b5447fcf9774255d50a80ec45aeaeef54d01e66afe8139fbd24386c4b2fa0e7f09ca56b3baa2177624a8d34ab9f4c8eefafa2b36
-  data.tar.gz: 2cdef508e130f74ccb0e659ff6b37fe9bd016eb7a7209117983c6d704b992f5a321e9971a8d98dd91ed34b6bd55fbaa618fafb145069d498a8735ef1dcefc278
+  metadata.gz: 6f47a359295804dfd868b3af40a2370a5c40c8a3e0483aa2b73030d890791519eab1e750b59ffe72920562ccce5713ecea1284a9508b7dc26934768ef32ab81d
+  data.tar.gz: 138c530b7af35432e90d8a1a8cb4483dc69d0c0c6cfa0eab0901c7713e1d8849fd12c49a3bba31a9d41a4f38f16cc5ec278d124fb8b7f029f6a9907f9cfaca77

data/.gitignore

@@ -0,0 +1,8 @@
+tmp/**/*
+.byebug_history
+.rubocop-https---raw-githubusercontent-com-airslie-styleguide-master-rubocop-yml
+.overcommit.yml
+pkg/renalware-forms-0.1.0.gem
+coverage
+pkg
+.bundle

data/.rspec

@@ -0,0 +1 @@
+--require spec_helper

data/.rubocop.yml

@@ -0,0 +1,63 @@
+require:
+  - rubocop-rails
+  - rubocop-rspec
+  - rubocop-performance
+
+# Note that the local default.yml is overwritten on CodeClimate with the contents of
+# the remote rubocop.yml pulled from GitHub in a codeclimate prepare step.
+inherit_from:
+  - default.yml
+
+AllCops:
+  UseCache: true
+  TargetRubyVersion: 3.0
+  # Just defining the Exclude or Include keys here overwrites the settings in default.yml
+  # so we have to redefine the entire set
+  Exclude:
+    - "*.gemspec"
+    - "vendor/**/*"
+    - "bin/**/*"
+    - "lib/tasks/**/*"
+    - "db/**/*"
+    - "spec/dummy/bin/**/*"
+    - "spec/dummy/lib/tasks/**/*"
+    - "spec/dummy/db/**/*"
+    - "tmp/**/*"
+    - "spec/dummy/tmp/**/*"
+    - "vendor/bundle/**/*"
+    - "config/initializers/devise.rb"
+
+Layout/LineLength:
+  Exclude:
+    - "spec/acceptance/renalware/steps/**/*"
+
+Metrics/AbcSize:
+  Max: 50
+RSpec/ExampleLength:
+  Max: 40
+RSpec/NestedGroups:
+  Max: 4
+RSpec/MultipleExpectations:
+  Max: 20
+RSpec/DescribeClass:
+  Enabled: false
+RSpec/ImplicitSubject:
+  Enabled: false
+RSpec/DescribedClass:
+  Enabled: false
+Performance/RedundantBlockCall:
+  Enabled: false
+Style/NumericPredicate:
+  Enabled: false
+RSpec/InstanceVariable:
+  Enabled: false
+Metrics/MethodLength:
+  Max: 50
+Rails/Date:
+  Enabled: false
+Rails/TimeZone:
+  Enabled: false
+Style/AsciiComments:
+  Enabled: false
+Style/ZeroLengthPredicate:
+  Enabled: false

data/.ruby-version

@@ -0,0 +1 @@
+3.0.2

data/.semaphore/semaphore.yml

@@ -0,0 +1,51 @@
+# Use the latest stable version of Semaphore 2.0 YML syntax:
+version: v1.0
+name: renalware-forms
+
+agent:
+  machine:
+    type: e1-standard-2
+    os_image: ubuntu1804
+
+blocks:
+  - name: Test setup
+    task:
+      jobs:
+        - name: bundle
+          commands:
+            - checkout
+            - cache restore gems-$SEMAPHORE_GIT_BRANCH-$(checksum Gemfile.lock),gems-$SEMAPHORE_GIT_BRANCH-,gems-master-
+            - sem-version ruby 3.0.2
+            - bundle install --deployment -j 4 --path vendor/bundle
+            - cache store gems-$SEMAPHORE_GIT_BRANCH-$(checksum Gemfile.lock) vendor/bundle
+
+  - name: Tests
+    task:
+      env_vars:
+        - name: RAILS_ENV
+          value: test
+
+      # This secret on semaphore contains the CC_TEST_REPORTER_ID ENV var
+      secrets:
+        - name: renalware-forms
+
+      prologue:
+        commands:
+          - checkout
+          - cache restore gems-$SEMAPHORE_GIT_BRANCH-$(checksum Gemfile.lock),gems-$SEMAPHORE_GIT_BRANCH-,gems-master-
+          - git submodule sync ; git submodule update --init
+          - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+          - chmod +x ./cc-test-reporter
+          - ./cc-test-reporter before-build
+          - sem-version ruby 3.0.2
+          - bundle install --deployment --path vendor/bundle
+
+      jobs:
+        - name: RSpec tests
+          commands:
+            - bundle exec rspec --format progress
+
+      epilogue:
+        on_pass:
+          commands:
+            - ./cc-test-reporter after-build

data/CHANGELOG.md

@@ -0,0 +1,37 @@
+# Change Log
+
+All notable changes to this project will be documented in
+this [changelog](http://keepachangelog.com/en/0.3.0/).
+This project adheres to Semantic Versioning.
+
+## Unreleased
+### Added
+### Changed
+### Fixed
+
+## 0.1.11
+3 April 2020
+### Added
+### Changed
+- Switched from Virtus to dry-types
+### Fixed
+
+## 0.1.7
+31 Mar 2020
+### Added
+### Changed
+### Fixed
+- Remove unused homecare args
+
+## 0.1.6
+31 Mar 2020
+### Added
+### Changed
+### Fixed
+- Support supplying a selected delivery frequency
+
+## 0.1.3
+### Added
+### Changed
+### Fixed
+- Bring in allergies

data/Gemfile

@@ -0,0 +1,21 @@
+source "https://rubygems.org"
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
+
+# Declare your gem's dependencies in renalware-forms.gemspec.
+# Bundler will treat runtime dependencies like base dependencies, and
+# development dependencies will be added by default to the :development group.
+gemspec
+
+# Declare any dependencies that are still in development here instead of in
+# your gemspec. These might include edge Rails or gems from your path or
+# Git. Remember to move these dependencies to your gemspec before releasing
+# your gem to rubygems.org.
+
+group :development, :test do
+  gem "byebug"
+  gem "rubocop"
+  gem "rubocop-performance"
+  gem "rubocop-rails"
+  gem "rubocop-rspec"
+  gem "simplecov", "~> 0.17.1"
+end

data/Gemfile.lock

@@ -0,0 +1,141 @@
+PATH
+  remote: .
+  specs:
+    renalware-forms (0.1.13)
+      activemodel
+      attr_extras (~> 6.2)
+      dry-struct
+      dry-types
+      prawn (~> 2.2)
+      prawn-table (~> 0.2)
+      rake
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    Ascii85 (1.1.0)
+    activemodel (6.1.4.1)
+      activesupport (= 6.1.4.1)
+    activesupport (6.1.4.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    afm (0.2.2)
+    ast (2.4.2)
+    attr_extras (6.2.4)
+    byebug (11.1.3)
+    concurrent-ruby (1.1.9)
+    diff-lcs (1.4.4)
+    docile (1.4.0)
+    dry-configurable (0.13.0)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 0.6)
+    dry-container (0.9.0)
+      concurrent-ruby (~> 1.0)
+      dry-configurable (~> 0.13, >= 0.13.0)
+    dry-core (0.7.1)
+      concurrent-ruby (~> 1.0)
+    dry-inflector (0.2.1)
+    dry-logic (1.2.0)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 0.5, >= 0.5)
+    dry-struct (1.4.0)
+      dry-core (~> 0.5, >= 0.5)
+      dry-types (~> 1.5)
+      ice_nine (~> 0.11)
+    dry-types (1.5.1)
+      concurrent-ruby (~> 1.0)
+      dry-container (~> 0.3)
+      dry-core (~> 0.5, >= 0.5)
+      dry-inflector (~> 0.1, >= 0.1.2)
+      dry-logic (~> 1.0, >= 1.0.2)
+    hashery (2.1.2)
+    i18n (1.8.10)
+      concurrent-ruby (~> 1.0)
+    ice_nine (0.11.2)
+    json (2.5.1)
+    minitest (5.14.4)
+    parallel (1.21.0)
+    parser (3.0.2.0)
+      ast (~> 2.4.1)
+    pdf-core (0.9.0)
+    pdf-reader (2.5.0)
+      Ascii85 (~> 1.0)
+      afm (~> 0.2.1)
+      hashery (~> 2.0)
+      ruby-rc4
+      ttfunk
+    prawn (2.4.0)
+      pdf-core (~> 0.9.0)
+      ttfunk (~> 1.7)
+    prawn-table (0.2.2)
+      prawn (>= 1.3.0, < 3.0.0)
+    rack (2.2.3)
+    rainbow (3.0.0)
+    rake (13.0.6)
+    regexp_parser (2.1.1)
+    rexml (3.2.5)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    rubocop (1.22.1)
+      parallel (~> 1.10)
+      parser (>= 3.0.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.12.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.12.0)
+      parser (>= 3.0.1.1)
+    rubocop-performance (1.11.5)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rails (2.12.2)
+      activesupport (>= 4.2.0)
+      rack (>= 1.1)
+      rubocop (>= 1.7.0, < 2.0)
+    rubocop-rspec (2.5.0)
+      rubocop (~> 1.19)
+    ruby-progressbar (1.11.0)
+    ruby-rc4 (0.1.5)
+    simplecov (0.17.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    ttfunk (1.7.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.1.0)
+    zeitwerk (2.4.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  byebug
+  pdf-reader
+  renalware-forms!
+  rspec
+  rubocop
+  rubocop-performance
+  rubocop-rails
+  rubocop-rspec
+  simplecov (~> 0.17.1)
+
+BUNDLED WITH
+   2.2.28

data/bin/rspec

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require 'bundler/setup'
+load Gem.bin_path('rspec-core', 'rspec')

data/default.yml

@@ -0,0 +1,6 @@
+inherit_from:
+  - https://raw.githubusercontent.com/airslie/styleguide/master/rubocop.yml
+
+# Don't add anything to this file other than the inherit_from above
+# as this file is overwritten on CodeClimate with the contents of the above
+# remote url which is downloaded in a CodeClimate prepare step.

data/lib/renalware/forms/generic/homecare/v1.rb

@@ -6,3 +6,14 @@ module Renalware::Forms::Generic
     end
   end
 end
+
+require_relative "v1/base"
+require_relative "v1/allergies"
+require_relative "v1/delivery_frequencies"
+require_relative "v1/document"
+require_relative "v1/footer"
+require_relative "v1/heading"
+require_relative "v1/medications"
+require_relative "v1/patient_details"
+require_relative "v1/prescription_durations"
+require_relative "v1/signoff"

data/lib/renalware/forms/generic/homecare.rb

@@ -6,3 +6,5 @@ module Renalware::Forms
     end
   end
 end
+
+require_relative "homecare/v1"

data/lib/renalware/forms/generic.rb

@@ -4,3 +4,5 @@ module Renalware::Forms
   module Generic
   end
 end
+
+require_relative "generic/homecare"

data/lib/renalware/forms/homecare/args.rb

@@ -1,58 +1,68 @@
 # frozen_string_literal: true
 
-require "virtus"
+require "dry-types"
+require "dry-struct"
 require "active_model"
 
 # rubocop:disable Metrics/ClassLength
 module Renalware::Forms
-  class Homecare::Args
-    include Virtus.model
+  module Types
+    include Dry.Types()
+  end
+
+  class Homecare::Args < Dry::Struct
     include ActiveModel::Validations
 
-    class Medication
-      include Virtus.model(strict: true)
+    class Medication < Dry::Struct
       include ActiveModel::Validations
 
-      attribute :date, Date
-      attribute :drug, String
-      attribute :dose, String
-      attribute :route, String
-      attribute :frequency, String
+      attribute :date, Types::Params::Date
+      attribute :drug, Types::String
+      attribute :dose, Types::String
+      attribute :route, Types::String
+      attribute :frequency, Types::String
     end
 
     # The first 2 attrbutes are used to drive what PDF to build
-    attribute :provider, String
-    attribute :version, Integer
-    attribute :title, String, default: ""
-    attribute :given_name, String
-    attribute :family_name, String
-    attribute :nhs_number, String, default: ""
-    attribute :born_on, Date
-    attribute :modality, String, default: ""
-    attribute :telephone, String, default: ""
-    attribute :hospital_number, String, default: ""
-    attribute :address, Array(String), default: []
-    attribute :postcode, String, default: ""
-    attribute :modality, String
-    attribute :prescriber_name, String, default: ""
-    attribute :prescription_date, Date
-    attribute :hospital_name, String
-    attribute :hospital_department, String
-    attribute :hospital_address, Array[String]
-    attribute :hospital_telephone, String
-    attribute :po_number, String
-    attribute :generated_at, DateTime
-    attribute :no_known_allergies, Boolean
-    attribute :allergies, Array[String]
-    attribute :drug_type, String
-    attribute :prescription_duration, String
-    attribute :administration_device, String
-    attribute :medications, Array[Medication]
-    attribute :consultant, String
-    attribute :delivery_frequencies, Array[String], default: ["3 months", "6 months"]
-    attribute :prescription_durations, Array[String] # e.g. ["3 months", "6 months"]
-    attribute :selected_prescription_duration, String # e.g. "3 months"
-    attribute :selected_delivery_frequency, String # e.g. "6 months"
+    attribute :provider, Types::Coercible::String
+    attribute :version, Types::Coercible::Integer
+    attribute :title, Types::String.default("").optional
+    attribute :given_name, Types::String
+    attribute :family_name, Types::String
+    attribute :nhs_number, Types::String.default("").optional
+    attribute :born_on, Types::Params::Date
+    attribute :modality , Types::Coercible::String.optional
+    attribute :telephone, Types::String.default("").optional
+    attribute :hospital_number, Types::String.default("").optional
+    attribute :address, Types::Array.of(Types::Coercible::String).default([].dup, shared: true)
+    attribute :postcode, Types::String.default("").optional
+    attribute :prescriber_name, Types::String.default("").optional
+    # attribute :prescription_date, Types::Params::Date
+    attribute :hospital_name, Types::String.default("")
+    attribute :hospital_department, Types::String.default("").optional
+    attribute :hospital_address, Types::Array.of(Types::Coercible::String).default([], shared: true)
+    attribute :hospital_telephone, Types::String.default("").optional
+    attribute :po_number, Types::String.default("").optional
+    attribute :generated_at, (Types::Params::DateTime.default { DateTime.now })
+    attribute :no_known_allergies, Types::Bool.optional
+    attribute :allergies, Types::Array.of(Types::Coercible::String)
+    attribute :drug_type, Types::Coercible::String.optional
+    # attribute :prescription_duration, Types::String
+    attribute :administration_device, Types::String.default("").optional
+    attribute :medications, Types::Array.of(Medication).default([].dup, shared: true)
+    attribute :consultant, Types::String.default("").optional
+    attribute(
+      :delivery_frequencies,
+      Types::Array.of(Types::Coercible::String).default(["3 months", "6 months"].freeze)
+    )
+    attribute(
+      :prescription_durations,
+      Types::Array
+        .of(Types::Coercible::String)
+        .default(["3 months", "6 months", "12 months"].freeze)
+    )
+    attribute :selected_prescription_duration, Types::String.default("") # e.g. "6 months"
+    attribute :selected_delivery_frequency, Types::String.default("") # e.g. "6 months"
 
     validates :family_name, presence: true
     validates :given_name, presence: true
@@ -100,27 +110,26 @@ module Renalware::Forms
     end
 
     def self.test_data(provider: :generic, version: 1)
-      new.tap do |args|
-        args.provider = provider
-        args.version = version
-        args.title = "Mr"
-        args.given_name = "Jack"
-        args.family_name = "JONES"
-        args.nhs_number = "0123456789"
-        args.born_on = Date.parse("2001-01-01")
-        args.telephone = "07000 000001"
-        args.hospital_number = "ABC123"
-        args.modality = "PD"
-        args.address = ["line1", "", nil, "line2", "line3   "]
-        args.postcode = "TW1 1UU"
-        args.modality = "HD"
-        args.prescriber_name = "Dr X Yz"
-        args.prescription_date = Date.today.to_s
-        args.consultant = "Dr Pepper"
-        args.hospital_name = "THE ROYAL LONDON HOSPITAL"
-        args.hospital_telephone = "0000 000001"
-        args.hospital_department = "Renal"
-        args.hospital_address = [
+      args = new(
+        provider: provider,
+        version: version,
+        title: "Mr",
+        given_name: "Jack",
+        family_name: "JONES",
+        nhs_number: "0123456789",
+        born_on: Date.parse("2001-01-01"),
+        telephone: "07000 000001",
+        hospital_number: "ABC123",
+        modality: "HD",
+        address: ["line1", "", nil, "line2", "line3   "],
+        postcode: "TW1 1UU",
+        prescriber_name: "Dr X Yz",
+        prescription_date: Date.today.to_s,
+        consultant: "Dr Pepper",
+        hospital_name: "THE ROYAL LONDON HOSPITAL",
+        hospital_telephone: "0000 000001",
+        hospital_department: "Renal",
+        hospital_address: [
           "The Royal London Hospital",
           "Barts Health NHS Trust",
           "Whitechapel",
@@ -129,30 +138,30 @@ module Renalware::Forms
           "UK",
           "Tel: 0800 00000000",
           "Another line"
-
-        ]
-        args.no_known_allergies = false
-        args.allergies = ["Nuts", nil, "Penicillin", "Mown grass"]
-        args.drug_type = "ESA"
-        args.prescription_duration = "1 month"
-        args.administration_device = "device?"
-        args.po_number = "P123"
-        args.generated_at = Time.now
-        args.delivery_frequencies = ["1 week", "3 months", "6 months", "12 month"]
-        args.prescription_durations = ["3 months", "6 months", "12 months"]
-        args.selected_prescription_duration = "6 months"
-        args.selected_delivery_frequency = "6 months"
-
-        args.medications << Medication.new(
-          date: Date.today,
-          drug: "Example drug",
-          dose: "1 unit",
-          route: "PO",
-          frequency: "3"
-        )
-
-        raise ArgumentError, args.errors unless args.valid?
-      end
+        ],
+        no_known_allergies: false,
+        allergies: ["Nuts", nil, "Penicillin", "Mown grass"],
+        drug_type: "ESA",
+        prescription_duration: "1 month",
+        administration_device: "device?",
+        po_number: "P123",
+        delivery_frequencies: ["1 week", "3 months", "6 months", "12 month"],
+        prescription_durations: ["3 months", "6 months", "12 months"],
+        selected_prescription_duration: "6 months",
+        selected_delivery_frequency: "6 months"
+      )
+
+      args.medications << Medication.new(
+        date: Date.today,
+        drug: "Example drug",
+        dose: "1 unit",
+        route: "PO",
+        frequency: "3"
+      )
+
+      raise ArgumentError, args.errors unless args.valid?
+
+      args
     end
 
     def medications_are_present

data/lib/renalware/forms/homecare.rb

@@ -1,10 +1,9 @@
 # frozen_string_literal: true
 
-require "prawn"
-require "prawn/table"
-require "attr_extras"
-
 module Renalware::Forms
   module Homecare
   end
 end
+
+require_relative "homecare/args"
+require_relative "homecare/pdf"

data/lib/renalware/forms/version.rb

@@ -2,6 +2,6 @@
 
 module Renalware
   module Forms
-    VERSION = "0.1.9"
+    VERSION = "0.1.13"
   end
 end

data/lib/renalware/forms.rb

@@ -1,18 +1,15 @@
 # frozen_string_literal: true
 
-require "zeitwerk"
 require "prawn"
 require "prawn/table"
 require "attr_extras"
 
-# Set up autoloading with zeitwerk
-# As we are nested in lib/renalware/forms, be sure to push an absolute
-# path to the lib folder.
-loader = Zeitwerk::Loader.new
-loader.push_dir File.expand_path("../", __dir__)
-loader.setup
-
 module Renalware
   module Forms
   end
 end
+
+require_relative "forms/base"
+require_relative "forms/helpers"
+require_relative "forms/generic"
+require_relative "forms/homecare"

data/lib/tasks/tasks.rake

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
+
 desc "Starts irb so we can debug the gem"
-task :console do
+task console: :environment do
   exec "irb -r ./lib/renalware/forms"
 end

data/renalware-forms.gemspec

@@ -0,0 +1,33 @@
+$:.push File.expand_path("lib", __dir__)
+
+# Maintain your gem's version:
+require "renalware/forms/version"
+
+# Describe your gem and declare its dependencies:
+Gem::Specification.new do |spec|
+  spec.name        = "renalware-forms"
+  spec.version     = Renalware::Forms::VERSION
+  spec.authors     = ["Airslie Ltd"]
+  spec.email       = ["dev@aisrlie.com"]
+  spec.homepage    = "http://airslie.com"
+  spec.summary     = "PDF library for Renalware forms"
+  spec.description = "The home for various forms for external providers e.g. home care prescriptions"
+  spec.license     = "MIT"
+  spec.required_ruby_version = ">= 3.0.0"
+
+  spec.files         = `git ls-files`.split("\n")
+  spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
+  spec.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+  spec.extra_rdoc_files = ["README.md"]
+
+  spec.add_dependency "activemodel"
+  spec.add_dependency "attr_extras", "~> 6.2"
+  spec.add_dependency "prawn", "~> 2.2"
+  spec.add_dependency "prawn-table", "~> 0.2"
+  spec.add_dependency "rake"
+  spec.add_dependency "dry-types"
+  spec.add_dependency "dry-struct"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "pdf-reader"
+end

data/spec/renalware/forms/args_spec.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Renalware::Forms::Homecare
+  RSpec.describe Args do
+    describe "#patient_name" do
+      subject {
+        hash = default_test_arg_values.update(
+          given_name: "John",
+          family_name: "SMITH",
+          title: title
+        )
+        described_class.new(hash).patient_name
+      }
+
+      context "when title present" do
+        let(:title) { "Mr" }
+
+        it { is_expected.to eq("SMITH, John (Mr)") }
+      end
+
+      context "when title missing" do
+        let(:title) { "" }
+
+        it { is_expected.to eq("SMITH, John") }
+      end
+    end
+  end
+end

data/spec/renalware/forms/homecare/generic/v1/allergies_spec.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Renalware::Forms::Generic
+  RSpec.describe Homecare::V1::Allergies do
+    context "when the patient has iit recoreded that they have no known allergies" do
+      it do
+        hash = default_test_arg_values.update(no_known_allergies: true)
+        args = Renalware::Forms::Homecare::Args.new(hash)
+        doc = test_prawn_doc
+
+        described_class.new(doc, args).build
+
+        text = extract_text_from_prawn_doc(doc)
+        expect(text).to include("No Known Allergies")
+      end
+    end
+
+    it do
+      hash = default_test_arg_values.update(
+        no_known_allergies: false,
+        allergies: %w(nuts penicillin)
+      )
+      args = Renalware::Forms::Homecare::Args.new(hash)
+      doc = test_prawn_doc
+
+      described_class.new(doc, args).build
+
+      text = extract_text_from_prawn_doc(doc)
+
+      expect(text).not_to include("No Known Allergies")
+      expect(text).to include("Known Allergies")
+      expect(text).to include("nuts")
+      expect(text).to include("penicillin")
+    end
+  end
+end

data/spec/renalware/forms/homecare/generic/v1/delivery_frequencies_spec.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Renalware::Forms::Generic
+  RSpec.describe Homecare::V1::DeliveryFrequencies do
+    def extract_pdf_text(args)
+      doc = test_prawn_doc
+      described_class.new(doc, args).build
+      extract_text_from_prawn_doc(doc)
+    end
+
+    it do
+      hash = default_test_arg_values.update(delivery_frequencies: ["Once", "3 weeks", "6 weeks"])
+      args = Renalware::Forms::Homecare::Args.new(hash)
+
+      text = extract_pdf_text(args)
+
+      expect(text).to include("Frequency of deliveries")
+      expect(text).to match(/❏ +Once/)
+      expect(text).to match(/❏ +3 weeks/)
+      expect(text).to match(/❏ +6 weeks/)
+    end
+
+    context "when there are no frequencies supplied" do
+      it "displays the defaults" do
+        args = Renalware::Forms::Homecare::Args.new(**default_test_arg_values)
+
+        text = extract_pdf_text(args)
+
+        expect(text).to match(/Frequency of deliveries/)
+        expect(text).to match(/❏ +3 months/)
+        expect(text).to match(/❏ +6 months/)
+      end
+    end
+
+    context "when there is a selected delivery_frequency" do
+      it "indicates that frequency has been selected by checking a box" do
+        hash = default_test_arg_values.update(
+          delivery_frequencies: ["3 months", "6 months", "12 months"],
+          selected_delivery_frequency: "6 months"
+        )
+        args = Renalware::Forms::Homecare::Args.new(hash)
+
+        text = extract_pdf_text(args)
+
+        expect(text).to match(/❏ +3 months/)
+        expect(text).to match(/■ +6 months/)
+        expect(text).to match(/❏ +12 months/)
+      end
+    end
+  end
+end

data/spec/renalware/forms/homecare/generic/v1/heading_spec.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Renalware::Forms::Generic
+  RSpec.describe Homecare::V1::Heading do
+    it do
+      hash = default_test_arg_values.update(
+        po_number: "P123",
+        hospital_number: "H123",
+        drug_type: "ESA"
+      )
+      args = Renalware::Forms::Homecare::Args.new(hash)
+      doc = test_prawn_doc
+
+      described_class.new(doc, args).build
+
+      text = extract_text_from_prawn_doc(doc)
+
+      expect(text).to include(args.po_number)
+      expect(text).to include(args.hospital_number)
+      expect(text).to include(args.drug_type)
+      expect(text).to include("Home Delivery Medication List")
+    end
+  end
+end

data/spec/renalware/forms/homecare/generic/v1/mediations_spec.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Renalware::Forms::Generic
+  RSpec.describe Homecare::V1::Medications do
+    it do
+      args = Renalware::Forms::Homecare::Args.new(**default_test_arg_values)
+      args.medications << Renalware::Forms::Homecare::Args::Medication.new(
+        date: "2020-01-01",
+        drug: "Drug1",
+        dose: "Dose1",
+        route: "Route1",
+        frequency: "Freq1"
+      )
+      args.medications << Renalware::Forms::Homecare::Args::Medication.new(
+        date: "2020-02-02",
+        drug: "Drug2",
+        dose: "Dose2",
+        route: "Route2",
+        frequency: "Freq2"
+      )
+      doc = test_prawn_doc
+
+      described_class.new(doc, args).build
+
+      text = extract_text_from_prawn_doc(doc)
+
+      expect(text).to include("2020-01-01")
+      expect(text).to include("Drug1")
+      expect(text).to include("Dose1")
+      expect(text).to include("Route1")
+      expect(text).to include("Freq1")
+      expect(text).to include("Drug2")
+    end
+  end
+end

data/spec/renalware/forms/homecare/generic/v1/patient_details_spec.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Renalware::Forms::Generic
+  RSpec.describe Homecare::V1::PatientDetails do
+    it do
+      hash = default_test_arg_values.update(
+        given_name: "John",
+        family_name: "SMITH",
+        title: "Mr",
+        modality: "HD",
+        born_on: "2001-01-01",
+        nhs_number: "0123456789",
+        hospital_number: "X123",
+        address: %w(aa bb cc),
+        postcode: "POSTCODE"
+      )
+      args = Renalware::Forms::Homecare::Args.new(hash)
+      doc = test_prawn_doc
+
+      described_class.new(doc, args).build
+
+      text = extract_text_from_prawn_doc(doc)
+
+      expect(text).to include("SMITH, John (Mr)")
+      expect(text).to include("HD")
+      expect(text).to include("2001-01-01")
+      expect(text).to include("0123456789")
+      expect(text).to include("X123")
+      expect(text).to include("aa")
+      expect(text).to include("bb")
+      expect(text).to include("cc")
+      expect(text).to include("POSTCODE")
+    end
+  end
+end

data/spec/renalware/forms/homecare/generic/v1/prescription_durations_spec.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Renalware::Forms::Generic
+  RSpec.describe Homecare::V1::PrescriptionDurations do
+    def extract_pdf_text(args)
+      doc = test_prawn_doc
+      described_class.new(doc, args).build
+      extract_text_from_prawn_doc(doc)
+    end
+
+    it do
+      hash = default_test_arg_values.update(
+        prescription_durations: ["3 months", "6 months", "12 months"]
+      )
+      args = Renalware::Forms::Homecare::Args.new(hash)
+
+      text = extract_pdf_text(args)
+
+      expect(text).to include("Repeat prescription for")
+      expect(text).to match(/❏ +3 months/)
+      expect(text).to match(/❏ +6 months/)
+      expect(text).to match(/❏ +12 months/)
+    end
+
+    it "works where there are no prescription_durations supplied" do
+      args = Renalware::Forms::Homecare::Args.new(default_test_arg_values)
+
+      text = extract_pdf_text(args)
+
+      expect(text).to include("Repeat prescription for")
+    end
+
+    context "when there is a selected prescription_duration" do
+      it "indicates that duration has been selected eg for checking a box" do
+        args = Renalware::Forms::Homecare::Args.new(
+          default_test_arg_values.update(
+            prescription_durations: ["3 months", "6 months", "12 months"],
+            selected_prescription_duration: "6 months"
+          )
+        )
+
+        text = extract_pdf_text(args)
+
+        expect(text).to match(/❏ +3 months/)
+        expect(text).to match(/■ +6 months/)
+        expect(text).to match(/❏ +12 months/)
+      end
+    end
+  end
+end

data/spec/renalware/forms/homecare/generic/v1/signoff_spec.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+module Renalware::Forms::Generic
+  RSpec.describe Homecare::V1::Signoff do
+    it do
+      args = Renalware::Forms::Homecare::Args.new(
+        **default_test_arg_values.update(consultant: "Dr Pepper")
+      )
+      doc = test_prawn_doc
+
+      described_class.new(doc, args).build
+
+      text = extract_text_from_prawn_doc(doc)
+      expect(text).to include("Dr Pepper")
+    end
+  end
+end

data/spec/renalware/forms/homecare/pdf_spec.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+require "spec_helper"
+
+RSpec.describe Renalware::Forms::Homecare::Pdf do
+  describe "#generate" do
+    # describe "argument validation" do
+    # it "throws an error if args is nil" do
+    #   expect { described_class.generate(nil) }.to raise_error(ArgumentError)
+    # end
+
+    # it "throws an error if arg.provider is nil" do
+    #   args = Renalware::Forms::Homecare::Args.new(provider: nil)
+
+    #   expect {
+    #     described_class.generate(args)
+    #   }.to raise_error(ArgumentError, "Missing provider")
+    # end
+
+    # it "throws an error if arg.provider is an empty string" do
+    #   args = Renalware::Forms::Homecare::Args.new(provider: "")
+
+    #   expect {
+    #     described_class.generate(args)
+    #   }.to raise_error(ArgumentError, "Missing provider")
+    # end
+
+    # it "throws an error if arg.version is not a number" do
+    #   args = Renalware::Forms::Homecare::Args.new(provider: :a, version: nil)
+
+    #   expect {
+    #     described_class.generate(args)
+    #   }.to raise_error(ArgumentError, "Version must be >0")
+    # end
+
+    # it "throws an error no matching provider found" do
+    #   args = Renalware::Forms::Homecare::Args.new(provider: :generico, version: 1)
+
+    #   expect {
+    #     described_class.generate(args)
+    #   }.to raise_error(
+    #     ArgumentError,
+    #     "No PDF forms found for provider=generico version=1 "\
+    #     "trying to resolve Renalware::Forms::Generico::Homecare::V1::Document"
+    #   )
+    # end
+
+    # it "throws an error no matching version found" do
+    #   args = Renalware::Forms::Homecare::Args.new(provider: :generic, version: 1000)
+
+    #   expect {
+    #     described_class.generate(args)
+    #   }.to raise_error(
+    #     ArgumentError,
+    #     "No PDF forms found for provider=generic version=1000 "\
+    #     "trying to resolve Renalware::Forms::Generic::Homecare::V1000::Document"
+    #   )
+    # end
+    # end
+
+    context "when arguments are valid" do
+      it "create render a PDF for a Generic::Homecare::V1::Document" do
+        args = Renalware::Forms::Homecare::Args.new(**default_test_arg_values)
+
+        pdf_data = described_class.generate(args).render
+
+        expect(pdf_data).to start_with("%PDF-")
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# The generated `.rspec` file contains `--require spec_helper` which will cause
+# this file to always be loaded, without a need to explicitly require it in any
+# files.
+#
+# Given that it is always loaded, you are encouraged to keep this file as
+# light-weight as possible. Requiring heavyweight dependencies from this file
+# will add to the boot time of your test suite on EVERY test run, even for an
+# individual file that may not need all of that loaded. Instead, consider making
+# a separate helper file that requires the additional dependencies and performs
+# the additional setup, and require it from the spec files that actually need
+# it.
+
+require "simplecov"
+SimpleCov.start
+
+require "tempfile"
+require "pdf-reader"
+require "./lib/renalware/forms"
+
+def pdf_reader_from(prawn_doc)
+  file = Tempfile.new("pdf")
+  prawn_doc.render_file file
+  PDF::Reader.new(file)
+end
+
+def test_prawn_doc
+  Prawn::Document.new(
+    page_size: "A4",
+    page_layout: :portrait,
+    margin: 15
+  )
+end
+
+def default_test_arg_values
+  {
+    provider: :generic,
+    version: 1,
+    modality: "HD",
+    telephone: "",
+    hospital_number: nil,
+    nhs_number: nil,
+    consultant: nil,
+    postcode: nil,
+    hospital_department: nil,
+    hospital_telephone: nil,
+    prescriber_name: nil,
+    po_number: "134",
+    administration_device: nil,
+    given_name: "John",
+    family_name: "SMITH",
+    title: "Mr",
+    no_known_allergies: true,
+    allergies: [],
+    drug_type: :esa,
+    born_on: "2019-01-01",
+    prescription_date: "2019-01-01"
+  }.dup
+end
+
+def extract_text_from_prawn_doc(doc)
+  pdf_reader_from(doc).pages.map(&:text).join
+end
+
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+  config.expect_with :rspec do |expectations|
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  config.mock_with :rspec do |mocks|
+    mocks.verify_partial_doubles = true
+  end
+  config.shared_context_metadata_behavior = :apply_to_host_groups
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renalware-forms
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.13
 platform: ruby
 authors:
 - Airslie Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-02 00:00:00.000000000 Z
+date: 2021-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -81,21 +81,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: virtus
+  name: dry-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: zeitwerk
+  name: dry-struct
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -139,13 +139,25 @@ dependencies:
 description: The home for various forms for external providers e.g. home care prescriptions
 email:
 - dev@aisrlie.com
-executables: []
+executables:
+- rspec
 extensions: []
-extra_rdoc_files: []
+extra_rdoc_files:
+- README.md
 files:
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".ruby-version"
+- ".semaphore/semaphore.yml"
+- CHANGELOG.md
+- Gemfile
+- Gemfile.lock
 - MIT-LICENSE
 - README.md
 - Rakefile
+- bin/rspec
+- default.yml
 - lib/renalware/forms.rb
 - lib/renalware/forms/base.rb
 - lib/renalware/forms/generic.rb
@@ -169,6 +181,17 @@ files:
 - lib/renalware/forms/version.rb
 - lib/tasks/homecare.rake
 - lib/tasks/tasks.rake
+- renalware-forms.gemspec
+- spec/renalware/forms/args_spec.rb
+- spec/renalware/forms/homecare/generic/v1/allergies_spec.rb
+- spec/renalware/forms/homecare/generic/v1/delivery_frequencies_spec.rb
+- spec/renalware/forms/homecare/generic/v1/heading_spec.rb
+- spec/renalware/forms/homecare/generic/v1/mediations_spec.rb
+- spec/renalware/forms/homecare/generic/v1/patient_details_spec.rb
+- spec/renalware/forms/homecare/generic/v1/prescription_durations_spec.rb
+- spec/renalware/forms/homecare/generic/v1/signoff_spec.rb
+- spec/renalware/forms/homecare/pdf_spec.rb
+- spec/spec_helper.rb
 homepage: http://airslie.com
 licenses:
 - MIT
@@ -181,14 +204,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: PDF library for Renalware forms