earth 0.11.7 → 0.11.8

data/lib/earth/automobile.rb

@@ -1,18 +1,3 @@
-require 'earth/automobile/automobile_fuel'
-require 'earth/automobile/automobile_make'
-require 'earth/automobile/automobile_make_year'
-require 'earth/automobile/automobile_make_year_fleet'
-require 'earth/automobile/automobile_make_model'
-require 'earth/automobile/automobile_make_model_year'
-require 'earth/automobile/automobile_make_model_year_variant'
-require 'earth/automobile/automobile_model'
-require 'earth/automobile/automobile_size_class'
-require 'earth/automobile/automobile_size_class_year'
-require 'earth/automobile/automobile_type_year'
-require 'earth/automobile/automobile_type_fuel_control'
-require 'earth/automobile/automobile_type_fuel_year'
-require 'earth/automobile/automobile_type_fuel_year_age'
-require 'earth/automobile/automobile_type_fuel_year_control'
-require 'earth/automobile/automobile_year'
-
-require 'earth/fuel'
+# lib/earth/automobile.rb
+require 'earth'
+Earth.require_related __FILE__

data/lib/earth/automobile/automobile_fuel.rb

@@ -1,6 +1,4 @@
-require 'earth/automobile/automobile_type_fuel_year_age'
-require 'earth/automobile/automobile_type_fuel_year'
-require 'earth/automobile/automobile_type_year'
+require 'earth/fuel'
 
 class AutomobileFuel < ActiveRecord::Base
   set_primary_key :name

data/lib/earth/automobile/automobile_fuel/data_miner.rb

@@ -1,3 +1,4 @@
+require 'earth/fuel/data_miner'
 AutomobileFuel.class_eval do
   data_miner do
     import "a list of pure automobile fuels",

data/lib/earth/automobile/automobile_make.rb

@@ -1,3 +1,4 @@
+require 'earth/fuel'
 class AutomobileMake < ActiveRecord::Base
   set_primary_key :name
   

data/lib/earth/automobile/automobile_make/data_miner.rb

@@ -1,3 +1,4 @@
+require 'earth/fuel/data_miner'
 AutomobileMake.class_eval do
   data_miner do
     process "Start from scratch" do

data/lib/earth/automobile/automobile_make_model.rb

@@ -1,3 +1,4 @@
+require 'earth/fuel'
 class AutomobileMakeModel < ActiveRecord::Base
   set_primary_key :name
   

data/lib/earth/automobile/automobile_make_model/data_miner.rb

@@ -1,3 +1,4 @@
+require 'earth/fuel/data_miner'
 AutomobileMakeModel.class_eval do
   data_miner do
     process "Start from scratch" do

data/lib/earth/automobile/automobile_make_model_year.rb

@@ -1,3 +1,4 @@
+require 'earth/fuel'
 class AutomobileMakeModelYear < ActiveRecord::Base
   set_primary_key :name
   

data/lib/earth/automobile/automobile_make_model_year/data_miner.rb

@@ -1,3 +1,4 @@
+require 'earth/fuel/data_miner'
 AutomobileMakeModelYear.class_eval do
   data_miner do
     process "Start from scratch" do

data/lib/earth/automobile/automobile_make_model_year_variant.rb

@@ -1,3 +1,4 @@
+require 'earth/fuel'
 class AutomobileMakeModelYearVariant < ActiveRecord::Base
   set_primary_key :row_hash
   

data/lib/earth/automobile/automobile_make_model_year_variant/data_miner.rb

@@ -1,3 +1,4 @@
+require 'earth/fuel/data_miner'
 AutomobileMakeModelYearVariant.class_eval do
   # For errata
   class AutomobileMakeModelYearVariant::Guru

data/lib/earth/automobile/automobile_make_year.rb

@@ -1,3 +1,4 @@
+require 'earth/fuel'
 class AutomobileMakeYear < ActiveRecord::Base
   set_primary_key :name
   

data/lib/earth/automobile/automobile_make_year/data_miner.rb

@@ -1,3 +1,4 @@
+require 'earth/fuel/data_miner'
 AutomobileMakeYear.class_eval do
   data_miner do
     process "Start from scratch" do

data/lib/earth/automobile/automobile_make_year_fleet.rb

@@ -1,3 +1,4 @@
+require 'earth/fuel'
 class AutomobileMakeYearFleet < ActiveRecord::Base
   set_primary_key :name
   

data/lib/earth/automobile/automobile_make_year_fleet/data_miner.rb

