honeybee-openstudio 2.22.3 → 2.22.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b23a8787eb73cfedcfb87593efb1089039ddf316fef2c45ef5911251a2a7b7fe
-  data.tar.gz: '019c3ea7029d7372de457911e7fbb08f690f83fc27e5605249e273b9bb677701'
+  metadata.gz: f8767065c98f72114b89b1d16304efe93ca0003a357f647954b0beed6989b1ec
+  data.tar.gz: 1ed4757de90face39cbc8309e45d5e1a872288bab0f9240da9a9d4b8db18dada
 SHA512:
-  metadata.gz: 3ebc33a0448cfc47bf86dc954d7186798d35482975b5a3fd66efcfe7003e7c1e06b43334621935e5eda599e433c68b3e64d7b9414bc80280af8b56ad503b55b4
-  data.tar.gz: 9923b7fec07cc6729d8a7f882802022629073671e2e2d9c53e5afb244ddbb9e87a8fd3a93e32a748742ba1cc079b32dc1e5d4a36b598d68b36deefc6574bf7ac
+  metadata.gz: '0925da969e4768649654327dd2574ab5cd4caec284ae804c42ae7fb772e139aae63d852a52b1406fb81e1c6db0fa1658f170c29389614bf0e3cc4d4054a428d4'
+  data.tar.gz: '091488d2fa18fa7f06452c43fea7d6559fdaa8591f04c9b5fa8732d65b0119e39aa789ba2c82ce806b5346aceabc44423ecd9c5d103d9f2cbb3d31e615f1e4d6'

data/honeybee-openstudio.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'honeybee-openstudio'
-  spec.version       = '2.22.3'
+  spec.version       = '2.22.4'
   spec.authors       = ['Tanushree Charan', 'Dan Macumber', 'Chris Mackey', 'Mostapha Sadeghipour Roudsari']
   spec.email         = ['tanushree.charan@nrel.gov', 'chris@ladybug.tools']
 

data/lib/from_openstudio/construction/air.rb

@@ -40,11 +40,11 @@ module Honeybee
         hash = {}
         hash[:type] = 'AirBoundaryConstructionAbridged'
         # set hash values from OpenStudio Object
-        hash[:identifier] = construction.nameString
+        hash[:identifier] = clean_name(construction.nameString)
         # check if boost optional object is empty
         unless construction.simpleMixingSchedule.empty?
           schedule = construction.simpleMixingSchedule.get
-          hash[:air_mixing_schedule] = schedule.nameString
+          hash[:air_mixing_schedule] = clean_name(schedule.nameString)
         end
         #TODO: Add air_mixing_per_area
 

data/lib/from_openstudio/construction/opaque.rb

@@ -40,12 +40,12 @@ module Honeybee
         hash = {}
         hash[:type] = 'OpaqueConstructionAbridged'
         # set hash values from OpenStudio Object
-        hash[:identifier] = construction.nameString
+        hash[:identifier] = clean_name(construction.nameString)
         hash[:materials] = []
         # get construction layers
         layers = construction.layers
         layers.each do |layer|
-          name = layer.nameString
+          name = clean_name(layer.nameString)
           hash[:materials] << name
         end
 

data/lib/from_openstudio/construction/shade.rb

@@ -40,7 +40,7 @@ module Honeybee
         hash = {}
         hash[:type] = 'ShadeConstruction'
         # set hash values from OpenStudio Object
-        hash[:identifier] = construction.nameString
+        hash[:identifier] = clean_name(construction.nameString)
         # get outermost construction layers
         layer = construction.layers[0]
         if layer.to_StandardGlazing.is_initialized

data/lib/from_openstudio/construction/window.rb

@@ -40,12 +40,12 @@ module Honeybee
         hash = {}
         hash[:type] = 'WindowConstructionAbridged'
         # set hash values from OpenStudio Object
-        hash[:identifier] = construction.nameString
+        hash[:identifier] = clean_name(construction.nameString)
         hash[:materials] = []
         # get construction layers
         layers = construction.layers
         layers.each do |layer|
-          name = layer.nameString
+          name = clean_name(layer.nameString)
           hash[:materials] << name
         end
 

data/lib/from_openstudio/construction_set.rb

@@ -40,7 +40,7 @@ module Honeybee
         hash = {}
         hash[:type] = 'ConstructionSetAbridged'
         # set hash values from OpenStudio Object
