bcl 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d33942d293d67bd8ac6595d462269ff40bf5a66e
-  data.tar.gz: 664e9df16a4f06cd0e5785f2596aaaafc3ab2dba
+  metadata.gz: 0102b8e0a960be6a451282df54e0085e1f5f0326
+  data.tar.gz: 3c2782995b885b716a487e7cdf1ea4065ae9c550
 SHA512:
-  metadata.gz: 1fa0f9dc57b106fbe903056e614f441f30af2f478cfd7e410e6270b05ef869ae959f3b26a4f988f1682c130e38668521f19c5868533a976b75dd6367dced02c3
-  data.tar.gz: 9f3bf501251c98d91674994f306d7e79b3f9c61d2785f1eb5b31f43b192d494b42977e5564f3d711a17f409edebb0307e51a43a1da7b4a3e34c92ff46afa6e76
+  metadata.gz: aeb50fb46e7813091e870a957d1b80d74c33759fad953e1fba1430b27c9bb6a33eba385ea063414407b6d8bc754135e9ab07a559618be794a6e2a15dca5f5d99
+  data.tar.gz: b31c0c600958f41b85f15c442f0a59930bc524e84b4da699be82c305856906db5e6fde8acd134bf2903d2327de4cbe06a450c4e00a3166cf0bcfebda127ba1b9

data/lib/bcl/component_methods.rb

@@ -17,19 +17,9 @@
 #  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 ######################################################################
 
-require 'rubygems'
-require 'pathname'
-require 'fileutils'
-require 'enumerator'
-require 'yaml'
-require 'base64'
 
 # required gems
-require 'json/pure'
-require 'bcl/tar_ball'
-#require 'rest-client'
 require 'net/https'
-require 'libxml'
 
 module BCL
 
@@ -41,13 +31,13 @@ module BCL
     attr_accessor :parsed_measures_path
 
     def initialize()
-      @parsed_measures_path = './measures/parsed/'
+      @parsed_measures_path = './measures/parsed'
       @config = nil
       @session = nil
       @access_token = nil
       @http = nil
       @api_version = 2.0
-      @group_id = nil 
+      @group_id = nil
 
       load_config
     end
@@ -81,7 +71,7 @@ module BCL
       if @group_id.nil?
         puts "[WARNING] You did not set a group ID in your config.yml file. You can retrieve your group ID from the node number of your group page (e.g., https://bcl.nrel.gov/node/32). Will continue, but you will not be able to upload content."
       end
-      
+
       @http = Net::HTTP.new(url, port)
       if port == 443
         @http.use_ssl = true
@@ -100,8 +90,6 @@ module BCL
       #  puts "#{key}: #{value}"
       #end
 
-      #restClient wasn't working
-      #res = RestClient.post "#{@config[:server][:url]}/api/user/login", data.to_json, :content_type => :json, :accept => :json
       if res.code == '200'
         puts "Login Successful"
 
@@ -123,7 +111,7 @@ module BCL
         #puts "DATA: #{data}"
         session_name = ""
         sessid = ""
-        json = JSON.parse(res.body)
+        json = MultiJson.load(res.body)
         json.each do |key, val|
           if key == 'session_name'
             session_name = val
@@ -175,14 +163,15 @@ module BCL
       retrieve_measures(search_term, filter_term, return_all_pages) do |measure|
         #parse and save
         parse_measure_metadata(measure)
-
       end
 
       return true
-
     end
 
-    #expects a JSON measure object
+
+    # Read the measure's information to pull out the metadata and to move into a more
+    # friendly directory name.
+    #   option measure is a JSON
     def parse_measure_metadata(measure)
 
       #check for valid measure
@@ -191,7 +180,7 @@ module BCL
         file_data = download_component(measure[:measure][:uuid])
 
         if file_data
-          save_file = File.expand_path("@{parsed_measures_path}#{measure[:measure][:name].downcase.gsub(" ", "_")}.zip")
+          save_file = File.expand_path("#{@parsed_measures_path}/#{measure[:measure][:name].downcase.gsub(" ", "_")}.zip")
           File.open(save_file, 'wb') { |f| f << file_data }
 
           #unzip file and delete zip.
@@ -201,13 +190,13 @@ module BCL
 
             # catch a weird case where there is an extra space in an unzip file structure but not in the measure.name
             if measure[:measure][:name] == "Add Daylight Sensor at Center of Spaces with a Specified Space Type Assigned"
