bcl 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f509d5e458bab1b477c6e4695a5333766e6f3e19be91ac2452d87452fcfcd981
-  data.tar.gz: ccd36a253abd3c64635959edf253ad4aac87789e95958787d11bda1b1e3dfb9c
+  metadata.gz: 889eac96a388f104d76ee80dc7406ec047b535e106498425418d7e121b94416d
+  data.tar.gz: ae5eba1617aabbe3245975a03d0733afccb5381182071e4a146780b26ad77196
 SHA512:
-  metadata.gz: 7ebba6c382b8a2d2576a8ffff66c8571161df38a01c6ff5ff17cc0b834cecd995c96ffb29749cde7302aa0650cb957ff859607fc89247b5594f2e691f423e099
-  data.tar.gz: 37e1f02ffd32494cbf49f83c04b305e0b7782b6527fe549c758be26ef0f8a683e797e18c1b68a5ecaa809cf750e72cf2184d276e7108f26ce14c3a8025cd3a13
+  metadata.gz: 71b0d4004fc2a0dfc20fff6e912adf194262bba8c2b6ba517d264d6700744c25142a036220131de1f19636e8c5fd4702d55a5fd641b8877843aa124178101c68
+  data.tar.gz: 4e4e7e94b3851f5a5be2a6dfbcd32c929149ce6e8c5251cfeef143d30546073d093f996d32af4b5949bae48523c87ea1f91b701f9eebf4b8af1e109408d31300

data/.rubocop.yml

@@ -5,5 +5,4 @@ AllCops:
     - 'gems/**/*'
 
 inherit_from:
-  - http://s3.amazonaws.com/openstudio-resources/styles/rubocop.yml
-
+  - http://s3.amazonaws.com/openstudio-resources/styles/rubocop_v3.yml

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## Version 0.6.1
+
+* Remove dependency for winole (`require 'win32ole'`). This affects the reading of the component spreadsheets and the 
+the master taxomony.
+* Use new rubocop (v3) from s3 openstudio-resources
+
 ## Version 0.6.0
 
 * Support Ruby > 2.5

data/Rakefile

@@ -250,7 +250,7 @@ namespace :bcl do
 
         paths << file.to_s
         if file.to_s =~ /^.{0,2}component.xml$/ || file.to_s =~ /^.{0,2}measure.xml$/
-          if file.to_s =~ /^.{0,2}component.xml$/
+          if file.to_s.match?(/^.{0,2}component.xml$/)
             content_type = 'component'
           end
           # extract uuid  and vid

data/lib/bcl.rb

@@ -27,12 +27,10 @@ require 'spreadsheet'
 
 require 'bcl/core_ext'
 require 'bcl/base_xml'
-require 'bcl/component_spreadsheet'
 require 'bcl/component_from_spreadsheet'
 require 'bcl/component'
 require 'bcl/component_methods'
 require 'bcl/tar_ball'
-require 'bcl/master_taxonomy'
 require 'bcl/version'
 
 # Some global structures

data/lib/bcl/component.rb

@@ -384,4 +384,4 @@ module BCL
       xmlfile.close
     end
   end
-end # module BCL
+end

data/lib/bcl/component_from_spreadsheet.rb

@@ -30,8 +30,6 @@ module BCL
   class ComponentFromSpreadsheet
     @@changed = false
 
-    public
-
     # initialize with Excel spreadsheet to read
     # seems to only be working with xls spreadsheets
     def initialize(xlsx_path, worksheet_names = ['all'])
@@ -80,14 +78,14 @@ module BCL
 
           puts " headers: #{component.headers}"
           component.headers.each do |header|
-            if /description/i.match(header.name)
+            if /description/i.match?(header.name)
               name = values.delete_at(0) # name, uid already processed
               uid = values.delete_at(0)
               component_xml.comp_version_id = values.delete_at(0)
               description = values.delete_at(0)
               component_xml.modeler_description = values.delete_at(0)
               component_xml.description = description
-            elsif /provenance/i.match(header.name)
+            elsif /provenance/i.match?(header.name)
               author = values.delete_at(0)
               datetime = values.delete_at(0)
               if datetime.nil?
@@ -97,10 +95,10 @@ module BCL
 
               comment = values.delete_at(0)
               component_xml.add_provenance(author.to_s, datetime.strftime('%Y-%m-%d'), comment.to_s)
-            elsif /tag/i.match(header.name)
+            elsif /tag/i.match?(header.name)
               value = values.delete_at(0)
               component_xml.add_tag(value)
-            elsif /attribute/i.match(header.name)
+            elsif /attribute/i.match?(header.name)
               value = values.delete_at(0)
               name = header.children[0]
               units = ''
@@ -109,7 +107,7 @@ module BCL
                 units = match_data[2].strip
               end
               component_xml.add_attribute(name, value, units)
