earth 0.5.0 → 0.5.2

data/lib/earth/automobile/automobile_type_year.rb

@@ -2,8 +2,14 @@ class AutomobileTypeYear < ActiveRecord::Base
   set_primary_key :name
   
   has_many :type_fuel_years, :class_name => 'AutomobileTypeFuelYear', :foreign_key => 'type_year_name'
-  
-  data_miner do
-    tap "Brighter Planet's sanitized automobile type year data", Earth.taps_server
+
+  create_table do
+    string  'name'
+    string  'type_name'
+    integer 'year'
+    float   'hfc_emissions'
+    string  'hfc_emissions_units'
+    float   'hfc_emission_factor'
+    string  'hfc_emission_factor_units'
   end
 end

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

@@ -1,34 +1,5 @@
 BusClass.class_eval do
   data_miner do
-    schema Earth.database_options do
-      string 'name'
-      float  'distance'
-      string 'distance_units'
-      float  'passengers'
-      float  'speed'
-      string 'speed_units'
-      float  'gasoline_intensity'
-      string 'gasoline_intensity_units'
-      float  'diesel_intensity'
-      string 'diesel_intensity_units'
-      float  'cng_intensity'
-      string 'cng_intensity_units'
-      float  'lng_intensity'
-      string 'lng_intensity_units'
-      float  'lpg_intensity'
-      string 'lpg_intensity_units'
-      float  'methanol_intensity'
-      string 'methanol_intensity_units'
-      float  'biodiesel_intensity'
-      string 'biodiesel_intensity_units'
-      float  'electricity_intensity'
-      string 'electricity_intensity_units'
-      float  'air_conditioning_emission_factor'
-      string 'air_conditioning_emission_factor_units'
-      float  'alternative_fuels_intensity'
-      string 'alternative_fuels_intensity_units'
-    end
-    
     import "a list of bus classes and pre-calculated trip and fuel use characteristics",
            :url => 'https://spreadsheets.google.com/pub?hl=en&hl=en&key=0AoQJbWqPrREqdGRsSnJoS1hraGJvR012cDROWXFPbVE&gid=0&output=csv' do
       key   'name'

data/lib/earth/bus/bus_class.rb

@@ -28,7 +28,32 @@ class BusClass < ActiveRecord::Base
                 :alternative_fuels_intensity => 0.04632038.gallons_per_mile.to(:litres_per_kilometre), # deprecated
                 :alternative_fuels_intensity_units => 'litres_per_kilometre' # deprecated
   
-  data_miner do
-    tap "Brighter Planet's sanitized bus class data", Earth.taps_server
+  create_table do
+    string 'name'
+    float  'distance'
+    string 'distance_units'
+    float  'passengers'
+    float  'speed'
+    string 'speed_units'
+    float  'gasoline_intensity'
+    string 'gasoline_intensity_units'
+    float  'diesel_intensity'
+    string 'diesel_intensity_units'
+    float  'cng_intensity'
+    string 'cng_intensity_units'
+    float  'lng_intensity'
+    string 'lng_intensity_units'
+    float  'lpg_intensity'
+    string 'lpg_intensity_units'
+    float  'methanol_intensity'
+    string 'methanol_intensity_units'
+    float  'biodiesel_intensity'
+    string 'biodiesel_intensity_units'
+    float  'electricity_intensity'
+    string 'electricity_intensity_units'
+    float  'air_conditioning_emission_factor'
+    string 'air_conditioning_emission_factor_units'
+    float  'alternative_fuels_intensity'
+    string 'alternative_fuels_intensity_units'
   end
 end

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

@@ -1,21 +1,6 @@
 BusFuel.class_eval do
   data_miner do
-    schema Earth.database_options do
-      string 'name'
-      string 'fuel_name'
-      float  'energy_content'
-      string 'energy_content_units'
-      float  'co2_emission_factor'
-      string 'co2_emission_factor_units'
-      float  'co2_biogenic_emission_factor'
-      string 'co2_biogenic_emission_factor_units'
-      float  'ch4_emission_factor'
-      string 'ch4_emission_factor_units'
-      float  'n2o_emission_factor'
-      string 'n2o_emission_factor_units'
-    end
-    
-    process "Ensure necessary datasets are imported" do
+    process "Ensure Fuel, GreenhouseGas, and BusFuelYearControl are populated" do
       Fuel.run_data_miner!
       GreenhouseGas.run_data_miner!
       BusFuelYearControl.run_data_miner!

data/lib/earth/bus/bus_fuel.rb

@@ -3,16 +3,23 @@ class BusFuel < ActiveRecord::Base
   
   belongs_to :fuel, :foreign_key => 'fuel_name'
   has_many :fuel_year_controls, :class_name => 'BusFuelYearControl', :foreign_key => 'bus_fuel_name'
-  
-  data_miner do
-    tap "Brighter Planet's sanitized bus fuel data", Earth.taps_server
     
-    process "Pull dependencies" do
-      run_data_miner_on_belongs_to_associations
-    end
-  end
-  
   def latest_fuel_year_controls
     fuel_year_controls.where(:year => fuel_year_controls.maximum('year'))
   end
+  
+  create_table do
+    string 'name'
+    string 'fuel_name'
+    float  'energy_content'
+    string 'energy_content_units'
+    float  'co2_emission_factor'
+    string 'co2_emission_factor_units'
+    float  'co2_biogenic_emission_factor'
+    string 'co2_biogenic_emission_factor_units'
+    float  'ch4_emission_factor'
+    string 'ch4_emission_factor_units'
+    float  'n2o_emission_factor'
+    string 'n2o_emission_factor_units'
+  end
 end

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

@@ -1,15 +1,5 @@
 BusFuelControl.class_eval do
   data_miner do
-    schema Earth.database_options do
-      string 'name'
-      string 'bus_fuel_name'
-      string 'control'
-      float  'ch4_emission_factor'
-      string 'ch4_emission_factor_units'
-      float  'n2o_emission_factor'
-      string 'n2o_emission_factor_units'
-    end
-    
     import "a list of bus fuel controls",
            :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdEw1QW80VVJhaXRkUURQSFhHczNyVWc&gid=0&output=csv' do
       key   'name'

data/lib/earth/bus/bus_fuel_control.rb

@@ -1,7 +1,12 @@
 class BusFuelControl < ActiveRecord::Base
   set_primary_key :name
-  
-  data_miner do
-    tap "Brighter Planet's sanitized bus fuel data", Earth.taps_server
+  create_table do
+    string 'name'
+    string 'bus_fuel_name'
+    string 'control'
+    float  'ch4_emission_factor'
+    string 'ch4_emission_factor_units'
+    float  'n2o_emission_factor'
+    string 'n2o_emission_factor_units'
   end
 end

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

@@ -1,15 +1,6 @@
 BusFuelYearControl.class_eval do
   data_miner do
-    schema Earth.database_options do
-      string  'name'
-      string  'bus_fuel_name'
-      integer 'year'
-      string  'control'
-      string  'bus_fuel_control_name'
-      float   'total_travel_percent'
-    end
-    
-    process "Ensure all BusFuelControls are imported" do
+    process "Ensure BusFuelControl is populated" do
       BusFuelControl.run_data_miner!
     end
     

data/lib/earth/bus/bus_fuel_year_control.rb

@@ -2,12 +2,13 @@ class BusFuelYearControl < ActiveRecord::Base
   set_primary_key :name
   
   belongs_to :fuel_control, :class_name => 'BusFuelControl', :foreign_key => 'bus_fuel_control_name'
-  
-  data_miner do
-    tap "Brighter Planet's sanitized bus fuel data", Earth.taps_server
-    
-    process "Pull dependencies" do
-      run_data_miner_on_belongs_to_associations
-    end
+
+  create_table do
+    string  'name'
+    string  'bus_fuel_name'
+    integer 'year'
+    string  'control'
+    string  'bus_fuel_control_name'
+    float   'total_travel_percent'
   end
 end

data/lib/earth/bus/data_miner.rb

@@ -2,3 +2,5 @@ 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'

data/lib/earth/bus.rb

@@ -2,3 +2,5 @@ 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'

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

@@ -1,10 +1,5 @@
 ComputationCarrier.class_eval do
   data_miner do
-    schema Earth.database_options do
-      string 'name'
-      float  'power_usage_effectiveness'
-    end
-    
     import "a list of computation carriers and their power usage effectiveness",
            :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdFlxZVZLai01WWJOOTFiaUd1blF6VkE&gid=0&output=csv' do
       key   'name'

data/lib/earth/computation/computation_carrier.rb

@@ -4,7 +4,8 @@ class ComputationCarrier < ActiveRecord::Base
   falls_back_on :name => 'fallback',
                 :power_usage_effectiveness => lambda { ComputationCarrier.maximum('power_usage_effectiveness') }
   
-  data_miner do
-    tap "Brighter Planet's computation carrier data", Earth.taps_server
+  create_table do
+    string 'name'
+    float  'power_usage_effectiveness'
   end
 end

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

