earth 0.11.13 → 0.11.14

data/spec/earth/automobile/automobile_type_fuel_year_age_spec.rb

@@ -4,7 +4,7 @@ require 'earth/automobile/data_miner'
 
 describe AutomobileTypeFuelYearAge do
   describe 'import' do
-    it 'imports and processes data successfully', :slow => true do
+    it 'imports and processes data successfully', :data_miner => true do
       expect do
         AutomobileTypeFuelYearAge.run_data_miner!
       end.should_not raise_error

data/spec/earth/bus/bus_class_spec.rb

@@ -5,7 +5,7 @@ describe 'BusFuel' do
     Earth.init :bus, :fuel, :apply_schemas => true
   end
 
-  describe 'import', :slow => true do
+  describe 'import', :data_miner => true do
     it 'is related to fuels' do
       BusFuel.run_data_miner!
       BusFuel.last.fuel.should_not be_nil

data/spec/earth/fuel/fuel_spec.rb

@@ -8,7 +8,7 @@ describe Fuel do
     Fuel.auto_upgrade!
   end
   
-  describe 'when importing data', :slow => true do
+  describe 'when importing data', :data_miner => true do
     it 'fetches all fuels' do
       Earth.init :fuel, :load_data_miner => true
       Fuel.run_data_miner!

data/spec/earth/hospitality/commercial_building_energy_consumption_survey_response_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+require 'earth/hospitality/commercial_building_energy_consumption_survey_response'
+
+describe CommercialBuildingEnergyConsumptionSurveyResponse do
+  before :all do
+    CommercialBuildingEnergyConsumptionSurveyResponse.auto_upgrade!
+  end
+  
+  describe "when importing data", :data_miner => true do
+    before do
+      require 'earth/hospitality/commercial_building_energy_consumption_survey_response/data_miner'
+    end
+    
+    it "imports all naics codes" do
+      CommercialBuildingEnergyConsumptionSurveyResponse.run_data_miner!
+      CommercialBuildingEnergyConsumptionSurveyResponse.count.should == 5215
+    end
+  end
+  
+  describe "verify imported data", :sanity => true do
+    it "should have room nights and fuel intensities per room night for lodging_records" do
+      spot_check = CommercialBuildingEnergyConsumptionSurveyResponse.lodging_records.first
+      spot_check.room_nights.should == 6205
+      spot_check.natural_gas_per_room_night.should be_within(0.00001).of(1.62234)
+      spot_check.natural_gas_per_room_night_units.should == 'cubic_metres_per_room_night'
+    end
+  end
+  
+  describe ".lodging_records" do
+    it "should return only records representing Hotels, Motels, and Inns with no other activity" do
+      lodging_records = CommercialBuildingEnergyConsumptionSurveyResponse.lodging_records
+      lodging_records.map(&:detailed_activity).uniq.sort.should == ['Hotel', 'Motel or inn']
+      lodging_records.map(&:first_activity).uniq.should == [nil]
+      lodging_records.count.should == 192
+    end
+  end
+end

data/spec/earth/hospitality/country_lodging_class_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+require 'earth/hospitality/country_lodging_class'
+
+describe CountryLodgingClass do
+  before :all do
+    CountryLodgingClass.auto_upgrade!
+  end
+  
+  describe "when importing data", :data_miner => true do
+    before do
+      require 'earth/hospitality/country_lodging_class/data_miner'
+    end
+    
+    it "imports all naics codes" do
+      CountryLodgingClass.run_data_miner!
+      CountryLodgingClass.count.should == 3
+    end
+  end
+  
+  describe "verify imported data", :sanity => true do
+    it "should have fuel intensities" do
+      us_hotel = CountryLodgingClass.find 'US Hotel'
+      us_hotel.fuel_oil_intensity.should be_within(0.00001).of(0.25014)
+      us_hotel.fuel_oil_intensity_units.should == 'litres_per_occupied_room_night'
+    end
+    
+    it "should have the correct total weighting for the US" do
+      CountryLodgingClass.where(:country_iso_3166_code => 'US').sum(&:weighting).should == be_within(0.0001).of(89209.27734)
+    end
+  end
+end

data/spec/earth/industry/cbecs_energy_intensity_spec.rb

@@ -8,7 +8,7 @@ def create_cbecs(name, args)
 end
 
 describe CbecsEnergyIntensity do
-  describe 'import', :slow => true do
+  describe 'import', :data_miner => true do
     before do
       require 'earth/industry/cbecs_energy_intensity/data_miner'
       CbecsEnergyIntensity.auto_upgrade!

data/spec/earth/industry/industry_spec.rb

@@ -6,7 +6,7 @@ describe Industry do
     Industry.auto_upgrade!
   end
   
