earth 0.5.4 → 0.6.0

data/lib/earth/industry/merchant.rb

@@ -3,9 +3,7 @@ class Merchant < ActiveRecord::Base
   
   belongs_to :merchant_category, :foreign_key => 'mcc'
 
-  force_schema do
-    string 'id'
-    string 'name'
-    string 'mcc'
-  end
-end
+  col :id
+  col :name
+  col :mcc
+end

data/lib/earth/industry/merchant_category.rb

@@ -8,8 +8,6 @@ class MerchantCategory < ActiveRecord::Base
     description
   end
 
-  force_schema do
-    string 'mcc'
-    string 'description'
-  end
-end
+  col :mcc
+  col :description
+end

data/lib/earth/industry/merchant_category_industry.rb

@@ -4,10 +4,8 @@ class MerchantCategoryIndustry < ActiveRecord::Base
   belongs_to :merchant_category, :foreign_key => 'mcc'
   belongs_to :industry,          :foreign_key => 'naics_code'
 
-  force_schema do
-    string 'row_hash'
-    string 'mcc'
-    float  'ratio'
-    string 'naics_code'
-  end
-end
+  col :row_hash
+  col :mcc
+  col :ratio, :type => :float
+  col :naics_code
+end

data/lib/earth/industry/product_line.rb

@@ -6,10 +6,8 @@ class ProductLine < ActiveRecord::Base
   has_many :product_line_industry_products, :foreign_key => 'ps_code'
   has_many :industry_products, :through => :product_line_industry_products
   
-  force_schema do
-    string 'ps_code'
-    string 'description'
-    string 'broadline' # FIXME TODO do we need this?
-    string 'parent'    # FIXME TODO do we need this?
-  end
-end
+  col :ps_code
+  col :description
+  col :broadline # FIXME TODO do we need this?
+  col :parent    # FIXME TODO do we need this?
+end

data/lib/earth/industry/product_line_industry_product.rb

@@ -4,10 +4,8 @@ class ProductLineIndustryProduct < ActiveRecord::Base
   belongs_to :product_line,     :foreign_key => 'ps_code'
   belongs_to :industry_product, :foreign_key => 'naics_product_code'
 
-  force_schema do
-    string 'row_hash'
-    string 'ps_code'
-    float  'ratio'
-    string 'naics_product_code'
-  end
-end
+  col :row_hash
+  col :ps_code
+  col :ratio, :type => :float
+  col :naics_product_code
+end

data/lib/earth/industry/sector.rb

@@ -3,10 +3,8 @@ class Sector < ActiveRecord::Base
 
   has_many :industry_sectors, :foreign_key => 'io_code'
   
-  force_schema do
-    string 'io_code'
-    string 'description'
-    float  'value'
-    string 'value_units'
-  end
-end
+  col :io_code
+  col :description
+  col :value, :type => :float
+  col :value_units
+end

data/lib/earth/locality/census_division.rb

@@ -13,26 +13,24 @@ class CensusDivision < ActiveRecord::Base
                 :meeting_building_electricity_intensity => 0.0084323684 / 1.square_feet.to(:square_metres),
                 :meeting_building_district_heat_intensity => 0.0004776370.kbtus.to(:megajoules) / 1.square_feet.to(:square_metres)
   
-  force_schema do
-    integer 'number'
-    string  'name'
-    string  'census_region_name'
-    integer 'census_region_number'
-    float   'meeting_building_natural_gas_intensity'
-    string  'meeting_building_natural_gas_intensity_units'
-    float   'meeting_building_fuel_oil_intensity'
-    string  'meeting_building_fuel_oil_intensity_units'
-    float   'meeting_building_electricity_intensity'
-    string  'meeting_building_electricity_intensity_units'
-    float   'meeting_building_district_heat_intensity'
-    string  'meeting_building_district_heat_intensity_units'
-    float   'lodging_building_natural_gas_intensity'
-    string  'lodging_building_natural_gas_intensity_units'
-    float   'lodging_building_fuel_oil_intensity'
-    string  'lodging_building_fuel_oil_intensity_units'
-    float   'lodging_building_electricity_intensity'
-    string  'lodging_building_electricity_intensity_units'
-    float   'lodging_building_district_heat_intensity'
-    string  'lodging_building_district_heat_intensity_units'
-  end
-end
+  col :number, :type => :integer
+  col :name
+  col :census_region_name
+  col :census_region_number, :type => :integer
+  col :meeting_building_natural_gas_intensity, :type => :float
+  col :meeting_building_natural_gas_intensity_units
+  col :meeting_building_fuel_oil_intensity, :type => :float
+  col :meeting_building_fuel_oil_intensity_units
+  col :meeting_building_electricity_intensity, :type => :float
+  col :meeting_building_electricity_intensity_units
+  col :meeting_building_district_heat_intensity, :type => :float
+  col :meeting_building_district_heat_intensity_units
+  col :lodging_building_natural_gas_intensity, :type => :float
+  col :lodging_building_natural_gas_intensity_units
+  col :lodging_building_fuel_oil_intensity, :type => :float
+  col :lodging_building_fuel_oil_intensity_units
+  col :lodging_building_electricity_intensity, :type => :float
+  col :lodging_building_electricity_intensity_units
+  col :lodging_building_district_heat_intensity, :type => :float
+  col :lodging_building_district_heat_intensity_units
+end

data/lib/earth/locality/census_region.rb

@@ -7,8 +7,6 @@ class CensusRegion < ActiveRecord::Base
   # has_many :zip_codes, :through => :census_divisions
   has_many :residential_energy_consumption_survey_responses, :foreign_key => 'census_region_number'
   
-  force_schema do
-    integer  'number'
-    string   'name'
-  end
-end
+  col :number, :type => :integer
+  col :name
+end

data/lib/earth/locality/climate_division.rb

@@ -6,10 +6,8 @@ class ClimateDivision < ActiveRecord::Base
   
   RADIUS = 750
 
-  force_schema do
-    string   'name'
-    float    'heating_degree_days'
-    float    'cooling_degree_days'
-    string   'state_postal_abbreviation'
-  end
-end
+  col :name
+  col :heating_degree_days, :type => :float
+  col :cooling_degree_days, :type => :float
+  col :state_postal_abbreviation
+end

data/lib/earth/locality/country.rb

@@ -19,18 +19,16 @@ class Country < ActiveRecord::Base
     end
   end
   
-  force_schema do
-    string 'iso_3166_code'
-    string 'name'
-    float  'automobile_urbanity'
-    float  'automobile_fuel_efficiency'
-    string 'automobile_fuel_efficiency_units'
-    float  'automobile_city_speed'
-    string 'automobile_city_speed_units'
-    float  'automobile_highway_speed'
-    string 'automobile_highway_speed_units'
-    float  'automobile_trip_distance'
-    string 'automobile_trip_distance_units'
-    float  'flight_route_inefficiency_factor'
-  end
-end
+  col :iso_3166_code
+  col :name
+  col :automobile_urbanity, :type => :float
+  col :automobile_fuel_efficiency, :type => :float
+  col :automobile_fuel_efficiency_units
+  col :automobile_city_speed, :type => :float
+  col :automobile_city_speed_units
+  col :automobile_highway_speed, :type => :float
+  col :automobile_highway_speed_units
+  col :automobile_trip_distance, :type => :float
+  col :automobile_trip_distance_units
+  col :flight_route_inefficiency_factor, :type => :float
+end

data/lib/earth/locality/egrid_region.rb

@@ -7,8 +7,17 @@ class EgridRegion < ActiveRecord::Base
   falls_back_on :name => 'fallback',
                 :loss_factor => 0.061879 # calculated using above formula 2/21/2011
   
-  force_schema do
-    string   'name'
-    float    'loss_factor'
-  end
-end
+  col :name
+  col :loss_factor, :type => :float
+  
+  # verify "Loss factor should be greater than zero and less than one" do
+  #   EgridRegion.all.each do |region|
+  #     unless region.loss_factor > 0 and region.loss_factor < 1
+  #       raise "Invalid loss factor for EgridRegion #{region.name}: #{region.loss_factor} (should be > 0 and < 1)"
+  #     end
+  #   end
+  # end
+  
+  # FIXME TODO verify fallback loss factor
+  
+end

data/lib/earth/locality/egrid_region/data_miner.rb

@@ -19,15 +19,5 @@ EgridRegion.class_eval do
       key 'name', :static => 'US'
       store 'loss_factor', :synthesize => lambda { |row| (row['USTNGN05'].to_f + row['USTNFI05'].to_f - row['USTCON05'].to_f) / row['USTNGN05'].to_f }
     end
-
-    verify "Loss factor should be greater than zero and less than one" do
-      EgridRegion.all.each do |region|
-        unless region.loss_factor > 0 and region.loss_factor < 1
-          raise "Invalid loss factor for EgridRegion #{region.name}: #{region.loss_factor} (should be > 0 and < 1)"
-        end
-      end
-    end
-    
-    # FIXME TODO verify fallback loss factor
   end
 end

data/lib/earth/locality/egrid_subregion.rb

@@ -23,22 +23,75 @@ class EgridSubregion < ActiveRecord::Base
                 :electricity_emission_factor => lambda { weighted_average(:electricity_emission_factor, :weighted_by => :net_generation) }, # DEPRECATED
                 :electricity_emission_factor_units => 'kilograms_co2e_per_kilowatt_hour' # DEPRECATED
   
-  force_schema do
-    string 'abbreviation'
-    string 'name'
-    string 'nerc_abbreviation'
-    string 'egrid_region_name'
-    float  'net_generation'
-    string 'net_generation_units'
-    float  'electricity_co2_emission_factor'
-    string 'electricity_co2_emission_factor_units'
-    float  'electricity_co2_biogenic_emission_factor'
-    string 'electricity_co2_biogenic_emission_factor_units'
-    float  'electricity_ch4_emission_factor'
-    string 'electricity_ch4_emission_factor_units'
-    float  'electricity_n2o_emission_factor'
-    string 'electricity_n2o_emission_factor_units'
-    float  'electricity_emission_factor'
-    string 'electricity_emission_factor_units'
-  end
+  col :abbreviation
+  col :name
+  col :nerc_abbreviation
+  col :egrid_region_name
+  col :net_generation, :type => :float
+  col :net_generation_units
+  col :electricity_co2_emission_factor, :type => :float
+  col :electricity_co2_emission_factor_units
+  col :electricity_co2_biogenic_emission_factor, :type => :float
+  col :electricity_co2_biogenic_emission_factor_units
+  col :electricity_ch4_emission_factor, :type => :float
+  col :electricity_ch4_emission_factor_units
+  col :electricity_n2o_emission_factor, :type => :float
+  col :electricity_n2o_emission_factor_units
+  col :electricity_emission_factor, :type => :float
+  col :electricity_emission_factor_units
+  
+  # FIXME TODO verify egrid_region_name is found in EgridRegions
+  # %w{ egrid_region_name }.each do |attribute|
+  #   verify "#{attribute.humanize} should never be missing" do
+  #     EgridSubregion.all.each do |subregion|
+  #       unless subregion.send("#{attribute}").present?
+  #         raise "Missing #{attribute.humanize.downcase} for EgridSubregion #{subregion.name}"
+  #       end
+  #     end
+  #   end
+  # end
+  # 
+  # ["net_generation",
+  #  "electricity_co2_emission_factor",
+  #  "electricity_ch4_emission_factor",
+  #  "electricity_n2o_emission_factor",
+  #  "electricity_emission_factor" ].each do |attribute|
+  #   verify "#{attribute.humanize} should be > 0" do
+  #     EgridSubregion.all.each do |subregion|
+  #       value = subregion.send(:"#{attribute}")
+  #       unless value > 0
+  #         raise "Invalid #{attribute.humanize.downcase} for EgridSubregion #{subregion.name}: #{value} (should be > 0)"
+  #       end
+  #     end
+  #   end
+  # end
+  # 
+  # verify "Electricity co2 biogenic emission factor should be 0" do
+  #   EgridSubregion.all.each do |subregion|
+  #     value = subregion.electricity_co2_biogenic_emission_factor
+  #     unless value == 0
+  #       raise "Invalid electricity co2 biogenic emission factor for EgridSubregion #{subregion.name}: #{value} (should be 0)"
+  #     end
+  #   end
+  # end
+  # 
+  # [["net_generation_units","megawatt_hours"],
+  #  ["electricity_co2_emission_factor_units","kilograms_per_kilowatt_hour"],
+  #  ["electricity_co2_biogenic_emission_factor_units","kilograms_per_kilowatt_hour"],
+  #  ["electricity_ch4_emission_factor_units","kilograms_co2e_per_kilowatt_hour"],
+  #  ["electricity_n2o_emission_factor_units","kilograms_co2e_per_kilowatt_hour"],
+  #  ["electricity_emission_factor_units","kilograms_co2e_per_kilowatt_hour"]].each do |pair|
+  #   attribute = pair[0]
+  #   proper_units = pair[1]
+  #   verify "#{attribute.humanize} should be #{proper_units.humanize.downcase}" do
+  #     EgridSubregion.all.each do |subregion|
+  #       units = subregion.send(:"#{attribute}")
+  #       unless units == proper_units
+  #         raise "Invalid #{attribute.humanize.downcase} for EgridSubregion #{subregion.name}: #{units} (should be #{proper_units})"
+  #       end
+  #     end
+  #   end
+  # end
+  
+  # FIXME TODO verify fallbacks
 end

data/lib/earth/locality/egrid_subregion/data_miner.rb

@@ -61,64 +61,5 @@ EgridSubregion.class_eval do
       update_all %{ electricity_emission_factor = electricity_co2_emission_factor + electricity_ch4_emission_factor + electricity_n2o_emission_factor,
                     electricity_emission_factor_units = 'kilograms_co2e_per_kilowatt_hour' }
     end
-    
-    # FIXME TODO verify egrid_region_name is found in EgridRegions
-    %w{ egrid_region_name }.each do |attribute|
-      verify "#{attribute.humanize} should never be missing" do
-        EgridSubregion.all.each do |subregion|
-          unless subregion.send("#{attribute}").present?
-            puts "Missing #{attribute.humanize.downcase} for EgridSubregion #{subregion.name}"
-            fail
-          end
-        end
-      end
-    end
-    
-    ["net_generation",
-     "electricity_co2_emission_factor",
-     "electricity_ch4_emission_factor",
-     "electricity_n2o_emission_factor",
-     "electricity_emission_factor" ].each do |attribute|
-      verify "#{attribute.humanize} should be > 0" do
-        EgridSubregion.all.each do |subregion|
-          value = subregion.send(:"#{attribute}")
-          unless value > 0
-            puts "Invalid #{attribute.humanize.downcase} for EgridSubregion #{subregion.name}: #{value} (should be > 0)"
-            fail
-          end
-        end
-      end
-    end
-    
-    verify "Electricity co2 biogenic emission factor should be 0" do
-      EgridSubregion.all.each do |subregion|
-        value = subregion.electricity_co2_biogenic_emission_factor
-        unless value == 0
-          puts "Invalid electricity co2 biogenic emission factor for EgridSubregion #{subregion.name}: #{value} (should be 0)"
-          fail
-        end
-      end
-    end
-    
-    [["net_generation_units","megawatt_hours"],
-     ["electricity_co2_emission_factor_units","kilograms_per_kilowatt_hour"],
-     ["electricity_co2_biogenic_emission_factor_units","kilograms_per_kilowatt_hour"],
-     ["electricity_ch4_emission_factor_units","kilograms_co2e_per_kilowatt_hour"],
-     ["electricity_n2o_emission_factor_units","kilograms_co2e_per_kilowatt_hour"],
-     ["electricity_emission_factor_units","kilograms_co2e_per_kilowatt_hour"]].each do |pair|
-      attribute = pair[0]
-      proper_units = pair[1]
-      verify "#{attribute.humanize} should be #{proper_units.humanize.downcase}" do
-        EgridSubregion.all.each do |subregion|
-          units = subregion.send(:"#{attribute}")
-          unless units == proper_units
-            puts "Invalid #{attribute.humanize.downcase} for EgridSubregion #{subregion.name}: #{units} (should be #{proper_units})"
-            fail
-          end
-        end
-      end
-    end
-    
-    # FIXME TODO verify fallbacks
   end
 end

data/lib/earth/locality/petroleum_administration_for_defense_district.rb

@@ -8,11 +8,9 @@ class PetroleumAdministrationForDefenseDistrict < ActiveRecord::Base
     str
   end
   
-  force_schema do
-    string   'code'
-    string   'district_code'
-    string   'district_name'
-    string   'subdistrict_code'
-    string   'subdistrict_name'
-  end
-end
+  col :code
+  col :district_code
+  col :district_name
+  col :subdistrict_code
+  col :subdistrict_name
+end

data/lib/earth/locality/state.rb

@@ -11,11 +11,9 @@ class State < ActiveRecord::Base
     Country.united_states
   end
 
-  force_schema do
-    string   'postal_abbreviation'
-    integer  'fips_code'
-    string   'name'
-    string   'census_division_number'
-    string   'petroleum_administration_for_defense_district_code'
-  end
-end
+  col :postal_abbreviation
+  col :fips_code, :type => :integer
+  col :name
+  col :census_division_number
+  col :petroleum_administration_for_defense_district_code
+end

data/lib/earth/locality/urbanity.rb

@@ -3,7 +3,5 @@ class Urbanity < ActiveRecord::Base
   
   has_many :residential_energy_consumption_survey_responses
 
-  force_schema do
-    string 'name'
-  end
-end
+  col :name
+end