@@ -1,3 +1,4 @@
+require 'earth/fuel/data_miner'
 AutomobileMakeYearFleet.class_eval do
   data_miner do
     import "annual corporate average fuel economy data for domestic and imported vehicle fleets from the NHTSA",

data/lib/earth/automobile/automobile_model.rb

@@ -1,3 +1,4 @@
+require 'earth/fuel'
 class AutomobileModel < ActiveRecord::Base
   set_primary_key :name
   

data/lib/earth/automobile/automobile_model/data_miner.rb

@@ -1,3 +1,4 @@
+require 'earth/fuel/data_miner'
 AutomobileModel.class_eval do
   data_miner do
     process "Start from scratch" do

data/lib/earth/automobile/automobile_size_class.rb

@@ -1,3 +1,4 @@
+require 'earth/fuel'
 class AutomobileSizeClass < ActiveRecord::Base
   set_primary_key :name
   

data/lib/earth/automobile/automobile_size_class/data_miner.rb

@@ -1,3 +1,4 @@
+require 'earth/fuel/data_miner'
 AutomobileSizeClass.class_eval do
   data_miner do
     import "a list of size classes and pre-calculated fuel efficiencies",

data/lib/earth/automobile/automobile_size_class_year.rb

@@ -1,3 +1,4 @@
+require 'earth/fuel'
 # Not yet in use - for if we want to autocaculate size class stuf - November 10, 2011
 class AutomobileSizeClassYear < ActiveRecord::Base
   set_primary_key :name

data/lib/earth/automobile/automobile_size_class_year/data_miner.rb

@@ -1,3 +1,4 @@
+require 'earth/fuel/data_miner'
 # Not yet in use - for if we want to autocaculate size class stuf - November 10, 2011
 AutomobileSizeClassYear.class_eval do
   data_miner do

data/lib/earth/automobile/automobile_type_fuel_control.rb

@@ -1,3 +1,4 @@
+require 'earth/fuel'
 class AutomobileTypeFuelControl < ActiveRecord::Base
   set_primary_key :name
   col :name

data/lib/earth/automobile/automobile_type_fuel_control/data_miner.rb

@@ -1,3 +1,4 @@
+require 'earth/fuel/data_miner'
 AutomobileTypeFuelControl.class_eval do
   data_miner do
     import "automobile type fuel control data derived from the 2010 EPA GHG Inventory",

data/lib/earth/automobile/automobile_type_fuel_year.rb

@@ -1,3 +1,4 @@
+require 'earth/fuel'
 class AutomobileTypeFuelYear < ActiveRecord::Base
   set_primary_key :name
   

data/lib/earth/automobile/automobile_type_fuel_year/data_miner.rb

@@ -1,3 +1,4 @@
+require 'earth/fuel/data_miner'
 AutomobileTypeFuelYear.class_eval do
   data_miner do
     import "total vehicle miles travelled by gasoline passenger cars from the 2010 EPA GHG Inventory",

data/lib/earth/automobile/automobile_type_fuel_year_age.rb

@@ -1,3 +1,4 @@
+require 'earth/fuel'
 class AutomobileTypeFuelYearAge < ActiveRecord::Base
   set_primary_key :name
   

data/lib/earth/automobile/automobile_type_fuel_year_age/data_miner.rb

@@ -1,3 +1,4 @@
+require 'earth/fuel/data_miner'
 AutomobileTypeFuelYearAge.class_eval do
   data_miner do
     import "total travel distribution of gasoline passenger cars from the 2010 EPA GHG Inventory",

data/lib/earth/automobile/automobile_type_fuel_year_control.rb

@@ -1,3 +1,4 @@
+require 'earth/fuel'
 class AutomobileTypeFuelYearControl < ActiveRecord::Base
   set_primary_key :name
   

data/lib/earth/automobile/automobile_type_fuel_year_control/data_miner.rb

@@ -1,3 +1,4 @@
+require 'earth/fuel/data_miner'
 AutomobileTypeFuelYearControl.class_eval do
   data_miner do
     import "automobile type fuel year control data derived from the 2010 EPA GHG Inventory",

data/lib/earth/automobile/automobile_type_year.rb

@@ -1,3 +1,4 @@
+require 'earth/fuel'
 class AutomobileTypeYear < ActiveRecord::Base
   set_primary_key :name
   

data/lib/earth/automobile/automobile_type_year/data_miner.rb

@@ -1,3 +1,4 @@
+require 'earth/fuel/data_miner'
 AutomobileTypeYear.class_eval do
   data_miner do
     import "automobile type year air conditioning emissions derived from the 2010 EPA GHG Inventory",