-  describe "when importing data", :slow => true do
+  describe "when importing data", :data_miner => true do
     before do
       require 'earth/industry/industry/data_miner'
     end

data/spec/earth/industry/mecs_energy_spec.rb

@@ -3,7 +3,7 @@ require 'earth/industry/mecs_energy'
 require 'earth/industry/industry' # MecsEnergy's custom find by method calls an Industry method
 
 describe MecsEnergy do
-  describe 'import', :slow => true do
+  describe 'import', :data_miner => true do
     before do
       require 'earth/industry/mecs_energy/data_miner'
       MecsEnergy.auto_upgrade!
@@ -19,7 +19,7 @@ describe MecsEnergy do
     it 'spot checks the data' do
       apparel = MecsEnergy.find_by_naics_code '315'
       apparel.census_region_number.should be_nil
-      apparel.energy.should be_within(10_000).of(14.trillion_btus.to(:megajoules))
+      apparel.energy.should be_within(20_000).of(14770781900)
       apparel.energy_units.should == 'megajoules'
       apparel.electricity.should == be_within(1_000).of(7.trillion_btus.to(:megajoules))
       apparel.electricity_units.should == 'megajoules'
@@ -49,6 +49,14 @@ describe MecsEnergy do
       MecsEnergy.find_by_naics_code_and_census_region_number('3117', 2).
         name.should == '311-2'
     end
+    it 'finds same category nationwide when census region is not present' do
+      MecsEnergy.find_by_naics_code_and_census_region_number('311221', 5).
+        name.should == '311221-'
+    end
+    it 'looks nationwide and at parent codes if fuel ratios is invalid' do
+      MecsEnergy.find_by_naics_code_and_census_region_number('311221', 1).
+        name.should == '311221-'
+    end
     it 'finds a parent category rather than a sibling category' do
       MecsEnergy.find_by_naics_code_and_census_region_number('311225', 2).
         name.should == '3112-2'

data/spec/earth/industry/mecs_ratio_spec.rb

@@ -3,7 +3,7 @@ require 'earth/industry/mecs_ratio'
 require 'earth/industry/industry' # MecsRatio's custom find by method calls an Industry method
 
 describe MecsRatio do
-  describe 'import', :slow => true do
+  describe 'import', :data_miner => true do
     before do
       require 'earth/industry/mecs_ratio/data_miner'
       MecsRatio.auto_upgrade!
@@ -33,6 +33,14 @@ describe MecsRatio do
       MecsRatio.find_by_naics_code_and_census_region_number('3117', 2).
         name.should == '311-2'
     end
+    it 'finds same category nationwide when census region is not present' do
+      MecsRatio.find_by_naics_code_and_census_region_number('311221', 5).
+        name.should == '311221-'
+    end
+    it 'looks nationwide and at parent codes if energy per dollar of shipments is missing' do
+      MecsRatio.find_by_naics_code_and_census_region_number('313', 4).
+        name.should == '313-'
+    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'

data/spec/earth/industry/naics_2002_naics_2007_concordance_spec.rb

@@ -6,7 +6,7 @@ describe Naics2002Naics2007Concordance do
     Naics2002Naics2007Concordance.auto_upgrade!
   end
   
-  describe "when importing data", :slow => true do
+  describe "when importing data", :data_miner => true do
     before do
       require 'earth/industry/naics_2002_naics_2007_concordance/data_miner'
     end

data/spec/earth/industry/naics_2002_sic_1987_concordance_spec.rb

@@ -6,7 +6,7 @@ describe Naics2002Sic1987Concordance do
     Naics2002Sic1987Concordance.auto_upgrade!
   end
   
-  describe "when importing data", :slow => true do
+  describe "when importing data", :data_miner => true do
     before do
       require 'earth/industry/naics_2002_sic_1987_concordance/data_miner'
     end

data/spec/earth/industry/naics_2002_spec.rb

@@ -6,7 +6,7 @@ describe Naics2002 do
     Naics2002.auto_upgrade!
   end
   
-  describe "when importing data", :slow => true do
+  describe "when importing data", :data_miner => true do
     before do
       require 'earth/industry/naics_2002/data_miner'
     end

data/spec/earth/industry/naics_2007_spec.rb

@@ -6,7 +6,7 @@ describe Naics2007 do
     Naics2007.auto_upgrade!
   end
   
-  describe "when importing data", :slow => true do
+  describe "when importing data", :data_miner => true do
     before do
       require 'earth/industry/naics_2007/data_miner'
     end

data/spec/earth/industry/sic_1987_spec.rb

@@ -6,7 +6,7 @@ describe Sic1987 do
     Sic1987.auto_upgrade!
   end
   