-            elsif /source/i.match(header.name)
+            elsif /source/i.match?(header.name)
               manufacturer = values.delete_at(0)
               model = values.delete_at(0)
               serial_no = values.delete_at(0)
@@ -120,7 +118,7 @@ module BCL
               component_xml.source_serial_no = serial_no
               component_xml.source_year = year
               component_xml.source_url = url
-            elsif /file/i.match(header.name)
+            elsif /file/i.match?(header.name)
               software_program = values.delete_at(0)
               version = values.delete_at(0)
               filename = values.delete_at(0)

data/lib/bcl/component_methods.rb

@@ -93,13 +93,13 @@ module BCL
         bni = ''
         junkout = res['set-cookie'].split(';')
         junkout.each do |line|
-          if line =~ /BNES_SESS/
+          if line.match?(/BNES_SESS/)
             bnes = line.match(/(BNES_SESS.*)/)[0]
           end
         end
 
         junkout.each do |line|
-          if line =~ /BNI/
+          if line.match?(/BNI/)
             bni = line.match(/(BNI.*)/)[0]
           end
         end
@@ -293,13 +293,13 @@ module BCL
       version_id = nil
       if uuid.nil?
         puts File.extname(filename_and_path).downcase
-        if filename_and_path =~ /^.*.tar.gz$/i
+        if filename_and_path.match?(/^.*.tar.gz$/i)
           uuid, version_id = uuid_vid_from_tarball(filename_and_path)
           puts "Parsed uuid out of tar.gz file with value #{uuid}"
         end
       else
         # verify the uuid via regex
