earth 0.12.4 → 1.0.0

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

@@ -1,9 +1,5 @@
 AutomobileTypeFuelYearControl.class_eval do
   data_miner do
-    process "Start from scratch" do
-      delete_all
-    end
-    
     import "automobile type fuel year control data derived from the 2010 EPA GHG Inventory",
            :url => "file://#{Earth::DATA_DIR}/automobile/annual_emission_controls.csv" do
       key   'name'

data/lib/earth/automobile/automobile_year.rb

@@ -1,4 +1,17 @@
+require 'earth/model'
+
 class AutomobileYear < ActiveRecord::Base
+  extend Earth::Model
+
+  TABLE_STRUCTURE = <<-EOS
+
+CREATE TABLE automobile_years
+  (
+     year INTEGER NOT NULL PRIMARY KEY
+  );
+
+EOS
+
   self.primary_key = "year"
   
   # Estimate of % of vehicles currently in use that were manufactured in each year
@@ -37,7 +50,6 @@ class AutomobileYear < ActiveRecord::Base
     }[year]
   end
   
-  col :year, :type => :integer
 
   warn_unless_size 28
 end

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

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

data/lib/earth/bus.rb

@@ -1,3 +1,3 @@
 # lib/earth/bus.rb
 require 'earth'
-Earth.require_related __FILE__
+Earth::Loader.require_related __FILE__

data/lib/earth/bus/bus_class.rb

@@ -1,5 +1,42 @@
-require 'earth/fuel'
+require 'falls_back_on'
+
+require 'earth/model'
+
 class BusClass < ActiveRecord::Base
+  extend Earth::Model
+
+  TABLE_STRUCTURE = <<-EOS
+
+CREATE TABLE bus_classes
+  (
+     name                                   CHARACTER VARYING(255) NOT NULL PRIMARY KEY,
+     distance                               FLOAT,
+     distance_units                         CHARACTER VARYING(255),
+     passengers                             FLOAT,
+     speed                                  FLOAT,
+     speed_units                            CHARACTER VARYING(255),
+     gasoline_intensity                     FLOAT,
+     gasoline_intensity_units               CHARACTER VARYING(255),
+     diesel_intensity                       FLOAT,
+     diesel_intensity_units                 CHARACTER VARYING(255),
+     cng_intensity                          FLOAT,
+     cng_intensity_units                    CHARACTER VARYING(255),
+     lng_intensity                          FLOAT,
+     lng_intensity_units                    CHARACTER VARYING(255),
+     lpg_intensity                          FLOAT,
+     lpg_intensity_units                    CHARACTER VARYING(255),
+     methanol_intensity                     FLOAT,
+     methanol_intensity_units               CHARACTER VARYING(255),
+     biodiesel_intensity                    FLOAT,
+     biodiesel_intensity_units              CHARACTER VARYING(255),
+     electricity_intensity                  FLOAT,
+     electricity_intensity_units            CHARACTER VARYING(255),
+     air_conditioning_emission_factor       FLOAT,
+     air_conditioning_emission_factor_units CHARACTER VARYING(255)
+  );
+
+EOS
+
   self.primary_key = "name"
   
   # https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdHY0R0hjZnhRaTIxTnpvRk1HNThwUmc&hl=en&output=html
@@ -27,30 +64,6 @@ class BusClass < ActiveRecord::Base
                 :air_conditioning_emission_factor => 0.04779 / 1.miles.to(:kilometres),
                 :air_conditioning_emission_factor_units => 'kilograms_co2e_per_kilometre'
   
-  col :name
-  col :distance, :type => :float
-  col :distance_units
-  col :passengers, :type => :float
-  col :speed, :type => :float
-  col :speed_units
-  col :gasoline_intensity, :type => :float
-  col :gasoline_intensity_units
-  col :diesel_intensity, :type => :float
-  col :diesel_intensity_units
-  col :cng_intensity, :type => :float
-  col :cng_intensity_units
-  col :lng_intensity, :type => :float
-  col :lng_intensity_units
-  col :lpg_intensity, :type => :float
-  col :lpg_intensity_units
-  col :methanol_intensity, :type => :float
-  col :methanol_intensity_units
-  col :biodiesel_intensity, :type => :float
-  col :biodiesel_intensity_units
-  col :electricity_intensity, :type => :float
-  col :electricity_intensity_units
-  col :air_conditioning_emission_factor, :type => :float
-  col :air_conditioning_emission_factor_units
 
   warn_unless_size 2
 end

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

@@ -1,4 +1,3 @@
-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,5 +1,31 @@
-require 'earth/fuel'
+require 'earth/model'
+
+require 'earth/bus/bus_fuel_year_control'
+require 'earth/fuel/fuel'
+
 class BusFuel < ActiveRecord::Base
