epb_view_models 1.0.11 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f71a412d77bf50228e2736594bce2312c64b088dc80a7e0708b3606fcb9f3e2c
-  data.tar.gz: 4d2e94eafa908f2a26ea7aa09e2940fa2461ded527a620f0ebf6a29d9a34281e
+  metadata.gz: 1aa9014f126ebe6df35a45f9be7898fe71ebf4253739d537c62ab133f976480a
+  data.tar.gz: 9de075f8be11ba4626d771128e75f72917edfb3797eeee2f4bac4c6252df32d7
 SHA512:
-  metadata.gz: 82cb7dcc22da7a1d5033a65a3cd57ec67827a7dcbf31bcc45cc328de2746a376457feb120143cdc22a6f6367acb2bf5a722bb55044308d4f4cfe1bd1734914e1
-  data.tar.gz: 54c8b796430bb11ff37474b65b80db256fbddccdb88d516404baab6b720ff86c8ecbd2ad703bece026a0b61d0f3f75dfd0c3342100c4ee56c0bdce9d1027462a
+  metadata.gz: 3ea8139966fc1c55555be100e3ecb63a19364eb6e027c631aa1865a753af2577abee1c00ab53edb78436754fdd89db0aa331a42518cdf1bea5b03b242be48023
+  data.tar.gz: cefc2119116d4aab5c1299dd71f609df481e4ca2327a17a8bca256d83a92eeefed2e17127650e3d24d86fdd39445306d8456439947c55db20119168414ce50c7

data/lib/epb_view_models.rb

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

data/lib/presenter/xsd.rb

@@ -10,22 +10,16 @@ module Presenter
       end
 
       hash = {}
-      xpath = "//xs:simpleType[@name='#{domain_arguments.simple_type}']//xs:enumeration"
 
       xsd_files.each do |file|
-        doc = REXML::Document.new(File.read(file))
-        enums_hash = {}
-        REXML::XPath.each(doc, "#{xpath}/@value") do |node|
-          desc_path = "#{xpath}[@value='#{node.value}']//xs:annotation//xs:documentation"
-          enums_hash.merge!(node.value => REXML::XPath.first(doc, desc_path).children.first)
-        end
+        enums_hash = File.extname(file).downcase == ".xsd" ? read_xsd(file, domain_arguments.simple_type) : read_xml(file, domain_arguments.simple_type, domain_arguments.node_hash)
 
         next if enums_hash.empty?
 
         hash[xsd_files_gateway.schema_version(file)] = enums_hash
       end
 
-      raise ViewModelBoundary::NodeNotFound, "Node #{domain_arguments.simple_type} was not found in any of the xsd files in #{domain_arguments.xsd_dir_path} directory" if hash.empty?
+      raise ViewModelBoundary::NodeNotFound, "Node #{domain_arguments.simple_type} was not found in any of the files in #{domain_arguments.xsd_dir_path} directory" if hash.empty?
 
       hash
     end
@@ -45,5 +39,29 @@ module Presenter
     def variation_between_schema_versions?(enums_hash)
       enums_hash.values.flatten.uniq.count != 1
     end
+
+  private
+
+    def read_xsd(file_name, simple_type)
+      xpath = "//xs:simpleType[@name='#{simple_type}']//xs:enumeration"
+      doc = REXML::Document.new(File.read(file_name))
+      enums_hash = {}
+      REXML::XPath.each(doc, "#{xpath}/@value") do |node|
+        desc_path = "#{xpath}[@value='#{node.value}']//xs:annotation//xs:documentation"
+        enums_hash.merge!(node.value => REXML::XPath.first(doc, desc_path).children.first)
+      end
+      enums_hash
+    end
+
+    def read_xml(file_name, node_name, node_hash)
+      doc = Nokogiri.XML(File.read(file_name))
+      enums_hash = {}
+
+      doc.xpath(node_name).each do |node|
+        enums_hash.merge!(node.xpath(node_hash.keys[0].to_s).children.text => node.xpath(node_hash.values[0]).children.text)
+      end
+
+      enums_hash
+    end
   end
 end

data/lib/view_model_domain/xsd_arguments.rb

@@ -1,12 +1,13 @@
 module ViewModelDomain
   class XsdArguments
-    attr_reader :simple_type, :assessment_type, :xsd_dir_path, :gem_path
+    attr_reader :simple_type, :assessment_type, :xsd_dir_path, :gem_path, :node_hash
 
-    def initialize(simple_type:, assessment_type:, xsd_dir_path: "", gem_path: "")
+    def initialize(simple_type:, assessment_type:, xsd_dir_path: "", gem_path: "", node_hash: nil)
       @simple_type = simple_type
       @assessment_type = assessment_type
       @xsd_dir_path = xsd_dir_path
       @gem_path = gem_path
+      @node_hash = node_hash
     end
   end
 end

metadata

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