-  describe "when importing data", :slow => true do
+  describe "when importing data", :data_miner => true do
     before do
       require 'earth/industry/sic_1987/data_miner'
     end
@@ -27,11 +27,6 @@ describe Sic1987 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
@@ -42,14 +37,5 @@ describe Sic1987 do
         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/locality/country_spec.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require 'spec_helper'
 require 'earth/locality/country'
 
@@ -6,7 +8,7 @@ describe Country do
     Country.auto_upgrade!
   end
   
-  describe 'import', :slow => true do
+  describe 'import', :data_miner => true do
     before do
       require 'earth/locality/country/data_miner'
     end
@@ -18,6 +20,11 @@ describe Country do
   end
   
   describe 'verify imported data', :sanity => true do
+    it 'uses UTF-8 encoding' do
+      Country.find('AX').name.should == "Åland Islands"
+      Country.find('CI').name.should == "Côte d'Ivoire"
+    end
+    
     it 'has valid electricity emission factor and electricity loss factor for most countries' do
       Country.where('electricity_emission_factor IS NOT NULL').count.should == 136
       Country.where(:electricity_emission_factor_units => 'kilograms_co2e_per_kilowatt_hour').count.should == 136
@@ -27,19 +34,29 @@ describe Country do
       Country.minimum(:electricity_loss_factor).should >= 0.0
       Country.maximum(:electricity_loss_factor).should < 0.3
       
-      Country.find('US').electricity_emission_factor.should be_within(0.00001).of(0.58946)
-      Country.find('US').electricity_emission_factor_units.should == 'kilograms_co2e_per_kilowatt_hour'
-      Country.find('US').electricity_loss_factor.should be_within(0.001).of(0.062)
+      us = Country.united_states
+      us.electricity_emission_factor.should be_within(0.00001).of(0.58946)
+      us.electricity_emission_factor_units.should == 'kilograms_co2e_per_kilowatt_hour'
+      us.electricity_loss_factor.should be_within(0.001).of(0.062)
       
-      Country.find('GB').electricity_emission_factor.should be_within(0.00001).of(0.51020)
-      Country.find('GB').electricity_emission_factor_units.should == 'kilograms_co2e_per_kilowatt_hour'
-      Country.find('GB').electricity_loss_factor.should be_within(0.001).of(0.073)
+      uk = Country.find 'GB'
+      uk.electricity_emission_factor.should be_within(0.00001).of(0.51020)
+      uk.electricity_emission_factor_units.should == 'kilograms_co2e_per_kilowatt_hour'
+      uk.electricity_loss_factor.should be_within(0.001).of(0.073)
     end
     
     it 'has fallback electricity emission factor and electricity loss factor' do
-      Country.fallback.electricity_emission_factor.should be_within(0.00001).of(0.62609)
-      Country.fallback.electricity_emission_factor_units.should == 'kilograms_co2e_per_kilowatt_hour'
-      Country.fallback.electricity_loss_factor.should be_within(0.001).of(0.096)
+      fallback = Country.fallback
+      fallback.electricity_emission_factor.should be_within(0.00001).of(0.62609)
+      fallback.electricity_emission_factor_units.should == 'kilograms_co2e_per_kilowatt_hour'
+      fallback.electricity_loss_factor.should be_within(0.001).of(0.096)
+    end
+    
+    it 'has lodging data for the US' do
+      us = Country.united_states
+      us.lodging_occupancy_rate.should be_within(0.001).of(0.601)
+      us.lodging_natural_gas_intensity.should be_within(0.00001).of(1.93316)
+      us.lodging_natural_gas_intensity_units.should == 'cubic_metres_per_occupied_room_night'
     end
   end
   

data/spec/earth/locality/state_spec.rb

@@ -6,7 +6,7 @@ describe State do
     State.auto_upgrade!
   end
   
-  describe 'when importing data', :slow => true do
+  describe 'when importing data', :data_miner => true do
     before do
       require 'earth/locality/state/data_miner'
     end

data/spec/earth/locality/zip_code_spec.rb

@@ -6,7 +6,7 @@ describe ZipCode do
     ZipCode.auto_upgrade!
   end
   
-  describe 'when importing data', :slow => true do
+  describe 'when importing data', :data_miner => true do
     before do
       require 'earth/locality/zip_code/data_miner'
     end

data/spec/spec_helper.rb

@@ -13,7 +13,7 @@ include Integration
 
 case ENV['EARTH_DB_ADAPTER']
 when 'mysql'
-  adapter = 'mysql'
+  adapter = 'mysql2'
   database = 'test_earth'
   username = 'root'
   password = 'password'
@@ -45,6 +45,6 @@ DataMiner.logger = logger
 
 RSpec.configure do |c|
   unless ENV['ALL'] == 'true'