data/lib/earth/automobile/automobile_year.rb

@@ -1,3 +1,4 @@
+require 'earth/fuel'
 class AutomobileYear < ActiveRecord::Base
   set_primary_key :year
   

data/lib/earth/automobile/automobile_year/data_miner.rb

@@ -1,3 +1,4 @@
+require 'earth/fuel/data_miner'
 AutomobileYear.class_eval do
   data_miner do
     process "Ensure AutomobileMakeModelYearVariant is populated" do

data/lib/earth/automobile/data_miner.rb

@@ -1,18 +1,3 @@
-require 'earth/automobile/automobile_fuel/data_miner'
-require 'earth/automobile/automobile_make/data_miner'
-require 'earth/automobile/automobile_make_year/data_miner'
-require 'earth/automobile/automobile_make_year_fleet/data_miner'
-require 'earth/automobile/automobile_make_model/data_miner'
-require 'earth/automobile/automobile_make_model_year/data_miner'
-require 'earth/automobile/automobile_make_model_year_variant/data_miner'
-require 'earth/automobile/automobile_size_class/data_miner'
-require 'earth/automobile/automobile_size_class_year/data_miner'
-require 'earth/automobile/automobile_type_year/data_miner'
-require 'earth/automobile/automobile_type_fuel_control/data_miner'
-require 'earth/automobile/automobile_type_fuel_year/data_miner'
-require 'earth/automobile/automobile_type_fuel_year_age/data_miner'
-require 'earth/automobile/automobile_type_fuel_year_control/data_miner'
-require 'earth/automobile/automobile_model/data_miner'
-require 'earth/automobile/automobile_year/data_miner'
-
-require 'earth/fuel/data_miner'
+# lib/earth/automobile/data_miner.rb
+require 'earth'
+Earth.require_related __FILE__

data/lib/earth/bus.rb

@@ -1,6 +1,3 @@
-require 'earth/bus/bus_class'
-require 'earth/bus/bus_fuel'
-require 'earth/bus/bus_fuel_control'
-require 'earth/bus/bus_fuel_year_control'
-
-require 'earth/fuel'
+# lib/earth/bus.rb
+require 'earth'
+Earth.require_related __FILE__

data/lib/earth/bus/bus_class.rb

@@ -1,3 +1,4 @@
+require 'earth/fuel'
 class BusClass < ActiveRecord::Base
   set_primary_key :name
   

data/lib/earth/bus/bus_class/data_miner.rb

@@ -1,3 +1,4 @@
+require 'earth/fuel/data_miner'
 BusClass.class_eval do
   data_miner do
     import "a list of bus classes and pre-calculated trip and fuel use characteristics",

data/lib/earth/bus/bus_fuel.rb

@@ -1,3 +1,4 @@
+require 'earth/fuel'
 class BusFuel < ActiveRecord::Base
   set_primary_key :name
   

data/lib/earth/bus/bus_fuel/data_miner.rb

@@ -1,3 +1,4 @@
+require 'earth/fuel/data_miner'
 BusFuel.class_eval do
   data_miner do
     process "Ensure Fuel, GreenhouseGas, and BusFuelYearControl are populated" do

data/lib/earth/bus/bus_fuel_control.rb

@@ -1,3 +1,4 @@
+require 'earth/fuel'
 class BusFuelControl < ActiveRecord::Base
   set_primary_key :name
   col :name

data/lib/earth/bus/bus_fuel_control/data_miner.rb

@@ -1,3 +1,4 @@
+require 'earth/fuel/data_miner'
 BusFuelControl.class_eval do
   data_miner do
     import "a list of bus fuel controls",

data/lib/earth/bus/bus_fuel_year_control.rb

@@ -1,3 +1,4 @@
+require 'earth/fuel'
 class BusFuelYearControl < ActiveRecord::Base
   set_primary_key :name
   

data/lib/earth/bus/bus_fuel_year_control/data_miner.rb

@@ -1,3 +1,4 @@
+require 'earth/fuel/data_miner'
 BusFuelYearControl.class_eval do
   data_miner do
     process "Ensure BusFuelControl is populated" do

data/lib/earth/bus/data_miner.rb

@@ -1,6 +1,3 @@
-require 'earth/bus/bus_class/data_miner'
-require 'earth/bus/bus_fuel/data_miner'
-require 'earth/bus/bus_fuel_control/data_miner'
-require 'earth/bus/bus_fuel_year_control/data_miner'
-
-require 'earth/fuel/data_miner'
+# lib/earth/bus/data_miner.rb
+require 'earth'
+Earth.require_related __FILE__

data/lib/earth/computation.rb

@@ -1,5 +1,3 @@
-require 'earth/computation/computation_carrier'
-require 'earth/computation/computation_carrier_region'
-require 'earth/computation/computation_carrier_instance_class'
-
-require 'earth/locality'
+# lib/earth/computation.rb
+require 'earth'
+Earth.require_related __FILE__

data/lib/earth/computation/computation_carrier.rb

@@ -1,3 +1,4 @@
+require 'earth/locality'
 class ComputationCarrier < ActiveRecord::Base
   set_primary_key :name
   

data/lib/earth/computation/computation_carrier/data_miner.rb

@@ -1,3 +1,4 @@
+require 'earth/locality/data_miner'
 ComputationCarrier.class_eval do
   data_miner do
     import "a list of computation carriers and their power usage effectiveness",
@@ -5,6 +6,5 @@ ComputationCarrier.class_eval do
       key   'name'
       store 'power_usage_effectiveness'
     end
-    
   end
 end

data/lib/earth/computation/computation_carrier_instance_class.rb

@@ -1,3 +1,4 @@
+require 'earth/locality'
 class ComputationCarrierInstanceClass < ActiveRecord::Base
   set_primary_key :name
   

data/lib/earth/computation/computation_carrier_instance_class/data_miner.rb

@@ -1,3 +1,4 @@
+require 'earth/locality/data_miner'
 ComputationCarrierInstanceClass.class_eval do
   data_miner do
     import "a list of computation carrier instance classes and their characteristics",

data/lib/earth/computation/computation_carrier_region.rb

@@ -1,3 +1,4 @@
+require 'earth/locality'
 class ComputationCarrierRegion < ActiveRecord::Base
   set_primary_key :name
   

data/lib/earth/computation/computation_carrier_region/data_miner.rb

@@ -1,3 +1,4 @@
+require 'earth/locality/data_miner'
 ComputationCarrierRegion.class_eval do
   data_miner do
     import "a list of computation carrier regions",

data/lib/earth/computation/data_miner.rb

@@ -1,5 +1,3 @@
-require 'earth/computation/computation_carrier/data_miner'
-require 'earth/computation/computation_carrier_region/data_miner'
-require 'earth/computation/computation_carrier_instance_class/data_miner'
-
-require 'earth/locality/data_miner'
+# lib/earth/computation/data_miner.rb
+require 'earth'
+Earth.require_related __FILE__

data/lib/earth/data_miner.rb

@@ -1,13 +1,3 @@
-require 'earth/air/data_miner'
-require 'earth/automobile/data_miner'
-require 'earth/bus/data_miner'
-require 'earth/computation/data_miner'
-require 'earth/diet/data_miner'
-require 'earth/fuel/data_miner'
-require 'earth/hospitality/data_miner'
-require 'earth/locality/data_miner'
-require 'earth/pet/data_miner'
-require 'earth/rail/data_miner'
-require 'earth/residence/data_miner'
-require 'earth/shipping/data_miner'
-require 'earth/industry/data_miner'
+# lib/earth/data_miner.rb
+require 'earth'
+Earth.require_all :load_data_miner => true

data/lib/earth/diet.rb

@@ -1,2 +1,3 @@
-require 'earth/diet/diet_class'
-require 'earth/diet/food_group'
+# lib/earth/diet.rb
+require 'earth'
+Earth.require_related __FILE__

data/lib/earth/diet/data_miner.rb

@@ -1,2 +1,3 @@
-require 'earth/diet/diet_class/data_miner'
-require 'earth/diet/food_group/data_miner'
+# lib/earth/diet/data_miner.rb
+require 'earth'
+Earth.require_related __FILE__

data/lib/earth/eia.rb

@@ -1,23 +1,21 @@
+require 'earth'
 module Earth
   module EIA
     extend self
 
     def normalize(model, fields)
       model.all.each do |record|
-        fields.each do |field|
-          value = record.send field
-          normalized_value = if value == 'Q'
-                               0
-                             elsif value == 'W'
-                               0
-                             elsif value == '*'
-                               0
-                             else
-                               value
-                             end
-          record.send "#{field}=", normalized_value
+        fields.each do |k|
+          v = record.send k
+          normalized_v = case v
+          when 'Q', 'W', '*'
+            0
+          else
+            v
+          end
+          record.send "#{k}=", normalized_v
         end
-        record.save
+        record.save!
       end
     end
   end