earth 0.12.4 → 1.0.0

data/lib/earth/residence/dishwasher_use.rb

@@ -1,11 +1,25 @@
+require 'earth/model'
+
+require 'earth/residence/residential_energy_consumption_survey_response'
+
 class DishwasherUse < ActiveRecord::Base
+  extend Earth::Model
+
+  TABLE_STRUCTURE = <<-EOS
+
+CREATE TABLE dishwasher_uses
+  (
+     name                                                 CHARACTER VARYING(255) NOT NULL PRIMARY KEY,
+     annual_energy_from_electricity_for_dishwashers       FLOAT,
+     annual_energy_from_electricity_for_dishwashers_units CHARACTER VARYING(255)
+  );
+
+EOS
+
   self.primary_key = "name"
   
   has_many :residential_energy_consumption_survey_responses
 
-  col :name
-  col :annual_energy_from_electricity_for_dishwashers, :type => :float
-  col :annual_energy_from_electricity_for_dishwashers_units
 
   warn_unless_size 5
 end

data/lib/earth/residence/residence_appliance.rb

@@ -1,4 +1,19 @@
+require 'earth/model'
+
 class ResidenceAppliance < ActiveRecord::Base
+  extend Earth::Model
+
+  TABLE_STRUCTURE = <<-EOS
+
+CREATE TABLE residence_appliances
+  (
+     name                                 CHARACTER VARYING(255) NOT NULL PRIMARY KEY,
+     annual_energy_from_electricity       FLOAT,
+     annual_energy_from_electricity_units CHARACTER VARYING(255)
+  );
+
+EOS
+
   self.primary_key = "name"
 
   class << self
@@ -10,9 +25,6 @@ class ResidenceAppliance < ActiveRecord::Base
     end
   end
 
-  col :name
-  col :annual_energy_from_electricity, :type => :float
-  col :annual_energy_from_electricity_units
 
   warn_unless_size 2
 end

data/lib/earth/residence/residence_appliance/data_miner.rb

@@ -1,3 +1,5 @@
+require 'earth/residence/residential_energy_consumption_survey_response'
+
 ResidenceAppliance.class_eval do
   data_miner do
     process "Ensure ResidentialEnergyConsumptionSurveyResponse is populated" do

data/lib/earth/residence/residence_class.rb

@@ -1,4 +1,19 @@
+require 'earth/model'
+
+require 'earth/residence/residential_energy_consumption_survey_response'
+
 class ResidenceClass < ActiveRecord::Base
+  extend Earth::Model
+
+  TABLE_STRUCTURE = <<-EOS
+
+CREATE TABLE residence_classes
+  (
+     name CHARACTER VARYING(255) NOT NULL PRIMARY KEY
+  );
+
+EOS
+
   self.primary_key = "name"
   
   has_many :residential_energy_consumption_survey_responses
@@ -9,7 +24,6 @@ class ResidenceClass < ActiveRecord::Base
     CLASSIFICATIONS.detect { |c| name.downcase.include? c }
   end
 
-  col :name
 
   warn_unless_size 5
 end

data/lib/earth/residence/residence_fuel_price.rb

@@ -1,21 +1,34 @@
-require 'earth/locality'
+require 'earth/model'
+
+require 'earth/residence/residence_fuel_type'
+
 class ResidenceFuelPrice < ActiveRecord::Base
+  extend Earth::Model
+
+  TABLE_STRUCTURE = <<-EOS
+
+CREATE TABLE residence_fuel_prices
+  (
+     row_hash                 CHARACTER VARYING(255) NOT NULL PRIMARY KEY,
+     residence_fuel_type_name CHARACTER VARYING(255),
+     year                     INTEGER,
+     month                    INTEGER,
+     price                    FLOAT,
+     price_units              CHARACTER VARYING(255),
+     price_description        CHARACTER VARYING(255),
+     locatable_id             CHARACTER VARYING(255),
+     locatable_type           CHARACTER VARYING(255)
+  );
+CREATE INDEX index_residence_fuel_prices_on_price_and_residence_fu239358947 ON residence_fuel_prices (price, residence_fuel_type_name, month, year, locatable_type, locatable_id);
+CREATE INDEX index_residence_fuel_prices_on_price_and_residence_fu1975072203 ON residence_fuel_prices (price, residence_fuel_type_name)
+
+EOS
+
   self.primary_key = "row_hash"
   
   belongs_to :fuel, :class_name => 'ResidenceFuelType', :foreign_key => 'residence_fuel_type_name'
   belongs_to :locatable, :polymorphic => true
   