-        hash[:identifier] = construction_set.nameString
+        hash[:identifier] = clean_name(construction_set.nameString)
         hash[:wall_set] = {}
         hash[:floor_set] = {}
         hash[:aperture_set] = {}
@@ -53,17 +53,17 @@ module Honeybee
           # get interior wall construction
           unless int_surf_construction.wallConstruction.empty?
             int_wall_const = int_surf_construction.wallConstruction.get
-            hash[:wall_set][:interior_construction] = int_wall_const.nameString
+            hash[:wall_set][:interior_construction] = clean_name(int_wall_const.nameString)
           end
           # get interior floor construction
           unless int_surf_construction.floorConstruction.empty?
             int_floor_const = int_surf_construction.floorConstruction.get
-            hash[:floor_set][:interior_construction] = int_floor_const.nameString
+            hash[:floor_set][:interior_construction] = clean_name(int_floor_const.nameString)
           end
           # get interior roofceiling construction
           unless int_surf_construction.roofCeilingConstruction.empty?
             int_roof_const = int_surf_construction.roofCeilingConstruction.get
-            hash[:roof_ceiling_set][:interior_construction] = int_roof_const.nameString
+            hash[:roof_ceiling_set][:interior_construction] = clean_name(int_roof_const.nameString)
           end
         end
 
@@ -72,17 +72,17 @@ module Honeybee
           int_subsurf_const = construction_set.defaultInteriorSubSurfaceConstructions.get
           unless int_subsurf_const.fixedWindowConstruction.empty?
             int_wind_const = int_subsurf_const.fixedWindowConstruction.get
-            hash[:aperture_set][:window_construction] = int_wind_const.nameString
+            hash[:aperture_set][:window_construction] = clean_name(int_wind_const.nameString)
           end
           # get interior door construction
           unless int_subsurf_const.doorConstruction.empty?
             int_door_const = int_subsurf_const.doorConstruction.get
-            hash[:door_set][:interior_construction] = int_door_const.nameString
+            hash[:door_set][:interior_construction] = clean_name(int_door_const.nameString)
           end
           # get interior glass door construction
           unless int_subsurf_const.glassDoorConstruction.empty?
             int_glass_door_const = int_subsurf_const.glassDoorConstruction.get
-            hash[:door_set][:interior_glass_construction] = int_glass_door_const.nameString
+            hash[:door_set][:interior_glass_construction] = clean_name(int_glass_door_const.nameString)
           end
         end
         
@@ -92,17 +92,17 @@ module Honeybee
           # get exterior wall construction
           unless ext_surf_const.wallConstruction.empty?
             ext_wall_const = ext_surf_const.wallConstruction.get
-            hash[:wall_set][:exterior_construction] = ext_wall_const.nameString
+            hash[:wall_set][:exterior_construction] = clean_name(ext_wall_const.nameString)
           end
           # get exterior floor construction
           unless ext_surf_const.floorConstruction.empty?
             ext_floor_const = ext_surf_const.floorConstruction.get
-            hash[:floor_set][:exterior_construction] = ext_floor_const.nameString
+            hash[:floor_set][:exterior_construction] = clean_name(ext_floor_const.nameString)
           end
           # get exterior roofceiling construction
           unless ext_surf_const.roofCeilingConstruction.empty?
             ext_roof_const = ext_surf_const.roofCeilingConstruction.get
-            hash[:roof_ceiling_set][:exterior_construction] = ext_roof_const.nameString
+            hash[:roof_ceiling_set][:exterior_construction] = clean_name(ext_roof_const.nameString)
           end
         end
 
@@ -112,22 +112,22 @@ module Honeybee
           # get exterior operable window construction
           unless ext_subsurf_const.operableWindowConstruction.empty?
             ext_wind_const = ext_subsurf_const.operableWindowConstruction.get
-            hash[:aperture_set][:operable_construction] = ext_wind_const.nameString
+            hash[:aperture_set][:operable_construction] = clean_name(ext_wind_const.nameString)
           end
           # get exterior skylight construction
           unless ext_subsurf_const.skylightConstruction.empty?
             ext_skylight_const = ext_subsurf_const.skylightConstruction.get
-            hash[:aperture_set][:skylight_construction] = ext_skylight_const.nameString
+            hash[:aperture_set][:skylight_construction] = clean_name(ext_skylight_const.nameString)
           end
           # get exterior door construction
           unless ext_subsurf_const.doorConstruction.empty?
             ext_door_const = ext_subsurf_const.doorConstruction.get
