earth 0.5.4 → 0.6.0

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

@@ -5,9 +5,13 @@ Urbanity.class_eval do
     end
     
     process "Derive from ResidentialEnergyConsumptionSurveyResponse" do
-      INSERT_IGNORE %{INTO urbanities(name)
-        SELECT DISTINCT recs_responses.urbanity_id FROM recs_responses WHERE LENGTH(recs_responses.urbanity_id) > 0
-      }
+      ::Earth::Utils.insert_ignore(
+        :src => ResidentialEnergyConsumptionSurveyResponse,
+        :dest => Urbanity,
+        :cols => {
+          :urbanity_id => :name
+        }
+      )
     end
   end
 end

data/lib/earth/locality/zip_code.rb

@@ -11,13 +11,11 @@ class ZipCode < ActiveRecord::Base
                    :lat_column_name => :latitude,
                    :lng_column_name => :longitude
 
-  force_schema do
-    string   'name'
-    string   'state_postal_abbreviation'
-    string   'description'
-    string   'latitude'
-    string   'longitude'
-    string   'egrid_subregion_abbreviation'
-    string   'climate_division_name'
-  end
-end
+  col :name
+  col :state_postal_abbreviation
+  col :description
+  col :latitude
+  col :longitude
+  col :egrid_subregion_abbreviation
+  col :climate_division_name
+end

data/lib/earth/pet/breed.rb

@@ -4,10 +4,8 @@ class Breed < ActiveRecord::Base
   has_many :breed_genders, :foreign_key => 'breed_name'
   belongs_to :species, :foreign_key => 'species_name'
   
-  force_schema do
-    string   'name'
-    string  'species_name'
-    float    'weight'
-    string   'weight_units'
-  end
-end
+  col :name
+  col :species_name
+  col :weight, :type => :float
+  col :weight_units
+end

data/lib/earth/pet/breed_gender.rb

@@ -4,11 +4,9 @@ class BreedGender < ActiveRecord::Base
   belongs_to :breed, :foreign_key => 'breed_name'
   belongs_to :gender, :foreign_key => 'gender_name'
   
-  force_schema do
-    string   'name'
-    string   'breed_name'
-    string   'gender_name'
-    float    'weight'
-    string   'weight_units'
-  end
-end
+  col :name
+  col :breed_name
+  col :gender_name
+  col :weight, :type => :float
+  col :weight_units
+end

data/lib/earth/pet/gender.rb

@@ -3,7 +3,5 @@ class Gender < ActiveRecord::Base
   
   has_many :breed_genders, :foreign_key => 'gender_name'
   
-  force_schema do
-    string 'name'
-  end
-end
+  col :name
+end

data/lib/earth/pet/species.rb

@@ -1,22 +1,20 @@
 class Species < ActiveRecord::Base
   set_primary_key :name
   
-  force_schema do
-    string   'name'
-    integer  'population'
-    float    'diet_emission_intensity'
-    string   'diet_emission_intensity_units'
-    float    'weight'
-    string   'weight_units'
-    float    'marginal_dietary_requirement'
-    string   'marginal_dietary_requirement_units'
-    float    'fixed_dietary_requirement'
-    string   'fixed_dietary_requirement_units'
-    float    'minimum_weight'
-    string   'minimum_weight_units'
-    float    'maximum_weight'
-    string   'maximum_weight_units'
-  end
+  col :name
+  col :population, :type => :integer
+  col :diet_emission_intensity, :type => :float
+  col :diet_emission_intensity_units
+  col :weight, :type => :float
+  col :weight_units
+  col :marginal_dietary_requirement, :type => :float
+  col :marginal_dietary_requirement_units
+  col :fixed_dietary_requirement, :type => :float
+  col :fixed_dietary_requirement_units
+  col :minimum_weight, :type => :float
+  col :minimum_weight_units
+  col :maximum_weight, :type => :float
+  col :maximum_weight_units
   
   scope :thoroughly_researched, :conditions => 'marginal_dietary_requirement IS NOT NULL'
   
@@ -57,4 +55,4 @@ class Species < ActiveRecord::Base
   def cat?
     eql? self.class[:cat]
   end
-end
+end

data/lib/earth/rail/rail_class.rb

@@ -1,16 +1,66 @@
 class RailClass < ActiveRecord::Base
   set_primary_key :name