-              if !File.exists? "#{@parsed_measures_path}#{measure[:measure][:name]}"
-                temp_dir_name = "#{@parsed_measures_path}Add Daylight Sensor at Center of  Spaces with a Specified Space Type Assigned"
-                FileUtils.move(temp_dir_name, "#{@parsed_measures_path}#{measure[:measure][:name]}")
+              if !File.exists? "#{@parsed_measures_path}/#{measure[:measure][:name]}"
+                temp_dir_name = "#{@parsed_measures_path}/Add Daylight Sensor at Center of  Spaces with a Specified Space Type Assigned"
+                FileUtils.move(temp_dir_name, "#{@parsed_measures_path}/#{measure[:measure][:name]}")
               end
             end
 
-            temp_dir_name = "#{@parsed_measures_path}#{measure[:measure][:name]}"
+            temp_dir_name = "#{@parsed_measures_path}/#{measure[:measure][:name]}"
 
             # Read the measure.rb file
             #puts "save dir name #{temp_dir_name}"
@@ -218,7 +207,7 @@ module BCL
               measure_string = File.read(measure_filename)
 
               measure_hash[:classname] = measure_string.match(/class (.*) </)[1]
-              measure_hash[:path] = "#{@parsed_measures_path}#{measure_hash[:classname]}"
+              measure_hash[:path] = "#{@parsed_measures_path}/#{measure_hash[:classname]}"
               measure_hash[:name] = measure[:measure][:name]
               if measure_string =~ /OpenStudio::Ruleset::WorkspaceUserScript/
                 measure_hash[:measure_type] = "EnergyPlusMeasure"
@@ -244,7 +233,7 @@ module BCL
                 new_arg[:variable_type] = arg[1]
                 arg_params = arg[2].split(",")
                 new_arg[:name] = arg_params[0].gsub(/"|'/, "")
-                choice_vector = arg_params[1]
+                choice_vector = arg_params[1].strip
 
                 # local variable name to get other attributes
                 new_arg[:display_name] = measure_string.match(/#{new_arg[:local_variable]}.setDisplayName\((.*)\)/)[1]
@@ -252,40 +241,52 @@ module BCL
 
                 if measure_string =~ /#{new_arg[:local_variable]}.setDefaultValue/
                   new_arg[:default_value] = measure_string.match(/#{new_arg[:local_variable]}.setDefaultValue\((.*)\)/)[1]
-                  case new_arg[:variable_type]
-                    when "Choice"
-                      # Choices to appear to only be strings?
-                      new_arg[:default_value].gsub!(/"|'/, "")
+                else
+                  puts "[WARNING] #{measure_hash[:name]}:#{new_arg[:name]} has no default value... will try to continue"
+                end
 
-                      # parse the choices from the measure
-                      choices = measure_string.scan(/#{choice_vector}.*<<.*("|')(.*)("|')/)
+                case new_arg[:variable_type]
+                  when "Choice"
+                    # Choices to appear to only be strings?
+                    puts "Choice vector appears to be #{choice_vector}"
+                    new_arg[:default_value].gsub!(/"|'/, "") if new_arg[:default_value]
 
-                      new_arg[:choices] = choices.map { |c| c[1] }
-                      # if the choices are inherited from the model, then need to just display the default value which
-                      # somehow magically works because that is the display name
-                      new_arg[:choices] << new_arg[:default_value] unless new_arg[:choices].include?(new_arg[:default_value])
-                    when "String"
-                      new_arg[:default_value].gsub!(/"|'/, "")
-                    when "Bool"
-                      new_arg[:default_value] = new_arg[:default_value].downcase == "true" ? true : false
-                    when "Integer"
-                      new_arg[:default_value] = new_arg[:default_value].to_i
-                    when "Double"
-                      new_arg[:default_value] = new_arg[:default_value].to_f
+                    # parse the choices from the measure
+                    possible_choices = measure_string.scan(/#{choice_vector}.*<<.*("|')(.*)("|')/)
+                    puts "Possible choices are #{possible_choices}"
+
+                    if possible_choices.empty?
+                      new_arg[:choices] = []
                     else
-                      raise "unknown variable type of #{new_arg[:variable_type]}"
-                  end
+                      new_arg[:choices] = possible_choices.map { |c| c[1] }
+                    end
+
+                    # if the choices are inherited from the model, then need to just display the default value which
+                    # somehow magically works because that is the display name
+                    if new_arg[:default_value]
+                      new_arg[:choices] << new_arg[:default_value] unless new_arg[:choices].include?(new_arg[:default_value])
+                    end
+                  when "String"
+                    new_arg[:default_value].gsub!(/"|'/, "") if new_arg[:default_value]
+                  when "Bool"
+                    new_arg[:default_value] = new_arg[:default_value].downcase == "true" ? true : false
+                  when "Integer"
+                    new_arg[:default_value] = new_arg[:default_value].to_i if new_arg[:default_value]
+                  when "Double"
+                    new_arg[:default_value] = new_arg[:default_value].to_f if new_arg[:default_value]
+                  else
+                    raise "unknown variable type of #{new_arg[:variable_type]}"
                 end
 
                 measure_hash[:arguments] << new_arg
               end
 
               # create a new measure.json file for parsing later if need be
-              File.open("#{measure_hash[:path]}/measure.json", 'w') { |f| f << JSON.pretty_generate(measure_hash) }
+              File.open("#{measure_hash[:path]}/measure.json", 'w') { |f| f << MultiJson.dump(measure_hash, :pretty => true) }
 
             end
           else
-            puts "Problems downloading #{measure[:measure][:name]}...moving on"
+            puts "Problems downloading #{measure[:measure][:name]}... moving on"
           end
         end
       end
@@ -355,19 +356,17 @@ module BCL
               }
 
       }
-      #restclient not working
-      #res = RestClient.post "#{@config[:server][:url]}/api/content.json", @data.to_json, :content_type => :json, :cookies => @session
 
       path = "/api/content.json"
       headers = {'Content-Type' => 'application/json', 'X-CSRF-Token' => @access_token, 'Cookie' => @session}
 
 
-      res = @http.post(path, @data.to_json, headers)
+      res = @http.post(path, MultiJson.dump(@data), headers)
 
       res_j = "could not get json from http post response"
       if res.code == '200'
         puts "200"
-        res_j = JSON.parse(res.body)
+        res_j = MultiJson.load(res.body)
         puts "  200 - Successful Upload"
         valid = true
 
@@ -455,9 +454,6 @@ module BCL
               }
       }
 
-      #restclient not working
-      #res = RestClient.post "#{@config[:server][:url]}/api/content", @data.to_json, :content_type => :json, :cookies => @session, :accept => :json   
-
       path = "/api/content.json"
       headers = {'Content-Type' => 'application/json', 'Cookie' => @session, 'X-CSRF-Token' => @access_token}
 
@@ -465,7 +461,7 @@ module BCL
 
       res_j = "could not get json from http post response"
       if res.code == '200'
-        res_j = JSON.parse(res.body)
+        res_j = MultiJson.load(res.body)
         puts "  200 - Successful Upload"
         valid = true
       elsif res.code == '404'
@@ -572,7 +568,7 @@ module BCL
         puts "search url: #{full_url}"
         res = @http.get(full_url)
         #return unparsed
-        JSON.parse(res.body, :symbolize_names => true)
+        MultiJson.load(res.body, :symbolize_keys => true)
       else
         #iterate over result pages
         #modify filter_str for show_rows=200 for maximum returns
@@ -586,14 +582,14 @@ module BCL
 
         pagecnt = 0
         continue = 1
-        results = Array.new
+        results = []
         while continue == 1
           #retrieve current page
           full_url_all = full_url + "&page=#{pagecnt}"
           puts "search url: #{full_url_all}"
           response = @http.get(full_url_all)
           #parse here so you can build results array
-          res = JSON.parse(response.body)
+          res = MultiJson.load(response.body)
 
           if res["result"].count > 0
             pagecnt += 1
@@ -606,7 +602,7 @@ module BCL
         end
         #return unparsed b/c that is what is expected
         formatted_results = {"result" => results}
-        results_to_return = JSON.parse(formatted_results.to_json, :symbolize_names => true)
+        results_to_return = MultiJson.load(MultiJson.dump(formatted_results), :symbolize_keys => true)
       end
     end
 

data/lib/bcl/component_spreadsheet.rb

@@ -20,20 +20,9 @@
 # Converts a custom Excel spreadsheet format to BCL components for upload
 # Format of the Excel spreadsheet is documented in /doc/ComponentSpreadsheet.docx
 
-require 'rubygems'
-require 'pathname'
-require 'fileutils'
-require 'date'
-
-# required gems
-require 'uuid' # gem install uuid
-require 'bcl/component_xml'
-require 'bcl/component_methods'
-require 'bcl/master_taxonomy'
-
-if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
+if RUBY_PLATFORM =~ /mswin|mingw|cygwin/
   begin
-    # apparently this is not a gem
+    # apparently this is not a gem (todo: need to remove and replace with roo)
     require 'win32ole'
     mod = WIN32OLE
     $have_win32ole = true
@@ -44,277 +33,277 @@ end
 
 module BCL
 
-WorksheetStruct = Struct.new(:name, :components)
-HeaderStruct = Struct.new(:name, :children)
-ComponentStruct = Struct.new(:row, :name, :uid, :version_id, :headers, :values)
-
-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)
+  WorksheetStruct = Struct.new(:name, :components)
+  HeaderStruct = Struct.new(:name, :children)
+  ComponentStruct = Struct.new(:row, :name, :uid, :version_id, :headers, :values)
+
+  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
-      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"
+    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
-    
-    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
+    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 == "" or filename == nil
+              #skip the file if it doesn't exist at the specified location
+              if not File.exists?(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
-              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 == "" or filename == nil
-            #skip the file if it doesn't exist at the specified location
-            if not File.exists?(filepath)
-              puts "[ComponentSpreadsheet] ERROR #{filepath} -> File does not exist, will not be included in component xml"
-              next #go to the next file
+              raise "Unknown section #{header.name}"
+
             end
-            component_xml.add_file(software_program, version, filepath, filename, filetype)
-            
-          else
-            raise "Unknown section #{header.name}"
-           
+
           end
 
+          taxonomy.check_component(component_xml)
+
+          component_xml.save_tar_gz(false)
+
         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
-    while true do 
-      test = xlsx_worksheet.Range("A#{num_rows}").Value
-      if test.nil? or test.empty?
-        num_rows -= 1
-        break
+
       end
-      num_rows += 1
+
+      BCL.gather_components(save_path, chunk_size, delete_old_gather)
+
     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 not value1.nil? and not value1.empty?
-        if not header.nil?
-          headers << header
+
+    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
+      while true do
+        test = xlsx_worksheet.Range("A#{num_rows}").Value
+        if test.nil? or test.empty?
+          num_rows -= 1
+          break
         end
-        header = HeaderStruct.new
-        header.name = value1
-        header.children = []
+        num_rows += 1
       end
-      
-      if not value2.nil? and not value2.empty?
-        if not header.nil?
-          header.children << value2
+
+      # 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 not value1.nil? and not value1.empty?
+          if not header.nil?
+            headers << header
+          end
+          header = HeaderStruct.new
+          header.name = value1
+          header.children = []
+        end
+
+        if not value2.nil? and not value2.empty?
+          if not header.nil?
+            header.children << value2
+          end
         end
+
+        if (value1.nil? or value1.empty?) and (value2.nil? or value2.empty?)
+          break
+        end
+
+        matchdata = /^\$(.+):/.match(col.Address)
+        max_col = matchdata[1]
       end
-      
-      if (value1.nil? or value1.empty?) and (value2.nil? or value2.empty?)
-        break
+
+      if not header.nil?
+        headers << header
       end
-      
-      matchdata = /^\$(.+):/.match(col.Address)
-      max_col = matchdata[1]
-    end
-    
-    if not header.nil?
-      headers << header
-    end
-    
-    if not 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? or component.uid.empty?
-        component.uid = UUID.new.generate
-        puts "#{component.name} uid missing; creating new one"
-        xlsx_worksheet.Range("B#{i}").value = component.uid     
+
+      if not 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? or 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? or 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
-      
-      # get version_id, if empty set it
-      component.version_id = xlsx_worksheet.Range("C#{i}").value
-      if component.version_id.nil? or 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
+
+      @worksheets << worksheet
+
+      puts "[ComponentSpreadsheet] Finished parsing components of type #{worksheet.name}"
+
     end
-    
-    @worksheets << worksheet
-    
-    puts "[ComponentSpreadsheet] Finished parsing components of type #{worksheet.name}"
-    
+
   end
-  
-end
 
 end # module BCL

data/lib/bcl/component_xml.rb

@@ -21,18 +21,6 @@
 # generating the component information that will be uploaded to 
 # the Building Component Library.
 
-require 'rubygems'
-require 'pathname'
-require 'fileutils'
-require 'csv'
-
-# required gems
-require 'builder'  #gem install builder (creates xml files)
-
-require 'bcl/tar_ball'
-require 'bcl/bcl_xml'
-
-
 module BCL
   class Component < BaseXml
     attr_accessor :comment

data/lib/bcl/master_taxonomy.rb

@@ -17,16 +17,9 @@
 #  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 ######################################################################
 
-require 'rubygems'
-require 'pathname'
-require 'fileutils'
-require 'rbconfig'
-
-#require gems
-require 'builder'  #gem install builder (creates xml files)
 $have_win32ole = false
 
-if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
+if RUBY_PLATFORM =~ /mswin|mingw|cygwin/
   begin
     # apparently this is not a gem
     require 'win32ole'

data/lib/bcl/measure_xml.rb

@@ -21,15 +21,6 @@
 # generating the component information that will be uploaded to
 # the Building Component Library.
 
-require 'rubygems'
-require 'pathname'
-require 'fileutils'
-require 'csv'
-
-# required gems
-require 'bcl/tar_ball'
-require 'bcl/bcl_xml'
-
 module BCL
   class Measure
     def initialize(save_path)
@@ -42,9 +33,5 @@ module BCL
 
       @xml = LibXML::XML::Document.string(xmlfile)
     end
-
-
-
   end
-
 end

data/lib/bcl/tar_ball.rb

@@ -17,11 +17,6 @@
 #  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 ######################################################################
 
-require 'rubygems'
-
-require 'archive/tar/minitar' #gem install archive-tar-minitar
-require 'zip/zip' #gem install rubyzip -v 0.9.9
-
 module BCL
 
   module_function
@@ -57,7 +52,7 @@ module BCL
 
   def create_zip(destination, paths)
 
-    Zip::ZipFile.open(zipfile_name, Zip::File::CREATE) do |zipfile|
+    Zip::File.open(zipfile_name, Zip::File::CREATE) do |zipfile|
       paths.each do |fi|
         # Two arguments:
         # - The name of the file as it will appear in the archive
@@ -69,7 +64,7 @@ module BCL
   end
 
   def extract_zip(filename, destination, delete_zip = false)
-    Zip::ZipFile.open(filename) { |zip_file|
+    Zip::File.open(filename) { |zip_file|
       zip_file.each { |f|
         f_path=File.join(destination, f.name)
         FileUtils.mkdir_p(File.dirname(f_path))

data/lib/bcl/version.rb

@@ -18,5 +18,5 @@
 ######################################################################
 
 module BCL
-  VERSION = "0.4.1"
+  VERSION = "0.5.0"
 end

data/lib/bcl.rb

@@ -1,11 +1,23 @@
+require 'pathname'
+require 'base64'
+
+# file formatters
+require 'yaml'
+require 'multi_json'
+require 'libxml'
 require 'builder'
+
+# todo: can we condense these into one?
+require 'archive/tar/minitar'
 require 'zlib'
+require 'zip'
 
+require 'bcl/bcl_xml'
 require 'bcl/component_spreadsheet'
 require 'bcl/component_xml'
 require 'bcl/component_methods'
 require 'bcl/measure_xml'
-require 'bcl/bcl_xml'
 require 'bcl/tar_ball'
 require 'bcl/master_taxonomy'
 require 'bcl/version'
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bcl
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Daniel Macumber
@@ -70,7 +70,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json_pure
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -84,7 +84,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: libxml-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -98,7 +98,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: libxml-ruby
+  name: yamler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -112,7 +112,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yamler
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -126,7 +126,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: roo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -140,61 +140,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubyzip
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.9
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.9
-- !ruby/object:Gem::Dependency
-  name: mime-types
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.25.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.25.1
-- !ruby/object:Gem::Dependency
-  name: roo
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.10.3
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.10.3
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.5.10
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.5.10
+        version: '0'
 description: This gem contains helper methods for generating the Component XML file
   needed to upload files to the Building Component Library. It also contains the classes
   needed for logging in via the api and uploading generating components
@@ -226,7 +198,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='