renalware-core 2.0.0.pre.rc7 → 2.0.0.pre.rc8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe0192f8e977702f2adbf2a0f2893b3552b9e6bd573f721208e0250e03e03312
-  data.tar.gz: 87a77ba05e6a2dfb83cddbdb4d1d2de1bfe19aaf2c50515e57677db00588f7d5
+  metadata.gz: d927fd26b8733bc5ec33cdc73b99b5dfffd2153a0ad5d2cad076f94594faefd1
+  data.tar.gz: bf774fb154de01725b0322f3a149a40d691dfe81eb6d38880f72f1329ad48303
 SHA512:
-  metadata.gz: 3f6ef5e4f2f0fc65a67b0d6cb9c649685ec7ed98db4b0129a1ffb5f96d566e6a283f1fd436cff669188cd34778561b696f2a68c86b9d539790131110b6705e00
-  data.tar.gz: e61ff85f88683a31976a64dc74dfd65be9250168c7de67225c73db358591b387cef1f8add0ddb9bbf08cb6ade2becdbcc8e4f142de7c6893f4bde1c412dd027d
+  metadata.gz: b5d0501d2a554f92f4f97048b46d52800e5a0eceaed4cbf0476114f650e628de804879ed4b71fd79c7e3bea794d1b1063af800819dc173392d50f75e897c83eb
+  data.tar.gz: 1cff8fa1d608fbdd588d63632001490c149dd2ef7d1e9d84784c6db6366996a248c86a5f23b5c00bc1c61255411a23ba3954c34560bb1716f3c5f4e9cf965eb7

data/{lib → app/models/renalware/feeds/files/practices}/xml_parser.rb

@@ -35,50 +35,62 @@
 # If tags are encountered multiple times, their blocks will be called multiple times.
 
 require "nokogiri"
+require_dependency "renalware/feeds"
 
-class XmlParser
-  def initialize(node, &block)
-    @node = node
-    @node.each do
-      self.instance_eval(&block)
-    end
-  end
+# Note I moved XmlParse into this namespace as I was getting strange
+# 'uninitialised constant XmlParser' errors in production when it was in /lib
 
-  def name
-    @node.name
-  end
+module Renalware
+  module Feeds
+    module Files
+      module Practices
+        class XmlParser
+          def initialize(node, &block)
+            @node = node
+            @node.each do
+              self.instance_eval(&block)
+            end
+          end
 
-  def inner_xml
-    @node.inner_xml.strip
-  end
+          def name
+            @node.name
+          end
 
-  def is_start?
-    @node.node_type == Nokogiri::XML::Reader::TYPE_ELEMENT
-  end
+          def inner_xml
+            @node.inner_xml.strip
+          end
 
-  def is_end?
-    @node.node_type == Nokogiri::XML::Reader::TYPE_END_ELEMENT
-  end
+          def is_start?
+            @node.node_type == Nokogiri::XML::Reader::TYPE_ELEMENT
+          end
 
-  def attribute(attribute)
-    @node.attribute(attribute)
-  end
+          def is_end?
+            @node.node_type == Nokogiri::XML::Reader::TYPE_END_ELEMENT
+          end
 
-  def for_element(name, &block)
-    return unless self.name == name and is_start?
-    self.instance_eval(&block)
-  end
+          def attribute(attribute)
+            @node.attribute(attribute)
+          end
+
+          def for_element(name, &block)
+            return unless self.name == name and is_start?
+            self.instance_eval(&block)
+          end
 
-  def inside_element(name=nil, &block)
-    return if @node.self_closing?
-    return unless name.nil? or (self.name == name and is_start?)
+          def inside_element(name=nil, &block)
+            return if @node.self_closing?
+            return unless name.nil? or (self.name == name and is_start?)
 
-    name = @node.name
-    depth = @node.depth
+            name = @node.name
+            depth = @node.depth
 
-    @node.each do
-      return if self.name == name and is_end? and @node.depth == depth
-      self.instance_eval(&block)
+            @node.each do
+              return if self.name == name and is_end? and @node.depth == depth
+              self.instance_eval(&block)
+            end
+          end
+        end
+      end
     end
   end
 end

data/app/models/renalware/letters/delivery/practice_email.rb

@@ -18,8 +18,7 @@ module Renalware
           if config.allow_external_mail
             practice&.email # nil is acceptable
           else
-            user_email = letter.updated_by&.email
-            user_email.presence || config.fallback_email_address_for_test_messages
+            config.fallback_email_address_for_test_messages
           end
         end
       end

data/app/models/renalware/zip_archive.rb

@@ -7,7 +7,7 @@ module Renalware
     end
 
     def unzip
-      Dir.mktmpdir do |dir|
+      Dir.mktmpdir(nil, Rails.root.join("tmp").to_s) do |dir|
         files = unzip_to_tmp_dir_and_return_pathames_array(dir)
         yield(files)
       end

data/lib/renalware/configuration.rb

@@ -47,7 +47,7 @@ module Renalware
     config_accessor(:fallback_email_address_for_test_messages) do
       ENV["FALLBACK_EMAIL_ADDRESS_FOR_TEST_MESSAGES"]
     end
-    config_accessor(:ukrdc_sending_facility_name) { "NOT_CONFIGURED" }
+    config_accessor(:ukrdc_sending_facility_name) { ENV["UKRDC_SENDING_FACILITY_NAME"] }
   end
 
   def self.config

data/lib/renalware/version.rb

@@ -1,3 +1,3 @@
 module Renalware
-  VERSION = "2.0.0.pre.rc7".freeze
+  VERSION = "2.0.0.pre.rc8".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: renalware-core
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.rc7
+  version: 2.0.0.pre.rc8
 platform: ruby
 authors:
 - Airslie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-29 00:00:00.000000000 Z
+date: 2018-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1345,6 +1345,7 @@ files:
 - app/models/renalware/feeds/files/practices/csv_organisation.rb
 - app/models/renalware/feeds/files/practices/import_csv.rb
 - app/models/renalware/feeds/files/practices/import_job.rb
+- app/models/renalware/feeds/files/practices/xml_parser.rb
 - app/models/renalware/feeds/files/primary_care_physicians/import_csv.rb
 - app/models/renalware/feeds/files/primary_care_physicians/import_job.rb
 - app/models/renalware/feeds/files/tissue_typing/import.rb
@@ -3218,7 +3219,6 @@ files:
 - lib/test_support/ajax_helpers.rb
 - lib/test_support/autocomplete_helpers.rb
 - lib/test_support/text_editor_helpers.rb
-- lib/xml_parser.rb
 - spec/factories/accesses/patients.rb
 - spec/factories/accesses/plans.rb
 - spec/factories/accesses/plans_types.rb