renalware-forms 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 181086d1ec5a5fc79aeb1f31ee96d41783421214068279e7685c32b0310b08c1
-  data.tar.gz: 124fa4c1c4b5f8a7a7c9aa6653b194f2ebd773664dded89be7a9c163681ae677
+  metadata.gz: 17b52d0a15890cefaeb0f17f380dfdb7ad4278a018e33c8efce02d0223087661
+  data.tar.gz: e03e9e3936da756f26656fa3a3f7f20a0aa2adbc8b4a3e6ffa4171722945fa56
 SHA512:
-  metadata.gz: 6f47a359295804dfd868b3af40a2370a5c40c8a3e0483aa2b73030d890791519eab1e750b59ffe72920562ccce5713ecea1284a9508b7dc26934768ef32ab81d
-  data.tar.gz: 138c530b7af35432e90d8a1a8cb4483dc69d0c0c6cfa0eab0901c7713e1d8849fd12c49a3bba31a9d41a4f38f16cc5ec278d124fb8b7f029f6a9907f9cfaca77
+  metadata.gz: 7916272475387df5ae34a022fa4119bbe563e556607e3c695255193fc1f2058ced488dd3cbd72f6cb21923ccfde2a782ae2a92d66993b41a0a5bec500c640a01
+  data.tar.gz: 24e0160727b509117d8c1ec5b60154e43b15180b1e94113b8e1bcc072083301196c79b8ea21a3e469b458f896701709af7c0ff8a7ea7a5cf702130e402f3bfe8

data/CHANGELOG.md

@@ -9,6 +9,14 @@ This project adheres to Semantic Versioning.
 ### Changed
 ### Fixed
 
+## 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

data/Gemfile.lock

@@ -1,14 +1,13 @@
 PATH
   remote: .
   specs:
-    renalware-forms (0.1.13)
+    renalware-forms (0.1.14)
       activemodel
       attr_extras (~> 6.2)
-      dry-struct
-      dry-types
       prawn (~> 2.2)
       prawn-table (~> 0.2)
       rake
+      virtus
 
 GEM
   remote: https://rubygems.org/
@@ -25,32 +24,18 @@ GEM
     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)
-    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)
@@ -117,10 +102,15 @@ GEM
       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

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::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"
+    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,60 +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/version.rb

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

data/renalware-forms.gemspec

@@ -1,4 +1,6 @@
-$:.push File.expand_path("lib", __dir__)
+# frozen_string_literal: true
+
+$LOAD_PATH.push File.expand_path("lib", __dir__)
 
 # Maintain your gem's version:
 require "renalware/forms/version"
@@ -11,13 +13,13 @@ Gem::Specification.new do |spec|
   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.description = "The home for various forms for external providers eg 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.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   spec.require_paths = ["lib"]
   spec.extra_rdoc_files = ["README.md"]
 
@@ -26,8 +28,7 @@ Gem::Specification.new do |spec|
   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_dependency "virtus"
   spec.add_development_dependency "pdf-reader"
+  spec.add_development_dependency "rspec"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: renalware-forms
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors:
 - Airslie Ltd
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: dry-types
+  name: virtus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,21 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: dry-struct
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
+  name: pdf-reader
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pdf-reader
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -136,7 +122,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: The home for various forms for external providers e.g. home care prescriptions
+description: The home for various forms for external providers eg home care prescriptions
 email:
 - dev@aisrlie.com
 executables: