renalware-forms 0.1.11 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92ef42b414ec62117acbf04fc22a9bf34e1ca82176a69c02914c564345f6f327
-  data.tar.gz: c951b4c7190b188bda3d2544e96fe173bf52b19ee3eb77313215c4b5708c738b
+  metadata.gz: cb8552f50f455db6eef5e37c00b2dedddfa21b4f833d603b71142d7fc49282db
+  data.tar.gz: f70cdcc5f42fab217b1246e6b538658cc8c2c2ab032684ec51f88c6b1e72acf0
 SHA512:
-  metadata.gz: 0e834a60b44a5244f9845eb8897624a1a64fba69c2dca49755dab064f61629a78f4bb020624ff007ab4376da87b2dd562f526d068972b848534e5068398c0784
-  data.tar.gz: 23b9b51811838cc076afb490526bd79adc2943a16038b7be9747122f05ee9c9d00ef84d08b27523346de161a643d680ae0c4c64f84bebd5bd7a56357a58e2b53
+  metadata.gz: 23b6c1b7851bbb8a49b795932d0e5164c2750fbd3b52ea5485ca3d1496d99c6cadb2a0517c65fe229435f5db1b921e697cfbcd577035abeae1727cac9b1962f0
+  data.tar.gz: 45b5577fa64bbda27fd634a55cbc566355890b9bf58b1d0d119558c4d81ca56c46e57ff43b10ce669b280d03189ef1ea81c08274471f439c1097774353f26973

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,52 @@
+# 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.15
+6 Oct 2021
+### Added
+### Changed
+### Fixed
+- Fixed unresolved constant VERSION
+
+## 0.1.14
+6 Oct 2021
+### Added
+### Changed
+- Switched from dry-types to Virtus
+- Use Ruby 3
+
+### 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,131 @@
+PATH
+  remote: .
+  specs:
+    renalware-forms (0.1.15)
+      activemodel
+      attr_extras (~> 6.2)
+      prawn (~> 2.2)
+      prawn-table (~> 0.2)
+      rake
+      virtus
+
+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)
+    axiom-types (0.1.1)
+      descendants_tracker (~> 0.0.4)
+      ice_nine (~> 0.11.0)
+      thread_safe (~> 0.3, >= 0.3.1)
+    byebug (11.1.3)
+    coercible (1.0.0)
+      descendants_tracker (~> 0.0.1)
+    concurrent-ruby (1.1.9)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    diff-lcs (1.4.4)
+    docile (1.4.0)
+    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)
+    thread_safe (0.3.6)
+    ttfunk (1.7.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.1.0)
+    virtus (2.0.0)
+      axiom-types (~> 0.1)
+      coercible (~> 1.0)
+      descendants_tracker (~> 0.0, >= 0.0.3)
+    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/footer.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "renalware/forms/version"
+
 module Renalware::Forms::Generic
   module Homecare::V1
     class Footer < Base

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,68 +1,61 @@
 # frozen_string_literal: true
 
-require "dry-types"
-require "dry-struct"
+require "virtus"
 require "active_model"
 
 # rubocop:disable Metrics/ClassLength
 module Renalware::Forms
-  module Types
-    include Dry.Types()
-  end
-
-  class Homecare::Args < Dry::Struct
+  class Homecare::Args
+    include Virtus.model
     include ActiveModel::Validations
 
-    class Medication < Dry::Struct
+    class Medication
+      include Virtus.model(strict: true)
       include ActiveModel::Validations
 
-      attribute :date, Types::Params::Date
-      attribute :drug, Types::String
-      attribute :dose, Types::String
-      attribute :route, Types::String
-      attribute :frequency, Types::String
+      attribute :date, Date
+      attribute :drug, String
+      attribute :dose, String
+      attribute :route, String
+      attribute :frequency, String
     end
 
     # The first 2 attrbutes are used to drive what PDF to build
-    attribute :provider, Types::Coercible::String
-    attribute :version, Types::Integer
-    attribute :title, Types::String.default("")
-    attribute :given_name, Types::String
-    attribute :family_name, Types::String
-    attribute :nhs_number, Types::String.default("")
-    attribute :born_on, Types::Params::Date
-    attribute :modality, Types::String.default("")
-    attribute :telephone, Types::String.default("")
-    attribute :hospital_number, Types::String.default("")
-    attribute :address, Types::Array.of(Types::Coercible::String).default([].dup, shared: true)
-    attribute :postcode, Types::String.default("")
-    attribute :prescriber_name, Types::String.default("")
-    attribute :prescription_date, Types::Params::Date
-    attribute :hospital_name, Types::String.default("")
-    attribute :hospital_department, Types::String.default("")
-    attribute :hospital_address, Types::Array.of(Types::Coercible::String).default([], shared: true)
-    attribute :hospital_telephone, Types::String.default("")
-    attribute :po_number, Types::String.default("")
-    attribute :generated_at, (Types::Params::DateTime.default { DateTime.now })
-    attribute :no_known_allergies, Types::Bool
-    attribute :allergies, Types::Array.of(Types::Coercible::String)
-    attribute :drug_type, Types::Coercible::String
-    # attribute :prescription_duration, Types::String
-    attribute :administration_device, Types::String.default("")
-    attribute :medications, Types::Array.of(Medication).default([].dup, shared: true)
-    attribute :consultant, Types::String.default("")
-    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"
+    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 :fmc_patient, 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 :administration_route, String
+    attribute :administration_frequency, 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 :selected_delivery_frequency, String # e.g. "6 months"
+    attribute :prescription_durations, Array[String] # e.g. ["3 months", "6 months"]
+    attribute :selected_prescription_duration, String # e.g. "3 months"
 
     validates :family_name, presence: true
     validates :given_name, presence: true
@@ -94,7 +87,7 @@ module Renalware::Forms
     end
 
     def format_address_array(add)
-      return unless add&.is_a?(Array)
+      return unless add.is_a?(Array)
 
       add.compact.reject { |line| line == "" }.uniq&.join("\n")
     end
@@ -109,59 +102,64 @@ module Renalware::Forms
       Array(allergies).uniq.compact.join("<br>")
     end
 
+    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
     def self.test_data(provider: :generic, version: 1)
-      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",
+      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.fmc_patient = "123"
+        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 = [
+          nil,
+          "WHITECHAPEL",
+          "",
           "LONDON",
           "E1 1FR",
           "UK",
           "Tel: 0800 00000000",
           "Another line"
-        ],
-        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
+        ]
+        args.no_known_allergies = false
+        args.allergies = ["Nuts", nil, "Penicillin", "Mown grass"]
+        args.drug_type = "ESA"
+        args.administration_frequency = "Daily"
+        args.administration_route = "Per Oral"
+        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.medications << Medication.new(
+          date: Date.today,
+          drug: "Example drug",
+          dose: "1 unit",
+          route: "PO",
+          frequency: "3"
+        )
+
+        raise ArgumentError, args.errors unless args.valid?
+      end
     end
+    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
     def medications_are_present
       if medications.size == 0

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.11"
+    VERSION = "0.1.15"
   end
 end