+  extend Earth::Model
+
+  TABLE_STRUCTURE = <<-EOS
+
+CREATE TABLE bus_fuels
+  (
+     name                               CHARACTER VARYING(255) NOT NULL PRIMARY KEY,
+     fuel_name                          CHARACTER VARYING(255),
+     energy_content                     FLOAT,
+     energy_content_units               CHARACTER VARYING(255),
+     co2_emission_factor                FLOAT,
+     co2_emission_factor_units          CHARACTER VARYING(255),
+     co2_biogenic_emission_factor       FLOAT,
+     co2_biogenic_emission_factor_units CHARACTER VARYING(255),
+     ch4_emission_factor                FLOAT,
+     ch4_emission_factor_units          CHARACTER VARYING(255),
+     n2o_emission_factor                FLOAT,
+     n2o_emission_factor_units          CHARACTER VARYING(255)
+  );
+
+EOS
+
   self.primary_key = "name"
   
   belongs_to :fuel, :foreign_key => 'fuel_name'
@@ -9,18 +35,6 @@ class BusFuel < ActiveRecord::Base
     fuel_year_controls.where(:year => fuel_year_controls.maximum('year'))
   end
   
-  col :name
-  col :fuel_name
-  col :energy_content, :type => :float
-  col :energy_content_units
-  col :co2_emission_factor, :type => :float
-  col :co2_emission_factor_units
-  col :co2_biogenic_emission_factor, :type => :float
-  col :co2_biogenic_emission_factor_units
-  col :ch4_emission_factor, :type => :float
-  col :ch4_emission_factor_units
-  col :n2o_emission_factor, :type => :float
-  col :n2o_emission_factor_units
   
   # # FIXME TODO verify fuel_name appears in fuels
   # verify "Fuel name should never be missing" do

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

@@ -1,4 +1,8 @@
-require 'earth/fuel/data_miner'
+require 'earth/bus/bus_fuel'
+require 'earth/bus/bus_fuel_year_control'
+require 'earth/fuel/fuel'
+require 'earth/fuel/greenhouse_gas'
+
 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,13 +1,25 @@
+require 'earth/model'
+
 require 'earth/fuel'
 class BusFuelControl < ActiveRecord::Base
+  extend Earth::Model
+
+  TABLE_STRUCTURE = <<-EOS
+
+CREATE TABLE bus_fuel_controls
+  (
+     name                      CHARACTER VARYING(255) NOT NULL PRIMARY KEY,
+     bus_fuel_name             CHARACTER VARYING(255),
+     control                   CHARACTER VARYING(255),
+     ch4_emission_factor       FLOAT,
+     ch4_emission_factor_units CHARACTER VARYING(255),
+     n2o_emission_factor       FLOAT,
+     n2o_emission_factor_units CHARACTER VARYING(255)
+  );
+
+EOS
+
   self.primary_key = "name"
-  col :name
-  col :bus_fuel_name
-  col :control
-  col :ch4_emission_factor, :type => :float
-  col :ch4_emission_factor_units
-  col :n2o_emission_factor, :type => :float
-  col :n2o_emission_factor_units
 
   warn_unless_size 9
 end

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

@@ -1,4 +1,3 @@
-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,15 +1,28 @@
-require 'earth/fuel'
+require 'earth/model'
+
+require 'earth/bus/bus_fuel_control'
+
 class BusFuelYearControl < ActiveRecord::Base
+  extend Earth::Model
+
+  TABLE_STRUCTURE = <<-EOS
+
+CREATE TABLE bus_fuel_year_controls
+  (
+     name                  CHARACTER VARYING(255) NOT NULL PRIMARY KEY,
+     bus_fuel_name         CHARACTER VARYING(255),
+     year                  INTEGER,
+     control               CHARACTER VARYING(255),
+     bus_fuel_control_name CHARACTER VARYING(255),
+     total_travel_percent  FLOAT
+  );
+
+EOS
+
   self.primary_key = "name"
   
   belongs_to :fuel_control, :class_name => 'BusFuelControl', :foreign_key => 'bus_fuel_control_name'
 
-  col :name
-  col :bus_fuel_name
-  col :year, :type => :integer
-  col :control
-  col :bus_fuel_control_name
-  col :total_travel_percent, :type => :float
 
   warn_unless_size 67
 end

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

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

data/lib/earth/computation.rb

@@ -1,3 +1,3 @@
 # lib/earth/computation.rb
 require 'earth'
-Earth.require_related __FILE__
+Earth::Loader.require_related __FILE__

data/lib/earth/computation/computation_carrier.rb

@@ -1,12 +1,25 @@
-require 'earth/locality'
+require 'falls_back_on'
+
+require 'earth/model'
+
 class ComputationCarrier < ActiveRecord::Base
+  extend Earth::Model
+
+  TABLE_STRUCTURE = <<-EOS
+
+CREATE TABLE computation_carriers
+  (
+     name                      CHARACTER VARYING(255) NOT NULL PRIMARY KEY,
+     power_usage_effectiveness FLOAT
+  );
+
+EOS
+
   self.primary_key = "name"
   
   falls_back_on :name => 'fallback',
                 :power_usage_effectiveness => lambda { ComputationCarrier.maximum('power_usage_effectiveness') }
   
-  col :name
-  col :power_usage_effectiveness, :type => :float
   
   # verify "Power usage effectiveness should be one or more" do
   #   ComputationCarrier.all.each do |carrier|

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

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

data/lib/earth/computation/computation_carrier_instance_class.rb

@@ -1,5 +1,25 @@
-require 'earth/locality'
+require 'falls_back_on'
+
+require 'earth/model'
+
+require 'earth/computation/computation_carrier'
+
 class ComputationCarrierInstanceClass < ActiveRecord::Base
+  extend Earth::Model
+
+  TABLE_STRUCTURE = <<-EOS
+
+CREATE TABLE computation_carrier_instance_classes
+  (
+     name                        CHARACTER VARYING(255) NOT NULL PRIMARY KEY,
+     computation_carrier_name    CHARACTER VARYING(255),
+     instance_class              CHARACTER VARYING(255),
+     electricity_intensity       FLOAT,
+     electricity_intensity_units CHARACTER VARYING(255)
+  );
+
+EOS
+
   self.primary_key = "name"
   
   belongs_to :carrier, :class_name => 'ComputationCarrier', :foreign_key => 'computation_carrier_name'
@@ -8,11 +28,6 @@ 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 }
   
-  col :name
-  col :computation_carrier_name
-  col :instance_class
-  col :electricity_intensity, :type => :float
-  col :electricity_intensity_units
   
   # FIXME TODO verify that computation carrier name appears in computation_carriers
   

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

@@ -1,4 +1,3 @@
-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,13 +1,26 @@
-require 'earth/locality'
+require 'earth/model'
+
+require 'earth/locality/egrid_subregion'
+
 class ComputationCarrierRegion < ActiveRecord::Base
+  extend Earth::Model
+
+  TABLE_STRUCTURE = <<-EOS
+
+CREATE TABLE computation_carrier_regions
+  (
+     name                         CHARACTER VARYING(255) NOT NULL PRIMARY KEY,
+     computation_carrier_name     CHARACTER VARYING(255),
+     region                       CHARACTER VARYING(255),
+     egrid_subregion_abbreviation CHARACTER VARYING(255)
+  );
+
+EOS
+
   self.primary_key = "name"
   
   belongs_to :egrid_subregion, :foreign_key => 'egrid_subregion_abbreviation'
 
-  col :name
-  col :computation_carrier_name
-  col :region
-  col :egrid_subregion_abbreviation
 
   warn_unless_size 4
 end

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

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

data/lib/earth/diet.rb

@@ -1,3 +1,3 @@
 # lib/earth/diet.rb
 require 'earth'
-Earth.require_related __FILE__
+Earth::Loader.require_related __FILE__

data/lib/earth/diet/diet_class.rb

@@ -1,4 +1,29 @@
+require 'earth/model'
+
 class DietClass < ActiveRecord::Base
+  extend Earth::Model
+
+  TABLE_STRUCTURE = <<-EOS
+
+CREATE TABLE diet_classes
+  (
+     name                     CHARACTER VARYING(255) NOT NULL PRIMARY KEY,
+     intensity                FLOAT,
+     intensity_units          CHARACTER VARYING(255),
+     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    FLOAT
+  );
+
+EOS
+
   self.primary_key = "name"
   
   class << self
@@ -7,19 +32,6 @@ class DietClass < ActiveRecord::Base
     end
   end
   
-  col :name
-  col :intensity, :type => :float
-  col :intensity_units
-  col :red_meat_share, :type => :float
-  col :poultry_share, :type => :float
-  col :fish_share, :type => :float
-  col :eggs_share, :type => :float
-  col :nuts_share, :type => :float
-  col :dairy_share, :type => :float
-  col :cereals_and_grains_share, :type => :float
-  col :fruit_share, :type => :float
-  col :vegetables_share, :type => :float
-  col :oils_and_sugars_share, :type => :float
 
   warn_unless_size 3
 end