-            hash[:door_set][:exterior_construction] = ext_door_const.nameString
+            hash[:door_set][:exterior_construction] = clean_name(ext_door_const.nameString)
           end
           # get exterior overhead door construction
           unless ext_subsurf_const.overheadDoorConstruction.empty?
             ext_ovhd_door_const = ext_subsurf_const.overheadDoorConstruction.get
-            hash[:door_set][:overhead_construction] = ext_ovhd_door_const.nameString
+            hash[:door_set][:overhead_construction] = clean_name(ext_ovhd_door_const.nameString)
           end
         end
 

data/lib/from_openstudio/geometry/aperture.rb

@@ -40,7 +40,7 @@ module Honeybee
       hash = {}
       hash[:type] = 'Aperture'
       hash[:identifier] = clean_identifier(sub_surface.nameString)
-      hash[:display_name] = clean_display_name(sub_surface.nameString)
+      hash[:display_name] = clean_name(sub_surface.nameString)
       hash[:user_data] = {handle: sub_surface.handle.to_s}
       hash[:properties] = properties_from_sub_surface(sub_surface)
       hash[:geometry] = geometry_from_sub_surface(sub_surface, site_transformation)

data/lib/from_openstudio/geometry/door.rb

@@ -40,7 +40,7 @@ module Honeybee
       hash = {}
       hash[:type] = 'Door'
       hash[:identifier] = clean_identifier(sub_surface.nameString)
-      hash[:display_name] = clean_display_name(sub_surface.nameString)
+      hash[:display_name] = clean_name(sub_surface.nameString)
       hash[:user_data] = {handle: sub_surface.handle.to_s}
       hash[:properties] = properties_from_sub_surface(sub_surface)
       hash[:geometry] = geometry_from_sub_surface(sub_surface, site_transformation)

data/lib/from_openstudio/geometry/face.rb

@@ -38,7 +38,7 @@ module Honeybee
       hash = {}
       hash[:type] = 'Face'
       hash[:identifier] = clean_identifier(surface.nameString)
-      hash[:display_name] = clean_display_name(surface.nameString)
+      hash[:display_name] = clean_name(surface.nameString)
       hash[:user_data] = {handle: surface.handle.to_s}
       hash[:properties] = properties_from_surface(surface)
       hash[:geometry] = geometry_from_surface(surface, site_transformation)

data/lib/from_openstudio/geometry/room.rb

@@ -38,7 +38,7 @@ module Honeybee
       hash = {}
       hash[:type] = 'Room'
       hash[:identifier] = clean_identifier(space.nameString)
-      hash[:display_name] = clean_display_name(space.nameString)
+      hash[:display_name] = clean_name(space.nameString)
       hash[:user_data] = {space: space.handle.to_s}
       hash[:properties] = properties_from_space(space)
 

data/lib/from_openstudio/geometry/shade.rb

@@ -40,7 +40,7 @@ module Honeybee
       hash = {}
       hash[:type] = 'Shade'
       hash[:identifier] = clean_identifier(shading_surface.nameString)
-      hash[:display_name] = clean_display_name(shading_surface.nameString)
+      hash[:display_name] = clean_name(shading_surface.nameString)
       hash[:user_data] = {handle: shading_surface.handle.to_s}
       hash[:properties] = properties_from_shading_surface(shading_surface)
       hash[:geometry] = geometry_from_shading_surface(shading_surface, site_transformation)

data/lib/from_openstudio/material/opaque.rb

@@ -40,7 +40,7 @@ module Honeybee
         hash = {}
         hash[:type] = 'EnergyMaterial'
         # set hash values from OpenStudio Object
-        hash[:identifier] = material.nameString
+        hash[:identifier] = clean_name(material.nameString)
         hash[:thickness] = material.thickness
         hash[:conductivity] = material.conductivity
         hash[:density] = material.density

data/lib/from_openstudio/material/opaque_no_mass.rb

@@ -40,7 +40,7 @@ module Honeybee
         hash = {}
         hash[:type] = 'EnergyMaterialNoMass'
         # set hash values from OpenStudio Object
-        hash[:identifier] = material.nameString
+        hash[:identifier] = clean_name(material.nameString)
         hash[:r_value] = material.thermalResistance
 
         if material.to_MasslessOpaqueMaterial.is_initialized