-  col :row_hash
-  col :residence_fuel_type_name
-  col :year, :type => :integer
-  col :month, :type => :integer
-  col :price, :type => :float
-  col :price_units
-  col :price_description
-  col :locatable_id
-  col :locatable_type
-  add_index [:price, :residence_fuel_type_name, :month, :year, :locatable_type, :locatable_id]
-  add_index [:price, :residence_fuel_type_name]
 
   warn_unless_size 13639
 end

data/lib/earth/residence/residence_fuel_price/data_miner.rb

@@ -1,4 +1,3 @@
-require 'earth/locality/data_miner'
 ResidenceFuelPrice.class_eval do
   class FuelOilParser
     def initialize(options = {})

data/lib/earth/residence/residence_fuel_type.rb

@@ -1,14 +1,25 @@
+require 'earth/model'
+
+require 'earth/residence/residence_fuel_price'
+
 class ResidenceFuelType < ActiveRecord::Base
+  extend Earth::Model
+
+  TABLE_STRUCTURE = <<-EOS
+
+CREATE TABLE residence_fuel_types
+  (
+     name                  CHARACTER VARYING(255) NOT NULL PRIMARY KEY,
+     emission_factor       FLOAT,
+     emission_factor_units CHARACTER VARYING(255)
+  );
+
+EOS
+
   self.primary_key = "name"
   
   has_many :prices, :class_name => 'ResidenceFuelPrice', :foreign_key => 'residence_fuel_type_name'
   
-  col :name
-  col :emission_factor, :type => :float
-  col :emission_factor_units
-  # col :energy_content, :type => :float
-  # col :energy_content_units
-  
   def price_per_unit(relaxations = [])
     conditions = { :residence_fuel_type_name => self }
     relaxations.push Hash.new

data/lib/earth/residence/residential_energy_consumption_survey_response.rb

@@ -1,5 +1,114 @@
-require 'earth/locality'
+require 'earth/model'
+
+require 'earth/locality/census_division'
+require 'earth/locality/census_region'
+require 'earth/residence/air_conditioner_use'
+require 'earth/residence/clothes_machine_use'
+require 'earth/residence/dishwasher_use'
+require 'earth/residence/residence_class'
+require 'earth/residence/urbanity'
+
 class ResidentialEnergyConsumptionSurveyResponse < ActiveRecord::Base
