openstudio-analysis 1.0.0.rc6 → 1.0.0.rc7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8ad533e87c735403c0c06a10ab0e26d60acb1ae
-  data.tar.gz: 96438625a69587a4aed66c35f7a7089723d31341
+  metadata.gz: ca20af75f85fbafc9d10757ab3dc8cc0623dc86b
+  data.tar.gz: 5d29bcb006606075cd7e90264c265a92972feff4
 SHA512:
-  metadata.gz: 326927ea97066c7e340bdcac9ec385baa49715d23e520a4b12e03cc3f4c275f245576d1a7fb7e83ee770646ead6ed44de4a8d3db92b7d71c1bf3113bf5e1376d
-  data.tar.gz: 3d1e74e51031c70855304754cd938ef14f21780ed9d5eae2af7f654b257a323165833160bcfee2b871c53e7039bf5154a6d1c093365641e1fbb9c2ad896fedd0
+  metadata.gz: 2310be20b3f47cfa92908af55844d93889a65ecf7bc16d325f09eba3af134e507705046f8f9b85459dd10a993ed9216fade89744abf3e6b12a8ab08bfd2182bb
+  data.tar.gz: 5f123620fc35e5ebd7045614841514ccda620495f78c1497521bbfa7b09c42a38bceeed1ef248c3bef5e62094084d145c216655d8018ea7c28486037be202245

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 OpenStudio Analysis Gem Change Log
 ==================================
 
+Version 1.0.0.rc7
+-----------------
+* Use more recent version of BCL gem for underscoring strings
+
 Version 1.0.0.pre.rc6
 ---------------------
 * When creating OSWs from batch datapoints, set the default run_directory to ./run

data/lib/openstudio/analysis/formulation.rb

@@ -128,7 +128,7 @@ module OpenStudio
 
       # return the machine name of the analysis
       def name
-        @display_name.snake_case
+        @display_name.to_underscore
       end
 
       # return a hash.

data/lib/openstudio/analysis/translator/datapoints.rb

@@ -235,7 +235,7 @@ module OpenStudio
           else
             @name = SecureRandom.uuid
           end
-          @analysis_name = @name.snake_case
+          @analysis_name = @name.to_underscore
 
           fail 'Require setting not found: measure_path' unless config_hash[:measure_paths]
           config_hash[:measure_paths] = [config_hash[:measure_paths]] unless config_hash[:measure_paths].respond_to?(:each)
@@ -266,7 +266,7 @@ module OpenStudio
             unless (Pathname.new path).absolute?
               path = File.expand_path(File.join(@root_path, path))
             end
-            @models << { name: model_name.snake_case, display_name: model_name, type: type, path: path }
+            @models << { name: model_name.to_underscore, display_name: model_name, type: type, path: path }
           end
 
           # Assign optional attributes

data/lib/openstudio/analysis/translator/excel.rb

@@ -426,9 +426,9 @@ module OpenStudio
 
             if b_settings
               @version = row[1].chomp if row[0] == 'Spreadsheet Version'
-              @settings["#{row[0].snake_case}"] = row[1] if row[0]
+              @settings["#{row[0].to_underscore}"] = row[1] if row[0]
               if @settings['cluster_name']
-                @settings['cluster_name'] = @settings['cluster_name'].snake_case
+                @settings['cluster_name'] = @settings['cluster_name'].to_underscore
               end
 
               if row[0] == 'AWS Tag'
@@ -445,7 +445,7 @@ module OpenStudio
                 else
                   @name = SecureRandom.uuid
                 end
-                @analysis_name = @name.snake_case
+                @analysis_name = @name.to_underscore
               end
               if row[0] == 'Export Directory'
                 tmp_filepath = row[1]
@@ -463,7 +463,7 @@ module OpenStudio
                   @measure_paths << File.expand_path(File.join(@root_path, tmp_filepath))
                 end
               end
-              @run_setup["#{row[0].snake_case}"] = row[1] if row[0]
+              @run_setup["#{row[0].to_underscore}"] = row[1] if row[0]
 
               # type cast
               if @run_setup['allow_multiple_jobs']
@@ -476,14 +476,14 @@ module OpenStudio
               if row[0]
                 v = row[1]
                 v.to_i if v % 1 == 0
-                @problem["#{row[0].snake_case}"] = v
+                @problem["#{row[0].to_underscore}"] = v
               end
 
             elsif b_algorithm_setup
               if row[0] && !row[0].empty?
                 v = row[1]
                 v = v.to_i if v % 1 == 0
-                @algorithm["#{row[0].snake_case}"] = v
+                @algorithm["#{row[0].to_underscore}"] = v
               end
             elsif b_weather_files
               if row[0] == 'Weather File'
@@ -506,7 +506,7 @@ module OpenStudio
                 unless (Pathname.new model_path).absolute?
                   model_path = File.expand_path(File.join(@root_path, model_path))
                 end
-                @models << { name: tmp_m_name.snake_case, display_name: tmp_m_name, type: row[2], path: model_path }
+                @models << { name: tmp_m_name.to_underscore, display_name: tmp_m_name, type: row[2], path: model_path }
               end
             elsif b_other_libs
               # determine if the path is relative
@@ -788,7 +788,7 @@ module OpenStudio
               if row[:measure_file_name_directory]
                 data['data'][measure_index]['measure_file_name_directory'] = row[:measure_file_name_directory]
               else
-                data['data'][measure_index]['measure_file_name_directory'] = row[:measure_file_name_or_var_display_name].underscore
+                data['data'][measure_index]['measure_file_name_directory'] = row[:measure_file_name_or_var_display_name].to_underscore
               end
               data['data'][measure_index]['measure_type'] = row[:measure_type_or_parameter_name_in_measure]
               data['data'][measure_index]['version'] = @version_id

data/lib/openstudio/analysis/translator/workflow.rb

@@ -52,6 +52,7 @@ module OpenStudio
             step_hash[:measure_id] = step[:uuid] if step[:uuid]
             step_hash[:version_id] = step[:version_uuid] if step[:version_uuid]
             step_hash[:description] = step[:description] if step[:description]
+            step_hash[:modeler_description] = step[:modeler_description] if step[:modeler_description]
             step_hash[:taxonomy] = step[:taxonomy] if step[:taxonomy]
             step_hash[:measure_type] = step[:measure_type]
             step_hash[:measure_type] = 'ModelMeasure' if step_hash[:measure_type] == 'RubyMeasure'

data/lib/openstudio/analysis/version.rb

@@ -1,5 +1,5 @@
 module OpenStudio
   module Analysis
-    VERSION = '1.0.0.rc6'
+    VERSION = '1.0.0.rc7'
   end
 end

data/lib/openstudio/helpers/string.rb

@@ -1,25 +1,5 @@
-# add the underscore from rails for snake_casing strings
-
-class String
-  def underscore
-    gsub(/::/, '/')
-      .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
-      .gsub(/([a-z\d])([A-Z])/, '\1_\2')
-      .tr('-', '_')
-      .downcase
-  end
-
-  def snake_case
-    return gsub(/\s/, '_').squeeze('_').downcase
-  end
-
-  def to_bool
-    return true if self == true || self =~ (/(true|t|yes|y|1)$/i)
-    return false if self == false || self =~ (/(false|f|no|n|0)$/i)
-    fail "invalid value for Boolean: '#{self}'"
-  end
-end
 
+# Typecast Variable Values by a string.
 def typecast_value(variable_type, value, inspect_string = false)
   out_value = nil
   unless value.nil?

data/openstudio-analysis.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'roo', '~> 2.4'
   s.add_dependency 'rubyzip', '~> 1.2' 
   s.add_dependency 'semantic', '~> 1.4'
-  s.add_dependency 'bcl', '~> 0.5.5'
+  s.add_dependency 'bcl', '~> 0.5.7'
   s.add_dependency 'dencity', '~> 0.1.0'
 
   s.add_development_dependency 'bundler', '~> 1.7'

data/spec/openstudio/excel_spec.rb

@@ -401,7 +401,7 @@ describe OpenStudio::Analysis::Translator::Excel do
 
     it 'should process' do
       model_uuid = @excel.models.first[:name]
-      expect(model_uuid).to match /[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/
+      expect(model_uuid).to match /[0-9a-f]{8}_[0-9a-f]{4}_[0-9a-f]{4}_[0-9a-f]{4}_[0-9a-f]{12}/
     end
 
     it 'should error out with missing measure information' do
@@ -420,7 +420,7 @@ describe OpenStudio::Analysis::Translator::Excel do
 
     it 'should process' do
       model_uuid = @excel.models.first[:name]
-      expect(model_uuid).to match /[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/
+      expect(model_uuid).to match /[0-9a-f]{8}_[0-9a-f]{4}_[0-9a-f]{4}_[0-9a-f]{4}_[0-9a-f]{12}/
     end
 
     it 'should process and save short display names' do
@@ -523,12 +523,12 @@ describe OpenStudio::Analysis::Translator::Excel do
 
     it 'should save the analysis' do
       expect { @excel.analysis }.to raise_error /There are more than one seed models defined in the excel file. Call .analyses. to return the array/
-      model_uuid = "#{@excel.name.snake_case}_#{@excel.models.first[:name]}"
+      model_uuid = "#{@excel.name.to_underscore}_#{@excel.models.first[:name]}"
 
       @excel.save_analysis # this will save all the analyses
 
       @excel.models.each do |f|
-        model_uuid = "#{@excel.name.snake_case}_#{f[:name]}"
+        model_uuid = "#{@excel.name.to_underscore}_#{f[:name]}"
         puts model_uuid
         expect(File.exist?("spec/files/export/analysis/#{model_uuid}.json")).to eq true
         expect(File.exist?("spec/files/export/analysis/#{model_uuid}.zip")).to eq true