data/lib/from_openstudio/material/window_blind.rb

@@ -40,7 +40,7 @@ module Honeybee
         hash = {}
         hash[:type] = 'EnergyWindowMaterialBlind'
         # set hash values from OpenStudio Object
-        hash[:identifier] = material.nameString
+        hash[:identifier] = clean_name(material.nameString)
         hash[:slat_orientation] = material.slatOrientation
         hash[:slat_width] = material.slatWidth
         hash[:slat_separation] = material.slatSeparation

data/lib/from_openstudio/material/window_gas.rb

@@ -40,7 +40,7 @@ module Honeybee
         hash = {}
         hash[:type] = 'EnergyWindowMaterialGas'
         # set hash values from OpenStudio Object
-        hash[:identifier] = material.nameString
+        hash[:identifier] = clean_name(material.nameString)
         hash[:thickness] = material.thickness
         hash[:gas_type] = material.gasType
 

data/lib/from_openstudio/material/window_gas_custom.rb

@@ -40,7 +40,7 @@ module Honeybee
         hash = {}
         hash[:type] = 'EnergyWindowMaterialGasCustom'
         # set hash values from OpenStudio Object
-        hash[:identifier] = material.nameString
+        hash[:identifier] = clean_name(material.nameString)
         hash[:thickness] = material.thickness
         # check if boost optional object is empty
         unless material.customConductivityCoefficientA.empty?

data/lib/from_openstudio/material/window_gas_mixture.rb

@@ -40,7 +40,7 @@ module Honeybee
         hash = {}
         hash[:type] = 'EnergyWindowMaterialGasMixture'
         # set hash values from OpenStudio Object
-        hash[:identifier] = material.nameString
+        hash[:identifier] = clean_name(material.nameString)
         hash[:thickness] = material.thickness
         hash[:gas_types] = []
         hash[:gas_fractions] = []

data/lib/from_openstudio/material/window_glazing.rb

@@ -40,7 +40,7 @@ module Honeybee
         hash = {}
         hash[:type] = 'EnergyWindowMaterialGlazing'
         # set hash values from OpenStudio Object
-        hash[:identifier] = material.nameString
+        hash[:identifier] = clean_name(material.nameString)
         hash[:thickness] = material.thickness
         hash[:solar_transmittance] = material.solarTransmittance
         # check if boost optional object is empty

data/lib/from_openstudio/material/window_simpleglazsys.rb

@@ -40,7 +40,7 @@ module Honeybee
         hash = {}
         hash[:type] = 'EnergyWindowMaterialSimpleGlazSys'
         # set hash values from OpenStudio Object
-        hash[:identifier] = material.nameString
+        hash[:identifier] = clean_name(material.nameString)
         hash[:u_factor] = material.uFactor
         hash[:shgc] = material.solarHeatGainCoefficient
         # check if boost optional object is empty

data/lib/honeybee/model_object.rb

@@ -36,6 +36,13 @@ module Honeybee
 
     attr_reader :errors, :warnings
 
+    @@encoding_options = {
+      :invalid           => :replace,  # Replace invalid byte sequences
+      :undef             => :replace,  # Replace anything not defined in ASCII
+      :replace           => '',        # Use a blank for those replacements
+      :universal_newline => true       # Always break lines with \n
+    }
+
     def method_missing(sym, *args)
       name = sym.to_s
       aname = name.sub('=', '')
@@ -99,13 +106,14 @@ module Honeybee
     end
 
     # remove illegal characters in identifier
-    def self.clean_display_name(str)
-      str.gsub(/[^[:ascii:]]/, '')
+    def self.clean_name(str)
+      ascii = str.encode(Encoding.find('ASCII'), @@encoding_options)
     end
 
     # remove illegal characters in identifier
     def self.clean_identifier(str)
-      str.gsub(/[^.A-Za-z0-9_-]/, '_').gsub(' ', '_')
+      encode_str = str.encode(Encoding.find('ASCII'), @@encoding_options)
+      encode_str.gsub(/[^.A-Za-z0-9_-]/, '_').gsub(' ', '_')
     end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: honeybee-openstudio
 version: !ruby/object:Gem::Version
-  version: 2.22.3
+  version: 2.22.4
 platform: ruby
 authors:
 - Tanushree Charan
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-07 00:00:00.000000000 Z
+date: 2021-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler