earth 0.11.11 → 0.11.12

data/earth.gemspec

@@ -5,7 +5,7 @@ require "earth/version"
 Gem::Specification.new do |s|
   s.name        = "earth"
   s.version     = Earth::VERSION
-  s.date = "2012-02-15"
+  s.date = "2012-02-20"
   s.platform    = Gem::Platform::RUBY
   s.authors = ["Seamus Abshere", "Derek Kastner", "Andy Rossmeissl"]
   s.email = %q{andy@rossmeissl.net}

data/lib/earth/air/flight_distance_class_seat_class.rb

@@ -1,6 +1,9 @@
 class FlightDistanceClassSeatClass < ActiveRecord::Base
   self.primary_key = "name"
   
+  belongs_to :seat_class, :class_name => 'FlightSeatClass', :foreign_key => 'seat_class_name'
+  belongs_to :distance_class, :class_name => 'FlightDistanceClass', :foreign_key => 'distance_class_name'
+  
   falls_back_on :name => 'fallback',
                 :multiplier => 1.0
   

data/lib/earth/conversions_ext.rb

@@ -76,13 +76,13 @@ Conversions.register :kbtus,          :joules,             (1_000.0 * 1_055.0558
 Conversions.register :watt_hours,     :joules,             3_600.0
 Conversions.register :kilowatt_hours, :joules,             3_600_000.0
 
-# Odd units for CBECS
+# Odd units for CBECS 2003
 Conversions.register :trillion_btus_per_million_square_feet, :megajoules_per_square_metre,     (1.trillion_btus.to(:megajoules) / 1.square_feet.to(:square_metres))
 Conversions.register :kilowatt_hours_per_square_foot, :megajoules_per_square_metre,            (1.kilowatt_hours.to(:megajoules) / 1.square_feet.to(:square_metres))
 Conversions.register :billion_cubic_feet_of_natural_gas, :megajoules,                          (1_000_000_000.cubic_feet.to(:cubic_metres) * 38.3395) # 2003 NatGas energy content MJ/m3
 Conversions.register :cubic_feet_of_natural_gas_per_square_foot, :megajoules_per_square_metre, ((1.cubic_feet.to(:cubic_metres) * 38.3395) / 1.square_feet.to(:square_metres))
-Conversions.register :million_gallons_of_fuel_oil, :megajoules,                                (1_000_000.gallons.to(:litres) * 39.0136) # Residual Fuel Oil energy content MJ/l from Fuels
-Conversions.register :gallons_of_fuel_oil_per_square_foot, :megajoules_per_square_metre,       ((39.0136 * 1.gallons.to(:litres)) / 1.square_feet.to(:square_metres))
+Conversions.register :million_gallons_of_fuel_oil, :megajoules,                                (1_000_000.gallons.to(:litres) * 41.9203) # Residual Fuel Oil No. 6 energy content MJ/l from Fuels
+Conversions.register :gallons_of_fuel_oil_per_square_foot, :megajoules_per_square_metre,       ((41.9203 * 1.gallons.to(:litres)) / 1.square_feet.to(:square_metres))
 
 # Only used in app1
 Conversions.register(:pounds_per_gallon, :kilograms_per_litre, 0.119826427) # only used in app1

data/lib/earth/industry/cbecs_energy_intensity.rb

@@ -41,18 +41,57 @@ class CbecsEnergyIntensity < ActiveRecord::Base
   scope :regional, where('census_region_number IS NOT NULL AND census_division_number IS NULL')
   scope :national, where(:census_region_number => nil, :census_division_number => nil)
 
+  FUELS = {
+    :electricity => { 
+      :consumption => :billion_kilowatt_hours,
+      :intensity => :kilowatt_hours_per_square_foot,
+      :set => 10
+    },
+    :natural_gas => { 
+      :consumption => :billion_cubic_feet_of_natural_gas,
+      :intensity => :cubic_feet_of_natural_gas_per_square_foot,
+      :set => 11
+    },
+    :fuel_oil => { 
+      :consumption => :million_gallons_of_fuel_oil,
+      :intensity => :gallons_of_fuel_oil_per_square_foot,
+      :set => 12
+    },
+    :district_heat => { 
+      :consumption => :trillion_btu,
+      :intensity => :trillion_btu_per_million_square_feet,
+      :set => 13
+    }
+  }
+  
+  # Find the first record whose naics_code matches code.
+  # If no record found chop off the last character of code and try again, and so on.
+  def self.find_by_naics_code(code)
+    find_by_naics_code_and_census_field(code, :census_region_number, nil)
+  end
+  
+  # Find the first record whose census_region_number matches number and whose naics_code matches code.
+  # If no record found chop off the last character of code and try again, and so on.
+  def self.find_by_naics_code_and_census_region_number(code, number)
+    find_by_naics_code_and_census_field(code, :census_region_number, number)
+  end
+  
   # Find the first record whose census_division_number matches number and whose naics_code matches code.
   # If no record found chop off the last character of code and try again, and so on.
   def self.find_by_naics_code_and_census_division_number(code, number)
+    find_by_naics_code_and_census_field(code, :census_division_number, number)
+  end
+  
+  def self.find_by_naics_code_and_census_field(code, field, number)
     if code.blank?
       record = nil
     else
-      record = where('census_division_number = ? AND naics_code = ?', number, code).first
-      record ||= find_by_naics_code_and_census_division_number(code[0..-2], number)
+      record = where(field => number, :naics_code => code).first
+      record ||= find_by_naics_code_and_census_field(code[0..-2], field, number)
     end
     record
   end
-
+  
   def fuel_ratios
     energy = 0
     FUELS.keys.each { |fuel| energy += send(fuel).to_f }

data/lib/earth/industry/cbecs_energy_intensity/data_miner.rb

@@ -3,29 +3,6 @@ require 'earth/industry'
 require 'earth/locality/data_miner'
 
 CbecsEnergyIntensity.class_eval do
-  const_set :FUELS, {
-    :electricity => { 
-      :consumption => :billion_kilowatt_hours,
-      :intensity => :kilowatt_hours_per_square_foot,
-      :set => 10
-    },
-    :natural_gas => { 
-      :consumption => :billion_cubic_feet_of_natural_gas,
-      :intensity => :cubic_feet_of_natural_gas_per_square_foot,
-      :set => 11
-    },
-    :fuel_oil => { 
-      :consumption => :million_gallons_of_fuel_oil,
-      :intensity => :gallons_of_fuel_oil_per_square_foot,
-      :set => 12
-    },
-    :district_heat => { 
-      :consumption => :trillion_btu,
-      :intensity => :trillion_btu_per_million_square_feet,
-      :set => 13
-    }
-  }
-
   const_set(:CBECS, {
     :region_tables => {
       :electricity => 'c15',

data/lib/earth/industry/industry.rb

@@ -1,4 +1,6 @@
 require 'earth/locality'
+
+# TODO replace this with NAICS 2002?
 class Industry < ActiveRecord::Base
   self.primary_key = "naics_code"
   
@@ -12,13 +14,13 @@ class Industry < ActiveRecord::Base
   
   col :naics_code
   col :description
-
+  
   class << self
     def format_naics_code(input)
       "%d" % input.to_i
     end
   end
-
+  
   def trade_industry?
     prefix = naics_code.to_s[0,2]
     %w{42 44 45}.include?(prefix)

data/lib/earth/industry/mecs_energy.rb

@@ -28,6 +28,12 @@ class MecsEnergy < ActiveRecord::Base
   FUELS = [:electricity, :residual_fuel_oil, :distillate_fuel_oil,
            :natural_gas, :lpg_and_ngl, :coal, :coke_and_breeze, :other_fuel]
   
+   # Find the first record whose naics_code matches code.
+   # If no record found chop off the last character of code and try again, and so on.
+   def self.find_by_naics_code(code)
+     find_by_naics_code_and_census_region_number(code, nil)
+   end
+   
   # Find the first record whose census_region_number matches number and whose naics_code matches code.
   # If no record found chop off the last character of code and try again, and so on.
   def self.find_by_naics_code_and_census_region_number(code, number)
@@ -35,16 +41,22 @@ class MecsEnergy < ActiveRecord::Base
       record = nil
     else
       code = Industry.format_naics_code code
-      record = where('census_region_number = ? AND naics_code = ?', number, code).first
+      record = where(:census_region_number => number, :naics_code => code).first
       record ||= find_by_naics_code_and_census_region_number(code[0..-2], number)
     end
     record
   end
   
+  # TODO make this less paranoid
+  # for now only return a ratio if no fuels are nil and at least one fuel is nonzero
   def fuel_ratios
-    FUELS.inject({}) do |ratios, fuel|
-      ratios[fuel] = send("#{fuel}").to_f / energy.to_f
-      ratios
+    if energy.to_f > 0 # return nil if energy is nil or 0
+      ratios = FUELS.inject({}) do |r, fuel|
+        fuel_use = send("#{fuel}")
+        r[fuel] = fuel_use.present? ? fuel_use / energy : nil
+        r
+      end
+      ratios unless ratios.values.include? nil or ratios.values.all?(&:zero?) # return nil if any fuel uses were missing or all fuel uses were zero
     end
   end
 end

data/lib/earth/industry/mecs_ratio.rb

@@ -12,14 +12,20 @@ class MecsRatio < ActiveRecord::Base
   col :energy_per_dollar_of_shipments, :type => :float
   col :energy_per_dollar_of_shipments_units
   
-  # Find the first MecsRatio whose census_region_number matches number and whose naics_code matches code.
+  # Find the first record whose naics_code matches code.
+  # If no record found chop off the last character of code and try again, and so on.
+  def self.find_by_naics_code(code)
+    find_by_naics_code_and_census_region_number(code, nil)
+  end
+  
+  # Find the first record whose census_region_number matches number and whose naics_code matches code.
   # If none found, chop off the last character of code and try again, and so on.
   def self.find_by_naics_code_and_census_region_number(code, number)
     if code.blank?
       record = nil
     else
       code = Industry.format_naics_code code
-      record = where('census_region_number = ? AND naics_code = ?', number, code).first
+      record = where(:census_region_number => number, :naics_code => code).first
       record ||= find_by_naics_code_and_census_region_number(code[0..-2], number)
     end
     record

data/lib/earth/industry/naics_2002.rb

@@ -0,0 +1,15 @@
+class Naics2002 < ActiveRecord::Base
+  self.primary_key = "code"
+  self.table_name = "naics_2002"
+  
+  belongs_to :industry, :foreign_key => :code
+  
+  has_many :naics_2002_sic_1987_concordances, :foreign_key => :naics_2002_code
+  has_many :sic_1987, :through => :naics_2002_sic_1987_concordances
+  
+  has_many :naics_2002_naics_2007_concordances, :foreign_key => :naics_2002_code
+  has_many :naics_2007, :through => :naics_2002_naics_2007_concordances
+  
+  col :code
+  col :description
+end

data/lib/earth/industry/naics_2002/data_miner.rb

@@ -0,0 +1,12 @@
+Naics2002.class_eval do
+  data_miner do
+    import "the U.S. Census 2002 NAICS code list",
+           :url => 'http://www.census.gov/eos/www/naics/reference_files_tools/2002/naics_2_6_02.txt',
+           :skip => 4,
+           :headers => %w{ code description },
+           :delimiter => '	' do
+      key 'code'
+      store 'description'
+    end
+  end
+end

data/lib/earth/industry/naics_2002_naics_2007_concordance.rb

@@ -0,0 +1,16 @@
+class Naics2002Naics2007Concordance < ActiveRecord::Base
+  self.primary_key = "row_hash"
+  
+  belongs_to :naics_2002, :foreign_key => :naics_2002_code
+  belongs_to :naics_2007, :foreign_key => :naics_2007_code
+  
+  # for data import
+  def self.extract_note(description)
+    (note = description.match(/ - (.+)/)) ? note.captures.first : nil
+  end
+  
+  col :row_hash
+  col :naics_2002_code
+  col :naics_2007_code
+  col :naics_2002_note
+end

data/lib/earth/industry/naics_2002_naics_2007_concordance/data_miner.rb

@@ -0,0 +1,16 @@
+require 'earth/industry/naics_2002'
+require 'earth/industry/naics_2007'
+
+Naics2002Naics2007Concordance.class_eval do
+  data_miner do
+    import "the US Census NAICS 2002 to NAICS 2007 concordance",
+           :url => 'http://www.census.gov/eos/www/naics/concordances/2002_to_2007_NAICS.xls',
+           :skip => 3,
+           :headers => %w{ 2002_code 2002_title 2007_code 2007_title } do
+      key 'row_hash'
+      store 'naics_2002_code', :synthesize => lambda { |row| "%06d" % row['2002_code'].to_i }
+      store 'naics_2007_code', :synthesize => lambda { |row| "%06d" % row['2007_code'].to_i }
+      store 'naics_2002_note', :synthesize => lambda { |row| extract_note row['2002_title'] }
+    end
+  end
+end

data/lib/earth/industry/naics_2002_sic_1987_concordance.rb

@@ -0,0 +1,16 @@
+class Naics2002Sic1987Concordance < ActiveRecord::Base
+  self.primary_key = "row_hash"
+  
+  belongs_to :naics_2002, :foreign_key => :naics_2002_code
+  belongs_to :sic_1987,   :foreign_key => :sic_1987_code
+  
+  # for data import
+  def self.extract_note(description)
+    (note = description.match /.+?\((.+)\)/) ? note.captures.first : nil
+  end
+  
+  col :row_hash
+  col :naics_2002_code
+  col :sic_1987_code
+  col :sic_note
+end

data/lib/earth/industry/naics_2002_sic_1987_concordance/data_miner.rb

@@ -0,0 +1,15 @@
+require 'earth/industry/naics_2002'
+require 'earth/industry/sic_1987'
+
+Naics2002Sic1987Concordance.class_eval do
+  data_miner do
+    import "the US Census SIC 1987 to NAICS 2002 concordance",
+           :url => 'http://www.census.gov/eos/www/naics/concordances/1987_SIC_to_2002_NAICS.xls',
+           :select => lambda {|row| row['SIC'].to_i > 0} do
+      key 'row_hash'
+      store 'naics_2002_code', :synthesize => lambda { |row| "%06d" % row['2002 NAICS'].to_i }
+      store 'sic_1987_code',   :synthesize => lambda { |row| "%04d" % row['SIC'].to_i }
+      store 'sic_note', :synthesize => lambda { |row| extract_note row['SIC Title (and note)'] }
+    end
+  end
+end

data/lib/earth/industry/naics_2007.rb

@@ -0,0 +1,10 @@
+class Naics2007 < ActiveRecord::Base
+  self.primary_key = "code"
+  self.table_name = "naics_2007"
+  
+  has_many :naics_2002_naics_2007_concordances, :foreign_key => :naics_2007_code
+  has_many :naics_2002, :through => :naics_2002_naics_2007_concordances
+  
+  col :code
+  col :description
+end

data/lib/earth/industry/naics_2007/data_miner.rb

@@ -0,0 +1,12 @@
+Naics2007.class_eval do
+  data_miner do
+    import "the U.S. Census 2007 NAICS code list",
+           :url => 'http://www.census.gov/eos/www/naics/reference_files_tools/2007/naics07.txt',
+           :skip => 2,
+           :headers => %w{ IGNORE code description },
+           :delimiter => '	' do
+      key 'code'
+      store 'description'
+    end
+  end
+end

data/lib/earth/industry/sic_1987.rb

@@ -0,0 +1,16 @@
+class Sic1987 < ActiveRecord::Base
+  self.primary_key = "code"
+  self.table_name = "sic_1987"
+  
+  has_many :naics_2002_sic_1987_concordances, :foreign_key => :sic_1987_code
+  has_many :naics_2002, :through => :naics_2002_sic_1987_concordances
+  has_many :industries, :through => :naics_2002
+  
+  # for data import
+  def self.format_description(description)
+    (desc = description.match /^(.+?) \(/) ? desc.captures.first : description
+  end
+  
+  col :code
+  col :description
+end

data/lib/earth/industry/sic_1987/data_miner.rb

@@ -0,0 +1,10 @@
+Sic1987.class_eval do
+  data_miner do
+    import "SIC 1987 codes derived from US Census SIC 1987 to NAICS 2002 concordance",
+           :url => 'http://www.census.gov/eos/www/naics/concordances/1987_SIC_to_2002_NAICS.xls',
+           :select => lambda {|row| row['SIC'].to_i > 0} do
+      key 'code', :synthesize => lambda { |row| "%04d" % row['SIC'].to_i }
+      store 'description', :synthesize => lambda { |row| format_description row['SIC Title (and note)'] }
+    end
+  end
+end

data/lib/earth/pet/species.rb

@@ -15,6 +15,8 @@ class Species < ActiveRecord::Base
   col :minimum_weight_units
   col :maximum_weight, :type => :float
   col :maximum_weight_units
+
+  has_many :breeds, :foreign_key => 'species_name'
   
   scope :thoroughly_researched, :conditions => 'marginal_dietary_requirement IS NOT NULL'
   

data/lib/earth/version.rb

@@ -1,3 +1,3 @@
 module Earth
-  VERSION = "0.11.11"
+  VERSION = "0.11.12"
 end

data/spec/earth/industry/cbecs_energy_intensity_spec.rb

@@ -1,6 +1,5 @@
 require 'spec_helper'
 require 'earth/industry/cbecs_energy_intensity'
-require 'earth/industry/cbecs_energy_intensity/data_miner'
 
 def create_cbecs(name, args)
   c = CbecsEnergyIntensity.new args
@@ -9,86 +8,59 @@ def create_cbecs(name, args)
 end
 
 describe CbecsEnergyIntensity do
-  before :all do
-    CbecsEnergyIntensity.auto_upgrade!
-  end
-  before :each do
-    CbecsEnergyIntensity.delete_all
-  end
-  
-  describe '.find_by_naics_code_and_census_division_number' do
+  describe 'import', :slow => true do
     before do
-      create_cbecs '1', :naics_code => '44', :census_division_number => 1
-      create_cbecs '2', :naics_code => '445', :census_division_number => 1
-      create_cbecs '3', :naics_code => '621', :census_division_number => 1
-      create_cbecs '4', :naics_code => '44', :census_division_number => 2
-      create_cbecs '5', :naics_code => '445', :census_division_number => 2
-      create_cbecs '6', :naics_code => '621', :census_division_number => 2
-    end
-    it 'finds an exact match' do
-      record = CbecsEnergyIntensity.find_by_naics_code_and_census_division_number('445', 2)
-      record.naics_code.should == '445'
-      record.census_division_number.should == 2
-    end
-    it 'finds a parent category when exact code is not present' do
-      record = CbecsEnergyIntensity.find_by_naics_code_and_census_division_number('4451', 2)
-      record.naics_code.should == '445'
-      record.census_division_number.should == 2
-    end
-    it 'does not find a sibling category' do
-      CbecsEnergyIntensity.find_by_naics_code_and_census_division_number('622', 2).
-        should be_nil
+      require 'earth/industry/cbecs_energy_intensity/data_miner'
+      CbecsEnergyIntensity.auto_upgrade!
+      CbecsEnergyIntensity.delete_all
     end
-    it 'returns nil if no match found' do
-      CbecsEnergyIntensity.find_by_naics_code_and_census_division_number('8131', 1).
-        should be_nil
-    end
-  end
-
-  describe '#fuel_ratios' do
-    it 'makes ratios from fuel energies' do
-      cbecs = CbecsEnergyIntensity.new :name => '1', :electricity => 1000, :natural_gas => 2000, :fuel_oil => 500, :district_heat => 0
-      cbecs.fuel_ratios.should == {
-        :electricity => 0.2857142857142857,
-        :natural_gas => 0.5714285714285714,
-        :fuel_oil => 0.14285714285714285,
-        :district_heat => 0.0
-      }
-    end
-  end
-
-  describe 'import', :slow => true do
     it 'fetches electric, natural gas, fuel oil, and distric heat data' do
       CbecsEnergyIntensity.run_data_miner!
-
-      # check census divisions
+      CbecsEnergyIntensity.count.should == 182
+    end
+  end
+  
+  describe 'verify imported data', :sanity => true do
+    #TODO check values
+    it 'checks census divisions' do
       divisionals = CbecsEnergyIntensity.divisional
       divisionals.count.should == 117
       spot_check(divisionals, [
         [[:principal_building_activity, :census_region_number, :census_division_number], [:electricity, :natural_gas]],
-
         [['Education', 1, 1], [:nil, :nil]],
         [['Education', 1, 2], [:present, :present]],
       ])
-
-      # check census regions
+    end
+    
+    # TODO check values
+    # [[:principal_building_activity, :census_region_number], [:electricity, :fuel_oil]],
+    # [['Education', 1], [46_800_000_000, 44_749_338_478]],
+    # [['Education', 2], [72_000_000_000, :nil]],
+    # [['Education', 3], [208_800_000_000, :nil]],
+    # [['Education', 4], [61_200_000_000, :nil]],
+    # [['Health Care', 1], [36_000_000_000, :nil]],
+    # [['Health Care', 2], [64_800_000_000, :nil]],
+    # [['Health Care', 3], [111_600_000_000, 2_697_655_156]],
+    # [['Health Care', 4], [43_200_000_000, 1_110_799_182]],
+    it 'checks cenusus regions' do
       regionals = CbecsEnergyIntensity.regional
       regionals.count.should == 52
       spot_check(regionals, [
         [[:principal_building_activity, :census_region_number], [:electricity, :fuel_oil]],
-        # Regional fuel oil
         [['Education', 1], [:present, :present]],
         [['Education', 2], [:present, :nil]],
         [['Education', 3], [:present, :nil]],
         [['Education', 4], [:present, :nil]],
-
         [['Health Care', 1], [:present, :nil]],
         [['Health Care', 2], [:present, :nil]],
         [['Health Care', 3], [:present, :present]],
         [['Health Care', 4], [:present, :present]],
+        
       ])
-
-      # check total us averages
+    end
+    
+    #TODO check values
+    it 'checks US averages' do
       nationals = CbecsEnergyIntensity.national
       nationals.count.should == 13
       spot_check(nationals, [
@@ -97,6 +69,69 @@ describe CbecsEnergyIntensity do
         [['Lodging'],                    [:present,     :present,  :nil]],
         [['Office'],                     [:present,     :present,  :present]],
       ])
-    end 
+    end
+  end
+  
+  describe '.find_by_naics_code_and_census_division_number' do
+    it 'finds an exact match' do
+      CbecsEnergyIntensity.find_by_naics_code_and_census_division_number('445', 2).name.should == '445-1-2'
+    end
+    it 'finds a parent category when exact code is not present' do
+      CbecsEnergyIntensity.find_by_naics_code_and_census_division_number('4451', 2).name.should == '445-1-2'
+    end
+    it 'does not find a sibling category' do
+      create_cbecs '72221-1-2', :naics_code => '72221', :census_division_number => 2, :census_region_number => 1
+      CbecsEnergyIntensity.find_by_naics_code_and_census_division_number('72229', 2).name.should == '722-1-2'
+      CbecsEnergyIntensity.delete '72221-1-2'
+    end
+    it 'returns nil if no match found' do
+      CbecsEnergyIntensity.find_by_naics_code_and_census_division_number('48', 2).should be_nil
+    end
+  end
+  
+  describe '.find_by_naics_code_and_census_region_number' do
+    it 'finds an exact match' do
+      CbecsEnergyIntensity.find_by_naics_code_and_census_region_number('445', 2).name.should == '445-2'
+    end
+    it 'finds a parent category when exact code is not present' do
+      CbecsEnergyIntensity.find_by_naics_code_and_census_region_number('4451', 2).name.should == '445-2'
+    end
+    it 'does not find a sibling category' do
+      create_cbecs '72221-2', :naics_code => '72221', :census_region_number => 2
+      CbecsEnergyIntensity.find_by_naics_code_and_census_region_number('72229', 2).name.should == '722-2'
+      CbecsEnergyIntensity.delete '72221-2'
+    end
+    it 'returns nil if no match found' do
+      CbecsEnergyIntensity.find_by_naics_code_and_census_region_number('48', 2).should be_nil
+    end
+  end
+  
+  describe '.find_by_naics_code' do
+    it 'finds an exact match' do
+      CbecsEnergyIntensity.find_by_naics_code('445').name.should == '445'
+    end
+    it 'finds a parent category when exact code is not present' do
+      CbecsEnergyIntensity.find_by_naics_code('4451').name.should == '445'
+    end
+    it 'does not find a sibling category' do
+      create_cbecs '72221', :naics_code => '72221'
+      CbecsEnergyIntensity.find_by_naics_code('72229').name.should == '722'
+      CbecsEnergyIntensity.delete '72221'
+    end
+    it 'returns nil if no match found' do
+      CbecsEnergyIntensity.find_by_naics_code('48').should be_nil
+    end
+  end
+  
+  describe '#fuel_ratios' do
+    it 'makes ratios from fuel energies' do
+      cbecs = CbecsEnergyIntensity.new :name => '1', :electricity => 1000, :natural_gas => 2000, :fuel_oil => 500, :district_heat => 0
+      cbecs.fuel_ratios.should == {
+        :electricity => 0.2857142857142857,
+        :natural_gas => 0.5714285714285714,
+        :fuel_oil => 0.14285714285714285,
+        :district_heat => 0.0
+      }
+    end
   end
 end

data/spec/earth/industry/industry_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+require 'earth/industry/industry'
+
+describe Industry do
+  before :all do
+    Industry.auto_upgrade!
+  end
+  
+  describe "when importing data", :slow => true do
+    before do
+      require 'earth/industry/industry/data_miner'
+    end
+    
+    it "imports all naics codes" do
+      Industry.run_data_miner!
+      Industry.count.should == 2341
+    end
+  end
+  
+  describe "methods" do
+    it "knows whether it's a trade industry (wholesale or retail trade)" do
+      Industry.find('42331').trade_industry?.should == true
+      Industry.find('445110').trade_industry?.should == true
+      Industry.find('4539').trade_industry?.should == true
+      Industry.find('33291').trade_industry?.should == false
+    end
+  end
+end

data/spec/earth/industry/mecs_energy_spec.rb

@@ -1,35 +1,42 @@
 require 'spec_helper'
-require 'earth/industry'
 require 'earth/industry/mecs_energy'
-require 'earth/industry/mecs_energy/data_miner'
+require 'earth/industry/industry' # MecsEnergy's custom find by method calls an Industry method
 
 describe MecsEnergy do
-  before(:all) do
-    MecsEnergy.auto_upgrade!
-    MecsEnergy.run_data_miner!
+  describe 'import', :slow => true do
+    before do
+      require 'earth/industry/mecs_energy/data_miner'
+      MecsEnergy.auto_upgrade!
+      MecsEnergy.delete_all
+    end
+    it 'retrieves Total US statistics' do
+      MecsEnergy.run_data_miner!
+      MecsEnergy.count.should == 395
+    end
   end
   
-  describe 'data mining' do
-    it 'retrieves Total US statistics' do
+  describe 'verify imported data', :sanity => true do
+    it 'spot checks the data' do
       apparel = MecsEnergy.find_by_naics_code '315'
       apparel.census_region_number.should be_nil
-      # apparel.energy.should == 14_770_800_000
-      # apparel.energy_units.should == 'megajoules'
-      # apparel.electricity.should == 7_385_390_000
-      # apparel.electricity_units.should == 'megajoules'
-      # apparel.residual_fuel_oil.should be_nil
-      # apparel.distillate_fuel_oil.should == 0
-      # apparel.energy_units.should == 'megajoules'
-      # apparel.natural_gas.should == 7
-      # apparel.energy_units.should == 'megajoules'
-      # apparel.lpg_and_ngl.should == 0
-      # apparel.energy_units.should == 'megajoules'
-      # apparel.coal.should == 0
-      # apparel.energy_units.should == 'megajoules'
-      # apparel.coke_and_breeze.should == 0
-      # apparel.energy_units.should == 'megajoules'
-      # apparel.other.should == 0
-      # apparel.energy_units.should == 'megajoules'
+      apparel.energy.should be_within(10_000).of(14.trillion_btus.to(:megajoules))
+      apparel.energy_units.should == 'megajoules'
+      apparel.electricity.should == be_within(1_000).of(7.trillion_btus.to(:megajoules))
+      apparel.electricity_units.should == 'megajoules'
+      apparel.residual_fuel_oil.should == 0
+      apparel.residual_fuel_oil_units.should == 'megajoules'
+      apparel.distillate_fuel_oil.should == 0
+      apparel.distillate_fuel_oil_units.should == 'megajoules'
+      apparel.natural_gas.should == be_within(1_000).of(7.trillion_btus.to(:megajoules))
+      apparel.natural_gas_units.should == 'megajoules'
+      apparel.lpg_and_ngl.should == 0
+      apparel.lpg_and_ngl_units.should == 'megajoules'
+      apparel.coal.should == 0
+      apparel.coal_units.should == 'megajoules'
+      apparel.coke_and_breeze.should == 0
+      apparel.coke_and_breeze_units.should == 'megajoules'
+      apparel.other_fuel.should == 0
+      apparel.other_fuel_units.should == 'megajoules'
     end
   end
   
@@ -52,6 +59,21 @@ describe MecsEnergy do
     end
   end
   
+  describe '.find_by_naics_code' do
+    it 'finds an exact match' do
+      MecsEnergy.find_by_naics_code('311221').name.should == '311221-'
+    end
+    it 'finds a parent category when exact code is not present' do
+      MecsEnergy.find_by_naics_code('3117').name.should == '311-'
+    end
+    it 'finds a parent category rather than a sibling category' do
+      MecsEnergy.find_by_naics_code('311225').name.should == '3112-'
+    end
+    it 'returns nil if no match found' do
+      MecsEnergy.find_by_naics_code('543211').should be_nil
+    end
+  end
+  
   describe '#fuel_ratios' do
     it 'returns a list of fuel ratios for a given NAICS' do
       energy = MecsEnergy.new :energy => 100, :electricity => 20,

data/spec/earth/industry/mecs_ratio_spec.rb

@@ -1,40 +1,60 @@
 require 'spec_helper'
 require 'earth/industry/mecs_ratio'
+require 'earth/industry/industry' # MecsRatio's custom find by method calls an Industry method
 
 describe MecsRatio do
-  before :all do
-    MecsRatio.auto_upgrade!
+  describe 'import', :slow => true do
+    before do
+      require 'earth/industry/mecs_ratio/data_miner'
+      MecsRatio.auto_upgrade!
+      MecsRatio.delete_all
+    end
+    it 'retrieves Total US statistics' do
+      MecsRatio.run_data_miner!
+      MecsRatio.count.should == 395
+    end
+  end
+  
+  describe 'verify imported data', :sanity => true do
+    it 'spot checks the data' do
+      apparel = MecsRatio.find_by_naics_code '315'
+      apparel.census_region_number.should be_nil
+      apparel.energy_per_dollar_of_shipments.should == be_within(0.000_001).of(0.5.kbtus.to(:megajoules))
+      apparel.energy_per_dollar_of_shipments_units.should == 'megajoules'
+    end
   end
   
   describe '.find_by_naics_code_and_census_region_number' do
-    before do
-      MecsRatio.create! :naics_code => '311', :census_region_number => 1, :energy_per_dollar_of_shipments => 11
-      MecsRatio.create! :naics_code => '3112', :census_region_number => 1, :energy_per_dollar_of_shipments => 12
-      MecsRatio.create! :naics_code => '311221', :census_region_number => 1, :energy_per_dollar_of_shipments => 13
-      MecsRatio.create! :naics_code => '31131', :census_region_number => 1, :energy_per_dollar_of_shipments => 13
-      MecsRatio.create! :naics_code => '311', :census_region_number => 2, :energy_per_dollar_of_shipments => 17
-      MecsRatio.create! :naics_code => '3112', :census_region_number => 2, :energy_per_dollar_of_shipments => 18
-      MecsRatio.create! :naics_code => '311221', :census_region_number => 2, :energy_per_dollar_of_shipments => 19
-      MecsRatio.create! :naics_code => '31131', :census_region_number => 2, :energy_per_dollar_of_shipments => 20
-    end
-    
     it 'finds an exact match' do
-      ratio = MecsRatio.find_by_naics_code_and_census_region_number('311221', 2)
-      ratio.naics_code.should == '311221'
-      ratio.census_region_number.should == 2
+      MecsRatio.find_by_naics_code_and_census_region_number('311221', 2).
+        name.should == '311221-2'
+    end
+    it 'finds a parent category when exact code is not present' do
+      MecsRatio.find_by_naics_code_and_census_region_number('3117', 2).
+        name.should == '311-2'
+    end
+    it 'finds a parent category rather than a sibling category' do
+      MecsRatio.find_by_naics_code_and_census_region_number('311225', 2).
+        name.should == '3112-2'
+    end
+    it 'returns nil if no match found' do
+      MecsRatio.find_by_naics_code_and_census_region_number('543211', 2).
+        should be_nil
+    end
+  end
+  
+  describe '.find_by_naics_code' do
+    it 'finds an exact match' do
+      MecsRatio.find_by_naics_code('311221').name.should == '311221-'
     end
     it 'finds a parent category when exact code is not present' do
-      ratio = MecsRatio.find_by_naics_code_and_census_region_number('3117', 2)
-      ratio.naics_code.should == '311'
-      ratio.census_region_number.should == 2
+      MecsRatio.find_by_naics_code('3117').name.should == '311-'
     end
     it 'finds a parent category rather than a sibling category' do
-      ratio = MecsRatio.find_by_naics_code_and_census_region_number('311225', 2)
-      ratio.naics_code.should == '3112'
-      ratio.census_region_number.should == 2
+      MecsRatio.find_by_naics_code('311225').name.should == '3112-'
     end
     it 'returns nil if no match found' do
-      MecsRatio.find_by_naics_code_and_census_region_number('543211', 2).should be_nil
+      MecsRatio.find_by_naics_code('543211').should be_nil
     end
   end
 end

data/spec/earth/industry/naics_2002_naics_2007_concordance_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+require 'earth/industry/naics_2002_naics_2007_concordance'
+
+describe Naics2002Naics2007Concordance do
+  before :all do
+    Naics2002Naics2007Concordance.auto_upgrade!
+  end
+  
+  describe "when importing data", :slow => true do
+    before do
+      require 'earth/industry/naics_2002_naics_2007_concordance/data_miner'
+    end
+    
+    it "extracts a note from a description" do
+      Naics2002Naics2007Concordance.extract_note("Internet Service Providers - Internet services providers providing services via client-supplied telecommunications connection").
+        should == "Internet services providers providing services via client-supplied telecommunications connection"
+    end
+    
+    it "imports all naics codes" do
+      Naics2002Naics2007Concordance.run_data_miner!
+      Naics2002Naics2007Concordance.count.should == 1200
+    end
+  end
+  
+  describe "relationships" do
+    before do
+      require 'earth/industry/naics_2002'
+      require 'earth/industry/naics_2007'
+    end
+    
+    it "belongs to :naics_2002" do
+      Naics2002Naics2007Concordance.find_by_naics_2002_code("111219").
+        naics_2002.should == Naics2002.find("111219")
+    end
+    
+    it "belongs to :naics_2007" do
+      Naics2002Naics2007Concordance.find_by_naics_2007_code("111211").
+        naics_2007.should == Naics2007.find("111211")
+    end
+  end
+end

data/spec/earth/industry/naics_2002_sic_1987_concordance_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+require 'earth/industry/naics_2002_sic_1987_concordance'
+
+describe Naics2002Sic1987Concordance do
+  before :all do
+    Naics2002Sic1987Concordance.auto_upgrade!
+  end
+  
+  describe "when importing data", :slow => true do
+    before do
+      require 'earth/industry/naics_2002_sic_1987_concordance/data_miner'
+    end
+    
+    it "extracts a paranthetical note from a description" do
+      Naics2002Sic1987Concordance.extract_note("Wood Household Furniture, Except Upholstered (wood box spring frames(parts))").
+        should == "wood box spring frames(parts)"
+    end
+    
+    it "imports all naics codes" do
+      Naics2002Sic1987Concordance.run_data_miner!
+      Naics2002Sic1987Concordance.count.should == 2164
+    end
+  end
+  
+  describe "relationships" do
+    before do
+      require 'earth/industry/naics_2002'
+      require 'earth/industry/sic_1987'
+    end
+    
+    it "belongs to :naics_2002" do
+      Naics2002Sic1987Concordance.find_by_naics_2002_code("111150").
+        naics_2002.should == Naics2002.find("111150")
+    end
+    
+    it "belongs to :sic_1987" do
+      Naics2002Sic1987Concordance.find_by_sic_1987_code("0119").
+        sic_1987.should == Sic1987.find("0119")
+    end
+  end
+end

data/spec/earth/industry/naics_2002_spec.rb

@@ -0,0 +1,59 @@
+require 'spec_helper'
+require 'earth/industry/naics_2002'
+
+describe Naics2002 do
+  before :all do
+    Naics2002.auto_upgrade!
+  end
+  
+  describe "when importing data", :slow => true do
+    before do
+      require 'earth/industry/naics_2002/data_miner'
+    end
+    
+    it "imports all naics codes" do
+      Naics2002.run_data_miner!
+      Naics2002.count.should == 2341
+    end
+  end
+  
+  describe "code translations" do
+    before do
+      require 'earth/industry/sic_1987'
+      require 'earth/industry/naics_2002_sic_1987_concordance'
+      require 'earth/industry/naics_2007'
+      require 'earth/industry/naics_2002_naics_2007_concordance'
+      require 'earth/industry/industry'
+    end
+    
+    it "can be translated to a SIC 1987 code" do
+      {
+        '111140' => %w{ 0111 },
+        '111150' => %w{ 0115 0119 },
+        '111920' => %w{ 0131 },
+        '238910' => %w{ 1081 1241 1389 1481 1629 1711 1794 1795 1799 7353 },
+        '488119' => %w{ 4581 4959 7997 }
+      }.each do |naics, sics|
+        Naics2002.find(naics).sic_1987.map(&:code).sort.should == sics
+      end
+    end
+    
+    it "can be translated to a NAICS 2007 code" do
+      {
+        '111150' => %w{ 111150 },
+        '111219' => %w{ 111211 111219 }
+      }.each do |naics_2002, naics_2007|
+        Naics2002.find(naics_2002).naics_2007.map(&:code).sort.should == naics_2007
+      end
+    end
+    
+    it "can be translated to an industry" do
+      {
+        '111150' => '111150',
+        '111219' => '111219'
+      }.each do |naics, industry|
+        Naics2002.find(naics).industry.naics_code.should == industry
+      end
+    end
+  end
+end

data/spec/earth/industry/naics_2007_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+require 'earth/industry/naics_2007'
+
+describe Naics2007 do
+  before :all do
+    Naics2007.auto_upgrade!
+  end
+  
+  describe "when importing data", :slow => true do
+    before do
+      require 'earth/industry/naics_2007/data_miner'
+    end
+    
+    it "imports all naics codes" do
+      Naics2007.run_data_miner!
+      Naics2007.count.should == 2328
+    end
+  end
+  
+  describe "code translations" do
+    before do
+      require 'earth/industry/naics_2002'
+      require 'earth/industry/naics_2002_naics_2007_concordance'
+    end
+    
+    it "can be translated to a NAICS 2002 code" do
+      {
+        '111211' => %w{ 111211 111219 },
+        '111310' => %w{ 111310 },
+      }.each do |naics_2007, naics_2002|
+        Naics2007.find(naics_2007).naics_2002.map(&:code).sort.should == naics_2002
+      end
+    end
+  end
+end

data/spec/earth/industry/sic_1987_spec.rb

@@ -0,0 +1,55 @@
+require 'spec_helper'
+require 'earth/industry/sic_1987'
+
+describe Sic1987 do
+  before :all do
+    Sic1987.auto_upgrade!
+  end
+  
+  describe "when importing data", :slow => true do
+    before do
+      require 'earth/industry/sic_1987/data_miner'
+    end
+    
+    it "imports all naics codes" do
+      Sic1987.run_data_miner!
+      Sic1987.count.should == 1004
+    end
+  end
+  
+  describe "verify imported data", :sanity => true do
+    it "has a description for every code" do
+      Sic1987.find_by_description(nil).should be_nil
+    end
+  end
+  
+  describe "code translations" do
+    before do
+      require 'earth/industry/naics_2002'
+      require 'earth/industry/naics_2002_sic_1987_concordance'
+      
+      require 'earth/industry/naics_2007'
+      require 'earth/industry/naics_2002_naics_2007_concordance'
+      
+      require 'earth/industry/industry'
+    end
+    
+    it "can be translated to a NAICS 2002 code" do
+      {
+        '0119' => %w{ 111120 111130 111150 111191 111199 },
+        '0131' => %w{ 111920 },
+      }.each do |sic, naics|
+        Sic1987.find(sic).naics_2002.map(&:code).sort.should == naics
+      end
+    end
+    
+    it "can be translated to an industry code" do
+      {
+        '0119' => %w{ 111120 111130 111150 111191 111199 },
+        '0131' => %w{ 111920 },
+      }.each do |sic, industries|
+        Sic1987.find(sic).industries.map(&:naics_code).sort.should == industries
+      end
+    end
+  end
+end

data/spec/earth_spec.rb

@@ -22,7 +22,7 @@ describe Earth do
 
   describe '.resources' do
     it 'should get a list of all resource names' do
-      Earth.resources.length.should == 96
+      Earth.resources.length.should == 100
       Earth.resources.should include('Aircraft')
       Earth.resources.should include('Industry')
     end
@@ -33,8 +33,8 @@ describe Earth do
       Earth.resources('computation').length.should == 3
       Earth.resources('diet').length.should == 2
       Earth.resources('fuel').length.should == 5
-      Earth.resources('hospitality').length.should == 5
-      Earth.resources('industry').length.should == 13
+      Earth.resources('hospitality').length.should == 4
+      Earth.resources('industry').length.should == 18
       Earth.resources('locality').length.should == 10
       Earth.resources('pet').length.should == 4
       Earth.resources('rail').length.should == 12

metadata

@@ -2,7 +2,7 @@
 name: earth
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.11.11
+  version: 0.11.12
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-15 00:00:00 Z
+date: 2012-02-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -504,9 +504,19 @@ files:
 - lib/earth/industry/merchant.rb
 - lib/earth/industry/merchant_category.rb
 - lib/earth/industry/merchant_category_industry.rb
+- lib/earth/industry/naics_2002.rb
+- lib/earth/industry/naics_2002/data_miner.rb
+- lib/earth/industry/naics_2002_naics_2007_concordance.rb
+- lib/earth/industry/naics_2002_naics_2007_concordance/data_miner.rb
+- lib/earth/industry/naics_2002_sic_1987_concordance.rb
+- lib/earth/industry/naics_2002_sic_1987_concordance/data_miner.rb
+- lib/earth/industry/naics_2007.rb
+- lib/earth/industry/naics_2007/data_miner.rb
 - lib/earth/industry/product_line.rb
 - lib/earth/industry/product_line_industry_product.rb
 - lib/earth/industry/sector.rb
+- lib/earth/industry/sic_1987.rb
+- lib/earth/industry/sic_1987/data_miner.rb
 - lib/earth/inflectors.rb
 - lib/earth/locality.rb
 - lib/earth/locality/census_division.rb
@@ -603,10 +613,15 @@ files:
 - spec/earth/bus/bus_fuel_control_spec.rb
 - spec/earth/bus/bus_fuel_year_control_spec.rb
 - spec/earth/fuel/fuel_spec.rb
-- spec/earth/hospitality/lodging_fuel_use_equation_spec.rb
 - spec/earth/industry/cbecs_energy_intensity_spec.rb
+- spec/earth/industry/industry_spec.rb
 - spec/earth/industry/mecs_energy_spec.rb
 - spec/earth/industry/mecs_ratio_spec.rb
+- spec/earth/industry/naics_2002_naics_2007_concordance_spec.rb
+- spec/earth/industry/naics_2002_sic_1987_concordance_spec.rb
+- spec/earth/industry/naics_2002_spec.rb
+- spec/earth/industry/naics_2007_spec.rb
+- spec/earth/industry/sic_1987_spec.rb
 - spec/earth/locality/country_spec.rb
 - spec/earth/pet/species_spec.rb
 - spec/earth_spec.rb
@@ -670,7 +685,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3928360334256672535
+      hash: -2879856841116714656
       segments: 
       - 0
       version: "0"
@@ -679,7 +694,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3928360334256672535
+      hash: -2879856841116714656
       segments: 
       - 0
       version: "0"
@@ -780,10 +795,15 @@ test_files:
 - spec/earth/bus/bus_fuel_control_spec.rb
 - spec/earth/bus/bus_fuel_year_control_spec.rb
 - spec/earth/fuel/fuel_spec.rb
-- spec/earth/hospitality/lodging_fuel_use_equation_spec.rb
 - spec/earth/industry/cbecs_energy_intensity_spec.rb
+- spec/earth/industry/industry_spec.rb
 - spec/earth/industry/mecs_energy_spec.rb
 - spec/earth/industry/mecs_ratio_spec.rb
+- spec/earth/industry/naics_2002_naics_2007_concordance_spec.rb
+- spec/earth/industry/naics_2002_sic_1987_concordance_spec.rb
+- spec/earth/industry/naics_2002_spec.rb
+- spec/earth/industry/naics_2007_spec.rb
+- spec/earth/industry/sic_1987_spec.rb
 - spec/earth/locality/country_spec.rb
 - spec/earth/pet/species_spec.rb
 - spec/earth_spec.rb

data/spec/earth/hospitality/lodging_fuel_use_equation_spec.rb

@@ -1,96 +0,0 @@
-require 'spec_helper'
-require 'earth/hospitality'
-require 'earth/hospitality/data_miner'
-require 'charisma'
-
-describe LodgingFuelUseEquation do
-  describe 'import', :slow => true do
-    it 'should import data without problems' do
-      LodgingFuelUseEquation.run_data_miner!
-      LodgingFuelUseEquation.all.count.should == 48
-    end
-  end
-  
-  describe 'climate zone numbers' do
-    it 'should be nil or 1 through 5' do
-      LodgingFuelUseEquation.select('DISTINCT climate_zone_number').map(&:climate_zone_number).should == [nil, 1, 2, 3, 4, 5]
-    end
-  end
-  
-  describe 'electricity factors' do
-    it 'should produce reasonable electricity use estimates' do
-      LodgingFuelUseEquation.where(:fuel => 'Electricity').each do |equation|
-        if equation.property_rooms == true and equation.construction_year == true
-          estimate = equation.rooms_factor * equation.year_factor * equation.constant
-          estimate.should > 0.0 and estimate.should < 1000.0
-          
-          estimate = equation.rooms_factor**1000 * equation.year_factor * equation.constant
-          estimate.should > 0.0 and estimate.should < 1000.0
-          
-          estimate = equation.rooms_factor * equation.year_factor**2020 * equation.constant
-          estimate.should > 0.0 and estimate.should < 1000.0
-          
-          estimate = equation.rooms_factor**1000 * equation.year_factor**2020 * equation.constant
-          estimate.should > 0.0 and estimate.should < 1000.0
-        elsif equation.property_rooms == true
-          estimate = equation.rooms_factor * equation.constant
-          estimate.should > 0.0 and estimate.should < 1000.0
-          
-          estimate = equation.rooms_factor**1000 * equation.constant
-          estimate.should > 0.0 and estimate.should < 1000.0
-        elsif equation.construction_year == true
-          estimate = equation.year_factor * equation.constant
-          estimate.should > 0.0 and estimate.should < 1000.0
-          
-          estimate = equation.year_factor**2020 * equation.constant
-          estimate.should > 0.0 and estimate.should < 1000.0
-        else
-          equation.constant.should > 0.0
-        end
-      end
-    end
-  end
-    
-  describe 'fuels factors' do
-    it 'should produce reasonable fuels use estimates' do
-      LodgingFuelUseEquation.where(:fuel => 'Fuels').each do |equation|
-        if equation.property_rooms == true and equation.construction_year == true
-          estimate = equation.rooms_factor + equation.year_factor + equation.constant
-          estimate.should > 0.0 and estimate.should < 1000.0
-          
-          estimate = equation.rooms_factor * 1000 + equation.year_factor + equation.constant
-          estimate.should > 0.0 and estimate.should < 1000.0
-          
-          estimate = equation.rooms_factor + equation.year_factor * 2020 + equation.constant
-          estimate.should > 0.0 and estimate.should < 1000.0
-          
-          estimate = equation.rooms_factor * 1000 + equation.year_factor * 2020 + equation.constant
-          estimate.should > 0.0 and estimate.should < 1000.0
-        elsif equation.property_rooms == true
-          estimate = equation.rooms_factor + equation.constant
-          estimate.should > 0.0 and estimate.should < 1000.0
-          
-          estimate = equation.rooms_factor * 1000 + equation.constant
-          estimate.should > 0.0 and estimate.should < 1000.0
-        elsif equation.construction_year == true
-          estimate = equation.year_factor + equation.constant
-          estimate.should > 0.0 and estimate.should < 1000.0
-          
-          estimate = equation.year_factor * 2020 + equation.constant
-          estimate.should > 0.0 and estimate.should < 1000.0
-        else
-          equation.constant.should > 0.0
-        end
-      end
-    end
-  end
-  
-  describe 'find_by_criteria' do
-    it 'should return the proper equation' do
-      LodgingFuelUseEquation.find_by_criteria('Fuels', {}).name.should == 'Fuels'
-      LodgingFuelUseEquation.find_by_criteria('Fuels', {:climate_zone_number => ::Charisma::Curator::Curation.new(2) }).name.should == 'Fuels zone 2'
-      LodgingFuelUseEquation.find_by_criteria('Fuels', {:climate_zone_number => ::Charisma::Curator::Curation.new(2), :property_rooms => 25}).name.should == 'Fuels zone 2 rooms'
-      LodgingFuelUseEquation.find_by_criteria('Fuels', {:climate_zone_number => ::Charisma::Curator::Curation.new(2), :property_rooms => 25, :property_construction_year => 1998}).name.should == 'Fuels zone 2 rooms year'
-    end
-  end
-end