earth 1.0.0 → 1.0.1

data/spec/factories/greenhouse_gas.rb

@@ -0,0 +1,7 @@
+require 'earth/fuel/greenhouse_gas'
+
+FactoryGirl.define do
+  factory :ghg, :class => GreenhouseGas do
+    trait(:co2) { name 'Carbon dioxide'; abbreviation 'co2' }
+  end
+end

data/spec/factories/industry.rb

@@ -0,0 +1,9 @@
+require 'earth/industry/industry'
+
+FactoryGirl.define do
+  factory :industry, :class => Industry do
+    trait(:corn_farming) { naics_code 11115; description 'Corn farming' }
+    trait(:retail_trade) { naics_code 44; description 'Retail trade' }
+    trait(:wholesale_trade) { naics_code 42; description 'Wholesale trade' }
+  end
+end

data/spec/factories/mecs_energy.rb

@@ -0,0 +1,15 @@
+require 'earth/industry/mecs_energy'
+
+FactoryGirl.define do
+  factory :mecs_energy, :class => MecsEnergy do
+    trait(:r11) { name '11'; naics_code 11; energy 100 }
+    trait(:r11c1) { name '11-1'; naics_code 11; census_region_number 1; energy 100 }
+    trait(:r111) { name '111'; naics_code 111; energy 100 }
+    trait(:r111c1) { name '111-1';naics_code 111; census_region_number 1; energy 100 }
+    trait(:r1111) { name '1111';naics_code 1111; energy 100 }
+    trait(:r1111c1) { name '1111-1';naics_code 1111; census_region_number 1; energy 100 }
+    trait(:r1111c2) { name '1111-2';naics_code 1111; census_region_number 2 }
+    trait(:r1112) { name '1112';naics_code 1112; energy 100 }
+    trait(:r1112c1) { name '1112-1';naics_code 1112; census_region_number 1; energy 100 }
+  end
+end

data/spec/factories/mecs_ratio.rb

@@ -0,0 +1,15 @@
+require 'earth/industry/mecs_ratio'
+
+FactoryGirl.define do
+  factory :mecs_ratio, :class => MecsRatio do
+    trait(:r11) { name '11'; naics_code 11; energy_per_dollar_of_shipments 0.1 }
+    trait(:r11c1) { name '11-1'; naics_code 11; census_region_number 1; energy_per_dollar_of_shipments 0.1 }
+    trait(:r111) { name '111'; naics_code 111; energy_per_dollar_of_shipments 0.1 }
+    trait(:r111c1) { name '111-1';naics_code 111; census_region_number 1; energy_per_dollar_of_shipments 0.1 }
+    trait(:r1111) { name '1111';naics_code 1111; energy_per_dollar_of_shipments 0.1 }
+    trait(:r1111c1) { name '1111-1';naics_code 1111; census_region_number 1; energy_per_dollar_of_shipments 0.1 }
+    trait(:r1111c2) { name '1111-2';naics_code 1111; census_region_number 2 }
+    trait(:r1112) { name '1112';naics_code 1112; energy_per_dollar_of_shipments 0.1 }
+    trait(:r1112c1) { name '1112-1';naics_code 1112; census_region_number 1; energy_per_dollar_of_shipments 0.1 }
+  end
+end

data/spec/factories/national_transit_database_company.rb

@@ -0,0 +1,8 @@
+require 'earth/rail/national_transit_database_company'
+
+FactoryGirl.define do
+  factory :ntd_company, :class => NationalTransitDatabaseCompany do
+    trait(:rail_company) { id 'muni'; name 'SF muni ' }
+    trait(:bus_company) { id 'gg'; name 'Golden gate transit' }
+  end
+end

data/spec/factories/national_transit_database_mode.rb

@@ -0,0 +1,8 @@
+require 'earth/rail/national_transit_database_mode'
+
+FactoryGirl.define do
+  factory :ntd_mode, :class => NationalTransitDatabaseMode do
+    trait(:rail) { code 'R'; name 'Rail'; rail_mode true }
+    trait(:bus) { code 'B'; name 'Bus'; rail_mode false }
+  end
+end

data/spec/factories/national_transit_database_record.rb

@@ -0,0 +1,9 @@
+require 'earth/rail/national_transit_database_record'
+
+FactoryGirl.define do
+  factory :ntd_record, :class => NationalTransitDatabaseRecord do
+    trait(:sf_rail_record) { name 'SF muni rail'; company_id 'muni'; mode_code 'R'; vehicle_distance 10000; vehicle_time 100; passenger_distance 500000; passengers 5000; electricity 25000 }
+    trait(:ny_rail_record) { name 'Metro north rail'; company_id 'mtn'; mode_code 'R' }
+    trait(:bus_record) { name 'Golden gate transit bus'; company_id 'gg'; mode_code 'B' }
+  end
+end

data/spec/factories/residence_appliance.rb

@@ -0,0 +1,7 @@
+require 'earth/residence/residence_appliance'
+
+FactoryGirl.define do
+  factory :residence_appliance, :class => ResidenceAppliance do
+    trait(:fridge) { name 'fridge'; annual_energy_from_electricity 1000 }
+  end
+end

data/spec/factories/zip_code.rb

@@ -0,0 +1,9 @@
+require 'earth/locality/zip_code'
+
+FactoryGirl.define do
+  factory :zip_code, :class => ZipCode do
+    trait(:zip1) { name 'test1'; latitude '50'; longitude '-75'; egrid_subregion_abbreviation 'CAMX' }
+    trait(:zip2) { name 'test2'; latitude '50'; longitude '-75.1' }
+    trait(:zip3) { name 'test3'; latitude '50'; longitude '-75.25' }
+  end
+end

data/spec/spec_helper.rb

@@ -12,35 +12,52 @@ require 'support/integration'
 include Integration
 
 require 'logger'
-logger = Logger.new 'log/test.log'
-ActiveRecord::Base.logger = logger
-DataMiner.logger = logger
+ActiveRecord::Base.logger = DataMiner.logger = Logger.new('log/test.log')
 
+require 'earth'
+Earth.init :connect => true, :mine_original_sources => true
 DataMiner.unit_converter = :conversions
 
 RSpec.configure do |c|
-  unless ENV['ALL'] == 'true'
-    c.filter_run_excluding :sanity => true
-    c.filter_run_excluding :data_miner => true
-  end
-  if ENV['SKIP_FLIGHT_SEGMENT'] == 'true'
-    c.filter_run_excluding :flight_segment => true
-  end
-
   c.before :all do
-    require 'earth'
-    Earth.init :mine_original_sources => true, :connect => true
+    # FULL_MINE=true clears, reloads, and sanity-checks data for the
+    # tested resource. This can be very slow because it clears and reloads
+    # data for any dependencies.
+    if ENV['FULL_MINE'] == 'true'
+      described_class.run_data_miner!
+    
+    # FAST_MINE=true clears, reloads, and sanity-checks data for the
+    # tested resource without reloading data for any dependencies. Only
+    # works if the test db already has sane data for those dependencies.
+    elsif ENV['FAST_MINE'] == 'true'
+      Earth.resource_models.each do |resource_model|
+        resource_model.data_miner_script.steps.clear unless resource_model == described_class
+      end
+      described_class.run_data_miner!
+    else
+      Earth.resource_models.each do |resource_model|
+        resource_model.create_table! false
+      end
+    end
   end
-  c.before :all, :sanity => true do
-    described_class.run_data_miner!
-  end
-
-  c.before(:each) do
+  
+  # SANITY=true sanity-checks data for the tested resource
+  c.filter_run_excluding(:sanity => true) unless (ENV['SANITY'] == 'true' || ENV['FAST_MINE'] == 'true' || ENV['FULL_MINE'] == 'true')
+  
+  # SKIP_SLOW=true lets you skip slow tests e.g. FlightSegment
+  c.filter_run_excluding(:slow => true) if ENV['SKIP_SLOW'] == 'true'
+  
+  # TEST_MINING=true runs spec/data_mining_spec.rb which data_mines all resources
+  c.filter_run_excluding :data_miner => true unless ENV['TEST_MINING'] == 'true'
+  
+  # Remember and revert any data added or removed by tests
+  # (doesn't apply to data loaded with FULL_MINE=true or FAST_MINE=true)
+  c.before :each do
     ActiveRecord::Base.connection.increment_open_transactions
     ActiveRecord::Base.connection.transaction_joinable = false
     ActiveRecord::Base.connection.begin_db_transaction
   end
-  c.after(:each) do
+  c.after :each do
     ActiveRecord::Base.connection.rollback_db_transaction
     ActiveRecord::Base.connection.decrement_open_transactions
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: earth
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-03 00:00:00.000000000Z
+date: 2012-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2166775580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2166775580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2166775160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +39,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2166775160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cohort_analysis
-  requirement: &2166774740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +55,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2166774740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: conversions
-  requirement: &2166774320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +71,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2166774320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: data_miner
-  requirement: &2166773820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +87,15 @@ dependencies:
         version: 2.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *2166773820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: falls_back_on
-  requirement: &2166773400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +103,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2166773400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fixed_width-multibyte
-  requirement: &2166772940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +119,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2166772940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fuzzy_match
-  requirement: &2166772440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +135,15 @@ dependencies:
         version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *2166772440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.3
 - !ruby/object:Gem::Dependency
   name: geokit
-  requirement: &2166772020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +151,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2166772020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: remote_table
-  requirement: &2166771480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -122,10 +167,15 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *2166771480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: table_warnings
-  requirement: &2166770980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -133,10 +183,15 @@ dependencies:
         version: 1.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *2166770980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: to_regexp
-  requirement: &2166770580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -144,10 +199,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2166770580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: weighted_average
-  requirement: &2166770040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -155,10 +215,15 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *2166770040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: timeframe
-  requirement: &2166769620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -166,10 +231,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2166769620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bueller
-  requirement: &2166769160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -177,10 +247,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2166769160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2166768740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -188,10 +263,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2166768740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: charisma
-  requirement: &2166768300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -199,10 +279,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2166768300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2166767880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -210,10 +295,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2166767880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &2166767460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -221,10 +311,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2166767460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &2166767040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -232,10 +327,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2166767040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &2166766620 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -243,10 +343,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2166766620
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2166766200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -254,10 +359,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2166766200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2166765780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -265,10 +375,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2166765780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2166765360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -276,10 +391,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2166765360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sandbox
-  requirement: &2166764940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -287,10 +407,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2166764940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2166764520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -298,10 +423,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2166764520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2166764100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -309,10 +439,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2166764100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &2166763680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -320,7 +455,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2166763680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: An earth-simulation environment with ActiveRecord models and data
 email:
 - seamus@abshere.net
@@ -365,6 +505,10 @@ files:
 - data/locality/us_auto_data.csv
 - data/locality/wri_hdd_cdd_data.csv
 - data/locality/zip_climate_divisions.csv
+- data/rail/ntd_companies.csv
+- data/rail/ntd_fuel_consumption.csv
+- data/rail/ntd_modes.csv
+- data/rail/ntd_service.csv
 - earth.gemspec
 - errata/aircraft/faa_errata.csv
 - errata/airline/bts_carrier_codes_errata.csv
@@ -378,7 +522,6 @@ files:
 - errata/flight_segment/bts_errata.csv
 - errata/readme
 - lib/earth.rb
-- lib/earth/acronyms.rb
 - lib/earth/air.rb
 - lib/earth/air/aircraft.rb
 - lib/earth/air/aircraft/data_miner.rb
@@ -414,6 +557,7 @@ files:
 - lib/earth/automobile/automobile_make_model_year/data_miner.rb
 - lib/earth/automobile/automobile_make_model_year_variant.rb
 - lib/earth/automobile/automobile_make_model_year_variant/data_miner.rb
+- lib/earth/automobile/automobile_make_model_year_variant/parser.rb
 - lib/earth/automobile/automobile_make_year.rb
 - lib/earth/automobile/automobile_make_year/data_miner.rb
 - lib/earth/automobile/automobile_make_year_fleet.rb
@@ -559,10 +703,6 @@ files:
 - lib/earth/rail/rail_class/data_miner.rb
 - lib/earth/rail/rail_company.rb
 - lib/earth/rail/rail_company/data_miner.rb
