openstudio-analysis 1.0.0.rc15 → 1.0.0.rc16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0067d3a4d72f588dd1f5a981c3e44592675c44eb
-  data.tar.gz: 98d4be34b9a8d2a99d0dc3dd9ee1fb4e450948ed
+  metadata.gz: b7a9dc756ad836c27c5786fb07041f602361681d
+  data.tar.gz: 1262bd15996a76a48e96d742b9018b9511c62009
 SHA512:
-  metadata.gz: 47d669f0e282ce5da24926c09fbaa0bb585cac6cce70f50eeae54fd58487753f5133127621d9c9d52c23646140701d0c97dca535a88454164da194534a475a19
-  data.tar.gz: 9e5c4a0d82c7ea242b1580980fcbcf78bde6c849d1eef6222bbdc341e14a729c60bcbf8b847ed7c0068c318f48dd0c2f422554739f4c1a3829f0ef119cd31c43
+  metadata.gz: 182e6bb29ee7271ea6d3ca0341ca54407885f2de631941ce795bd8bf6215a608b9d985f5ba90478da8dbdb6d68349159749280ed3c3f22fdb3254a6db804c29b
+  data.tar.gz: 76418bfdbbda8d2185f25e8cfd0651047591e5eedac908d3707fffefdca84e43af74f22b2505d5f46d09ddcad30e9da3578a256ec837afc46b59a6884f218fe6

data/lib/openstudio/analysis/server_api.rb

@@ -172,6 +172,8 @@ module OpenStudio
             j = JSON.parse resp.body, symbolize_names: true
             if j && j[:analysis] && j[:analysis][:analysis_type] == analysis_type
               status = j[:analysis][:status]
+            elsif j && j[:analysis] && analysis_type == 'batch_run'
+              status = j[:analysis][:status]
             end
           end
         end
@@ -295,13 +297,22 @@ module OpenStudio
         downloaded = false
         file_path_and_name = nil
 
-        response = @conn.get "/data_points/#{datapoint_id}/download"
+        response = @conn.get "/data_points/#{datapoint_id}/download_result_file?filename=data_point.zip"
         if response.status == 200
           filename = response['content-disposition'].match(/filename=(\"?)(.+)\1/)[2]
           downloaded = true
           file_path_and_name = "#{save_directory}/#{filename}"
           puts "File #{filename} already exists, overwriting" if File.exist?(file_path_and_name)
           File.open(file_path_and_name, 'wb') { |f| f << response.body }
+        else
+          response = @conn.get "/data_points/#{datapoint_id}/download"
+          if response.status == 200
+            filename = response['content-disposition'].match(/filename=(\"?)(.+)\1/)[2]
+            downloaded = true
+            file_path_and_name = "#{save_directory}/#{filename}"
+            puts "File #{filename} already exists, overwriting" if File.exist?(file_path_and_name)
+            File.open(file_path_and_name, 'wb') { |f| f << response.body }
+          end
         end
 
         [downloaded, file_path_and_name]

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

@@ -702,7 +702,6 @@ module OpenStudio
           variable_index = -1
           measure_name = nil
           rows.each_with_index do |row, icnt|
-            next if icnt < 1 # skip the first line after the header
             # puts "Parsing line: #{icnt}:#{row}"
 
             # check if we are a measure - nil means that the cell was blank

data/lib/openstudio/analysis/version.rb

@@ -1,5 +1,5 @@
 module OpenStudio
   module Analysis
-    VERSION = '1.0.0.rc15'.freeze
+    VERSION = '1.0.0.rc16'.freeze
   end
 end

data/openstudio-analysis.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_dependency 'faraday', '~> 0.8'
-  s.add_dependency 'nokogiri', '~> 1.6'
+  s.add_dependency 'nokogiri', '~> 1.6.8'
   s.add_dependency 'roo', '~> 2.4'
   s.add_dependency 'rubyzip', '~> 1.2'
   s.add_dependency 'semantic', '~> 1.4'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openstudio-analysis
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc15
+  version: 1.0.0.rc16
 platform: ruby
 authors:
 - Nicholas Long
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-08 00:00:00.000000000 Z
+date: 2017-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 1.6.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 1.6.8
 - !ruby/object:Gem::Dependency
   name: roo
   requirement: !ruby/object:Gem::Requirement