+  extend Earth::Model
+
+  TABLE_STRUCTURE = <<-EOS
+
+CREATE TABLE recs_responses
+  (
+     id                                                        INTEGER NOT NULL PRIMARY KEY,
+     air_conditioner_use_id                                    CHARACTER VARYING(255),
+     annual_energy_from_electricity_for_air_conditioners       FLOAT,
+     annual_energy_from_electricity_for_air_conditioners_units CHARACTER VARYING( 255),
+     annual_energy_from_electricity_for_clothes_driers         FLOAT,
+     annual_energy_from_electricity_for_clothes_driers_units   CHARACTER VARYING(255),
+     annual_energy_from_electricity_for_dishwashers            FLOAT,
+     annual_energy_from_electricity_for_dishwashers_units      CHARACTER VARYING(255),
+     annual_energy_from_electricity_for_freezers               FLOAT,
+     annual_energy_from_electricity_for_freezers_units         CHARACTER VARYING(255),
+     annual_energy_from_electricity_for_heating_space          FLOAT,
+     annual_energy_from_electricity_for_heating_space_units    CHARACTER VARYING(255),
+     annual_energy_from_electricity_for_heating_water          FLOAT,
+     annual_energy_from_electricity_for_heating_water_units    CHARACTER VARYING(255),
+     annual_energy_from_electricity_for_other_appliances       FLOAT,
+     annual_energy_from_electricity_for_other_appliances_units CHARACTER VARYING( 255),
+     annual_energy_from_electricity_for_refrigerators          FLOAT,
+     annual_energy_from_electricity_for_refrigerators_units    CHARACTER VARYING(255),
+     annual_energy_from_fuel_oil_for_appliances                FLOAT,
+     annual_energy_from_fuel_oil_for_appliances_units          CHARACTER VARYING(255),
+     annual_energy_from_fuel_oil_for_heating_space             FLOAT,
+     annual_energy_from_fuel_oil_for_heating_space_units       CHARACTER VARYING(255),
+     annual_energy_from_fuel_oil_for_heating_water             FLOAT,
+     annual_energy_from_fuel_oil_for_heating_water_units       CHARACTER VARYING(255),
+     annual_energy_from_kerosene                               FLOAT,
+     annual_energy_from_kerosene_units                         CHARACTER VARYING(255),
+     annual_energy_from_natural_gas_for_appliances             FLOAT,
+     annual_energy_from_natural_gas_for_appliances_units       CHARACTER VARYING(255),
+     annual_energy_from_natural_gas_for_heating_space          FLOAT,
+     annual_energy_from_natural_gas_for_heating_space_units    CHARACTER VARYING(255),
+     annual_energy_from_natural_gas_for_heating_water          FLOAT,
+     annual_energy_from_natural_gas_for_heating_water_units    CHARACTER VARYING(255),
+     annual_energy_from_propane_for_appliances                 FLOAT,
+     annual_energy_from_propane_for_appliances_units           CHARACTER VARYING(255),
+     annual_energy_from_propane_for_heating_space              FLOAT,
+     annual_energy_from_propane_for_heating_space_units        CHARACTER VARYING(255),
+     annual_energy_from_propane_for_heating_water              FLOAT,
+     annual_energy_from_propane_for_heating_water_units        CHARACTER VARYING(255),
+     annual_energy_from_wood                                   FLOAT,
+     annual_energy_from_wood_units                             CHARACTER VARYING(255),
+     attached_1car_garage                                      INTEGER,
+     attached_2car_garage                                      INTEGER,
+     attached_3car_garage                                      INTEGER,
+     bathrooms                                                 FLOAT,
+     bedrooms                                                  INTEGER,
+     census_division_name                                      CHARACTER VARYING(255),
+     census_division_number                                    INTEGER,
+     census_region_name                                        CHARACTER VARYING(255),
+     census_region_number                                      INTEGER,
+     central_ac_use                                            CHARACTER VARYING(255),
+     clothes_dryer_use                                         CHARACTER VARYING(255),
+     clothes_machine_use_id                                    CHARACTER VARYING(255),
+     clothes_washer_use                                        CHARACTER VARYING(255),
+     construction_period                                       CHARACTER VARYING(255),
+     construction_year                                         DATE,
+     cooling_degree_days                                       INTEGER,
+     cooling_degree_days_units                                 CHARACTER VARYING(255),
+     detached_1car_garage                                      INTEGER,
+     detached_2car_garage                                      INTEGER,
+     detached_3car_garage                                      INTEGER,
+     dishwasher_use_id                                         CHARACTER VARYING(255),
+     efficient_lights_on_1_to_4_hours                          INTEGER,
+     efficient_lights_on_4_to_12_hours                         INTEGER,
+     efficient_lights_on_over_12_hours                         INTEGER,
+     floorspace                                                FLOAT,
+     floorspace_units                                          CHARACTER VARYING(255),
+     freezer_count                                             INTEGER,
+     full_bathrooms                                            INTEGER,
+     half_bathrooms                                            INTEGER,
+     heated_garage                                             INTEGER,
+     heating_degree_days                                       INTEGER,
+     heating_degree_days_units                                 CHARACTER VARYING(255),
+     lighting_efficiency                                       FLOAT,
+     lighting_use                                              FLOAT,
+     lighting_use_units                                        CHARACTER VARYING(255),
+     lights_on_1_to_4_hours                                    INTEGER,
+     lights_on_4_to_12_hours                                   INTEGER,
+     lights_on_over_12_hours                                   INTEGER,
+     outdoor_all_night_gas_lights                              INTEGER,
+     outdoor_all_night_lights                                  INTEGER,
+     ownership                                                 BOOLEAN,
+     refrigerator_count                                        INTEGER,
+     residence_class_id                                        CHARACTER VARYING(255),
+     residents                                                 INTEGER,
+     rooms                                                     FLOAT,
+     thermostat_programmability                                BOOLEAN,
+     total_rooms                                               INTEGER,
+     urbanity_id                                               CHARACTER VARYING(255),
+     weighting                                                 FLOAT,
+     window_ac_use                                             CHARACTER VARYING(255)
+  );
+
+EOS
+
   self.primary_key = "id"
   self.table_name = :recs_responses
   
@@ -28,96 +137,6 @@ class ResidentialEnergyConsumptionSurveyResponse < ActiveRecord::Base
   ]
   
   # sabshere 9/20/10 sorted with sort -d -t "'" -k 2 ~/Desktop/parts.txt
-  col :id, :type => :integer
-  col :air_conditioner_use_id
-  col :annual_energy_from_electricity_for_air_conditioners, :type => :float
-  col :annual_energy_from_electricity_for_air_conditioners_units
-  col :annual_energy_from_electricity_for_clothes_driers, :type => :float
-  col :annual_energy_from_electricity_for_clothes_driers_units
-  col :annual_energy_from_electricity_for_dishwashers, :type => :float
-  col :annual_energy_from_electricity_for_dishwashers_units
-  col :annual_energy_from_electricity_for_freezers, :type => :float
-  col :annual_energy_from_electricity_for_freezers_units
-  col :annual_energy_from_electricity_for_heating_space, :type => :float
-  col :annual_energy_from_electricity_for_heating_space_units
-  col :annual_energy_from_electricity_for_heating_water, :type => :float
-  col :annual_energy_from_electricity_for_heating_water_units
-  col :annual_energy_from_electricity_for_other_appliances, :type => :float
-  col :annual_energy_from_electricity_for_other_appliances_units
-  col :annual_energy_from_electricity_for_refrigerators, :type => :float
-  col :annual_energy_from_electricity_for_refrigerators_units
-  col :annual_energy_from_fuel_oil_for_appliances, :type => :float
-  col :annual_energy_from_fuel_oil_for_appliances_units
-  col :annual_energy_from_fuel_oil_for_heating_space, :type => :float
-  col :annual_energy_from_fuel_oil_for_heating_space_units
-  col :annual_energy_from_fuel_oil_for_heating_water, :type => :float
-  col :annual_energy_from_fuel_oil_for_heating_water_units
-  col :annual_energy_from_kerosene, :type => :float
-  col :annual_energy_from_kerosene_units
-  col :annual_energy_from_natural_gas_for_appliances, :type => :float
-  col :annual_energy_from_natural_gas_for_appliances_units
-  col :annual_energy_from_natural_gas_for_heating_space, :type => :float
-  col :annual_energy_from_natural_gas_for_heating_space_units
-  col :annual_energy_from_natural_gas_for_heating_water, :type => :float
-  col :annual_energy_from_natural_gas_for_heating_water_units
-  col :annual_energy_from_propane_for_appliances, :type => :float
-  col :annual_energy_from_propane_for_appliances_units
-  col :annual_energy_from_propane_for_heating_space, :type => :float
-  col :annual_energy_from_propane_for_heating_space_units
-  col :annual_energy_from_propane_for_heating_water, :type => :float
-  col :annual_energy_from_propane_for_heating_water_units
-  col :annual_energy_from_wood, :type => :float
-  col :annual_energy_from_wood_units
-  col :attached_1car_garage, :type => :integer
-  col :attached_2car_garage, :type => :integer
-  col :attached_3car_garage, :type => :integer
-  col :bathrooms, :type => :float
-  col :bedrooms, :type => :integer
-  col :census_division_name
-  col :census_division_number, :type => :integer
-  col :census_region_name
-  col :census_region_number, :type => :integer
-  col :central_ac_use
-  col :clothes_dryer_use
-  col :clothes_machine_use_id
-  col :clothes_washer_use
-  col :construction_period
-  col :construction_year, :type => :date
-  col :cooling_degree_days, :type => :integer
-  col :cooling_degree_days_units
-  col :detached_1car_garage, :type => :integer
-  col :detached_2car_garage, :type => :integer
-  col :detached_3car_garage, :type => :integer
-  col :dishwasher_use_id
-  col :efficient_lights_on_1_to_4_hours, :type => :integer
-  col :efficient_lights_on_4_to_12_hours, :type => :integer
-  col :efficient_lights_on_over_12_hours, :type => :integer
-  col :floorspace, :type => :float
-  col :floorspace_units
-  col :freezer_count, :type => :integer
-  col :full_bathrooms, :type => :integer
-  col :half_bathrooms, :type => :integer
-  col :heated_garage, :type => :integer
-  col :heating_degree_days, :type => :integer
-  col :heating_degree_days_units
-  col :lighting_efficiency, :type => :float
-  col :lighting_use, :type => :float
-  col :lighting_use_units
-  col :lights_on_1_to_4_hours, :type => :integer
-  col :lights_on_4_to_12_hours, :type => :integer
-  col :lights_on_over_12_hours, :type => :integer
-  col :outdoor_all_night_gas_lights, :type => :integer
-  col :outdoor_all_night_lights, :type => :integer
-  col :ownership, :type => :boolean
-  col :refrigerator_count, :type => :integer
-  col :residence_class_id
-  col :residents, :type => :integer
-  col :rooms, :type => :float
-  col :thermostat_programmability, :type => :boolean
-  col :total_rooms, :type => :integer
-  col :urbanity_id
-  col :weighting, :type => :float
-  col :window_ac_use
 
   warn_unless_size 4382
 end