-- lib/earth/rail/rail_company_traction.rb
-- lib/earth/rail/rail_company_traction/data_miner.rb
-- lib/earth/rail/rail_company_traction_class.rb
-- lib/earth/rail/rail_company_traction_class/data_miner.rb
 - lib/earth/rail/rail_fuel.rb
 - lib/earth/rail/rail_fuel/data_miner.rb
 - lib/earth/rail/rail_traction.rb
@@ -602,7 +742,9 @@ files:
 - spec/earth/air/airline_spec.rb
 - spec/earth/air/airport_spec.rb
 - spec/earth/air/bts_aircraft_spec.rb
+- spec/earth/air/flight_distance_class_seat_class_spec.rb
 - spec/earth/air/flight_distance_class_spec.rb
+- spec/earth/air/flight_seat_class_spec.rb
 - spec/earth/air/flight_segment_spec.rb
 - spec/earth/automobile/automobile_activity_year_spec.rb
 - spec/earth/automobile/automobile_activity_year_type_fuel_spec.rb
@@ -621,13 +763,21 @@ files:
 - spec/earth/automobile/automobile_type_fuel_year_control_spec.rb
 - spec/earth/automobile/automobile_type_fuel_year_spec.rb
 - spec/earth/automobile/automobile_year_spec.rb
+- spec/earth/bus/bus_class_spec.rb
 - spec/earth/bus/bus_fuel_control_spec.rb
 - spec/earth/bus/bus_fuel_spec.rb
 - spec/earth/bus/bus_fuel_year_control_spec.rb
+- spec/earth/computation/computation_carrrier_instance_class_spec.rb
+- spec/earth/computation/computation_carrrier_region_spec.rb
+- spec/earth/computation/computation_carrrier_spec.rb
+- spec/earth/diet/diet_class_spec.rb
+- spec/earth/diet/food_group_spec.rb
 - spec/earth/electricity/electric_market_spec.rb
 - spec/earth/electricity/electric_utility_spec.rb
 - spec/earth/electricity/green_button_adoption_spec.rb
 - spec/earth/fuel/fuel_spec.rb
+- spec/earth/fuel/fuel_year_spec.rb
+- spec/earth/fuel/greenhouse_gas_spec.rb
 - spec/earth/hospitality/commercial_building_energy_consumption_survey_response_spec.rb
 - spec/earth/hospitality/lodging_class_spec.rb
 - spec/earth/industry/cbecs_energy_intensity_spec.rb
@@ -640,19 +790,79 @@ files:
 - spec/earth/industry/naics_2002_spec.rb
 - spec/earth/industry/naics_2007_spec.rb
 - spec/earth/industry/sic_1987_spec.rb
+- spec/earth/locality/census_division_spec.rb
+- spec/earth/locality/census_region_spec.rb
+- spec/earth/locality/climate_division_spec.rb
 - spec/earth/locality/country_spec.rb
 - 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/padd_spec.rb
 - spec/earth/locality/state_spec.rb
 - spec/earth/locality/zip_code_spec.rb
 - spec/earth/model_spec.rb
+- spec/earth/pet/breed_gender_spec.rb
+- spec/earth/pet/breed_spec.rb
+- spec/earth/pet/gender_spec.rb
 - spec/earth/pet/species_spec.rb
+- spec/earth/rail/country_rail_class_spec.rb
+- spec/earth/rail/country_rail_traction_class_spec.rb
+- spec/earth/rail/country_rail_traction_spec.rb
+- spec/earth/rail/national_transit_database_company_spec.rb
+- spec/earth/rail/national_transit_database_mode_spec.rb
+- spec/earth/rail/national_transit_database_record_spec.rb
+- spec/earth/rail/rail_class_spec.rb
+- spec/earth/rail/rail_company_spec.rb
+- spec/earth/rail/rail_fuel_spec.rb
+- spec/earth/rail/rail_traction_spec.rb
+- spec/earth/residence/air_conditioner_use_spec.rb
+- spec/earth/residence/clothes_machine_use_spec.rb
+- spec/earth/residence/dishwasher_use_spec.rb
+- spec/earth/residence/residence_appliance_spec.rb
+- spec/earth/residence/residence_class_spec.rb
+- spec/earth/residence/residence_fuel_price_spec.rb
+- spec/earth/residence/residence_fuel_type_spec.rb
+- spec/earth/residence/residential_energy_consumption_survey_response_spec.rb
+- spec/earth/residence/urbanity_spec.rb
+- spec/earth/shipping/carrier_mode_spec.rb
+- spec/earth/shipping/carrier_spec.rb
+- spec/earth/shipping/shipment_mode_spec.rb
 - spec/earth_spec.rb
 - spec/factories/airline.rb
 - spec/factories/airport.rb
