earth 0.12.3 → 0.12.4

data/spec/earth/hospitality/lodging_class_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+require 'earth/hospitality/lodging_class'
+
+describe LodgingClass do
+  describe 'when importing data', :data_miner => true do
+    before do
+      Earth.init :hospitality, :load_data_miner => true
+    end
+    
+    it 'imports data' do
+      LodgingClass.run_data_miner!
+    end
+  end
+  
+  describe 'verify imported data', :sanity => true do
+    it { LodgingClass.count.should == 3 }
+  end
+end

data/spec/earth/industry/mecs_energy_spec.rb

@@ -21,13 +21,13 @@ describe MecsEnergy do
       apparel.census_region_number.should be_nil
       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.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.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'

data/spec/earth/industry/mecs_ratio_spec.rb

@@ -19,7 +19,7 @@ describe MecsRatio 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.should be_within(5e-6).of(0.5.kbtus.to(:megajoules))
       apparel.energy_per_dollar_of_shipments_units.should == 'megajoules'
     end
   end

data/spec/earth/industry/merchant_category_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+require 'earth/industry/merchant_category'
+
+describe MerchantCategory do
+  describe 'import', :data_miner => true do
+    before do
+      Earth.init :industry, :load_data_miner => true, :skip_parent_associations => :true
+    end
+    
+    it 'should import data' do
+      MerchantCategory.run_data_miner!
+      MerchantCategory.count.should > 0
+      MerchantCategory.first.mcc.to_s.should =~ /^\d+$/
+      MerchantCategory.first.description.to_s.should_not be_empty
+    end
+  end
+end

data/spec/earth/locality/country_spec.rb

@@ -6,11 +6,10 @@ require 'earth/locality/country'
 describe Country do
   describe 'import', :data_miner => true do
     before do
-      Earth.init :locality, :load_data_miner => true, :skip_parent_associations => :true
+      Earth.init :locality, :load_data_miner => true
     end
     
     it 'should import data' do
-      Country.delete_all if Country.table_exists?
       Country.run_data_miner!
     end
   end
@@ -38,17 +37,27 @@ describe Country do
     describe 'electricity data' do
       it { Country.where('electricity_emission_factor >= 0').count.should == 136 }
       it { Country.where(:electricity_emission_factor_units => 'kilograms_co2e_per_kilowatt_hour').count.should == 136 }
+      it { Country.where('electricity_co2_emission_factor >= 0').count.should == 136 }
+      it { Country.where(:electricity_co2_emission_factor_units => 'kilograms_per_kilowatt_hour').count.should == 136 }
+      it { Country.where('electricity_ch4_emission_factor >= 0').count.should == 136 }
+      it { Country.where(:electricity_ch4_emission_factor_units => 'kilograms_co2e_per_kilowatt_hour').count.should == 136 }
+      it { Country.where('electricity_n2o_emission_factor >= 0').count.should == 136 }
+      it { Country.where(:electricity_n2o_emission_factor_units => 'kilograms_co2e_per_kilowatt_hour').count.should == 136 }
       it { Country.where('electricity_loss_factor >= 0').count.should == 136 }
       it { Country.maximum(:electricity_loss_factor).should < 0.3 }
       
       # spot checks
-      it { us.electricity_emission_factor.should be_within(5e-6).of(0.55437) }
-      it { us.electricity_emission_factor_units.should == 'kilograms_co2e_per_kilowatt_hour' }
+      it { us.electricity_emission_factor.should be_within(6e-6).of(0.55437) }
+      it { us.electricity_co2_emission_factor.should be_within(5e-6).of(0.55165) }
+      it { us.electricity_ch4_emission_factor.should be_within(5e-9).of(0.00027255) }
+      it { us.electricity_n2o_emission_factor.should be_within(5e-8).of(0.0024437) }
       it { us.electricity_loss_factor.should be_within(5e-6).of(0.06503) }
       
-      it { uk.electricity_emission_factor.should be_within(1e-5).of(0.51020) }
-      it { uk.electricity_emission_factor_units.should == 'kilograms_co2e_per_kilowatt_hour' }
-      it { uk.electricity_loss_factor.should be_within(1e-3).of(0.073) }
+      it { uk.electricity_emission_factor.should be_within(5e-6).of(0.51020) }
+      it { uk.electricity_co2_emission_factor.should be_within(5e-6).of(0.5085) }
+      it { uk.electricity_ch4_emission_factor.should be_within(5e-9).of(0.00016875) }
+      it { uk.electricity_n2o_emission_factor.should be_within(5e-8).of(0.00152576) }
+      it { uk.electricity_loss_factor.should be_within(5e-4).of(0.073) }
     end
     
     describe 'flight data' do
@@ -58,9 +67,9 @@ describe Country do
     end
     
     describe 'lodging data' do
-      it { us.lodging_occupancy_rate.should be_within(0.001).of(0.601) }
-      it { us.lodging_natural_gas_intensity.should be_within(0.00001).of(1.93316) }
-      it { us.lodging_natural_gas_intensity_units.should == 'cubic_metres_per_occupied_room_night' }
+      it { us.lodging_occupancy_rate.should be_within(5e-4).of(0.601) }
+      it { us.lodging_natural_gas_intensity.should be_within(5e-4).of(50.719) }
+      it { us.lodging_natural_gas_intensity_units.should == 'megajoules_per_room_night' }
     end
     
     describe 'rail data' do
@@ -93,11 +102,18 @@ describe Country do
   end
   
   describe '.fallback' do
-    it 'has fallback electricity emission factor and electricity loss factor' do
-      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
+    let(:fallback) { Country.fallback }
+    
+    it { fallback.name.should == 'fallback' }
+    it { fallback.electricity_emission_factor.should be_within(5e-6).of(0.62609) }
+    it { fallback.electricity_emission_factor_units.should == 'kilograms_co2e_per_kilowatt_hour' }
+    it { fallback.electricity_co2_emission_factor.should be_within(5e-6).of(0.62354) }
+    it { fallback.electricity_co2_emission_factor_units.should == 'kilograms_per_kilowatt_hour' }
+    it { fallback.electricity_ch4_emission_factor.should be_within(5e-6).of(0.00021) }
+    it { fallback.electricity_ch4_emission_factor_units.should == 'kilograms_co2e_per_kilowatt_hour' }
+    it { fallback.electricity_n2o_emission_factor.should be_within(5e-6).of(0.00234) }
+    it { fallback.electricity_n2o_emission_factor_units.should == 'kilograms_co2e_per_kilowatt_hour' }
+    it { fallback.electricity_loss_factor.should be_within(5e-4).of(0.096) }
+    it { fallback.electricity_mix.should == ElectricityMix.fallback }
   end
 end

data/spec/earth/locality/egrid_subregion_spec.rb

@@ -13,37 +13,50 @@ describe EgridSubregion do
   end
   
   describe 'verify imported data', :sanity => true do
-    it { EgridSubregion.count.should == 26 }
-    it { EgridSubregion.where("net_generation > 0").count.should == EgridSubregion.count }
-    it { EgridSubregion.where("co2_emission_factor > 0").count.should == EgridSubregion.count }
-    it { EgridSubregion.where("co2_biogenic_emission_factor >= 0").count.should == EgridSubregion.count }
-    it { EgridSubregion.where("ch4_emission_factor > 0").count.should == EgridSubregion.count }
-    it { EgridSubregion.where("n2o_emission_factor > 0").count.should == EgridSubregion.count }
-    it { EgridSubregion.where("electricity_emission_factor > 0").count.should == EgridSubregion.count }
+    let(:total) { EgridSubregion.count }
+    let(:akgd) { EgridSubregion.find 'akgd' }
+    
+    it { total.should == 26 }
+    it { EgridSubregion.where("net_generation > 0").count.should == total }
+    it { EgridSubregion.where("co2_emission_factor > 0").count.should == total }
+    it { EgridSubregion.where(:co2_biogenic_emission_factor => nil).count.should == total }
+    it { EgridSubregion.where("ch4_emission_factor > 0").count.should == total }
+    it { EgridSubregion.where("n2o_emission_factor > 0").count.should == total }
+    
+    # DEPRECATED
+    it { EgridSubregion.where("electricity_emission_factor > 0").count.should == total }
     
     # spot check
-    it { EgridSubregion.first.net_generation.should be_within(5).of(5_337_982) }
-    it { EgridSubregion.first.co2_emission_factor.should be_within(5e-6).of(0.58099) }
-    it { EgridSubregion.first.co2_biogenic_emission_factor.should be_within(5e-6).of(0.0) }
-    it { EgridSubregion.first.ch4_emission_factor.should be_within(5e-6).of(0.00031) }
-    it { EgridSubregion.first.n2o_emission_factor.should be_within(5e-6).of(0.00104) }
-    it { EgridSubregion.first.electricity_emission_factor.should be_within(5e-6).of(0.58234) }
-    
-    it { EgridSubregion.first.net_generation_units.should == 'megawatt_hours' }
-    it { EgridSubregion.first.co2_emission_factor_units.should == 'kilograms_per_kilowatt_hour' }
-    it { EgridSubregion.first.co2_biogenic_emission_factor_units.should == 'kilograms_per_kilowatt_hour' }
-    it { EgridSubregion.first.ch4_emission_factor_units.should == 'kilograms_co2e_per_kilowatt_hour' }
-    it { EgridSubregion.first.n2o_emission_factor_units.should == 'kilograms_co2e_per_kilowatt_hour' }
-    it { EgridSubregion.first.electricity_emission_factor_units.should == 'kilograms_co2e_per_kilowatt_hour' }
+    it { akgd.net_generation.should be_within(5).of(5_337_982) }
+    it { akgd.co2_emission_factor.should be_within(5e-6).of(0.58099) }
+    it { akgd.co2_biogenic_emission_factor.should == nil }
+    it { akgd.ch4_emission_factor.should be_within(5e-6).of(0.00031) }
+    it { akgd.n2o_emission_factor.should be_within(5e-6).of(0.00104) }
+    
+    # DEPRECATED
+    it { akgd.electricity_emission_factor.should be_within(5e-6).of(0.58234) }
+    
+    it { akgd.net_generation_units.should == 'megawatt_hours' }
+    it { akgd.co2_emission_factor_units.should == 'kilograms_per_kilowatt_hour' }
+    it { akgd.co2_biogenic_emission_factor_units.should == nil }
+    it { akgd.ch4_emission_factor_units.should == 'kilograms_co2e_per_kilowatt_hour' }
+    it { akgd.n2o_emission_factor_units.should == 'kilograms_co2e_per_kilowatt_hour' }
+    
+    # DEPRECATED
+    it { akgd.electricity_emission_factor_units.should == 'kilograms_co2e_per_kilowatt_hour' }
   end
   
   describe '.fallback' do
-    it { EgridSubregion.fallback.name.should == 'fallback' }
-    it { EgridSubregion.fallback.egrid_region.name.should == 'fallback' }
-    it { EgridSubregion.fallback.co2_emission_factor.should be_within(5e-6).of(0.55165) }
-    it { EgridSubregion.fallback.co2_biogenic_emission_factor.should be_within(5e-6).of(0.0) }
-    it { EgridSubregion.fallback.ch4_emission_factor.should be_within(5e-6).of(0.00027) }
-    it { EgridSubregion.fallback.n2o_emission_factor.should be_within(5e-6).of(0.00244) }
-    it { EgridSubregion.fallback.electricity_emission_factor.should be_within(5e-6).of(0.55437) }
+    let(:fallback) { EgridSubregion.fallback }
+    
+    it { fallback.name.should == 'fallback' }
+    it { fallback.egrid_region.name.should == 'fallback' }
+    it { fallback.co2_emission_factor.should be_within(5e-6).of(0.55165) }
+    it { fallback.co2_biogenic_emission_factor.should == nil }
+    it { fallback.ch4_emission_factor.should be_within(5e-6).of(0.00027) }
+    it { fallback.n2o_emission_factor.should be_within(5e-6).of(0.00244) }
+    
+    # DEPRECATED
+    it { fallback.electricity_emission_factor.should be_within(5e-6).of(0.55437) }
   end
 end

data/spec/earth/locality/electricity_mix_spec.rb

@@ -0,0 +1,70 @@
+require 'spec_helper'
+require 'earth/locality/electricity_mix'
+
+describe ElectricityMix do
+  describe 'import', :data_miner => true do
+    before do
+      Earth.init :locality, :load_data_miner => true
+    end
+    
+    it 'should import data' do
+      ElectricityMix.run_data_miner!
+    end
+  end
+  
+  describe 'verify imported data', :sanity => true do
+    let(:total) { ElectricityMix.count }
+    let(:uk) { ElectricityMix.find_by_country_iso_3166_code 'GB' }
+    let(:akgd) { ElectricityMix.find_by_egrid_subregion_abbreviation 'akgd' }
+    let(:us) { ElectricityMix.find_by_country_iso_3166_code 'US' }
+    let(:ca) { ElectricityMix.find_by_state_postal_abbreviation 'CA' }
+    
+    it { total.should == 213 }
+    it { ElectricityMix.where('co2_emission_factor >= 0').count.should == total }
+    it { ElectricityMix.where(:co2_emission_factor_units => 'kilograms_per_kilowatt_hour').count.should == total }
+    it { ElectricityMix.where('ch4_emission_factor >= 0').count.should == total }
+    it { ElectricityMix.where(:ch4_emission_factor_units => 'kilograms_co2e_per_kilowatt_hour').count.should == total }
+    it { ElectricityMix.where('n2o_emission_factor >= 0').count.should == total }
+    it { ElectricityMix.where(:n2o_emission_factor_units => 'kilograms_co2e_per_kilowatt_hour').count.should == total }
+    it { ElectricityMix.where('loss_factor >= 0').count.should == total }
+    it { ElectricityMix.maximum(:loss_factor).should < 0.3 }
+    
+    # spot checks
+    it { uk.co2_emission_factor.should be_within(5e-6).of(0.5085) }
+    it { uk.ch4_emission_factor.should be_within(5e-9).of(0.00016875) }
+    it { uk.n2o_emission_factor.should be_within(5e-9).of(0.00152576) }
+    it { uk.loss_factor.should be_within(5e-4).of(0.073) }
+    
+    it { akgd.co2_emission_factor.should be_within(5e-6).of(0.58099) }
+    it { akgd.co2_biogenic_emission_factor.should == nil }
+    it { akgd.ch4_emission_factor.should be_within(5e-6).of(0.00031) }
+    it { akgd.n2o_emission_factor.should be_within(5e-6).of(0.00104) }
+    it { akgd.loss_factor.should be_within(5e-6).of(0.0584) }
+    
+    it { us.co2_emission_factor.should be_within(5e-6).of(0.55165) }
+    it { us.ch4_emission_factor.should be_within(5e-9).of(0.00027255) }
+    it { us.n2o_emission_factor.should be_within(5e-8).of(0.0024437) }
+    it { us.loss_factor.should be_within(5e-6).of(0.06503) }
+    
+    it { ca.co2_emission_factor.should be_within(5e-6).of(0.30163) }
+    it { ca.ch4_emission_factor.should be_within(5e-6).of(0.00033) }
+    it { ca.n2o_emission_factor.should be_within(5e-6).of(0.00085) }
+    it { ca.loss_factor.should be_within(5e-6).of(0.08208) }
+  end
+  
+  describe '.fallback' do
+    it { ElectricityMix.fallback.name.should == 'fallback' }
+    it { ElectricityMix.fallback.co2_emission_factor.should be_within(5e-6).of(0.62354) }
+    it { ElectricityMix.fallback.ch4_emission_factor.should be_within(5e-6).of(0.00021) }
+    it { ElectricityMix.fallback.n2o_emission_factor.should be_within(5e-6).of(0.00234) }
+    it { ElectricityMix.fallback.loss_factor.should be_within(5e-6).of(0.096) }
+  end
+  
+  describe '#energy_content' do
+    it { ElectricityMix.first.energy_content.should be_within(5e-6).of(3.6) }
+  end
+  
+  describe '#energy_content_units' do
+    it { ElectricityMix.first.energy_content_units.should == 'megajoules_per_kilowatt_hour' }
+  end
+end

data/spec/earth/locality/state_spec.rb

@@ -4,7 +4,7 @@ require 'earth/locality/state'
 describe State do
   describe 'when importing data', :data_miner => true do
     before do
-      Earth.init :locality, :load_data_miner => true, :skip_parent_associations => :true
+      Earth.init :locality, :load_data_miner => true
     end
     
     it 'imports data' do
@@ -24,21 +24,21 @@ describe State do
     end
     
     it 'should have an average electricity emission factor' do
-      State.find('VT').electricity_emission_factor.should be_within(0.00001).of(0.37848)
+      State.find('VT').electricity_emission_factor.should be_within(5e-6).of(0.33313)
       State.find('VT').electricity_emission_factor_units.should == "kilograms_co2e_per_kilowatt_hour"
-      State.find('CA').electricity_emission_factor.should be_within(0.00001).of(0.31315)
+      State.find('CA').electricity_emission_factor.should be_within(5e-6).of(0.30281)
       State.find('CA').electricity_emission_factor_units.should == "kilograms_co2e_per_kilowatt_hour"
-      State.find('MT').electricity_emission_factor.should be_within(0.00001).of(0.41092)
+      State.find('MT').electricity_emission_factor.should be_within(5e-6).of(0.39160)
       State.find('MT').electricity_emission_factor_units.should == "kilograms_co2e_per_kilowatt_hour"
-      State.find('NM').electricity_emission_factor.should be_within(0.00001).of(0.57194)
+      State.find('NM').electricity_emission_factor.should be_within(5e-6).of(0.54601)
       State.find('NM').electricity_emission_factor_units.should == "kilograms_co2e_per_kilowatt_hour"
     end
     
     it 'should have an average electricity loss factor' do
-      State.find('VT').electricity_loss_factor.should be_within(0.00001).of(0.0647079)
-      State.find('CA').electricity_loss_factor.should be_within(0.00001).of(0.0483723)
-      State.find('MT').electricity_loss_factor.should be_within(0.00001).of(0.0491516)
-      State.find('NM').electricity_loss_factor.should be_within(0.00001).of(0.0499872)
+      State.find('VT').electricity_loss_factor.should be_within(5e-6).of(0.05822)
+      State.find('CA').electricity_loss_factor.should be_within(5e-6).of(0.08208)
+      State.find('MT').electricity_loss_factor.should be_within(5e-6).of(0.08094)
+      State.find('NM').electricity_loss_factor.should be_within(5e-6).of(0.08007)
     end
   end
   
@@ -47,9 +47,8 @@ describe State do
       require 'earth/locality/country'
     end
     
-    it 'should the United States' do
+    it 'should return the United States' do
       State.first.country.should == Country.united_states
-      State.last.country.should == Country.united_states
     end
   end
 end

data/spec/earth/locality/zip_code_spec.rb

@@ -21,6 +21,15 @@ describe ZipCode do
     it { ZipCode.where('population IS NOT NULL').count.should == 33120 }
   end
   
+  # from acts_as_mappable
+  describe '.find_within' do
+    it { ZipCode.find_within(15, :units => :kms, :origin => ZipCode.find('05753').latitude_longitude).count.should == 7 }
+  end
+  
+  describe '.known_subregion' do
+    it { ZipCode.known_subregion.where(:egrid_subregion_abbreviation => nil).count.should == 0 }
+  end
+  
   describe '#country' do
     before do
       require 'earth/locality/country'
@@ -38,9 +47,4 @@ describe ZipCode do
       ZipCode.find('00210').latitude_longitude.should == ['43.005895', '-71.013202']
     end
   end
-  
-  # from acts_as_mappable
-  describe '.find_within' do
-    it { ZipCode.find_within(15, :units => :kms, :origin => ZipCode.find('05753').latitude_longitude).count.should == 7 }
-  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 == 101
+      Earth.resources.length.should == 100
       Earth.resources.should include('Aircraft')
       Earth.resources.should include('Industry')
     end
@@ -34,9 +34,9 @@ describe Earth do
       Earth.resources('diet').length.should == 2
       Earth.resources('electricity').length.should == 3
       Earth.resources('fuel').length.should == 5
-      Earth.resources('hospitality').length.should == 3
-      Earth.resources('industry').length.should == 18
-      Earth.resources('locality').length.should == 10
+      Earth.resources('hospitality').length.should == 2
+      Earth.resources('industry').length.should == 17
+      Earth.resources('locality').length.should == 11
       Earth.resources('pet').length.should == 4
       Earth.resources('rail').length.should == 12
       Earth.resources('residence').length.should == 9

data/spec/spec_helper.rb

@@ -50,4 +50,7 @@ RSpec.configure do |c|
   unless ENV['ALL'] == 'true'
     c.filter_run_excluding :data_miner => true
   end
+  if ENV['SKIP_FLIGHT_SEGMENT'] == 'true'
+    c.filter_run_excluding :flight_segment => true
+  end
 end

metadata

@@ -2,7 +2,7 @@
 name: earth
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.12.3
+  version: 0.12.4
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-20 00:00:00 Z
+date: 2012-07-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -131,7 +131,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.3.0
+        version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: *id011
@@ -314,6 +314,8 @@ files:
 - TODO
 - bin/earth_tester.rb
 - certification_changelog.markdown
+- data/air/airlines.csv
+- data/air/airports.csv
 - data/automobile/annual_emission_controls.csv
 - data/automobile/annual_fuel_consumption.csv
 - data/automobile/annual_sizes.csv
@@ -325,9 +327,11 @@ files:
 - data/automobile/hybridity_multipliers.csv
 - data/automobile/sizes.csv
 - data/automobile/trip_distances.csv
+- data/hospitality/lodging_classes.csv
 - data/locality/country_flight_data.csv
 - data/locality/egrid_relationships.csv
 - data/locality/misc_zip_data.csv
+- data/locality/national_electricity_efs.csv
 - data/locality/us_auto_data.csv
 - data/locality/wri_hdd_cdd_data.csv
 - data/locality/zip_climate_divisions.csv
@@ -345,6 +349,7 @@ files:
 - errata/readme
 - lib/earth.rb
 - lib/earth/acronyms.rb
+- lib/earth/active_record_base_class_methods.rb
 - lib/earth/air.rb
 - lib/earth/air/aircraft.rb
 - lib/earth/air/aircraft/data_miner.rb
@@ -450,8 +455,6 @@ files:
 - lib/earth/hospitality.rb
 - lib/earth/hospitality/commercial_building_energy_consumption_survey_response.rb
 - lib/earth/hospitality/commercial_building_energy_consumption_survey_response/data_miner.rb
-- lib/earth/hospitality/country_lodging_class.rb
-- lib/earth/hospitality/country_lodging_class/data_miner.rb
 - lib/earth/hospitality/data_miner.rb
 - lib/earth/hospitality/lodging_class.rb
 - lib/earth/hospitality/lodging_class/data_miner.rb
@@ -468,8 +471,8 @@ files:
 - lib/earth/industry/mecs_energy/data_miner.rb
 - lib/earth/industry/mecs_ratio.rb
 - lib/earth/industry/mecs_ratio/data_miner.rb
-- lib/earth/industry/merchant.rb
 - lib/earth/industry/merchant_category.rb
+- lib/earth/industry/merchant_category/data_miner.rb
 - lib/earth/industry/merchant_category_industry.rb
 - lib/earth/industry/naics_2002.rb
 - lib/earth/industry/naics_2002/data_miner.rb
@@ -501,6 +504,8 @@ files:
 - lib/earth/locality/egrid_region/data_miner.rb
 - lib/earth/locality/egrid_subregion.rb
 - lib/earth/locality/egrid_subregion/data_miner.rb
+- lib/earth/locality/electricity_mix.rb
+- lib/earth/locality/electricity_mix/data_miner.rb
 - lib/earth/locality/petroleum_administration_for_defense_district.rb
 - lib/earth/locality/petroleum_administration_for_defense_district/data_miner.rb
 - lib/earth/locality/state.rb
@@ -604,11 +609,12 @@ files:
 - spec/earth/electricity/green_button_adoption_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/hospitality/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
 - spec/earth/industry/mecs_ratio_spec.rb
+- spec/earth/industry/merchant_category_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
@@ -618,6 +624,7 @@ files:
 - spec/earth/locality/egrid_country_spec.rb
 - spec/earth/locality/egrid_region_spec.rb
 - spec/earth/locality/egrid_subregion_spec.rb
+- spec/earth/locality/electricity_mix_spec.rb
 - spec/earth/locality/state_spec.rb
 - spec/earth/locality/zip_code_spec.rb
 - spec/earth/pet/species_spec.rb
@@ -681,7 +688,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -307877030326161721
+      hash: -3264838130013702299
       segments: 
       - 0
       version: "0"
@@ -690,7 +697,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -307877030326161721
+      hash: -3264838130013702299
       segments: 
       - 0
       version: "0"
@@ -733,11 +740,12 @@ test_files:
 - spec/earth/electricity/green_button_adoption_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/hospitality/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
 - spec/earth/industry/mecs_ratio_spec.rb
+- spec/earth/industry/merchant_category_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
@@ -747,6 +755,7 @@ test_files:
 - spec/earth/locality/egrid_country_spec.rb
 - spec/earth/locality/egrid_region_spec.rb
 - spec/earth/locality/egrid_subregion_spec.rb
+- spec/earth/locality/electricity_mix_spec.rb
 - spec/earth/locality/state_spec.rb
 - spec/earth/locality/zip_code_spec.rb
 - spec/earth/pet/species_spec.rb