renalware-core 2.0.37 → 2.0.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3db0ad6b8f0f4a6d478ecb2b24947e1f92d2e13fc3f8aeb9d5410c3e07e6fe58
-  data.tar.gz: c59c4a12487d819da02c5227a6c2fc444276a635b666fce0390be3b227d8b476
+  metadata.gz: bded04d49b6bb55e363f0aea57ff4bb129dee0f9e25ffaa3a4d515aa7942f55b
+  data.tar.gz: 2d2513e0f3d161c064f7a7010f4420b0fa7fcbb913e55ecb8130cc88ae0205e3
 SHA512:
-  metadata.gz: 14b5fb7212b9a888d725d30ef91bd3b247d5ca16d7da22b7fc201a3aee5ac3c4ddb9c8c8cf04308875d3f6604dc68a2b09c2a8f5d450a06bcbb6da27875c6f99
-  data.tar.gz: 04e0de968deaf0758b1149925b250914cf517727e89c675140a8f5b6fb9cd56976d86fd4ba4af30e7c24e0cf1e656d836f44e13190e2000470ac9b9488272c0b
+  metadata.gz: ce45551e62fdb8f6e03c4845ddbd9fc2b740aeb8f9cdbc2d34197107f285b53fdff81299501822415beabd3413b60e78658837947a30affb147be11fd44188a3
+  data.tar.gz: 32ae5f07a4e9f1c1de68b0ab881712cbebab81c6e722288295fc419c0b0cf8d9467cba7c9d1b8516b060de096742c4bcede1b2c0224a6a05f1fe89df9af80881

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
@@ -11,7 +13,7 @@ end
 
 # We can use rake tasks like app:db:reset when APP_RAKEFILE set
 unless defined?(APP_RAKEFILE)
-  APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
+  APP_RAKEFILE = File.expand_path("spec/dummy/Rakefile", __dir__)
 end
 
 load "rails/tasks/engine.rake"

data/app/controllers/renalware/hd/diaries_controller.rb

@@ -53,7 +53,7 @@ module Renalware
             relation: WeeklyDiary.eager_load(
                 slots: [:patient, :station, :diurnal_period_code],
                 master_diary: { slots: [:patient, :station, :diurnal_period_code] }
-            ),
+              ),
             unit_id: unit_id,
             week_period: week_period,
             by: current_user

data/app/controllers/renalware/renal/registry_preflight_checks_controller.rb

@@ -18,6 +18,10 @@ module Renalware
             Renalware::HD.cast_patient(__getobj__)&.hd_profile&.hospital_unit&.unit_code
           end
         end
+
+        def renal_profile
+          Renalware::Renal.cast_patient(__getobj__).profile
+        end
       end
 
       class DeceasedPatientPresenter < SimpleDelegator
@@ -26,13 +30,15 @@ module Renalware
         end
 
         def hd_unit; end
+
+        def renal_profile
+          Renalware::Renal.cast_patient(__getobj__).profile
+        end
       end
 
       def patients
         authorize [:renalware, :renal, :registry_preflight_check], :patients?
-        query = Registry::PreflightChecks::PatientsQuery.new(
-          query_params: params.fetch(:q, {})
-        )
+        query = Registry::PreflightChecks::PatientsQuery.new(query_params: query_params)
         patients = query.call.page(page).per(per_page)
         patients = CollectionPresenter.new(patients, PatientPresenter)
         render locals: { patients: patients, query: query.search }
@@ -40,13 +46,19 @@ module Renalware
 
       def deaths
         authorize [:renalware, :renal, :registry_preflight_check], :deaths?
-        query = Registry::PreflightChecks::DeathsQuery.new(
-          query_params: params.fetch(:q, {})
-        )
+        query = Registry::PreflightChecks::DeathsQuery.new(query_params: query_params)
         patients = query.call.page(page).per(per_page)
         patients = CollectionPresenter.new(patients, DeceasedPatientPresenter)
         render locals: { patients: patients, query: query.search }
       end
+
+      private
+
+      def query_params
+        qparams = params.fetch(:q, {})
+        qparams[:profile_esrf_on_gteq] ||= 3.years.ago
+        qparams
+      end
     end
   end
 end

data/app/controllers/renalware/snippets/snippet_clones_controller.rb