-  force_schema do
-    string 'name'
-    string 'description'
-    float  'passengers'
-    float  'distance'
-    string 'distance_units'
-    float  'speed'
-    string 'speed_units'
-    float  'electricity_intensity'
-    string 'electricity_intensity_units'
-    float  'diesel_intensity'
-    string 'diesel_intensity_units'
-  end
-end
+  col :name
+  col :description
+  col :passengers, :type => :float
+  col :distance, :type => :float
+  col :distance_units
+  col :speed, :type => :float
+  col :speed_units
+  col :electricity_intensity, :type => :float
+  col :electricity_intensity_units
+  col :diesel_intensity, :type => :float
+  col :diesel_intensity_units
+  
+  # verify "Passengers, distance, speed, and electricity intensity should be greater than zero" do
+  #   RailClass.all.each do |rail_class|
+  #     %w{ passengers distance speed electricity_intensity }.each do |attribute|
+  #       value = rail_class.send(:"#{attribute}")
+  #       unless value > 0
+  #         raise "Invalid #{attribute} for RailClass #{rail_class.name}: #{value} (should be > 0)"
+  #       end
+  #     end
+  #   end
+  # end
+  # 
+  # verify "Distance units should be kilometres" do
+  #   RailClass.all.each do |rail_class|
+  #     unless rail_class.distance_units == "kilometres"
+  #       raise "Invalid distance units for RailClass #{rail_class.name}: #{rail_class.distance_units} (should be kilometres)"
+  #     end
+  #   end
+  # end
+  # 
+  # verify "Speed units should be kilometres per hour" do
+  #   RailClass.all.each do |rail_class|
+  #     unless rail_class.speed_units == "kilometres_per_hour"
+  #       raise "Invalid speed units for RailClass #{rail_class.name}: #{rail_class.speed_units} (should be kilometres_per_hour)"
+  #     end
+  #   end
+  # end
+  # 
+  # verify "Electricity intensity units should be kilowatt hours per kilometre" do
+  #   RailClass.all.each do |rail_class|
+  #     unless rail_class.electricity_intensity_units == "kilowatt_hours_per_kilometre"
+  #       raise "Invalid electricity intensity units for RailClass #{rail_class.name}: #{rail_class.electricity_intensity_units} (should be kilowatt_hours_per_kilometre)"
+  #     end
+  #   end
+  # end
+  # 
+  # verify "Diesel intensity should be zero or more" do
+  #   RailClass.all.each do |rail_class|
+  #     unless rail_class.diesel_intensity >= 0
+  #       raise "Invalid diesel intensity for RailClass #{rail_class.name}: #{rail_class.diesel_intensity} (should be > 0)"
+  #     end
+  #   end
+  # end
+  # 
+  # verify "Diesel intensity units should be litres per kilometre" do
+  #   RailClass.all.each do |rail_class|
+  #     unless rail_class.diesel_intensity_units == "litres_per_kilometre"
+  #       raise "Invalid distance units for RailClass #{rail_class.name}: #{rail_class.diesel_intensity_units} (should be litres_per_kilometre)"
+  #     end
+  #   end
+  # end
+  
+end

data/lib/earth/rail/rail_class/data_miner.rb

@@ -14,56 +14,5 @@ RailClass.class_eval do
       store 'electricity_intensity', :units_field_name => 'electricity_intensity_units'
       store 'diesel_intensity', :units_field_name => 'diesel_intensity_units'
     end
-    
-    verify "Passengers, distance, speed, and electricity intensity should be greater than zero" do
-      RailClass.all.each do |rail_class|
-        %w{ passengers distance speed electricity_intensity }.each do |attribute|
-          value = rail_class.send(:"#{attribute}")
-          unless value > 0
-            raise "Invalid #{attribute} for RailClass #{rail_class.name}: #{value} (should be > 0)"
-          end
-        end
-      end
-    end
-    
-    verify "Distance units should be kilometres" do
-      RailClass.all.each do |rail_class|
-        unless rail_class.distance_units == "kilometres"
-          raise "Invalid distance units for RailClass #{rail_class.name}: #{rail_class.distance_units} (should be kilometres)"
-        end
-      end
-    end
-    
-    verify "Speed units should be kilometres per hour" do
-      RailClass.all.each do |rail_class|
-        unless rail_class.speed_units == "kilometres_per_hour"
-          raise "Invalid speed units for RailClass #{rail_class.name}: #{rail_class.speed_units} (should be kilometres_per_hour)"
-        end
-      end
-    end
-    
-    verify "Electricity intensity units should be kilowatt hours per kilometre" do
-      RailClass.all.each do |rail_class|
-        unless rail_class.electricity_intensity_units == "kilowatt_hours_per_kilometre"
-          raise "Invalid electricity intensity units for RailClass #{rail_class.name}: #{rail_class.electricity_intensity_units} (should be kilowatt_hours_per_kilometre)"
-        end
-      end
-    end
-    
-    verify "Diesel intensity should be zero or more" do
-      RailClass.all.each do |rail_class|
-        unless rail_class.diesel_intensity >= 0
-          raise "Invalid diesel intensity for RailClass #{rail_class.name}: #{rail_class.diesel_intensity} (should be > 0)"
-        end
-      end
-    end
-    
-    verify "Diesel intensity units should be litres per kilometre" do
-      RailClass.all.each do |rail_class|
-        unless rail_class.diesel_intensity_units == "litres_per_kilometre"
-          raise "Invalid distance units for RailClass #{rail_class.name}: #{rail_class.diesel_intensity_units} (should be litres_per_kilometre)"
-        end
-      end
-    end
   end
 end

data/lib/earth/residence/air_conditioner_use.rb

@@ -6,9 +6,7 @@ class AirConditionerUse < ActiveRecord::Base
   falls_back_on :fugitive_emission => 0.102295.pounds_per_square_foot.to(:kilograms_per_square_metre), # https://brighterplanet.sifterapp.com/projects/30/issues/430
                 :fugitive_emission_units => 'kilograms_per_square_metre'
 
-  force_schema do
-    string 'name'
-    float 'fugitive_emission'
-    string 'fugitive_emission_units'
-  end
-end
+  col :name
+  col :fugitive_emission, :type => :float
+  col :fugitive_emission_units
+end

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

@@ -5,9 +5,13 @@ AirConditionerUse.class_eval do
     end
     
     process "Derive from ResidentialEnergyConsumptionSurveyResponse" do
-      INSERT_IGNORE %{INTO air_conditioner_uses(name)
-        SELECT DISTINCT recs_responses.central_ac_use FROM recs_responses WHERE LENGTH(recs_responses.central_ac_use) > 0
-      }
+      ::Earth::Utils.insert_ignore(
+        :src => ResidentialEnergyConsumptionSurveyResponse,
+        :dest => AirConditionerUse,
+        :cols => {
+          :central_ac_use => :name
+        }
+      )
     end
     
     import "Ian's precalculated fugitive emissions values", :url => 'http://spreadsheets.google.com/pub?key=ri_380yQZAqBKeqie_TECgg&gid=0&output=csv' do

data/lib/earth/residence/clothes_machine_use.rb

@@ -3,9 +3,7 @@ class ClothesMachineUse < ActiveRecord::Base
   
   has_many :residential_energy_consumption_survey_responses
 
-  force_schema do
-    string 'name'
-    float  'annual_energy_from_electricity_for_clothes_driers'
-    string 'annual_energy_from_electricity_for_clothes_driers_units'
-  end
-end
+  col :name
+  col :annual_energy_from_electricity_for_clothes_driers, :type => :float
+  col :annual_energy_from_electricity_for_clothes_driers_units
+end

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

@@ -5,19 +5,21 @@ ClothesMachineUse.class_eval do
     end
     
     process "Derive from ResidentialEnergyConsumptionSurveyResponse" do
-      INSERT_IGNORE %{INTO clothes_machine_uses(name)
-        SELECT DISTINCT recs_responses.clothes_washer_use FROM recs_responses WHERE LENGTH(recs_responses.clothes_washer_use) > 0
-      }
+      ::Earth::Utils.insert_ignore(
+        :src => ResidentialEnergyConsumptionSurveyResponse,
+        :dest => ClothesMachineUse,
+        :cols => {
+          :clothes_washer_use => :name
+        }
+      )
     end
     
     # sabshere 5/20/10 weird that this uses cohort
     process "precalculate annual energy use" do
-      find_in_batches do |batch|
-        batch.each do |record|
-          record.annual_energy_from_electricity_for_clothes_driers = ResidentialEnergyConsumptionSurveyResponse.big_cohort(:clothes_machine_use_id => record.name).weighted_average :annual_energy_from_electricity_for_clothes_driers
-          record.annual_energy_from_electricity_for_clothes_driers_units = 'joules'
-          record.save!
-        end
+      find_each do |record|
+        record.annual_energy_from_electricity_for_clothes_driers = ResidentialEnergyConsumptionSurveyResponse.big_cohort(:clothes_machine_use_id => record.name).weighted_average :annual_energy_from_electricity_for_clothes_driers
+        record.annual_energy_from_electricity_for_clothes_driers_units = 'joules'
+        record.save!
       end
     end
   end

data/lib/earth/residence/dishwasher_use.rb

@@ -3,9 +3,7 @@ class DishwasherUse < ActiveRecord::Base
   
   has_many :residential_energy_consumption_survey_responses
 
-  force_schema do
-    string 'name'
-    float 'annual_energy_from_electricity_for_dishwashers'
-    string 'annual_energy_from_electricity_for_dishwashers_units'
-  end
-end
+  col :name
+  col :annual_energy_from_electricity_for_dishwashers, :type => :float
+  col :annual_energy_from_electricity_for_dishwashers_units
+end

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

@@ -5,19 +5,21 @@ DishwasherUse.class_eval do
     end
     
     process "Derive from ResidentialEnergyConsumptionSurveyResponse" do
-      INSERT_IGNORE %{INTO dishwasher_uses(name)
-        SELECT DISTINCT recs_responses.dishwasher_use_id FROM recs_responses WHERE LENGTH(recs_responses.dishwasher_use_id) > 0
-      }
+      ::Earth::Utils.insert_ignore(
+        :src => ResidentialEnergyConsumptionSurveyResponse,
+        :dest => DishwasherUse,
+        :cols => {
+          :dishwasher_use_id => :name
+        }
+      )
     end
     
     # sabshere 5/25/10 weird that this uses cohort
     process "precalculate annual energy" do
-      find_in_batches do |batch|
-        batch.each do |record|
-          record.annual_energy_from_electricity_for_dishwashers = ResidentialEnergyConsumptionSurveyResponse.big_cohort(:dishwasher_use_id => record.name).weighted_average :annual_energy_from_electricity_for_dishwashers
-          record.annual_energy_from_electricity_for_dishwashers_units = 'joules'
-          record.save!
-        end
+      find_each do |record|
+        record.annual_energy_from_electricity_for_dishwashers = ResidentialEnergyConsumptionSurveyResponse.big_cohort(:dishwasher_use_id => record.name).weighted_average :annual_energy_from_electricity_for_dishwashers
+        record.annual_energy_from_electricity_for_dishwashers_units = 'joules'
+        record.save!
       end
     end
   end

data/lib/earth/residence/residence_appliance.rb

@@ -10,9 +10,7 @@ class ResidenceAppliance < ActiveRecord::Base
     end
   end
 
-  force_schema do
-    string   'name'
-    float    'annual_energy_from_electricity'
-    string   'annual_energy_from_electricity_units'
-  end
-end
+  col :name
+  col :annual_energy_from_electricity, :type => :float
+  col :annual_energy_from_electricity_units
+end

data/lib/earth/residence/residence_class.rb

@@ -9,7 +9,5 @@ class ResidenceClass < ActiveRecord::Base
     CLASSIFICATIONS.detect { |c| name.downcase.include? c }
   end
 
-  force_schema do
-    string :name
-  end
-end
+  col :name
+end

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

@@ -5,9 +5,13 @@ ResidenceClass.class_eval do
     end
     
     process "Derive from ResidentialEnergyConsumptionSurveyResponse" do
-      INSERT_IGNORE %{INTO residence_classes(name)
-        SELECT DISTINCT recs_responses.residence_class_id FROM recs_responses WHERE LENGTH(recs_responses.residence_class_id) > 0
-      }
+      ::Earth::Utils.insert_ignore(
+        :src => ResidentialEnergyConsumptionSurveyResponse,
+        :dest => ResidenceClass,
+        :cols => {
+          :residence_class_id => :name
+        }
+      )
     end
   end
 end

data/lib/earth/residence/residence_fuel_price.rb

@@ -7,17 +7,15 @@ class ResidenceFuelPrice < ActiveRecord::Base
   belongs_to :fuel, :class_name => 'ResidenceFuelType', :foreign_key => 'residence_fuel_type_name'
   belongs_to :locatable, :polymorphic => true
   
-  force_schema do
-    string  'row_hash'
-    string 'residence_fuel_type_name'
-    integer 'year'
-    integer 'month'
-    float   'price'
-    string  'price_units'
-    string  'price_description'
-    string  'locatable_id'
-    string  'locatable_type'
-    index   ['price', 'residence_fuel_type_name', 'month', 'year', 'locatable_type', 'locatable_id']
-    index   ['price', 'residence_fuel_type_name']
-  end
-end
+  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]
+end