@@ -1,13 +1,5 @@
 ComputationCarrierInstanceClass.class_eval do
   data_miner do
-    schema Earth.database_options do
-      string 'name'
-      string 'computation_carrier_name'
-      string 'instance_class'
-      float  'electricity_intensity'
-      string 'electricity_intensity_units'
-    end
-    
     import "a list of computation carrier instance classes and their characteristics",
            :url => 'https://spreadsheets.google.com/pub?key=0AkCJNpm9Ks6JdGExaW1ic2c0d2s1ZmpzeUdOa2kyRlE&gid=0&output=csv' do
       key   'name'

data/lib/earth/computation/computation_carrier_instance_class.rb

@@ -7,11 +7,11 @@ class ComputationCarrierInstanceClass < ActiveRecord::Base
                 :electricity_intensity => lambda { ComputationCarrierInstanceClass.find_by_name('Amazon m1.small').electricity_intensity },
                 :electricity_intensity_units => lambda { ComputationCarrierInstanceClass.find_by_name('Amazon m1.small').electricity_intensity_units }
   
-  data_miner do
-    tap "Brighter Planet's computation carrier instance class data", Earth.taps_server
-    
-    process "Pull dependencies" do
-      run_data_miner_on_belongs_to_associations
-    end
+  create_table do
+    string 'name'
+    string 'computation_carrier_name'
+    string 'instance_class'
+    float  'electricity_intensity'
+    string 'electricity_intensity_units'
   end
 end

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

@@ -1,12 +1,5 @@
 ComputationCarrierRegion.class_eval do
   data_miner do
-    schema Earth.database_options do
-      string 'name'
-      string 'computation_carrier_name'
-      string 'region'
-      string 'egrid_subregion_abbreviation'
-    end
-    
     import "a list of computation carrier regions",
            :url => 'https://spreadsheets.google.com/pub?key=0AkCJNpm9Ks6JdGFEU1gtVzFPeS0tV1VnR05WZ2ZFUVE&gid=0&output=csv' do
       key   'name'

data/lib/earth/computation/computation_carrier_region.rb

@@ -2,12 +2,11 @@ class ComputationCarrierRegion < ActiveRecord::Base
   set_primary_key :name
   
   belongs_to :egrid_subregion, :foreign_key => 'egrid_subregion_abbreviation'
-  
-  data_miner do
-    tap "Brighter Planet's computation carrier region data", Earth.taps_server
-    
-    process "Pull dependencies" do
-      run_data_miner_on_belongs_to_associations
-    end
+
+  create_table do
+    string 'name'
+    string 'computation_carrier_name'
+    string 'region'
+    string 'egrid_subregion_abbreviation'
   end
 end

data/lib/earth/computation/data_miner.rb

@@ -1,3 +1,5 @@
 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'

data/lib/earth/computation.rb

@@ -1,3 +1,5 @@
 require 'earth/computation/computation_carrier'
 require 'earth/computation/computation_carrier_region'
 require 'earth/computation/computation_carrier_instance_class'
+
+require 'earth/locality'

data/lib/earth/diet/diet_class/data_miner.rb

@@ -1,21 +1,5 @@
 DietClass.class_eval do
   data_miner do
-    schema Earth.database_options do
-      string 'name'
-      float  'intensity'
-      string 'intensity_units'
-      float  'red_meat_share'
-      float  'poultry_share'
-      float  'fish_share'
-      float  'eggs_share'
-      float  'nuts_share'
-      float  'dairy_share'
-      float  'cereals_and_grains_share'
-      float  'fruit_share'
-      float  'vegetables_share'
-      float  'oils_and_sugars_share'
-    end
-    
     import "a Brighter Planet-defined list of diet classes and food group caloric distributions",
            :url => 'http://static.brighterplanet.com/science/data/consumables/diets/diet_classes.csv' do
       key   'name'

data/lib/earth/diet/diet_class.rb

@@ -1,13 +1,25 @@
 class DietClass < ActiveRecord::Base
   set_primary_key :name
   
-  data_miner do
-    tap "Brighter Planet's diet class data", Earth.taps_server
-  end
-  
   class << self
     def fallback
       find_by_name 'standard'
     end
   end
+  
+  create_table do
+    string 'name'
+    float  'intensity'
+    string 'intensity_units'
+    float  'red_meat_share'
+    float  'poultry_share'
+    float  'fish_share'
+    float  'eggs_share'
+    float  'nuts_share'
+    float  'dairy_share'
+    float  'cereals_and_grains_share'
+    float  'fruit_share'
+    float  'vegetables_share'
+    float  'oils_and_sugars_share'
+  end
 end

data/lib/earth/diet/food_group/data_miner.rb

@@ -1,14 +1,5 @@
 FoodGroup.class_eval do
   data_miner do
-    schema Earth.database_options do
-      string  'name'
-      float   'intensity'
-      string  'intensity_units'
-      float   'energy'
-      string  'energy_units'
-      string  'suggested_imperial_measurement' # ?
-    end
-    
     import "a list of food groups and their emissions intensities",
            :url => 'http://static.brighterplanet.com/science/data/consumables/diets/food_groups.csv' do
       key   'name'

data/lib/earth/diet/food_group.rb

@@ -11,7 +11,12 @@ class FoodGroup < ActiveRecord::Base
     end
   end
   
-  data_miner do
-    tap "Brighter Planet's food group data", Earth.taps_server
+  create_table do
+    string  'name'
+    float   'intensity'
+    string  'intensity_units'
+    float   'energy'
+    string  'energy_units'
+    string  'suggested_imperial_measurement' # ?
   end
 end

data/lib/earth/fuel/fuel/data_miner.rb

@@ -1,21 +1,5 @@
 Fuel.class_eval do
   data_miner do
-    schema Earth.database_options do
-      string 'name'
-      float  'density'
-      string 'density_units'
-      float  'energy_content'
-      string 'energy_content_units'
-      float  'carbon_content'
-      string 'carbon_content_units'
-      float  'oxidation_factor'
-      float  'biogenic_fraction'
-      float  'co2_emission_factor'
-      string 'co2_emission_factor_units'
-      float  'co2_biogenic_emission_factor'
-      string 'co2_biogenic_emission_factor_units'
-    end
-    
     process "Ensure FuelYear is populated" do
       FuelYear.run_data_miner!
     end

data/lib/earth/fuel/fuel.rb

@@ -3,8 +3,20 @@ class Fuel < ActiveRecord::Base
   
   has_many :fuel_years, :foreign_key => 'fuel_name'
   
-  data_miner do
-    tap "Brighter Planet's fuels data", Earth.taps_server
+  create_table do
+    string 'name'
+    float  'density'
+    string 'density_units'
+    float  'energy_content'
+    string 'energy_content_units'
+    float  'carbon_content'
+    string 'carbon_content_units'
+    float  'oxidation_factor'
+    float  'biogenic_fraction'
+    float  'co2_emission_factor'
+    string 'co2_emission_factor_units'
+    float  'co2_biogenic_emission_factor'
+    string 'co2_biogenic_emission_factor_units'
   end
   
   def latest_year

data/lib/earth/fuel/fuel_price/data_miner.rb

@@ -4,12 +4,6 @@ FuelPrice.class_eval do
   # month/year
 
   data_miner do
-    schema Earth.database_options do
-      string  'name'
-      float   'price'
-      string  'price_units'
-    end
-    
     import 'fuel prices derived from the EIA',
            :url => 'http://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdHlSdXJoOFB5aEpHenJQbTVJdS1pMVE&gid=0&output=csv',
            :select => lambda { |row| row['fuel_type_name'].present? } do

data/lib/earth/fuel/fuel_price.rb

@@ -3,11 +3,9 @@ class FuelPrice < ActiveRecord::Base
   
   belongs_to :fuel_type, :foreign_key => 'name' # weird
   
-  data_miner do
-    tap "Brighter Planet's fuel price data", Earth.taps_server
-    
-    process "pull dependencies" do
-      run_data_miner_on_belongs_to_associations
-    end
+  create_table do
+    string  'name'
+    float   'price'
+    string  'price_units'
   end
 end

data/lib/earth/fuel/fuel_type/data_miner.rb

@@ -5,20 +5,6 @@ FuelType.class_eval do
   # gas-specific emissions factors
   
   data_miner do
-    schema Earth.database_options do
-      string 'name'
-      float  'emission_factor'
-      string 'emission_factor_units'
-      float  'density'
-      string 'density_units'
-      float  'average_purchase_volume'
-      string 'average_purchase_volume_units'
-      # float    'energy_content'
-      # string   'energy_content_units'
-      # float    'carbon_content'
-      # string   'carbon_content_units'
-    end
-    
     # process "Define some necessary conversions" do
     #   Conversions.register :teragrams_per_quadrillion_british_thermal_units, :kilograms_per_joule,         0.000000000947817123
     #   Conversions.register :million_british_thermal_units_per_short_ton,     :joules_per_kilogram,         1.16300000

data/lib/earth/fuel/fuel_type.rb

