renalware-forms 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cce70f650aa4a18739885e3f567b4bea6195f15c8d75f2708ba23a30d04f927
-  data.tar.gz: d39780022bd9edf3c20f01bceba25d0b23098890d4805168bea339970bb69d3b
+  metadata.gz: 92ef42b414ec62117acbf04fc22a9bf34e1ca82176a69c02914c564345f6f327
+  data.tar.gz: c951b4c7190b188bda3d2544e96fe173bf52b19ee3eb77313215c4b5708c738b
 SHA512:
-  metadata.gz: 5b2beb336928b99dbeda3d71a54204f7a7a942cc4436853fe827a819c8c84f9a29208cb1254c15886987deec20bd8640060065a752763e6f59306751e7b03412
-  data.tar.gz: 3fd76b82b143ded9456ecdeea33603ad5290af005ff6ca479676207d090b981243e7aaf1358e7b9fe20743401314a60d2f0d38c12c9b8ca8def935361f00b266
+  metadata.gz: 0e834a60b44a5244f9845eb8897624a1a64fba69c2dca49755dab064f61629a78f4bb020624ff007ab4376da87b2dd562f526d068972b848534e5068398c0784
+  data.tar.gz: 23b9b51811838cc076afb490526bd79adc2943a16038b7be9747122f05ee9c9d00ef84d08b27523346de161a643d680ae0c4c64f84bebd5bd7a56357a58e2b53

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::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"
 
     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,29 @@ 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/version.rb

@@ -2,6 +2,6 @@
 
 module Renalware
   module Forms
-    VERSION = "0.1.10"
+    VERSION = "0.1.11"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renalware-forms
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Airslie Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-02 00:00:00.000000000 Z
+date: 2020-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -81,19 +81,33 @@ 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: 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: zeitwerk
   requirement: !ruby/object:Gem::Requirement