-        unless uuid =~ /[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/
+        unless uuid.match?(/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/)
           raise "uuid of #{uuid} is invalid"
         end
       end
@@ -362,7 +362,7 @@ module BCL
           xml_file = REXML::Document.new entry.read
 
           # pull out some information
-          if entry.name =~ /component/
+          if entry.name.match?(/component/)
             u = xml_file.elements['component/uid']
             v = xml_file.elements['component/version_id']
           else
@@ -392,7 +392,7 @@ module BCL
       xml_to_parse = File.new(path_to_xml)
       xml_file = REXML::Document.new xml_to_parse
 
-      if path_to_xml.to_s.split('/').last =~ /component.xml/
+      if path_to_xml.to_s.split('/').last.match?(/component.xml/)
         u = xml_file.elements['component/uid']
         v = xml_file.elements['component/version_id']
       else
@@ -619,7 +619,7 @@ module BCL
 
       settings
     end
-  end # class ComponentMethods
+  end
 
   # TODO: make this extend the component_xml class (or create a super class around components)
 
@@ -681,4 +681,4 @@ module BCL
 
     Dir.chdir(current_dir)
   end
-end # module BCL
+end

data/lib/bcl/version.rb

@@ -18,5 +18,5 @@
 ######################################################################
 
 module BCL
-  VERSION = '0.6.0'.freeze
+  VERSION = '0.6.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bcl
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Daniel Macumber
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-30 00:00:00.000000000 Z
+date: 2020-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -174,11 +174,9 @@ files:
 - lib/bcl/component.rb
 - lib/bcl/component_from_spreadsheet.rb
 - lib/bcl/component_methods.rb
-- lib/bcl/component_spreadsheet.rb
 - lib/bcl/core_ext.rb
 - lib/bcl/current_taxonomy.json
 - lib/bcl/current_taxonomy.xml
-- lib/bcl/master_taxonomy.rb
 - lib/bcl/tar_ball.rb
 - lib/bcl/version.rb
 - lib/files/Components.xls

data/lib/bcl/component_spreadsheet.rb

@@ -1,287 +0,0 @@
-######################################################################
-#  Copyright (c) 2008-2019, Alliance for Sustainable Energy.
-#  All rights reserved.
-#
-#  This library is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Lesser General Public
-#  License as published by the Free Software Foundation; either
-#  version 2.1 of the License, or (at your option) any later version.
-#
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Lesser General Public License for more details.
-#
-#  You should have received a copy of the GNU Lesser General Public
-#  License along with this library; if not, write to the Free Software
-#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-######################################################################
-
-# Converts a custom Excel spreadsheet format to BCL components for upload
-# Format of the Excel spreadsheet is documented in /doc/ComponentSpreadsheet.docx
-
-if RUBY_PLATFORM =~ /mswin|mingw|cygwin/
-  begin
-    # apparently this is not a gem (todo: need to remove and replace with roo)
-    require 'win32ole'
-    mod = WIN32OLE
-    $have_win32ole = true
-  rescue NameError
-    # do not have win32ole
-  end
-end
-
-module BCL
-  class ComponentSpreadsheet
-    public
-
-    # WINDOWS ONLY SECTION BECAUSE THIS USES WIN32OLE
-    if $have_win32ole
-
-      # initialize with Excel spreadsheet to read
-      def initialize(xlsx_path, worksheet_names = ['all'])
-        @xlsx_path = Pathname.new(xlsx_path).realpath.to_s
-        @worksheets = []
-
-        begin
-          excel = WIN32OLE.new('Excel.Application')
-
-          xlsx = excel.Workbooks.Open(@xlsx_path)
-
-          # by default, operate on all worksheets
-          if worksheet_names == ['all']
-            xlsx.Worksheets.each do |xlsx_worksheet|
-              parse_xlsx_worksheet(xlsx_worksheet)
-            end
-          else # if specific worksheets are specified, operate on them
-            worksheet_names.each do |worksheet_name|
-              parse_xlsx_worksheet(xlsx.Worksheets(worksheet_name))
-            end
-          end
-
-          # save spreadsheet if changes have been made
-          if xlsx.saved == true
-            # puts "[ComponentSpreadsheet] Spreadsheet unchanged; not saving"
-          else
-            xlsx.Save
-            puts '[ComponentSpreadsheet] Spreadsheet changes saved'
-          end
-        ensure
-          excel.Quit
-          WIN32OLE.ole_free(excel)
-          excel.ole_free
-          xlsx = nil
-          excel = nil
-          GC.start
-        end
-      end
-
-    else # if $have_win32ole
-
-      # parse the master taxonomy document
-      def initialize(_xlsx_path)
-        puts "ComponentSpreadsheet class requires 'win32ole' to parse the component spreadsheet."
-        puts 'ComponentSpreadsheet may also be stored and loaded from JSON if your platform does not support win32ole.'
-      end
-
-    end # if $have_win32ole
-
-    def save(save_path, chunk_size = 1000, delete_old_gather = false)
-      # load master taxonomy to validate components
-      taxonomy = BCL::MasterTaxonomy.new
-
-      # FileUtils.rm_rf(save_path) if File.exists?(save_path) and File.directory?(save_path)
-
-      @worksheets.each do |worksheet|
-        worksheet.components.each do |component|
-          component_xml = Component.new("#{save_path}/components")
-          component_xml.name = component.name
-          component_xml.uid = component.uid
-          component_xml.comp_version_id = component.version_id
-
-          # this tag is how we know where this goes in the taxonomy
-          component_xml.add_tag(worksheet.name)
-
-          values = component.values[0]
-          component.headers.each do |header|
-            if /description/i.match(header.name)
-
-              name = values.delete_at(0)
-              uid = values.delete_at(0)
-              version_id = values.delete_at(0)
-              description = values.delete_at(0)
-              fidelity_level = values.delete_at(0).to_int
-              # name, uid, and version_id already processed
-              component_xml.description = description
-              component_xml.fidelity_level = fidelity_level
-
-            elsif /provenance/i.match(header.name)
-
-              author = values.delete_at(0)
-              datetime = values.delete_at(0)
-              if datetime.nil?
-                # puts "[ComponentSpreadsheet] WARNING missing the date in the datetime column in the spreadsheet - assuming today"
-                datetime = DateTime.new
-              else
-                datetime = DateTime.parse(datetime)
-              end
-
-              comment = values.delete_at(0)
-              component_xml.add_provenance(author.to_s, datetime.to_s, comment.to_s)
-
-            elsif /tag/i.match(header.name)
-
-              value = values.delete_at(0)
-              component_xml.add_tag(value)
-
-            elsif /attribute/i.match(header.name)
-
-              value = values.delete_at(0)
-              name = header.children[0]
-              units = ''
-              if match_data = /(.*)\((.*)\)/.match(name)
-                name = match_data[1].strip
-                units = match_data[2].strip
-              end
-              component_xml.add_attribute(name, value, units)
-
-            elsif /source/i.match(header.name)
-
-              manufacturer = values.delete_at(0)
-              model = values.delete_at(0)
-              serial_no = values.delete_at(0)
-              year = values.delete_at(0)
-              url = values.delete_at(0)
-              component_xml.source_manufacturer = manufacturer
-              component_xml.source_model = model
-              component_xml.source_serial_no = serial_no
-              component_xml.source_year = year
-              component_xml.source_url = url
-
-            elsif /file/i.match(header.name)
-
-              software_program = values.delete_at(0)
-              version = values.delete_at(0)
-              filename = values.delete_at(0)
-              filetype = values.delete_at(0)
-              filepath = values.delete_at(0)
-              # not all components(rows) have all files; skip if filename "" or nil
-              next if filename == '' || filename.nil?
-
-              # skip the file if it doesn't exist at the specified location
-              unless File.exist?(filepath)
-                puts "[ComponentSpreadsheet] ERROR #{filepath} -> File does not exist, will not be included in component xml"
-                next # go to the next file
-              end
-              component_xml.add_file(software_program, version, filepath, filename, filetype)
-
-            else
-              raise "Unknown section #{header.name}"
-
-            end
-          end
-
-          taxonomy.check_component(component_xml)
-
-          component_xml.save_tar_gz(false)
-        end
-      end
-
-      BCL.gather_components(save_path, chunk_size, delete_old_gather)
-    end
-
-    private
-
-    def parse_xlsx_worksheet(xlsx_worksheet)
-      worksheet = WorksheetStruct.new
-      worksheet.name = xlsx_worksheet.Range('A1').Value
-      worksheet.components = []
-      puts "[ComponentSpreadsheet] Starting parsing components of type #{worksheet.name}"
-
-      # find number of rows, first column should be name, should not be empty
-      num_rows = 1
-      loop do
-        test = xlsx_worksheet.Range("A#{num_rows}").Value
-        if test.nil? || test.empty?
-          num_rows -= 1
-          break
-        end
-        num_rows += 1
-      end
-
-      # scan number of columns
-      headers = []
-      header = nil
-      max_col = nil
-      xlsx_worksheet.Columns.each do |col|
-        value1 = col.Rows('1').Value
-        value2 = col.Rows('2').Value
-
-        if !value1.nil? && !value1.empty?
-          unless header.nil?
-            headers << header
-          end
-          header = HeaderStruct.new
-          header.name = value1
-          header.children = []
-        end
-
-        if !value2.nil? && !value2.empty?
-          unless header.nil?
-            header.children << value2
-          end
-        end
-
-        if (value1.nil? || value1.empty?) && (value2.nil? || value2.empty?)
-          break
-        end
-
-        matchdata = /^\$(.+):/.match(col.Address)
-        max_col = matchdata[1]
-      end
-
-      unless header.nil?
-        headers << header
-      end
-
-      unless headers.empty?
-        headers[0].name = 'description'
-      end
-
-      puts "  Found #{num_rows - 2} components"
-
-      components = []
-      for i in 3..num_rows do
-        component = ComponentStruct.new
-        component.row = i
-
-        # get name
-        component.name = xlsx_worksheet.Range("A#{i}").value
-
-        # get uid, if empty set it
-        component.uid = xlsx_worksheet.Range("B#{i}").value
-        if component.uid.nil? || component.uid.empty?
-          component.uid = UUID.new.generate
-          puts "#{component.name} uid missing; creating new one"
-          xlsx_worksheet.Range("B#{i}").value = component.uid
-        end
-
-        # get version_id, if empty set it
-        component.version_id = xlsx_worksheet.Range("C#{i}").value
-        if component.version_id.nil? || component.version_id.empty?
-          component.version_id = UUID.new.generate
-          puts "#{component.name} version id missing; creating new one"
-          xlsx_worksheet.Range("C#{i}").value = component.version_id
-        end
-
-        component.headers = headers
-        component.values = xlsx_worksheet.Range("A#{i}:#{max_col}#{i}").value
-        worksheet.components << component
-      end
-
-      @worksheets << worksheet
-
-      puts "[ComponentSpreadsheet] Finished parsing components of type #{worksheet.name}"
-    end
-  end
-end # module BCL

data/lib/bcl/master_taxonomy.rb

@@ -1,528 +0,0 @@
-######################################################################
-#  Copyright (c) 2008-2019, Alliance for Sustainable Energy.
-#  All rights reserved.
-#
-#  This library is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Lesser General Public
-#  License as published by the Free Software Foundation; either
-#  version 2.1 of the License, or (at your option) any later version.
-#
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Lesser General Public License for more details.
-#
-#  You should have received a copy of the GNU Lesser General Public
-#  License along with this library; if not, write to the Free Software
-#  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-######################################################################
-
-$have_win32ole = false
-
-if RUBY_PLATFORM =~ /mswin|mingw|cygwin/
-  begin
-    # apparently this is not a gem
-    require 'win32ole'
-    mod = WIN32OLE
-    $have_win32ole = true
-  rescue NameError
-    # do not have win32ole
-  end
-end
-
-module BCL
-  # each TagStruct represents a node in the taxonomy tree
-  TagStruct = Struct.new(:level_hierarchy, :name, :description, :parent_tag, :child_tags, :terms)
-
-  # each TermStruct represents a row in the master taxonomy
-  TermStruct = Struct.new(:first_level, :second_level, :third_level, :level_hierarchy, :name, :description,
-                          :abbr, :data_type, :enums, :ip_written, :ip_symbol, :ip_mask, :si_written, :si_symbol, :si_mask,
-                          :unit_conversion, :default_val, :min_val, :max_val, :allow_multiple, :row, :tp_include,
-                          :tp_required, :tp_use_in_search, :tp_use_in_facets, :tp_show_data_to_data_users, :tp_third_party_testing,
-                          :tp_additional_web_dev_info, :tp_additional_data_user_info, :tp_additional_data_submitter_info)
-
-  # class for parsing, validating, and querying the master taxonomy document
-  class MasterTaxonomy
-    # parse the master taxonomy document
-    def initialize(xlsx_path = nil, sort_alpha = false)
-      @sort_alphabetical = sort_alpha
-
-      # hash of level_taxonomy to tag
-      @tag_hash = {}
-
-      if xlsx_path.nil?
-        # load from the current taxonomy
-        path = current_taxonomy_path
-        puts "Loading current taxonomy from #{path}"
-        File.open(path, 'r') do |file|
-          @tag_hash = Marshal.load(file)
-        end
-      else
-        xlsx_path = Pathname.new(xlsx_path).realpath.to_s
-        puts "Loading taxonomy file #{xlsx_path}"
-
-        # WINDOWS ONLY SECTION BECAUSE THIS USES WIN32OLE
-        if $have_win32ole
-          begin
-            excel = WIN32OLE.new('Excel.Application')
-            xlsx = excel.Workbooks.Open(xlsx_path)
-            terms_worksheet = xlsx.Worksheets('Terms')
-            parse_terms(terms_worksheet)
-          ensure
-            # not really saving just pretending so don't get prompted on quit
-            xlsx.saved = true
-            excel.Quit
-            WIN32OLE.ole_free(excel)
-            excel.ole_free
-            xlsx = nil
-            excel = nil
-            GC.start
-          end
-        else # if $have_win32ole
-          puts "MasterTaxonomy class requires 'win32ole' to parse master taxonomy document."
-          puts 'MasterTaxonomy may also be stored and loaded from JSON if your platform does not support win32ole.'
-        end # if $have_win32ole
-      end
-    end
-
-    # save the current taxonomy
-    def save_as_current_taxonomy(path = nil)
-      path ||= current_taxonomy_path
-      puts "Saving current taxonomy to #{path}"
-      # this is really not JSON... it is a persisted format of ruby
-      File.open(path, 'w') do |file|
-        Marshal.dump(@tag_hash, file)
-      end
-    end
-
-    # write taxonomy to xml
-    def write_xml(path, output_type = 'tpex')
-      root_tag = @tag_hash['']
-
-      if root_tag.nil?
-        puts 'Cannot find root tag'
-        return false
-      end
-
-      File.open(path, 'w') do |file|
-        xml = Builder::XmlMarkup.new(target: file, indent: 2)
-
-        # setup the xml file
-        xml.instruct!(:xml, version: '1.0', encoding: 'UTF-8')
-        xml.schema('xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance') do
-          write_tag_to_xml(root_tag, 0, xml, output_type)
-        end
-      end
-    end
-
-    # get all terms for a given tag
-    # this includes terms that are inherited from parent levels
-    # e.g. master_taxonomy.get_terms("Space Use.Lighting.Lamp Ballast")
-    def get_terms(tag)
-      terms = tag.terms
-
-      parent_tag = tag.parent_tag
-      until parent_tag.nil?
-        terms.concat(parent_tag.terms)
-        parent_tag = parent_tag.parent_tag
-      end
-
-      # sort the terms as they come out
-      result = terms.uniq
-      if !@sort_alphabetical
-        result = result.sort_by(&:row)
-      else
-        result = result.sort_by(&:name)
-      end
-
-      result
-    end
-
-    # check that the given component is conforms with the master taxonomy
-    def check_component(component)
-      valid = true
-      tag = nil
-
-      # see if we can find the component's tag in the taxonomy
-      tags = component.tags
-      if tags.empty?
-        puts '[Check Component ERROR] Component does not have any tags'
-        valid = false
-      elsif tags.size > 1
-        puts '[Check Component ERROR] Component has multiple tags'
-        valid = false
-      else
-        tag = @tag_hash[tags[0].descriptor]
-        unless tag
-          puts "[Check Component ERROR] Cannot find #{tags[0].descriptor} in the master taxonomy"
-          valid = false
-        end
-      end
-
-      unless tag
-        return false
-      end
-
-      terms = get_terms(tag)
-
-      # TODO: check for all required attributes
-      terms.each do |_term|
-        # if term.required
-        # make sure we find attribute
-        # end
-      end
-
-      # check that all attributes are allowed
-      component.attributes.each do |attribute|
-        term = nil
-        terms.each do |t|
-          if t.name == attribute.name
-            term = t
-            break
-          end
-        end
-
-        unless term
-          puts "[Check Component ERROR] Cannot find term for #{attribute.name} in #{tag.level_hierarchy}"
-          valid = false
-          next
-        end
-
-        # TODO: validate value, datatype, units
-      end
-
-      valid
-    end
-
-    private
-
-    def current_taxonomy_path
-      File.dirname(__FILE__) + '/current_taxonomy.json'
-    end
-
-    def parse_terms(terms_worksheet)
-      # check header
-      header_error = validate_terms_header(terms_worksheet)
-      if header_error
-        raise 'Header Error on Terms Worksheet'
-      end
-
-      # add root tag
-      root_terms = []
-      root_terms << TermStruct.new('', '', '', '', 'OpenStudio Type', 'Type of OpenStudio Object')
-      root_terms[0].row = 0
-      # root_terms << TermStruct.new()
-      root_tag = TagStruct.new('', 'root', 'Root of the taxonomy', nil, [], root_terms)
-      @tag_hash[''] = root_tag
-
-      ### puts "**** tag hash: #{@tag_hash}"
-
-      # find number of rows by parsing until hit empty value in first column
-      row_num = 3
-      loop do
-        term = parse_term(terms_worksheet, row_num)
-        if term.nil?
-          break
-        end
-
-        add_term(term)
-
-        row_num += 1
-      end
-
-      # sort the tag tree
-      sort_tag(root_tag)
-
-      # check the tag tree
-      check_tag(root_tag)
-    end
-
-    def validate_terms_header(terms_worksheet)
-      test_arr = []
-      test_arr << { 'name' => 'First Level', 'strict' => true }
-      test_arr << { 'name' => 'Second Level', 'strict' => true }
-      test_arr << { 'name' => 'Third Level', 'strict' => true }
-      test_arr << { 'name' => 'Level Hierarchy', 'strict' => true }
-      test_arr << { 'name' => 'Term', 'strict' => true }
-      test_arr << { 'name' => 'Abbr', 'strict' => true }
-      test_arr << { 'name' => 'Description', 'strict' => true }
-      test_arr << { 'name' => 'Data Type', 'strict' => true }
-      test_arr << { 'name' => 'Allow Multiple', 'strict' => true }
-      test_arr << { 'name' => 'Enumerations', 'strict' => true }
-      test_arr << { 'name' => 'IP Units Written Out', 'strict' => true }
-      test_arr << { 'name' => 'IP Units Symbol', 'strict' => true }
-      test_arr << { 'name' => 'IP Display Mask', 'strict' => true }
-      test_arr << { 'name' => 'SI Units Written Out', 'strict' => true }
-      test_arr << { 'name' => 'SI Units Symbol', 'strict' => true }
-      test_arr << { 'name' => 'SI Display Mask', 'strict' => true }
-      test_arr << { 'name' => 'Unit Conversion', 'strict' => true }
-      test_arr << { 'name' => 'Default', 'strict' => true }
-      test_arr << { 'name' => 'Min', 'strict' => true }
-      test_arr << { 'name' => 'Max', 'strict' => true }
-      test_arr << { 'name' => 'Source', 'strict' => true }
-      test_arr << { 'name' => 'Review State', 'strict' => true }
-      test_arr << { 'name' => 'General Comments', 'strict' => true }
-      test_arr << { 'name' => 'Requested By / Project', 'strict' => true }
-      test_arr << { 'name' => 'Include in TPE', 'strict' => false }
-      test_arr << { 'name' => 'Required for Adding a New Product', 'strict' => false }
-      test_arr << { 'name' => 'Use as a Column Header in Search Results', 'strict' => false }
-      test_arr << { 'name' => 'Allow Users to Filter with this Facet', 'strict' => false }
-      test_arr << { 'name' => 'Show Data to Data Users', 'strict' => false }
-      test_arr << { 'name' => 'Additional Instructions for Web Developers', 'strict' => false }
-      test_arr << { 'name' => 'Related Third Party Testing Standards', 'strict' => false }
-      test_arr << { 'name' => 'Additional Guidance to Data Submitters', 'strict' => false }
-      test_arr << { 'name' => 'Additional Guidance to Data Users', 'strict' => false }
-
-      parse = true
-      col = 1
-      while parse
-        if terms_worksheet.Columns(col).Rows(2).Value.nil? || col > test_arr.size
-          parse = false
-        else
-          unless terms_worksheet.Columns(col).Rows(2).Value == test_arr[col - 1]['name']
-            if test_arr[col - 1]['strict']
-              raise "[ERROR] Header does not match: #{col}: '#{terms_worksheet.Columns(col).Rows(2).Value} <> #{test_arr[col - 1]['name']}'"
-            else
-              puts "[WARNING] Header does not match: #{col}: '#{terms_worksheet.Columns(col).Rows(2).Value} <> #{test_arr[col - 1]['name']}'"
-            end
-          end
-        end
-        col += 1
-      end
-    end
-
-    def parse_term(terms_worksheet, row)
-      term = TermStruct.new
-      term.row = row
-      term.first_level = terms_worksheet.Columns(1).Rows(row).Value
-      term.second_level = terms_worksheet.Columns(2).Rows(row).Value
-      term.third_level = terms_worksheet.Columns(3).Rows(row).Value
-      term.level_hierarchy = terms_worksheet.Columns(4).Rows(row).Value
-      term.name = terms_worksheet.Columns(5).Rows(row).Value
-      term.abbr = terms_worksheet.Columns(6).Rows(row).Value
-      term.description = terms_worksheet.Columns(7).Rows(row).Value
-      term.data_type = terms_worksheet.Columns(8).Rows(row).Value
-      term.allow_multiple = terms_worksheet.Columns(9).Rows(row).Value
-      term.enums = terms_worksheet.Columns(10).Rows(row).Value
-      term.ip_written = terms_worksheet.Columns(11).Rows(row).Value
-      term.ip_symbol = terms_worksheet.Columns(12).Rows(row).Value
-      term.ip_mask = terms_worksheet.Columns(13).Rows(row).Value
-      term.si_written = terms_worksheet.Columns(14).Rows(row).Value
-      term.si_symbol = terms_worksheet.Columns(15).Rows(row).Value
-      term.si_mask = terms_worksheet.Columns(16).Rows(row).Value
-      term.unit_conversion = terms_worksheet.Columns(17).Rows(row).Value
-      term.default_val = terms_worksheet.Columns(18).Rows(row).Value
-      term.min_val = terms_worksheet.Columns(19).Rows(row).Value
-      term.max_val = terms_worksheet.Columns(20).Rows(row).Value
-
-      # custom TPex Columns
-      term.tp_include = terms_worksheet.Columns(25).Rows(row).Value
-      term.tp_required = terms_worksheet.Columns(26).Rows(row).Value
-      term.tp_use_in_search = terms_worksheet.Columns(27).Rows(row).Value
-      term.tp_use_in_facets = terms_worksheet.Columns(28).Rows(row).Value
-      term.tp_show_data_to_data_users = terms_worksheet.Columns(29).Rows(row).Value
-      term.tp_additional_web_dev_info = terms_worksheet.Columns(30).Rows(row).Value
-      term.tp_third_party_testing = terms_worksheet.Columns(31).Rows(row).Value
-      term.tp_additional_data_submitter_info = terms_worksheet.Columns(32).Rows(row).Value
-      term.tp_additional_data_user_info = terms_worksheet.Columns(33).Rows(row).Value
-
-      # trigger to quit parsing the xcel doc
-      if term.first_level.nil? || term.first_level.empty?
-        return nil
-      end
-
-      term
-    end
-
-    def add_term(term)
-      level_hierarchy = term.level_hierarchy
-
-      # create the tag
-      tag = @tag_hash[level_hierarchy]
-
-      if tag.nil?
-        tag = create_tag(level_hierarchy, term.description)
-      end
-
-      if term.name.nil? || term.name.strip.empty?
-        # this row is really about the tag
-        tag.description = term.description
-
-      else
-        # this row is about a term
-        unless validate_term(term)
-          return nil
-        end
-
-        tag.terms = [] if tag.terms.nil?
-        tag.terms << term
-      end
-    end
-
-    def create_tag(level_hierarchy, tag_description = '')
-      # puts "create_tag called for #{level_hierarchy}"
-
-      parts = level_hierarchy.split('.')
-
-      name = parts[-1]
-      parent_level = parts[0..-2].join('.')
-
-      parent_tag = @tag_hash[parent_level]
-      if parent_tag.nil?
-        parent_tag = create_tag(parent_level)
-      end
-
-      description = tag_description
-      child_tags = []
-      terms = []
-      tag = TagStruct.new(level_hierarchy, name, description, parent_tag, child_tags, terms)
-
-      parent_tag.child_tags << tag
-
-      @tag_hash[level_hierarchy] = tag
-
-      tag
-    end
-
-    def sort_tag(tag)
-      # tag.terms = tag.terms.sort {|x, y| x.level_hierarchy <=> y.level_hierarchy}
-      tag.child_tags = tag.child_tags.sort_by(&:level_hierarchy)
-      tag.child_tags.each { |child_tag| sort_tag(child_tag) }
-
-      # tag.terms = tag.terms.sort {|x, y| x.name <=> y.name}
-      # tag.child_tags = tag.child_tags.sort {|x, y| x.name <=> y.name}
-      # tag.child_tags.each {|child_tag| sort_tag(child_tag) }
-    end
-
-    def check_tag(tag)
-      if tag.description.nil? || tag.description.empty?
-        puts "[check_tag] tag '#{tag.level_hierarchy}' has no description"
-      end
-
-      tag.terms.each { |term| check_term(term) }
-      tag.child_tags.each { |child_tag| check_tag(child_tag) }
-    end
-
-    def validate_term(term)
-      valid = true
-
-      parts = term.level_hierarchy.split('.')
-
-      if parts.empty?
-        puts "Hierarchy parts empty, #{term.level_hierarchy}"
-        valid = false
-      end
-
-      if parts.size >= 1 && !term.first_level == parts[0]
-        puts "First level '#{term.first_level}' does not match level hierarchy '#{term.level_hierarchy}', skipping term"
-        valid = false
-      end
-
-      if parts.size >= 2 && !term.second_level == parts[1]
-        puts "Second level '#{term.second_level}' does not match level hierarchy '#{term.level_hierarchy}', skipping term"
-        valid = false
-      end
-
-      if parts.size >= 3 && !term.third_level == parts[2]
-        puts "Third level '#{term.third_level}' does not match level hierarchy '#{term.level_hierarchy}', skipping term"
-        valid = false
-      end
-
-      if parts.size > 3
-        puts "Hierarchy cannot have more than 3 parts '#{term.level_hierarchy}', skipping term"
-        valid = false
-      end
-
-      unless term.data_type.nil?
-        valid_types = ['double', 'integer', 'enum', 'file', 'string', 'autocomplete']
-        if (term.data_type.downcase != term.data_type) || !valid_types.include?(term.data_type)
-          puts "[ERROR] Term '#{term.name}' does not have a valid data type with '#{term.data_type}'"
-        end
-
-        if term.data_type.casecmp('enum').zero?
-          if term.enums.nil? || term.enums == '' || term.enums.casecmp('no enum found').zero?
-            puts "[ERROR] Term '#{term.name}' does not have valid enumerations"
-          end
-        end
-      end
-
-      valid
-    end
-
-    def check_term(term)
-      if term.description.nil? || term.description.empty?
-        # puts "[check_term] term '#{term.level_hierarchy}.#{term.name}' has no description"
-      end
-    end
-
-    # write term to xml
-    def write_terms_to_xml(tag, xml, output_type)
-      terms = get_terms(tag)
-      unless terms.empty?
-        terms.each do |term|
-          xml.term do
-            xml.name term.name
-            xml.abbr term.abbr unless term.abbr.nil?
-            xml.description term.description unless term.description.nil?
-            xml.data_type term.data_type unless term.data_type.nil?
-            xml.allow_multiple term.allow_multiple unless term.allow_multiple.nil?
-
-            if !term.enums.nil? && term.enums != ''
-              xml.enumerations do
-                out = term.enums.split('|')
-                out.sort! if @sort_alphabetical
-                out.each do |enum|
-                  xml.enumeration enum
-                end
-              end
-            end
-            xml.ip_written term.ip_written unless term.ip_written.nil?
-            xml.ip_symbol term.ip_symbol unless term.ip_symbol.nil?
-            xml.ip_mask term.ip_mask unless term.ip_mask.nil?
-            xml.si_written term.si_written unless term.si_written.nil?
-            xml.si_symbol term.si_symbol unless term.si_symbol.nil?
-            xml.si_mask term.si_mask unless term.si_mask.nil?
-            xml.row term.row unless term.row.nil?
-            xml.unit_conversion term.unit_conversion unless term.unit_conversion.nil?
-            xml.default_val term.default_val unless term.default_val.nil?
-            xml.min_val term.min_val unless term.min_val.nil?
-            xml.max_val term.max_val unless term.max_val.nil?
-
-            if output_type == 'tpex'
-              xml.tp_include term.tp_include unless term.tp_include.nil?
-              xml.tp_required term.tp_required unless term.tp_required.nil?
-              xml.tp_use_in_search term.tp_use_in_search unless term.tp_use_in_search.nil?
-              xml.tp_use_in_facets term.tp_use_in_facets unless term.tp_use_in_facets.nil?
-              xml.tp_show_data_to_data_users term.tp_show_data_to_data_users unless term.tp_show_data_to_data_users.nil?
-              xml.tp_third_party_testing term.tp_third_party_testing unless term.tp_third_party_testing.nil?
-              xml.tp_additional_web_dev_info term.tp_additional_web_dev_info unless term.tp_additional_web_dev_info.nil?
-              xml.tp_additional_data_user_info term.tp_additional_data_user_info unless term.tp_additional_data_user_info.nil?
-              xml.tp_additional_data_submitter_info term.tp_additional_data_submitter_info unless term.tp_additional_data_submitter_info.nil?
-            end
-          end
-        end
-      end
-    end
-
-    # write a tag to xml
-    def write_tag_to_xml(tag, level, xml, output_type)
-      level_string = "level_#{level}"
-      xml.tag!(level_string) do
-        s_temp = tag.name
-        xml.name s_temp
-        xml.description tag.description
-
-        level += 1
-
-        if tag.child_tags.empty?
-          write_terms_to_xml(tag, xml, output_type)
-        end
-
-        child_tags = tag.child_tags
-        child_tags.each do |child_tag|
-          write_tag_to_xml(child_tag, level, xml, output_type)
-        end
-      end
-    end
-  end
-end # module BCL