data/lib/earth/residence/residential_energy_consumption_survey_response/data_miner.rb

@@ -1,4 +1,3 @@
-require 'earth/locality/data_miner'
 ResidentialEnergyConsumptionSurveyResponse.class_eval do
   data_miner do
     # conversions are NOT performed here, since we first have to zero out legitimate skips

data/lib/earth/residence/urbanity.rb

@@ -1,9 +1,23 @@
+require 'earth/model'
+
+require 'earth/residence/residential_energy_consumption_survey_response'
+
 class Urbanity < ActiveRecord::Base
+  extend Earth::Model
+
+  TABLE_STRUCTURE = <<-EOS
+
+CREATE TABLE urbanities
+  (
+     name CHARACTER VARYING(255) NOT NULL PRIMARY KEY
+  );
+
+EOS
+
   self.primary_key = "name"
   
   has_many :residential_energy_consumption_survey_responses
 
-  col :name
 
   warn_unless_size 4
 end

data/lib/earth/shipping.rb

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

data/lib/earth/shipping/carrier.rb

@@ -1,4 +1,28 @@
+require 'falls_back_on'
+
+require 'earth/model'
+
+require 'earth/shipping/carrier_mode'
+
 class Carrier < ActiveRecord::Base
+  extend Earth::Model
+
+  TABLE_STRUCTURE = <<-EOS
+
+CREATE TABLE carriers
+  (
+     name                            CHARACTER VARYING(255) NOT NULL PRIMARY KEY,
+     full_name                       CHARACTER VARYING(255),
+     package_volume                  FLOAT,
+     route_inefficiency_factor       FLOAT,
+     transport_emission_factor       FLOAT,
+     transport_emission_factor_units CHARACTER VARYING(255),
+     corporate_emission_factor       FLOAT,
+     corporate_emission_factor_units CHARACTER VARYING(255)
+  );
+
+EOS
+
   self.primary_key = "name"
   
   has_many :carrier_modes, :foreign_key => 'carrier_name', :primary_key => 'name'
@@ -8,14 +32,6 @@ class Carrier < ActiveRecord::Base
                 :transport_emission_factor => 0.0005266,
                 :corporate_emission_factor => 0.221
   
-  col :name
-  col :full_name
-  col :package_volume, :type => :float
-  col :route_inefficiency_factor, :type => :float
-  col :transport_emission_factor, :type => :float
-  col :transport_emission_factor_units
-  col :corporate_emission_factor, :type => :float
-  col :corporate_emission_factor_units
   
   # verify "Package volume should be greater than zero" do
   #   Carrier.all.each do |carrier|