@@ -8,11 +8,21 @@ class FuelType < ActiveRecord::Base
                 :average_purchase_volume       => 100, #FIXME TODO put a real value here - also do we want to do volumes in kJ?
                 :average_purchase_volume_units => 'FIXME'
   
-  data_miner do
-    tap "Brighter Planet's fuel types data", Earth.taps_server
-  end
-  
   def price
     prices.average :price
   end
+  
+  create_table do
+    string 'name'
+    float  'emission_factor'
+    string 'emission_factor_units'
+    float  'density'
+    string 'density_units'
+    float  'average_purchase_volume'
+    string 'average_purchase_volume_units'
+    # float    'energy_content'
+    # string   'energy_content_units'
+    # float    'carbon_content'
+    # string   'carbon_content_units'
+  end
 end

data/lib/earth/fuel/fuel_year/data_miner.rb

@@ -1,21 +1,5 @@
 FuelYear.class_eval do
   data_miner do
-    schema Earth.database_options do
-      string  'name'
-      string  'fuel_name'
-      integer 'year'
-      float   'energy_content'
-      string  'energy_content_units'
-      float   'carbon_content'
-      string  'carbon_content_units'
-      float   'oxidation_factor'
-      float   'biogenic_fraction'
-      float   'co2_emission_factor'
-      string  'co2_emission_factor_units'
-      float   'co2_biogenic_emission_factor'
-      string  'co2_biogenic_emission_factor_units'
-    end
-    
     import "fuels with annually variable characteristics, derived from the 2010 EPA GHG Inventory",
            :url => 'https://spreadsheets.google.com/pub?hl=en&hl=en&key=0AoQJbWqPrREqdFZVSlZ3SUZsTzZLVTB5bVk5THdBN2c&gid=0&output=csv' do
       key 'name'

data/lib/earth/fuel/fuel_year.rb

@@ -1,7 +1,19 @@
 class FuelYear < ActiveRecord::Base
   set_primary_key :name
   
-  data_miner do
-    tap "Brighter Planet's fuel year data", Earth.taps_server
+  create_table do
+    string  'name'
+    string  'fuel_name'
+    integer 'year'
+    float   'energy_content'
+    string  'energy_content_units'
+    float   'carbon_content'
+    string  'carbon_content_units'
+    float   'oxidation_factor'
+    float   'biogenic_fraction'
+    float   'co2_emission_factor'
+    string  'co2_emission_factor_units'
+    float   'co2_biogenic_emission_factor'
+    string  'co2_biogenic_emission_factor_units'
   end
 end

data/lib/earth/fuel/greenhouse_gas/data_miner.rb

@@ -1,14 +1,5 @@
 GreenhouseGas.class_eval do
   data_miner do
-    schema Earth.database_options do
-      string  'name'
-      string  'abbreviation'
-      string  'ipcc_report'
-      integer 'time_horizon'
-      string  'time_horizon_units'
-      integer 'global_warming_potential'
-    end
-    
     import "greenhouse gas global warming potentials taken from the IPCC AR4",
            :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdE1tUjBwS1ZHZnBUUG1XcVpkOTVHOVE&gid=0&output=csv' do
       key 'name'

data/lib/earth/fuel/greenhouse_gas.rb

@@ -1,13 +1,18 @@
 class GreenhouseGas < ActiveRecord::Base
   set_primary_key :name
-  
-  data_miner do
-    tap "Brighter Planet's greenhouse gas data", Earth.taps_server
-  end
-  
+    
   class << self
     def [](abbreviation)
       find_by_abbreviation abbreviation.to_s
     end
   end
+  
+  create_table do
+    string  'name'
+    string  'abbreviation'
+    string  'ipcc_report'
+    integer 'time_horizon'
+    string  'time_horizon_units'
+    integer 'global_warming_potential'
+  end
 end

data/lib/earth/hospitality/lodging_class/data_miner.rb

@@ -1,17 +1,5 @@
 LodgingClass.class_eval do
   data_miner do
-    schema Earth.database_options do
-      string 'name'
-      float  'electricity_intensity'
-      string 'electricity_intensity'
-      float  'natural_gas_intensity'
-      string 'natural_gas_intensity'
-      float  'fuel_oil_intensity'
-      string 'fuel_oil_intensity'
-      float  'district_heat_intensity'
-      string 'district_heat_intensity'
-    end
-    
     import "a list of lodging classes and pre-calculated emission factors",
            :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdGZZWmZtWEJlYzhRNXlPdWpBTldlcUE&hl=en&gid=0&output=csv' do
       key   'name'