+- spec/factories/automobile_activity_year.rb
+- spec/factories/automobile_activity_year_type.rb
+- spec/factories/automobile_activity_year_type_fuel.rb
+- spec/factories/automobile_fuel.rb
+- spec/factories/automobile_make.rb
+- spec/factories/automobile_make_model.rb
+- spec/factories/automobile_make_model_year.rb
+- spec/factories/automobile_model.rb
+- spec/factories/automobile_type_fuel.rb
+- spec/factories/automobile_type_fuel_control.rb
+- spec/factories/automobile_type_fuel_year.rb
+- spec/factories/automobile_type_fuel_year_control.rb
+- spec/factories/bus_fuel.rb
+- spec/factories/bus_fuel_year_control.rb
+- spec/factories/cbecs_energy_intensity.rb
+- spec/factories/commercial_building_energy_consumption_survey_response.rb
+- spec/factories/electric_utility.rb
+- spec/factories/flight_distance_class.rb
 - spec/factories/flight_segment.rb
+- spec/factories/food_group.rb
+- spec/factories/fuel.rb
+- spec/factories/fuel_year.rb
+- spec/factories/green_button_adoption.rb
+- spec/factories/greenhouse_gas.rb
+- spec/factories/industry.rb
+- spec/factories/mecs_energy.rb
+- spec/factories/mecs_ratio.rb
+- spec/factories/national_transit_database_company.rb
+- spec/factories/national_transit_database_mode.rb
+- spec/factories/national_transit_database_record.rb
+- spec/factories/residence_appliance.rb
+- spec/factories/zip_code.rb
 - spec/spec_helper.rb
 - spec/support/integration.rb
 - vendor/geokit-rails/.gitignore
@@ -713,7 +923,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1250548202269852024
+      hash: -4304792872288072718
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -722,10 +932,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1250548202269852024
+      hash: -4304792872288072718
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Land, sky, and sea
@@ -735,7 +945,9 @@ test_files:
 - spec/earth/air/airline_spec.rb
 - spec/earth/air/airport_spec.rb
 - spec/earth/air/bts_aircraft_spec.rb
+- spec/earth/air/flight_distance_class_seat_class_spec.rb
 - spec/earth/air/flight_distance_class_spec.rb
+- spec/earth/air/flight_seat_class_spec.rb
 - spec/earth/air/flight_segment_spec.rb
 - spec/earth/automobile/automobile_activity_year_spec.rb
 - spec/earth/automobile/automobile_activity_year_type_fuel_spec.rb
@@ -754,13 +966,21 @@ test_files:
 - spec/earth/automobile/automobile_type_fuel_year_control_spec.rb
 - spec/earth/automobile/automobile_type_fuel_year_spec.rb
 - spec/earth/automobile/automobile_year_spec.rb
+- spec/earth/bus/bus_class_spec.rb
 - spec/earth/bus/bus_fuel_control_spec.rb
 - spec/earth/bus/bus_fuel_spec.rb
 - spec/earth/bus/bus_fuel_year_control_spec.rb
+- spec/earth/computation/computation_carrrier_instance_class_spec.rb
+- spec/earth/computation/computation_carrrier_region_spec.rb
+- spec/earth/computation/computation_carrrier_spec.rb
+- spec/earth/diet/diet_class_spec.rb
+- spec/earth/diet/food_group_spec.rb
 - spec/earth/electricity/electric_market_spec.rb
 - spec/earth/electricity/electric_utility_spec.rb
 - spec/earth/electricity/green_button_adoption_spec.rb
 - spec/earth/fuel/fuel_spec.rb
+- spec/earth/fuel/fuel_year_spec.rb
+- spec/earth/fuel/greenhouse_gas_spec.rb
 - spec/earth/hospitality/commercial_building_energy_consumption_survey_response_spec.rb
 - spec/earth/hospitality/lodging_class_spec.rb
 - spec/earth/industry/cbecs_energy_intensity_spec.rb
@@ -773,18 +993,78 @@ test_files:
 - spec/earth/industry/naics_2002_spec.rb
 - spec/earth/industry/naics_2007_spec.rb
 - spec/earth/industry/sic_1987_spec.rb
+- spec/earth/locality/census_division_spec.rb
+- spec/earth/locality/census_region_spec.rb
+- spec/earth/locality/climate_division_spec.rb
 - spec/earth/locality/country_spec.rb
 - 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/padd_spec.rb
 - spec/earth/locality/state_spec.rb
 - spec/earth/locality/zip_code_spec.rb
 - spec/earth/model_spec.rb
+- spec/earth/pet/breed_gender_spec.rb
+- spec/earth/pet/breed_spec.rb
+- spec/earth/pet/gender_spec.rb
 - spec/earth/pet/species_spec.rb
+- spec/earth/rail/country_rail_class_spec.rb
+- spec/earth/rail/country_rail_traction_class_spec.rb
+- spec/earth/rail/country_rail_traction_spec.rb
+- spec/earth/rail/national_transit_database_company_spec.rb
+- spec/earth/rail/national_transit_database_mode_spec.rb
+- spec/earth/rail/national_transit_database_record_spec.rb
+- spec/earth/rail/rail_class_spec.rb
+- spec/earth/rail/rail_company_spec.rb
+- spec/earth/rail/rail_fuel_spec.rb
+- spec/earth/rail/rail_traction_spec.rb
+- spec/earth/residence/air_conditioner_use_spec.rb
+- spec/earth/residence/clothes_machine_use_spec.rb
+- spec/earth/residence/dishwasher_use_spec.rb
+- spec/earth/residence/residence_appliance_spec.rb
+- spec/earth/residence/residence_class_spec.rb
+- spec/earth/residence/residence_fuel_price_spec.rb
+- spec/earth/residence/residence_fuel_type_spec.rb
+- spec/earth/residence/residential_energy_consumption_survey_response_spec.rb
+- spec/earth/residence/urbanity_spec.rb
+- spec/earth/shipping/carrier_mode_spec.rb
+- spec/earth/shipping/carrier_spec.rb
+- spec/earth/shipping/shipment_mode_spec.rb
 - spec/earth_spec.rb
 - spec/factories/airline.rb
 - spec/factories/airport.rb
+- spec/factories/automobile_activity_year.rb
+- spec/factories/automobile_activity_year_type.rb
+- spec/factories/automobile_activity_year_type_fuel.rb
+- spec/factories/automobile_fuel.rb
+- spec/factories/automobile_make.rb
+- spec/factories/automobile_make_model.rb
+- spec/factories/automobile_make_model_year.rb
+- spec/factories/automobile_model.rb
+- spec/factories/automobile_type_fuel.rb
+- spec/factories/automobile_type_fuel_control.rb
+- spec/factories/automobile_type_fuel_year.rb
+- spec/factories/automobile_type_fuel_year_control.rb
+- spec/factories/bus_fuel.rb
+- spec/factories/bus_fuel_year_control.rb
+- spec/factories/cbecs_energy_intensity.rb
+- spec/factories/commercial_building_energy_consumption_survey_response.rb
+- spec/factories/electric_utility.rb
+- spec/factories/flight_distance_class.rb
 - spec/factories/flight_segment.rb
+- spec/factories/food_group.rb
+- spec/factories/fuel.rb
+- spec/factories/fuel_year.rb
+- spec/factories/green_button_adoption.rb
+- spec/factories/greenhouse_gas.rb
+- spec/factories/industry.rb
+- spec/factories/mecs_energy.rb
+- spec/factories/mecs_ratio.rb
+- spec/factories/national_transit_database_company.rb
+- spec/factories/national_transit_database_mode.rb
+- spec/factories/national_transit_database_record.rb
+- spec/factories/residence_appliance.rb
+- spec/factories/zip_code.rb
 - spec/spec_helper.rb
 - spec/support/integration.rb