@@ -9,8 +9,8 @@ require_dependency "renalware/snippets"
 module Renalware
   module Snippets
     class SnippetClonesController < BaseController
-      COPY_SUFFIX = "[COPY]".freeze
-      CLONE_SUFFIX = "[CLONE]".freeze
+      COPY_SUFFIX = "[COPY]"
+      CLONE_SUFFIX = "[CLONE]"
 
       def create
         snippet = duplicate_current_snippet

data/app/controllers/renalware/system/errors_controller.rb

@@ -6,11 +6,11 @@ module Renalware
       layout "renalware/layouts/error"
 
       def not_found
-        render status: 404, formats: [:html]
+        render status: :not_found, formats: [:html]
       end
 
       def internal_server_error
-        render status: 500, formats: [:html]
+        render status: :internal_server_error, formats: [:html]
       end
 
       def generate_test_internal_server_error

data/app/helpers/renalware/article_helper.rb

@@ -13,8 +13,8 @@ module Renalware
       output = tag(:article, options, true)
       if title.present?
         output.safe_concat(
-          content_tag("header".freeze) do
-            content_tag("h1".freeze, title)
+          content_tag("header") do
+            content_tag("h1", title)
           end
         )
       end

data/app/models/renalware/letters/pathology_layout.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency "renalware/letters"
 
 module Renalware

data/app/models/renalware/null_user.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Renalware
   NullUser = Naught.build do |config|
     config.black_hole

data/app/models/renalware/pathology/adjust_observation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency "renalware/pathology"
 require "attr_extras"
 

data/app/models/renalware/pathology/observations_jsonb_serializer.rb

@@ -16,7 +16,6 @@ module Renalware
       #   values.hgb_observed_at # => "2017-17-01"
       # So the values has methods corresponding to the entire set of possible
       # OBX codes, and also methods to reach in and get their result and observed_at date.
-      # rubocop:disable Style/MethodMissing
       def method_missing(method_name, *_args, &_block)
         code, suffix = method_parts(method_name)
         if VALID_SUFFIXES.include?(suffix) || AllObservationCodes.include?(code)

data/app/models/renalware/renal/patient.rb

@@ -9,9 +9,14 @@ module Renalware
       scope :having_no_primary_renal_diagnosis, lambda {
         where(renal_profile: nil)
       }
+
       scope :with_profile, lambda {
         joins("LEFT OUTER JOIN renal_profiles ON renal_profiles.patient_id = patients.id")
       }
+
+      scope :with_profile_avoiding_redefinition_of_renal_profiles_alias, lambda {
+        eager_load(:profile)
+      }
     end
   end
 end

data/app/models/renalware/renal/profile.rb

@@ -17,7 +17,7 @@ module Renalware
 
       has_document class_name: "Renalware::Renal::ProfileDocument"
 
-      validates :patient, presence: true
+      validates :patient, presence: true, uniqueness: true
       validates :esrf_on, timeliness: { type: :date, allow_nil: true }, allow_blank: true
       validates :first_seen_on,
                 timeliness: {

data/app/models/renalware/renal/registry/preflight_checks/deaths_query.rb

@@ -19,18 +19,15 @@ module Renalware
           end
 
           def default_relation
-            Renalware::Patient
-              .preload(current_modality: [:description])
-              .all
-              .order(family_name: :asc)
+            Renalware::Renal::Patient.left_outer_joins(:profile)
           end
 
           def call
             search
               .result
               .extending(ModalityScopes)
+              .preload(current_modality: [:description])
               .with_current_modality_matching(MODALITY_NAMES)
-              .joins("LEFT OUTER JOIN renal_profiles ON renal_profiles.patient_id = patients.id")
               .where("patients.first_cause_id is NULL AND renal_profiles.esrf_on IS NOT NULL")
           end
 

data/app/models/renalware/renal/registry/preflight_checks/patients_query.rb

@@ -11,25 +11,47 @@ module Renalware
           MODALITY_NAMES = %w(HD PD Transplant).freeze
           attr_reader :relation, :query_params
 
+          # rubocop:disable Lint/UnusedMethodArgument
           def initialize(relation: nil, query_params: {})
             @relation ||= default_relation
             @query_params = query_params
             @query_params[:s] = "modality_descriptions_name ASC" if @query_params[:s].blank?
           end
+          # rubocop:enable Lint/UnusedMethodArgument
 
+          # The way I understand Ransack is that if you use a query like profile_esrf_gt
+          # (that's the RenalProfile in this case as we are dealing with a Renal::Patient)
+          # it will do the left out join itself onto renal_profiles.
+          # At one point I did a manual join onto renal_profiles here like this
+          # .joins("LEFT OUTER JOIN renal_profiles ON renal_profiles.patient_id = patients.id")
+          # but that only worked when there was no search predicate passed; when you pass eg
+          # profile_esrf_gt it joins onto renal_profiles again and you get a duplicate join.
+          # However using left_outer_joins here somehow prevents a duplicate join;
+          # one join onto renal_profiles is there whether there is a renal_profile_esrf_gt present
+          # or not. However it ONLY works if you use left_outer_joins BEFORE calling .ransack
+          # - calling it afterwards (in #call below) still results in a duplicate join IF
+          # renal_profile_esrf_gt is present in the query.
+          #
+          # I have to say, ransack eats up a lot of time and presents a lot of cognitive friction.
+          # Building a custom form object would have shaved an hour off the writing (mainly
+          # debugging) of this code.
+          #
+          # Update: moved loading of profile to #call.
+          # Having it in #default_relation leads to a duplicate alias if sorting on esrf for
+          # instance. Having to use .eager_load(:profile) in #call. However this creates n+1
+          # queries. Ransack again creating more confusion...
           def default_relation
-            Renalware::Patient
-              .preload(current_modality: [:description])
-              .all
+            Renalware::Renal::Patient.all
           end
 
           def call
             search
               .result
+              .eager_load(:profile)
+              .joins("LEFT OUTER JOIN hd_profiles ON hd_profiles.patient_id = patients.id")
               .extending(ModalityScopes)
+              .preload(current_modality: [:description])
               .with_current_modality_matching(MODALITY_NAMES)
-              .merge(HD::Patient.with_profile)
-              .joins("LEFT OUTER JOIN renal_profiles ON renal_profiles.patient_id = patients.id")
               .where(where_conditions)
           end
 

data/app/models/renalware/ukrdc/patients_query.rb

@@ -9,7 +9,6 @@ module Renalware
     # patients who have changed since the last time they were exported.
     class PatientsQuery
       def call(changed_since: nil)
-
         if changed_since.present?
           rpv_patients.where("updated_at > ?", changed_since)
         else

data/app/models/renalware/ukrdc/send_patient.rb

@@ -99,7 +99,7 @@ module Renalware
         def time_neutral_payload
           payload
             .gsub(/<Stream>[^<]*<\/Stream>/, "<Stream>removed</Stream>")
-            .gsub(/ (time|start|stop)=["'][^'"]*['"]/, '')
+            .gsub(/ (time|start|stop)=["'][^'"]*['"]/, "")
             .gsub(/<UpdatedOn>[^<]*<\/UpdatedOn>/, "<UpdatedOn>removed</UpdatedOn>")
         end
       end

data/app/presenters/renalware/accesses/dashboard_presenter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency "renalware/accesses"
 require "attr_extras"
 

data/app/presenters/renalware/hd/mdm_presenter.rb

@@ -50,6 +50,10 @@ module Renalware
       def audits
         @audits ||= PatientStatistics.for_patient(patient).limit(6).ordered
       end
+
+      def rolling_audit
+        @rolling_audit ||= audits.find_by(rolling: true)
+      end
     end
   end
 end

data/app/presenters/renalware/hd/session_presenter.rb

@@ -70,8 +70,8 @@ module Renalware
         post = after_measurement_for(measurement)
         return if pre.blank? || post.blank?
         case pre
-        when ::Float; (post - pre).round(1)
-        when ::Integer; (post - pre)
+        when ::Float then (post - pre).round(1)
+        when ::Integer then (post - pre)
         end
       rescue StandardError => exception
         nil

data/app/presenters/renalware/mdm_presenter.rb

@@ -108,6 +108,26 @@ module Renalware
       CollectionPresenter.new(letters_, Renalware::Letters::LetterPresenterFactory)
     end
 
+    def current_pathology_for_code(code)
+      result = OpenStruct.new(value: nil, date: nil)
+      hash = patient.current_observation_set&.values_for_codes(code) || {}
+      obs = hash[code]
+      if obs.present?
+        result.value = obs["result"]
+        result.date = obs["observed_at"]
+        result.date = Date.parse(result.date)
+      end
+      result
+    end
+
+    def transplant_status
+      Renalware::Transplants::Registration.for_patient(patient)
+        .first
+        &.current_status
+        &.description
+        &.name
+    end
+
     private
 
     def pathology_descriptions_for_codes(codes)
@@ -137,3 +157,4 @@ module Renalware
     end
   end
 end
+# rubocop:enable Metrics/ClassLength

data/app/presenters/renalware/patients/banner_presenter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_dependency "renalware/patients"
 
 module Renalware

data/app/views/renalware/api/ukrdc/patients/_address.xml.builder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 xml = builder
 
 # From National MIM H=Home TMP=Temporary PST=Postal

data/app/views/renalware/api/ukrdc/patients/_allergies.xml.builder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #
 # https://github.com/renalreg/ukrdc/blob/6d95e364dd8de857839fe6cdbd4e7fc3fb4c1d42/Schema/Allergies/Allergy.xsd
 # This should be snomed-defined but we are just sending free text as that is all we have.

data/app/views/renalware/api/ukrdc/patients/_clinic_visit_observation.xml.builder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 xml = builder
 
 i18n_key ||= method

data/app/views/renalware/api/ukrdc/patients/_clinical_relationships.xml.builder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 xml = builder
 
 xml.ClinicalRelationships do

data/app/views/renalware/api/ukrdc/patients/_diagnoses.xml.builder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # https://github.com/renalreg/ukrdc/blob/6d95e364dd8de857839fe6cdbd4e7fc3fb4c1d42/Schema/Diagnoses/Diagnosis.xsd
 # This is snomed-based, so might not be possible?
 xml = builder

data/app/views/renalware/api/ukrdc/patients/_documents.xml.builder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 xml = builder
 
 xml.Documents do

data/app/views/renalware/api/ukrdc/patients/_encounters.xml.builder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 xml = builder
 
 xml.Encounters do

data/app/views/renalware/api/ukrdc/patients/_family_histories.xml.builder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 xml = builder
 
 xml.FamilyHistories do

data/app/views/renalware/api/ukrdc/patients/_lab_orders.xml.builder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 xml = builder
 
 # TODO: Implement start stop dates

data/app/views/renalware/api/ukrdc/patients/_medications.xml.builder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 xml = builder
 
 xml.Medications do

data/app/views/renalware/api/ukrdc/patients/_name.xml.builder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 builder.Name(use: "L") do
   builder.Prefix nameable.title
   builder.Family nameable.family_name

data/app/views/renalware/api/ukrdc/patients/_observations.xml.builder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # What are observations in RW?
 # - clinic visit
 #   - weight

data/app/views/renalware/api/ukrdc/patients/_patient.xml.builder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #
 # Things we are not going to include in RW2.0
 # - PersonToContact

data/app/views/renalware/api/ukrdc/patients/_program_memberships.xml.builder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 xml = builder
 
 xml.ProgramMemberships do

data/app/views/renalware/api/ukrdc/patients/_sending_facility.xml.builder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 xml = builder
 
 xml.SendingFacility Renalware.config.ukrdc_sending_facility_name,

data/app/views/renalware/api/ukrdc/patients/_social_histories.xml.builder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 xml = builder
 
 # Currently only used for smoking for which CodingStandard=RRSMOKE Code=YES/NO/EX

data/app/views/renalware/api/ukrdc/patients/_surveys.xml.builder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 xml = builder
 
 xml.Surveys do

data/app/views/renalware/api/ukrdc/patients/diagnoses/_cause_of_death.xml.builder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 xml = builder
 
 xml.CauseOfDeath do

data/app/views/renalware/api/ukrdc/patients/encounters/_hd_session.xml.builder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 xml = builder
 
 xml.Treatment do

data/app/views/renalware/api/ukrdc/patients/lab_orders/_lab_order.xml.builder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # See HL7 spec http://pacs.hk/Doc/HL7/Hl7V231.pdf
 
 # A Note about PlacerId

data/app/views/renalware/api/ukrdc/patients/lab_orders/_result_item.xml.builder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 xml = builder
 observation = Renalware::Pathology::ObservationPresenter.new(observation)
 observation = Renalware::UKRDC::PathologyObservationPresenter.new(observation)

data/app/views/renalware/api/ukrdc/patients/show.xml.builder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # See
 # https://www.ukrdc.org/2015/09/15/ukrdc-schema/
 # https://github.com/renalreg/ukrdc

data/app/views/renalware/api/v1/medications/prescriptions/index.json.jbuilder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 json.array!(
   prescriptions,
   :id,

data/app/views/renalware/api/v1/patients/patients/index.json.jbuilder

@@ -1,4 +1,6 @@
-def modify_query(url, options={})
+# frozen_string_literal: true
+
+def modify_query(url, options = {})
   uri = URI(url)
   query_hash = Rack::Utils.parse_query(uri.query)
   query_hash.merge!(options)

data/app/views/renalware/api/v1/patients/patients/show.json.jbuilder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 json.id patient.id
 json.secure_id patient.secure_id
 json.nhs_number patient.nhs_number

data/app/views/renalware/hd/mdm/_summary.html.slim

@@ -0,0 +1,21 @@
+article
+  header
+    h2 Additional Information
+
+  dl.dl-horizontal.xlarge
+    dt Latest Pre mean BP
+    - if mdm.rolling_audit.present?
+      dd= "#{mdm.rolling_audit.pre_mean_systolic_blood_pressure.to_i} / #{mdm.rolling_audit.pre_mean_diastolic_blood_pressure.to_i}"
+    dt Latest Post mean BP
+    - if mdm.rolling_audit.present?
+      dd= "#{mdm.rolling_audit.post_mean_systolic_blood_pressure.to_i} / #{mdm.rolling_audit.post_mean_diastolic_blood_pressure.to_i}"
+
+    dt Latest URR
+    dd
+      - obs = mdm.current_pathology_for_code("URR")
+      = obs.value
+      |   
+      = "(#{l(obs.date)})" if obs.date.present?
+
+    dt Transplant status
+    dd= mdm.transplant_status

data/app/views/renalware/hd/mdm/_top.html.slim

@@ -9,3 +9,5 @@
            positive_results_only: true
 .columns.medium-12.large-6
   = render "prescriptions", mdm: mdm, with_esa: true
+.columns.medium-12.large-6
+  = render "summary", mdm: mdm

data/app/views/renalware/renal/prd_descriptions/search.json.jbuilder

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 json.array! @prd_descriptions do |prd_description|
   json.id     prd_description.id
   json.label  prd_description.to_s

data/app/views/renalware/renal/registry_preflight_checks/_filters.html.slim

@@ -0,0 +1,19 @@
+.search-form.filters
+  = simple_form_for query,
+                    url: url,
+                    method: :get,
+                    html: { autocomplete: "off" } do |f|
+    .row
+      .medium-2.columns
+        = f.input :profile_esrf_on_gteq, as: :date_picker, label: "ESRF after"
+
+      -if defined?(display_modality_filter) && display_modality_filter
+        .medium-4.large-3.columns
+          = f.input :current_modality_description_id_eq,
+                    collection: Renalware::Modalities::Description.pluck("name", "id"),
+                    label: "Modality"
+
+      .medium-4.columns.actions.end
+        = f.submit t("helpers.submit.filter"), class: "button", name: nil
+        span= " or "
+        = link_to t("helpers.reset"), url

data/app/views/renalware/renal/registry_preflight_checks/_table.html.slim

@@ -10,6 +10,10 @@ table.renal-registry-preflight-checks
                       "Modality",
                       default_order: :asc)
       td.col-width-small HD Site
+      td.col-width-date
+        = sort_link([:renalware, query],
+                    :profile_esrf_on,
+                    "ESRF date")
       td Missing data
   tbody
     - patients.each do |patient|
@@ -19,6 +23,7 @@ table.renal-registry-preflight-checks
         td= patient.hospital_identifiers
         td= patient.current_modality
         td= patient.hd_unit
+        td= l(patient.renal_profile&.esrf_on)
         td.missing-data
           - patient.missing_data.map do |data_item|
             span(class=data_item)= t(".#{data_item}")

data/app/views/renalware/renal/registry_preflight_checks/deaths.html.slim

@@ -1,4 +1,8 @@
 = within_admin_layout(title: "Renal Registry Return: Preflight Checks") do
+  = render "filters",
+           query: query,
+           url: deaths_renal_registry_preflight_checks_path,
+           display_modality_filter: false
   = render "navigation"
   = render "table", patients: patients, query: query
   = paginate patients

data/app/views/renalware/renal/registry_preflight_checks/patients.html.slim

@@ -1,4 +1,8 @@
 = within_admin_layout(title: "Renal Registry Return: Preflight Checks") do
+  = render "filters",
+           query: query,
+           url: patients_renal_registry_preflight_checks_path,
+           display_modality_filter: true
   = render "navigation"
   = render "table", patients: patients, query: query
   = paginate patients

data/lib/document/attribute_initializer.rb

@@ -12,10 +12,9 @@ module Document
     end
 
     def self.build_class(type)
-      case
-      when type == Document::Enum
+      if type == Document::Enum
         AttributeInitializer::Enum
-      when type && type.included_modules.include?(::ActiveModel::Model)
+      elsif type&.included_modules&.include?(::ActiveModel::Model)
         AttributeInitializer::ActiveModel
       else
         AttributeInitializer::Base

data/lib/document/embedded.rb

@@ -105,7 +105,33 @@ module Document
   class Embedded
     include Virtus.model
     include ActiveModel::Model
+    include ActiveModel::Validations::Callbacks
     extend Enumerize
+    STRIPPABLE_TYPES = %w(Float Integer).freeze
+
+    before_validation :strip_leading_trailing_whitespace_from_numbers
+
+    def strip_leading_trailing_whitespace_from_numbers
+      attributes.keys.each do |att|
+        # Find the type defined in the document definition eg `attribute :weight, Integer``
+        # Note that primitive could be a string or class, hence :to_s
+        primitive = self.class.attribute_set[att].type.primitive.to_s
+
+        # If the type is in STRIPPABLE_TYPES ie its a numeric type,
+        # and it has arrived as a string (which responds to :strip) then
+        # ensure there are no leading or trailing spaces, otherwise Virtus cannot
+        # coerce it into the correct type. For example Virtus won't corece
+        # " 1" into 1 but will coerce "1" into 1 (FYI the Dry::Types gem (the successor to Virtus)
+        # rectifies this).
+        # Note also that here in this before_validation callback, the act of assignment in
+        # `self[att] =` prompts Virtus to re-attempt to coerce the value, which now, if space
+        # has prevented it from doing so before, it will do successfully.
+        next unless STRIPPABLE_TYPES.include?(primitive)
+        if self[att].respond_to?(:strip)
+          self[att] = self[att].strip
+        end
+      end
+    end
 
     # Assign a default value to the attributes using a custom type.
     # Set a validation on nested object.

data/lib/renalware/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Renalware
-  VERSION = "2.0.37"
+  VERSION = "2.0.38"
 end

data/spec/support/capybara.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # # frozen_string_literal: true
 
 Capybara.register_driver(:headless_chrome) do |app|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.37
+  version: 2.0.38
 platform: ruby
 authors:
 - Airslie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-28 00:00:00.000000000 Z
+date: 2018-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_type
@@ -226,14 +226,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: dumb_delegator
   requirement: !ruby/object:Gem::Requirement
@@ -590,14 +590,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 5.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.0
+        version: 5.3.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -2174,6 +2174,7 @@ files:
 - app/views/renalware/hd/mdm/_bottom.html.slim
 - app/views/renalware/hd/mdm/_middle.html.slim
 - app/views/renalware/hd/mdm/_sessions.html.slim
+- app/views/renalware/hd/mdm/_summary.html.slim
 - app/views/renalware/hd/mdm/_top.html.slim
 - app/views/renalware/hd/mdm_patients/_filters.html.slim
 - app/views/renalware/hd/mdm_patients/_patient.html.slim
@@ -2578,6 +2579,7 @@ files:
 - app/views/renalware/renal/profiles/_mini.html.slim
 - app/views/renalware/renal/profiles/edit.html.slim
 - app/views/renalware/renal/profiles/show.html.slim
+- app/views/renalware/renal/registry_preflight_checks/_filters.html.slim
 - app/views/renalware/renal/registry_preflight_checks/_navigation.html.slim
 - app/views/renalware/renal/registry_preflight_checks/_table.html.slim
 - app/views/renalware/renal/registry_preflight_checks/deaths.html.slim