epb_view_models 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70fe31a8b4317370e678562b7ce01baa5db0b8e48b8b185197c88285731a476b
-  data.tar.gz: 73542839d5a7ac83b87698248308e46faa5397f94c8a63758ebdfd4a93f42a22
+  metadata.gz: f71a412d77bf50228e2736594bce2312c64b088dc80a7e0708b3606fcb9f3e2c
+  data.tar.gz: 4d2e94eafa908f2a26ea7aa09e2940fa2461ded527a620f0ebf6a29d9a34281e
 SHA512:
-  metadata.gz: 27154cc9e7eb4e48f595042cf2e100093647307e62fd6552f57d9e782d5926232fa67d0cb07c0f8767582fe6e123ec165db33efe62b7ca2fd73e237af87e9107
-  data.tar.gz: 2d05b80c15f37828f1da3ac56857843e21fc33b138c9bfd8109e7a74f9defb64042155a3a84fc6343e99ffea5353cc157f5d8ef6337ac2be30de29036e1c4b94
+  metadata.gz: 82cb7dcc22da7a1d5033a65a3cd57ec67827a7dcbf31bcc45cc328de2746a376457feb120143cdc22a6f6367acb2bf5a722bb55044308d4f4cfe1bd1734914e1
+  data.tar.gz: 54c8b796430bb11ff37474b65b80db256fbddccdb88d516404baab6b720ff86c8ecbd2ad703bece026a0b61d0f3f75dfd0c3342100c4ee56c0bdce9d1027462a

data/lib/epb_view_models.rb

@@ -5,7 +5,7 @@ loader = Zeitwerk::Loader.for_gem
 loader.setup
 
 module EpbViewModels
-  VERSION = "1.0.10"
+  VERSION = "1.0.11"
 end
 
 # Monkey patching to avoid using ActiveRecord::Type::Boolean.new.cast

data/lib/view_model_domain/xsd_arguments.rb

@@ -2,7 +2,7 @@ module ViewModelDomain
   class XsdArguments
     attr_reader :simple_type, :assessment_type, :xsd_dir_path, :gem_path
 
-    def initialize(simple_type:, assessment_type:, xsd_dir_path: "/api/schemas/xml/**/", gem_path: "")
+    def initialize(simple_type:, assessment_type:, xsd_dir_path: "", gem_path: "")
       @simple_type = simple_type
       @assessment_type = assessment_type
       @xsd_dir_path = xsd_dir_path

data/lib/view_model_gateway/xsd_files_gateway.rb

@@ -2,6 +2,9 @@ module ViewModelGateway
   class XsdFilesGateway
     attr_reader :simple_type, :assessment_type, :xsd_dir_path, :glob_path
 
+    API_PATH = "api/schemas/xml/".freeze
+    XSD_DEFAULT_PATH = "/api/schemas/xml/**/".freeze
+
     def initialize(domain_arguments)
       @simple_type = domain_arguments.simple_type
       @assessment_type = domain_arguments.assessment_type
@@ -10,20 +13,23 @@ module ViewModelGateway
     end
 
     def schema_version(file)
-      api_path = "api/schemas/xml/"
-      api_path_start = file.index(api_path) + api_path.length
+      api_path_start = file.index(API_PATH) + API_PATH.length
       schema_version = file[api_path_start..].split("/").first
       sap_defnied_in_rdsap_dir?(file) ? "#{schema_version}/SAP" : schema_version
     end
 
     def xsd_files
-      files = case @assessment_type.downcase
-              when "sap"
-                sap_xsd_files
-              when "rdsap"
-                rdsap_xsd_files
-              when "cepc"
-                cepc_xsd_files
+      files = if @xsd_dir_path.nil? || @xsd_dir_path.empty?
+                case @assessment_type.downcase
+                when "sap"
+                  sap_xsd_files
+                when "rdsap"
+                  rdsap_xsd_files
+                when "cepc"
+                  cepc_xsd_files
+                end
+              else
+                Dir.glob("#{@dir_path}#{@xsd_dir_path}")
               end
 
       raise ViewModelBoundary::XsdFilesNotFound, "No xsd files were found in #{@glob_path} directory" if files.nil? || files.empty?
@@ -38,17 +44,17 @@ module ViewModelGateway
     end
 
     def sap_xsd_files
-      @glob_path = "#{@dir_path + xsd_dir_path}*-Domains.xsd"
+      @glob_path = "#{@dir_path + XSD_DEFAULT_PATH}*-Domains.xsd"
       Dir.glob(@glob_path)
     end
 
     def rdsap_xsd_files
-      @glob_path = "#{@dir_path + xsd_dir_path}*-Domains.xsd"
+      @glob_path = "#{@dir_path + XSD_DEFAULT_PATH}*-Domains.xsd"
       Dir.glob(@glob_path)
     end
 
     def cepc_xsd_files
-      @glob_path = "#{@dir_path + xsd_dir_path}Reported-Data.xsd"
+      @glob_path = "#{@dir_path + XSD_DEFAULT_PATH}Reported-Data.xsd"
       Dir.glob(@glob_path)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epb_view_models
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - MHCLG Energy Performance of Buildings
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-12 00:00:00.000000000 Z
+date: 2021-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri