bcl 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10d084384705465f95b8b328994161d836c98c83
-  data.tar.gz: ffdd20227e95f5b995f0c1bf0f228af53b287bc3
+  metadata.gz: cbd79659281ee21204429f1a34bb6f5d65ce7feb
+  data.tar.gz: 6dd76b45e44bddd5b2783fe25247aa8a52c51e64
 SHA512:
-  metadata.gz: 19cfe476429d53381ff893040138977fddd2a9a6aab330f965e012c7dc346ee61624fc522aa13c92e7dd9df1bd16ab5cb9b7cb278d9ef8c68e64ed5920a3f5e6
-  data.tar.gz: 55a8758853dd04845cfbcd9fce45187a63970d87c4f734bbca024322346d7ddc9b2051d80620e5a8d7b1448e9bdf369262e62967e2ea69150ea464bc7fdf7e86
+  metadata.gz: 9495c30a31a7c3ed00adb152dd484c38614b7c43266d613980a56e7572a586e1427234199ccfac79277507515627dd75c292abcc93991c7f96f842786bdc35e0
+  data.tar.gz: 3133b42d0e3c1e33790e5d56c843d881405c9ceaf62abefb79c356184a89c20317aa7b0c969a5525424c251ebe4b53108955bebcefca9afe564a35726826a922

data/lib/bcl.rb

@@ -1,3 +1,6 @@
+require 'builder'
+require 'zlib'
+
 require 'bcl/component_spreadsheet'
 require 'bcl/component_xml'
 require 'bcl/component_methods'
@@ -5,5 +8,4 @@ require 'bcl/measure_xml'
 require 'bcl/bcl_xml'
 require 'bcl/tar_ball'
 require 'bcl/master_taxonomy'
-require 'bcl/mongo_to_component'
-require 'bcl/version'
+require 'bcl/version'

data/lib/bcl/component_methods.rb

@@ -38,36 +38,22 @@ module BCL
     attr_accessor :config
     attr_accessor :session
     attr_accessor :http
+    attr_accessor :parsed_measures_path
 
     def initialize(group_id = nil)
+      @parsed_measures_path = './measures/parsed/'
       @config = nil
       @session = nil
       @access_token = nil
       @http = nil
       @api_version = 2.0
-      #set group to NREL (32) if nil
-      @group_id = group_id.nil? ? 32 : group_id
-      config_path = File.expand_path('~') + '/.bcl'
-      config_name = 'config.yml'
-      if File.exists?(config_path + "/" + config_name)
-        puts "loading config settings from #{config_path + "/" + config_name}"
-        @config = YAML.load_file(config_path + "/" + config_name)
-      else
-        #location of template file
-        FileUtils.mkdir_p(config_path)
-        File.open(config_path + "/" + config_name, 'w') do |file|
-          file << default_yaml.to_yaml
-        end
-        puts "******** Please fill in user credentials in #{config_path}/#{config_name} file.  DO NOT COMMIT THIS FILE. **********"
-      end
+      @group_id = group_id.nil? ? 32 : group_id #set group to NREL (32) if nil
 
+      
+      load_config
     end
 
-    def default_yaml
-      settings = {:server => {:url => "https://bcl.nrel.gov", :user => {:username => "ENTER_BCL_USERNAME", :password => "ENTER_BCL_PASSWORD"}}}
-
-      settings
-    end
+    
 
 
     def login(username=nil, password=nil, url=nil)
@@ -159,8 +145,8 @@ module BCL
           puts "error info: #{access_token.body}"
         end
 
-        #puts "access_token = *#{@access_token}*" 
-        #puts "cookie = #{@session}"
+        #puts "access_token = *#{@access_token}*"
+        # puts "cookie = #{@session}"
 
         res
       else
@@ -173,6 +159,163 @@ module BCL
       end
     end
 
+    #retrieve, parse, and save metadata for BCL measures
+    def measure_metadata(search_term = nil, filter_term=nil, return_all_pages = false)
+
+      #setup results directory
+      if !Dir.exists?(@parsed_measures_path)
+        FileUtils.mkdir_p(@parsed_measures_path)
+      end
+      puts "...storing parsed metadata in #{@parsed_measures_path}"
+
+      #retrieve measures
+      puts "retrieving measures that match search_term: #{search_term.nil? ? "nil":search_term} and filters: #{filter_term.nil? ? "nil":filter_term}"
+      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
+    def parse_measure_metadata(measure)
+
+      #check for valid measure
+      if measure[:measure][:name] && measure[:measure][:uuid]
+
+        file_data = download_component(measure[:measure][:uuid])
+
+        if file_data
+          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.
+          #TODO check that something was downloaded here before extracting zip
+          if File.exists?(save_file)
+            BCL.extract_zip(save_file, @parsed_measures_path, true)
+
+            # 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]}")
+              end
+            end
+
+            temp_dir_name = "#{@parsed_measures_path}#{measure[:measure][:name]}"
+
+            # Read the measure.rb file
+            #puts "save dir name #{temp_dir_name}"
+            measure_filename = "#{temp_dir_name}/measure.rb"
+            if File.exists?(measure_filename)
+              measure_hash = {}
+              # read in the measure file and extract some information
+              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[:name] = measure[:measure][:name]
+              if measure_string =~ /OpenStudio::Ruleset::WorkspaceUserScript/
+                measure_hash[:measure_type] = "EnergyPlusMeasure"
+              elsif measure_string =~ /OpenStudio::Ruleset::ModelUserScript/
+                measure_hash[:measure_type] = "RubyMeasure"
+              elsif measure_string =~ /OpenStudio::Ruleset::ReportingUserScript/
+                measure_hash[:measure_type] = "ReportingMeasure"
+              else
+                raise "measure type is unknown with an inherited class in #{measure_filename}: #{measure_hash.inspect}"
+              end
+
+              # move the directory to the class name
+              FileUtils.rm_rf(measure_hash[:path]) if Dir.exists?(measure_hash[:path]) && temp_dir_name != measure_hash[:path]
+              FileUtils.move(temp_dir_name, measure_hash[:path]) unless temp_dir_name == measure_hash[:path]
+
+              measure_hash[:arguments] = []
+
+              args = measure_string.scan(/(.*).*=.*OpenStudio::Ruleset::OSArgument::make(.*)Argument\((.*).*\)/)
+              #puts "found #{args.size} arguments for measure '#{measure[:measure][:name]}'"
+              args.each do |arg|
+                new_arg = {}
+                new_arg[:local_variable] = arg[0].strip
+                new_arg[:variable_type] = arg[1]
+                arg_params = arg[2].split(",")
+                new_arg[:name] = arg_params[0].gsub(/"|'/, "")
+                choice_vector = arg_params[1]
+
+                # local variable name to get other attributes
+                new_arg[:display_name] = measure_string.match(/#{new_arg[:local_variable]}.setDisplayName\((.*)\)/)[1]
+                new_arg[:display_name].gsub!(/"|'/, "") if new_arg[:display_name]
+
+                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!(/"|'/, "")
+
+                      # parse the choices from the measure
+                      choices = measure_string.scan(/#{choice_vector}.*<<.*("|')(.*)("|')/)
+
+                      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
+                    else
+                      raise "unknown variable type of #{new_arg[:variable_type]}"
+                  end
+                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) }
+
+            end
+          else
+            puts "Problems downloading #{measure[:measure][:name]}...moving on"
+          end
+        end
+      end
+    end
+
+    # retrieve measures for parsing metadata.
+    # specify a search term to narrow down search or leave nil to retrieve all
+    # set all_pages to true to iterate over all pages of results
+    # can't specify filters other than the hard-coded bundle and show_rows
+    def retrieve_measures(search_term = nil, filter_term=nil, return_all_pages = false, &block)
+      #raise "Please login before performing this action" if @session.nil?
+
+      #make sure filter_term includes bundle
+      if filter_term.nil?
+        filter_term = "fq[]=bundle%3Anrel_measure"
+      elsif !filter_term.include? "bundle"
+        filter_term = filter_term + "&fq[]=bundle%3Anrel_measure"
+      end
+
+
+      # use provided search term or nil.
+      # if return_all_pages is true, iterate over pages of API results. Otherwise only return first 100
+      results = search(search_term, filter_term, return_all_pages)
+      puts "#{results[:result].count} results returned"
+
+      results[:result].each do |result|
+        puts "retrieving measure: #{result[:measure][:name]}"
+        yield result
+      end
+
+    end
+
     # pushes component to the bcl and publishes them (if logged-in as BCL Website Admin user).
     # username and password set in ~/.bcl/config.yml file
     def push_content(filename_and_path, write_receipt_file, content_type)
@@ -196,10 +339,10 @@ module BCL
           "node" =>
               {
                   "type" => "#{content_type}",
-                  #"field_component_tags" =>  #TODO remove this field_component_tags once BCL is fixed
-                  #  {
-                  #    "und" => "1289"
-                  #  },
+                  "field_component_tags" =>  #TODO remove this field_component_tags once BCL is fixed
+                    {
+                      "und" => "1289"
+                    },
                   "og_group_ref" =>
                       {
                           "und" =>
@@ -215,14 +358,17 @@ module BCL
 
       path = "/api/content.json"
       headers = {'Content-Type' => 'application/json', 'X-CSRF-Token' => @access_token, 'Cookie' => @session}
-      #puts headers.inspect
+
+
       res = @http.post(path, @data.to_json, headers)
 
       res_j = "could not get json from http post response"
       if res.code == '200'
+        puts "200"
         res_j = JSON.parse(res.body)
         puts "  200 - Successful Upload"
         valid = true
+
       elsif res.code == '404'
         puts "  error code: #{res.code} - #{res.body}"
         puts "  404 - check these common causes first:"
@@ -249,6 +395,7 @@ module BCL
       end
 
       [valid, res_j]
+
     end
 
     def push_contents(array_of_components, skip_files_with_receipts, content_type)
@@ -293,10 +440,10 @@ module BCL
           "node" =>
               {
                   "uuid" => "#{uuid}",
-                  #"field_component_tags" =>  #TODO remove this field_component_tags once BCL is fixed
-                  #  {
-                  #    "und" => "1289"
-                  #  },
+                  "field_component_tags" => #TODO remove this field_component_tags once BCL is fixed
+                      {
+                          "und" => "1289"
+                      },
                   "og_group_ref" =>
                       {
                           "und" =>
@@ -375,7 +522,7 @@ module BCL
           else
             log_message = "pushing updated content #{File.basename(comp)}"
             puts log_message
-            valid, res = update_content(comp, true, uuid, @group_id)
+            valid, res = update_content(comp, true, uuid)
             log_message += " #{valid} #{res.inspect.chomp}"
           end
         end
@@ -384,28 +531,84 @@ module BCL
       logs
     end
 
-    # Simple method to search bcl and return the result as an XML object
-    def search(search_str=nil, filter_str=nil)
-      full_url = "/api/search.json"
+    # Simple method to search bcl and return the result as hash with symbols
+    # If all = true, iterate over pages of results and return all
+    # JSON ONLY
+    def search(search_str=nil, filter_str=nil, all=false)
+      full_url = "/api/search/"
 
       #add search term
-      if !search_str.nil?
-        full_url = full_url + "/" + search_str
+      if !search_str.nil? and search_str != ""
+        full_url = full_url + search_str
+        #strip out xml in case it's included. make sure .json is included
+        full_url = full_url.gsub('.xml', '')
+        unless search_str.include? ".json"
+          full_url = full_url + ".json"
+        end
+      else
+        full_url = full_url + "*.json"
       end
+
       #add api_version
+      if @api_version < 2.0
+        puts "WARNING:  attempting to use search with api_version #{@api_version}. Use API v2.0 for this functionality."
+      end
       full_url = full_url + "?api_version=#{@api_version}"
+
       #add filters
       if !filter_str.nil?
+        #strip out api_version from filters, if included
+        if filter_str.include? "api_version="
+          filter_str = filter_str.gsub(/api_version=\d{1,}/, '')
+          filter_str = filter_str.gsub(/&api_version=\d{1,}/, '')
+        end
         full_url = full_url + "&" + filter_str
       end
 
-      res = @http.get(full_url)
-
-      #retrieve in json
-      res.body
+      #simple search vs. all results
+      if !all
+        puts "search url: #{full_url}"
+        res = @http.get(full_url)
+        #return unparsed
+        JSON.parse(res.body, :symbolize_names => true)
+      else
+        #iterate over result pages
+        #modify filter_str for show_rows=200 for maximum returns
+        if filter_str.include? "show_rows="
+          full_url = full_url.gsub(/show_rows=\d{1,}/, "show_rows=200")
+        else
+          full_url = full_url + "&show_rows=200"
+        end
+        #make sure filter_str doesn't already have a page=x
+        full_url.gsub(/page=\d{1,}/, '')
+
+        pagecnt = 0
+        continue = 1
+        results = Array.new
+        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)
+
+          if res["result"].count > 0
+            pagecnt += 1
+            res["result"].each do |r|
+              results << r
+            end
+          else
+            continue = 0
+          end
+        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)
+      end
     end
 
-    # Delete receipt files
+     # Delete receipt files
     def delete_receipts(array_of_components)
       array_of_components.each do |comp|
         receipt_file = File.dirname(comp) + "/" + File.basename(comp, '.tar.gz') + ".receipt"
@@ -417,21 +620,59 @@ module BCL
     end
 
     def list_all_measures()
-      json = JSON.parse(search(nil, "f[0]=bundle%3Anrel_measure&show_rows=100"), :symbolize_names => true)
+      json = search(nil, "fq[]=bundle%3Anrel_measure&show_rows=100")
       
       json
     end
-    
+
     def download_component(uid)
-      result = @http.get("/api/component/download?uids=#{uid}")
-      
-      #https://bcl.nrel.gov/api/component/download?uids=a667a52f-aa04-4997-9292-c81671d75f84
-      result.body ? result.body : nil
+
+      begin
+        result = @http.get("/api/component/download?uids=#{uid}")
+        puts "DOWNLOADING: /api/component/download?uids=#{uid}"
+        #puts "RESULTS: #{result.inspect}"
+        #puts "RESULTS BODY: #{result.body}"
+
+        #look at response code
+        if result.code == '200'
+          puts "Download Successful"
+          result.body ? result.body : nil
+        else
+          puts "Download fail. Error code #{result.code}"
+          nil
+        end
+
+      rescue
+        puts "Couldn't download uid(s): #{uid}...skipping"
+        nil
+      end
+
     end
 
+    private
+
+    def load_config()
+      config_filename = File.expand_path("~/.bcl/config.yml")
+
+      if File.exists?(config_filename)
+        puts "loading config settings from #{config_filename}"
+        @config = YAML.load_file(config_filename)
+      else
+        #location of template file
+        FileUtils.mkdir_p(File.dirname(config_filename))
+        File.open(config_filename, 'w') { |f| f << default_yaml.to_yaml }
+        File.chmod(0600, config_filename)
+        puts "******** Please fill in user credentials in #{config_filename} file if you need to upload data **********"
+      end
+    end
+    
+    def default_yaml
+      settings = {:server => {:url => "https://bcl.nrel.gov", :user => {:username => "ENTER_BCL_USERNAME", :password => "ENTER_BCL_PASSWORD"}}}
+
+      settings
+    end
   end #class ComponentMethods
 
-  
 
   # TODO make this extend the component_xml class (or create a super class around components)
 
@@ -495,4 +736,5 @@ module BCL
 
   end
 
+
 end # module BCL

data/lib/bcl/component_xml.rb

@@ -383,4 +383,4 @@ module BCL
     end
   end
 
-end # module BCL
+end # module BCL

data/lib/bcl/measure_xml.rb

@@ -27,12 +27,10 @@ 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 Measure
     def initialize(save_path)
       super(save_path)
@@ -43,12 +41,10 @@ module BCL
       xmlfile = File.open(filepath, 'r').read
 
       @xml = LibXML::XML::Document.string(xmlfile)
-
-
     end
 
 
 
   end
 
-end
+end

data/lib/bcl/tar_ball.rb

@@ -1,4 +1,4 @@
-######################################################################
+  ######################################################################
 #  Copyright (c) 2008-2013, Alliance for Sustainable Energy.
 #  All rights reserved.
 #  
@@ -19,8 +19,8 @@
 
 require 'rubygems'
 
-require 'zlib' #gem install zliby # need to convert this to another library (this is olllld)
 require 'archive/tar/minitar' #gem install archive-tar-minitar
+require 'zip/zip' #gem install rubyzip -v 0.9.9
 
 module BCL
 
@@ -55,4 +55,33 @@ module BCL
     }
   end
 
+  def create_zip(destination, paths)
+
+    Zip::ZipFile.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
+        # - The original file, including the path to find it
+        zipfile.add(fi.basename, fi)
+      end
+    end
+
+  end
+
+  def extract_zip(filename, destination, delete_zip = false)
+    Zip::ZipFile.open(filename) { |zip_file|
+      zip_file.each { |f|
+        f_path=File.join(destination, f.name)
+        FileUtils.mkdir_p(File.dirname(f_path))
+        zip_file.extract(f, f_path) unless File.exist?(f_path)
+      }
+    }
+
+    if delete_zip
+      fileList = Array.new
+      fileList << filename
+      FileUtils.rm(fileList)
+    end
+  end
+
 end # module BCL

data/lib/bcl/version.rb

@@ -18,5 +18,5 @@
 ######################################################################
 
 module BCL
-  VERSION = "0.3.7"
+  VERSION = "0.3.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bcl
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - Daniel Macumber
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-19 00:00:00.000000000 Z
+date: 2014-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuid
@@ -69,20 +69,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: mongo
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: json_pure
   requirement: !ruby/object:Gem::Requirement
@@ -141,7 +127,6 @@ files:
 - lib/bcl/current_taxonomy.xml
 - lib/bcl/master_taxonomy.rb
 - lib/bcl/measure_xml.rb
-- lib/bcl/mongo_to_component.rb
 - lib/bcl/tar_ball.rb
 - lib/bcl/version.rb
 - lib/bcl.rb
@@ -165,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Classes for creating component XML files for the BCL

data/lib/bcl/mongo_to_component.rb

@@ -1,114 +0,0 @@
-######################################################################
-#  Copyright (c) 2008-2013, 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
-######################################################################
-
-#Mongo Record to Component
-require 'bcl/component_xml'
-
-module BCL
-  class MongoToComponent
-    attr_accessor :component
-    attr_accessor :error_message
-
-      def initialize(record)
-      @component = nil
-      @error_message = ""
-
-      if record.has_key? "general"
-        @component = BCL::Component.new('tmp')
-        general = record["general"]
-
-        #add uid/vid
-        if record.has_key? "unique_id"
-          component.uid = record["unique_id"]
-        else
-          @error_message = "Invalid Mongo record: no unique_id"
-        end
-        if record.has_key? "version_id"
-          component.comp_version_id = record["version_id"]
-        else
-          @error_message = "Invalid Mongo record: no version_id"
-        end
-
-        #add general info
-        if general.has_key? "name"
-          component.name = general["name"]
-        end
-        if general.has_key? "description"
-          @component.description = general["description"]
-        end
-        if general.has_key? "fidelity_level"
-          @component.fidelity_level = general["fidelity_level"]
-        end
-        if general.has_key? "source_manufacturer"
-          @component.source_manufacturer = general["source_manufacturer"]
-        end
-        if general.has_key? "source_url"
-          @component.source_url = general["source_url"]
-        end
-
-        #add tags
-        if general.has_key? "tags"
-          tags = general["tags"]
-          tags.each do |name,value|
-            @component.add_tag(value)
-          end
-        end
-
-        #add attributes
-        if general.has_key? "attributes"
-          attribute_container = general["attributes"]
-          attribute_container.each do |a,attributes|
-            #attributes iterator is an array of hashes
-            #NOTE: double check this...could be old messed-up structure?
-            attributes.each do |attribute|
-              name = ""
-              units = ""
-              value = ""
-              datatype = ""
-              if attribute.has_key? "name"
-                name = attribute["name"]
-              end
-              if attribute.has_key? "value"
-                value = attribute["value"]
-              end
-              if attribute.has_key? "units"
-                units = attribute["units"]
-              end
-              @component.add_attribute(name, value, units)
-
-              #TODO: eventually find a way to validate the datatype in record with datatype in component
-            end
-          end
-        end
-
-        #todo: add provenance
-
-      else
-        @error_message = "Invalid Mongo record: no 'general' section"
-      end
-      #set component to NIL if there were errors
-      if !@error_message == nil
-        @component = nil
-      end
-    end
-
-  end
-
-end # module BCL
-