-    c.filter_run_excluding :slow => true
+    c.filter_run_excluding :data_miner => true
   end
 end

metadata

@@ -1,295 +1,292 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: earth
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.11.14
   prerelease: 
-  version: 0.11.13
 platform: ruby
-authors: 
+authors:
 - Seamus Abshere
 - Derek Kastner
 - Andy Rossmeissl
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-05 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-26 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2165356220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2165356220
+- !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &2165355780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2165355780
+- !ruby/object:Gem::Dependency
   name: cohort_analysis
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &2165355360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2165355360
+- !ruby/object:Gem::Dependency
   name: conversions
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &2165370800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2165370800
+- !ruby/object:Gem::Dependency
   name: data_miner
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &2165370300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "1.3"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2165370300
+- !ruby/object:Gem::Dependency
   name: falls_back_on
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &2165369760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2165369760
+- !ruby/object:Gem::Dependency
   name: fixed_width-multibyte
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &2165369300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2165369300
+- !ruby/object:Gem::Dependency
   name: fuzzy_match
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &2165368800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2165368800
+- !ruby/object:Gem::Dependency
   name: geokit
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &2165368360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: mini_record-compat
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *2165368360
+- !ruby/object:Gem::Dependency
+  name: active_record_inline_schema
+  requirement: &2165367900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2165367900
+- !ruby/object:Gem::Dependency
   name: remote_table
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &2165367380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2165367380
+- !ruby/object:Gem::Dependency
   name: table_warnings
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &2165366880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2165366880
+- !ruby/object:Gem::Dependency
   name: to_regexp
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &2165366500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id013
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2165366500
+- !ruby/object:Gem::Dependency
   name: weighted_average
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &2165365960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *id014
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2165365960
+- !ruby/object:Gem::Dependency
   name: bueller
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  requirement: &2165365500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id015
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2165365500
+- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  requirement: &2165365020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id016
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2165365020
+- !ruby/object:Gem::Dependency
   name: charisma
-  requirement: &id017 !ruby/object:Gem::Requirement 
+  requirement: &2165364520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id017
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2165364520
+- !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &id018 !ruby/object:Gem::Requirement 
+  requirement: &2165364020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id018
-- !ruby/object:Gem::Dependency 
-  name: mysql
-  requirement: &id019 !ruby/object:Gem::Requirement 
+  version_requirements: *2165364020
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: &2165379760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id019
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2165379760
+- !ruby/object:Gem::Dependency
   name: pg
-  requirement: &id020 !ruby/object:Gem::Requirement 
+  requirement: &2165379300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id020
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2165379300
+- !ruby/object:Gem::Dependency
   name: rake
-  requirement: &id021 !ruby/object:Gem::Requirement 
+  requirement: &2165378880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id021
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2165378880
+- !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &id022 !ruby/object:Gem::Requirement 
+  requirement: &2165378460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id022
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2165378460
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id023 !ruby/object:Gem::Requirement 
+  requirement: &2165378040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id023
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2165378040
+- !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &id024 !ruby/object:Gem::Requirement 
+  requirement: &2165377620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id024
+  version_requirements: *2165377620
 description: An earth-simulation environment with ActiveRecord models and data
 email: andy@rossmeissl.net
-executables: 
+executables:
 - earth_tester.rb
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - LICENSE-PREAMBLE
 - README.markdown
-files: 
-- .document
+files:
 - .gitignore
 - Gemfile
 - Guardfile
@@ -613,6 +610,8 @@ 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/commercial_building_energy_consumption_survey_response_spec.rb
+- spec/earth/hospitality/country_lodging_class_spec.rb
 - spec/earth/industry/cbecs_energy_intensity_spec.rb
 - spec/earth/industry/industry_spec.rb
 - spec/earth/industry/mecs_energy_spec.rb
@@ -676,38 +675,30 @@ files:
 - vendor/geokit-rails/test/test_helper.rb
 homepage: https://github.com/brighterplanet/earth
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -2326149133598914243
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -2326149133598914243
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Land, sky, and sea
-test_files: 
+test_files:
 - features/automobile_fuel.feature
 - features/automobile_make.feature
 - features/automobile_make_fleet_year.feature
@@ -797,6 +788,8 @@ 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/commercial_building_energy_consumption_survey_response_spec.rb
+- spec/earth/hospitality/country_lodging_class_spec.rb
 - spec/earth/industry/cbecs_energy_intensity_spec.rb
 - spec/earth/industry/industry_spec.rb
 - spec/earth/industry/mecs_energy_spec.rb
@@ -813,3 +806,4 @@ test_files:
 - spec/earth_spec.rb
 - spec/spec_helper.rb
 - spec/support/integration.rb
+has_rdoc: