earth 0.5.4 → 0.6.0

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

@@ -65,11 +65,7 @@ AutomobileTypeFuelYear.class_eval do
     end
     
     process "Derive type year name for association with AutomobileTypeYear" do
-      if ActiveRecord::Base.connection.adapter_name.downcase == 'sqlite'
-        update_all "type_year_name = type_name || ' ' || year"
-      else
-        update_all "type_year_name = CONCAT(type_name, ' ', year)"
-      end
+      update_all "type_year_name = type_name || ' ' || year"
     end
     
     process "Ensure AutomobileTypeFuelYearControl and AutomobileTypeFuelControl are populated" do
@@ -93,52 +89,5 @@ AutomobileTypeFuelYear.class_eval do
         record.save
       end
     end
-    
-    %w{ type_name fuel_common_name type_year_name }.each do |attribute|
-      verify "#{attribute.humanize} should never be missing" do
-        AutomobileTypeFuelYear.all.each do |record|
-          value = record.send(:"#{attribute}")
-          unless value.present?
-            raise "Missing #{attribute.humanize.downcase} for AutomobileTypeFuelYear '#{record.name}'"
-          end
-        end
-      end
-    end
-    
-    verify "Year should be from 1990 to 2008" do
-      AutomobileTypeFuelYear.all.each do |record|
-        year = record.send(:year)
-        unless year > 1989 and year < 2009
-          raise "Invalid year for AutomobileTypeFuelYear '#{record.name}': #{year} (should be from 1990 to 2008)"
-        end
-      end
-    end
-    
-    %w{ total_travel fuel_consumption ch4_emission_factor n2o_emission_factor }.each do |attribute|
-      verify "#{attribute.humanize} should be greater than zero" do
-        AutomobileTypeFuelYear.all.each do |record|
-          value = record.send(:"#{attribute}")
-          unless value > 0
-            raise "Invalid #{attribute.humanize.downcase} for AutomobileTypeFuelYear '#{record.name}': #{value} (should be > 0)"
-          end
-        end
-      end
-    end
-    
-    [["total_travel_units", "kilometres"],
-     ["fuel_consumption_units", "litres"],
-     ["ch4_emission_factor_units", "kilograms_per_litre"],
-     ["n2o_emission_factor_units", "kilograms_per_litre"]].each do |pair|
-      attribute = pair[0]
-      proper_units = pair[1]
-      verify "#{attribute.humanize} should be #{proper_units.humanize.downcase}" do
-        AutomobileTypeFuelYear.all.each do |record|
-          units = record.send(:"#{attribute}")
-          unless units == proper_units
-            raise "Invalid #{attribute.humanize.downcase} for AutomobileTypeFuelYear '#{record.name}': #{units} (should be #{proper_units})"
-          end
-        end
-      end
-    end
   end
 end

data/lib/earth/automobile/automobile_type_fuel_year_age.rb

@@ -3,16 +3,68 @@ class AutomobileTypeFuelYearAge < ActiveRecord::Base
   
   belongs_to :type_fuel_year, :class_name => 'AutomobileTypeFuelYear', :foreign_key => 'type_fuel_year_name'
 
-  force_schema do
-    string  'name'
-    string  'type_name'
-    string  'fuel_common_name'
-    integer 'year'
-    integer 'age'
-    string  'type_fuel_year_name'
-    float   'total_travel_percent'
-    float   'annual_distance'
-    string  'annual_distance_units'
-    integer 'vehicles'
-  end
+  col :name
+  col :type_name
+  col :fuel_common_name
+  col :year, :type => :integer
+  col :age, :type => :integer
+  col :type_fuel_year_name
+  col :total_travel_percent, :type => :float
+  col :annual_distance, :type => :float
+  col :annual_distance_units
+  col :vehicles, :type => :integer
+  
+  # %w{ type_name fuel_common_name type_fuel_year_name}.each do |attribute|
+  #   verify "#{attribute.humanize} should never be missing" do
+  #     AutomobileTypeFuelYearAge.all.each do |record|
+  #       value = record.send(:"#{attribute}")
+  #       unless value.present?
+  #         raise "Missing #{attribute.humanize.downcase} for AutomobileTypeFuelYearAge '#{record.name}'"
+  #       end
+  #     end
+  #   end
+  # end
+  # 
+  # verify "Year should be 2008" do
+  #   AutomobileTypeFuelYearAge.all.each do |record|
+  #     value = record.send(:year)
+  #     unless value == 2008
+  #       raise "Invalid year for AutomobileTypeFuelYearAge '#{record.name}': #{value} (should be 2008)"
+  #     end
+  #   end
+  # end
+  # 
+  # [["age", 0, 30], ["total_travel_percent", 0, 1]].each do |triplet|
+  #   attribute = triplet[0]
+  #   min = triplet[1]
+  #   max = triplet[2]
+  #   verify "#{attribute.humanize} should be from #{min} to #{max}" do
+  #     AutomobileTypeFuelYearAge.all.each do |record|
+  #       value = record.send(:"#{attribute}")
+  #       unless value >= min and value <= max
+  #         raise "Invalid #{attribute.humanize.downcase} for AutomobileTypeFuelYearAge '#{record.name}': #{value} (should be from #{min} to #{max})"
+  #       end
+  #     end
+  #   end
+  # end
+  # 
+  # %w{ annual_distance vehicles }.each do |attribute|
+  #   verify "#{attribute.humanize} should be greater than zero" do
+  #     AutomobileTypeFuelYearAge.all.each do |record|
+  #       value = record.send(:"#{attribute}")
+  #       unless value > 0
+  #         raise "Invalid #{attribute.humanize.downcase} for AutomobileTypeFuelYearAge '#{record.name}': #{value} (should be > 0)"
+  #       end
+  #     end
+  #   end
+  # end
+  # 
+  # verify "Annual distance units should be kilometres" do
+  #   AutomobileTypeFuelYearAge.all.each do |record|
+  #     units = record.send(:annual_distance_units)
+  #     unless units == "kilometres"
+  #       raise "Invalid annual distance units for AutomobileTypeFuelYearAge '#{record.name}': #{units} (should be kilometres)"
+  #     end
+  #   end
+  # end
 end

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

@@ -99,11 +99,7 @@ AutomobileTypeFuelYearAge.class_eval do
     end
     
     process "Derive type fuel year name for association with AutomobileTypeFuelYear" do
-      if ActiveRecord::Base.connection.adapter_name.downcase == 'sqlite'
-        update_all "type_fuel_year_name = type_name || ' ' || fuel_common_name || ' ' || year"
-      else
-        update_all "type_fuel_year_name = CONCAT(type_name, ' ', fuel_common_name, ' ', year)"
-      end
+      update_all "type_fuel_year_name = type_name || ' ' || fuel_common_name || ' ' || year"
     end
     
     process "Ensure AutomobileTypeFuelYear is populated" do
@@ -116,59 +112,5 @@ AutomobileTypeFuelYearAge.class_eval do
         record.save
       end
     end
-    
-    %w{ type_name fuel_common_name type_fuel_year_name}.each do |attribute|
-      verify "#{attribute.humanize} should never be missing" do
-        AutomobileTypeFuelYearAge.all.each do |record|
-          value = record.send(:"#{attribute}")
-          unless value.present?
-            raise "Missing #{attribute.humanize.downcase} for AutomobileTypeFuelYearAge '#{record.name}'"
-          end
-        end
-      end
-    end
-    
-    verify "Year should be 2008" do
-      AutomobileTypeFuelYearAge.all.each do |record|
-        value = record.send(:year)
-        unless value == 2008
-          raise "Invalid year for AutomobileTypeFuelYearAge '#{record.name}': #{value} (should be 2008)"
-        end
-      end
-    end
-    
-    [["age", 0, 30], ["total_travel_percent", 0, 1]].each do |triplet|
-      attribute = triplet[0]
-      min = triplet[1]
-      max = triplet[2]
-      verify "#{attribute.humanize} should be from #{min} to #{max}" do
-        AutomobileTypeFuelYearAge.all.each do |record|
-          value = record.send(:"#{attribute}")
-          unless value >= min and value <= max
-            raise "Invalid #{attribute.humanize.downcase} for AutomobileTypeFuelYearAge '#{record.name}': #{value} (should be from #{min} to #{max})"
-          end
-        end
-      end
-    end
-    
-    %w{ annual_distance vehicles }.each do |attribute|
-      verify "#{attribute.humanize} should be greater than zero" do
-        AutomobileTypeFuelYearAge.all.each do |record|
-          value = record.send(:"#{attribute}")
-          unless value > 0
-            raise "Invalid #{attribute.humanize.downcase} for AutomobileTypeFuelYearAge '#{record.name}': #{value} (should be > 0)"
-          end
-        end
-      end
-    end
-    
-    verify "Annual distance units should be kilometres" do
-      AutomobileTypeFuelYearAge.all.each do |record|
-        units = record.send(:annual_distance_units)
-        unless units == "kilometres"
-          raise "Invalid annual distance units for AutomobileTypeFuelYearAge '#{record.name}': #{units} (should be kilometres)"
-        end
-      end
-    end
   end
 end

data/lib/earth/automobile/automobile_type_fuel_year_control.rb

@@ -3,14 +3,35 @@ class AutomobileTypeFuelYearControl < ActiveRecord::Base
   
   belongs_to :control, :class_name => 'AutomobileTypeFuelControl', :foreign_key => 'type_fuel_control_name'
   
-  force_schema do
-    string  'name'
-    string  'type_name'
-    string  'fuel_common_name'
-    integer 'year'
-    string  'control_name'
-    string  'type_fuel_control_name'
-    string  'type_fuel_year_name'
-    float   'total_travel_percent'
-  end
+  col :name
+  col :type_name
+  col :fuel_common_name
+  col :year, :type => :integer
+  col :control_name
+  col :type_fuel_control_name
+  col :type_fuel_year_name
+  col :total_travel_percent, :type => :float
+  
+  # %w{ type_name fuel_common_name control_name type_fuel_control_name type_fuel_year_name }.each do |attribute|
+  #   verify "#{attribute.humanize} should never be missing" do
+  #     AutomobileTypeFuelYearControl.all.each do |record|
+  #       value = record.send(:"#{attribute}")
+  #       unless value.present?
+  #         raise "Missing #{attribute.humanize.downcase} for AutomobileTypeFuelYearControl '#{record.name}'"
+  #       end
+  #     end
+  #   end
+  # end
+  # 
+  # verify "Year should be from 1990 to 2008" do
+  #   AutomobileTypeFuelYearControl.all.each do |record|
+  #     year = record.send(:year)
+  #     unless year > 1989 and year < 2009
+  #       raise "Invalid year for AutomobileTypeFuelYearControl '#{record.name}': #{year} (should be from 1990 to 2008)"
+  #     end
+  #   end
+  # end
+  
+  # FIXME TODO verify "Total travel percent for each type fuel year should sum to one"
+  
 end

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

@@ -11,41 +11,11 @@ AutomobileTypeFuelYearControl.class_eval do
     end
     
     process "Derive type fuel control name for association with AutomobileTypeFuelControl" do
-      if ActiveRecord::Base.connection.adapter_name.downcase == 'sqlite'
-        update_all "type_fuel_control_name = type_name || ' ' || fuel_common_name || ' ' || control_name"
-      else
-        update_all "type_fuel_control_name = CONCAT(type_name, ' ', fuel_common_name, ' ', control_name)"
-      end
+      update_all "type_fuel_control_name = type_name || ' ' || fuel_common_name || ' ' || control_name"
     end
     
     process "Derive type fuel year name for association with AutomobileTypeFuelYear" do
-      if ActiveRecord::Base.connection.adapter_name.downcase == 'sqlite'
-        update_all "type_fuel_year_name = type_name || ' ' || fuel_common_name || ' ' || year"
-      else
-        update_all "type_fuel_year_name = CONCAT(type_name, ' ', fuel_common_name, ' ', year)"
-      end
+      update_all "type_fuel_year_name = type_name || ' ' || fuel_common_name || ' ' || year"
     end
-    
-    %w{ type_name fuel_common_name control_name type_fuel_control_name type_fuel_year_name }.each do |attribute|
-      verify "#{attribute.humanize} should never be missing" do
-        AutomobileTypeFuelYearControl.all.each do |record|
-          value = record.send(:"#{attribute}")
-          unless value.present?
-            raise "Missing #{attribute.humanize.downcase} for AutomobileTypeFuelYearControl '#{record.name}'"
-          end
-        end
-      end
-    end
-    
-    verify "Year should be from 1990 to 2008" do
-      AutomobileTypeFuelYearControl.all.each do |record|
-        year = record.send(:year)
-        unless year > 1989 and year < 2009
-          raise "Invalid year for AutomobileTypeFuelYearControl '#{record.name}': #{year} (should be from 1990 to 2008)"
-        end
-      end
-    end
-    
-    # FIXME TODO verify "Total travel percent for each type fuel year should sum to one"
   end
 end

data/lib/earth/automobile/automobile_type_year.rb

@@ -3,13 +3,54 @@ class AutomobileTypeYear < ActiveRecord::Base
   
   has_many :type_fuel_years, :class_name => 'AutomobileTypeFuelYear', :foreign_key => 'type_year_name'
 
-  force_schema 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
+  col :name
+  col :type_name
+  col :year, :type => :integer
+  col :hfc_emissions, :type => :float
+  col :hfc_emissions_units
+  col :hfc_emission_factor, :type => :float
+  col :hfc_emission_factor_units
+  
+  # verify "Type name should never be missing" do
+  #   AutomobileTypeYear.all.each do |record|
+  #     value = record.send(:type_name)
+  #     unless value.present?
+  #       raise "Missing type name for AutomobileTypeYear '#{record.name}'"
+  #     end
+  #   end
+  # end
+  # 
+  # verify "Year should be from 1990 to 2008" do
+  #   AutomobileTypeYear.all.each do |record|
+  #     year = record.send(:year)
+  #     unless year > 1989 and year < 2009
+  #       raise "Invalid year for AutomobileTypeYear '#{record.name}': #{year} (should be from 1990 to 2008)"
+  #     end
+  #   end
+  # end
+  # 
+  # %w{ hfc_emissions hfc_emission_factor }.each do |attribute|
+  #   verify "#{attribute.humanize} should be zero or more" do
+  #     AutomobileTypeYear.all.each do |record|
+  #       value = record.send(:"#{attribute}")
+  #       unless value >= 0
+  #         raise "Invalid #{attribute.humanize.downcase} for AutomobileTypeYear '#{record.name}': #{value} (should be zero or more)"
+  #       end
+  #     end
+  #   end
+  # end
+  # 
+  # [["hfc_emissions_units", "kilograms_co2e"], ["hfc_emission_factor_units", "kilograms_co2e_per_litre"]].each do |pair|
+  #   attribute = pair[0]
+  #   proper_units = pair[1]
+  #   verify "#{attribute.humanize} should be #{proper_units.humanize.downcase}" do
+  #     AutomobileTypeYear.all.each do |record|
+  #       units = record.send(:"#{attribute}")
+  #       unless units == proper_units
+  #         raise "Invalid #{attribute.humanize.downcase} for AutomobileTypeYear '#{record.name}': #{units} (should be #{proper_units})"
+  #       end
+  #     end
+  #   end
+  # end
+  
+end

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

@@ -18,48 +18,6 @@ AutomobileTypeYear.class_eval do
         record.hfc_emission_factor_units = "kilograms_co2e_per_litre"
         record.save
       end
-    end
-    
-    verify "Type name should never be missing" do
-      AutomobileTypeYear.all.each do |record|
-        value = record.send(:type_name)
-        unless value.present?
-          raise "Missing type name for AutomobileTypeYear '#{record.name}'"
-        end
-      end
-    end
-    
-    verify "Year should be from 1990 to 2008" do
-      AutomobileTypeYear.all.each do |record|
-        year = record.send(:year)
-        unless year > 1989 and year < 2009
-          raise "Invalid year for AutomobileTypeYear '#{record.name}': #{year} (should be from 1990 to 2008)"
-        end
-      end
-    end
-    
-    %w{ hfc_emissions hfc_emission_factor }.each do |attribute|
-      verify "#{attribute.humanize} should be zero or more" do
-        AutomobileTypeYear.all.each do |record|
-          value = record.send(:"#{attribute}")
-          unless value >= 0
-            raise "Invalid #{attribute.humanize.downcase} for AutomobileTypeYear '#{record.name}': #{value} (should be zero or more)"
-          end
-        end
-      end
-    end
-    
-    [["hfc_emissions_units", "kilograms_co2e"], ["hfc_emission_factor_units", "kilograms_co2e_per_litre"]].each do |pair|
-      attribute = pair[0]
-      proper_units = pair[1]
-      verify "#{attribute.humanize} should be #{proper_units.humanize.downcase}" do
-        AutomobileTypeYear.all.each do |record|
-          units = record.send(:"#{attribute}")
-          unless units == proper_units
-            raise "Invalid #{attribute.humanize.downcase} for AutomobileTypeYear '#{record.name}': #{units} (should be #{proper_units})"
-          end
-        end
-      end
-    end
+    end    
   end
 end

data/lib/earth/automobile/data_miner.rb

@@ -13,3 +13,4 @@ require 'earth/automobile/automobile_type_fuel_control/data_miner'
 require 'earth/automobile/automobile_type_fuel_year/data_miner'
 require 'earth/automobile/automobile_type_fuel_year_age/data_miner'
 require 'earth/automobile/automobile_type_fuel_year_control/data_miner'
+require 'earth/fuel/data_miner'

data/lib/earth/bus/bus_class.rb

@@ -28,32 +28,112 @@ 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
   
-  force_schema 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
+  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
+  col :alternative_fuels_intensity, :type => :float
+  col :alternative_fuels_intensity_units
+  
+  # verify "Some attributes should be greater than zero" do
+  #   BusClass.all.each do |bus_class|
+  #     %w{ distance passengers speed diesel_intensity air_conditioning_emission_factor }.each do |attribute|
+  #       value = bus_class.send(:"#{attribute}")
+  #       unless value > 0
+  #         raise "Invalid #{attribute.humanize.downcase} for BusClass #{bus_class.name}: #{value} (should be > 0)"
+  #       end
+  #     end
+  #   end
+  # end
+  # 
+  # verify "Some attributes should be zero or more" do
+  #   BusClass.all.each do |bus_class|
+  #     %w{ gasoline_intensity cng_intensity lng_intensity lpg_intensity methanol_intensity biodiesel_intensity electricity_intensity alternative_fuels_intensity }.each do |attribute|
+  #       value = bus_class.send(:"#{attribute}")
+  #       unless value >= 0
+  #         raise "Invalid #{attribute.humanize.downcase} for BusClass #{bus_class.name}: #{value} (should be >= 0)"
+  #       end
+  #     end
+  #   end
+  # end
+  # 
+  # verify "Units should be correct" do
+  #   BusClass.all.each do |bus_class|
+  #     [["distance_units", "kilometres"],
+  #      ["speed_units", "kilometres_per_hour"],
+  #      ["diesel_intensity_units", "litres_per_kilometre"],
+  #      ["gasoline_intensity_units", "litres_per_kilometre"],
+  #      ["cng_intensity_units", "litres_per_kilometre"],
+  #      ["lng_intensity_units", "litres_per_kilometre"],
+  #      ["lpg_intensity_units", "litres_per_kilometre"],
+  #      ["methanol_intensity_units", "litres_per_kilometre"],
+  #      ["biodiesel_intensity_units", "litres_per_kilometre"],
+  #      ["electricity_intensity_units", "kilowatt_hours_per_kilometre"],
+  #      ["air_conditioning_emission_factor_units", "kilograms_co2e_per_kilometre"],
+  #      ["alternative_fuels_intensity_units", "litres_per_kilometre"]].each do |pair|
+  #       attribute = pair[0]
+  #       proper_units = pair[1]
+  #       units = bus_class.send(:"#{attribute}")
+  #       unless units == proper_units
+  #         raise "Invalid #{attribute.humanize.downcase} for BusClass #{bus_class.name}: #{units} (should be #{proper_units})"
+  #       end
+  #     end
+  #   end
+  # end
+  # 
+  # verify "Fallbacks should satisfy same constraints as data" do
+  #   %w{ distance passengers speed diesel_intensity air_conditioning_emission_factor }.each do |attribute|
+  #     value = BusClass.fallback.send(:"#{attribute}")
+  #     unless value > 0
+  #       raise "Invalid #{attribute.humanize.downcase} for fallback BusClass: #{value} (should be > 0)"
+  #     end
+  #   end
+  #   
+  #   %w{ gasoline_intensity cng_intensity lng_intensity lpg_intensity methanol_intensity biodiesel_intensity electricity_intensity alternative_fuels_intensity }.each do |attribute|
+  #     value = BusClass.fallback.send(:"#{attribute}")
+  #     unless value >= 0
+  #       raise "Invalid #{attribute.humanize.downcase} for fallback BusClass: #{value} (should be >= 0)"
+  #     end
+  #   end
+  #   
+  #   [["distance_units", "kilometres"],
+  #    ["speed_units", "kilometres_per_hour"],
+  #    ["diesel_intensity_units", "litres_per_kilometre"],
+  #    ["gasoline_intensity_units", "litres_per_kilometre"],
+  #    ["cng_intensity_units", "litres_per_kilometre"],
+  #    ["lng_intensity_units", "litres_per_kilometre"],
+  #    ["lpg_intensity_units", "litres_per_kilometre"],
+  #    ["methanol_intensity_units", "litres_per_kilometre"],
+  #    ["biodiesel_intensity_units", "litres_per_kilometre"],
+  #    ["electricity_intensity_units", "kilowatt_hours_per_kilometre"],
+  #    ["air_conditioning_emission_factor_units", "kilograms_co2e_per_kilometre"],
+  #    ["alternative_fuels_intensity_units", "litres_per_kilometre"]].each do |pair|
+  #     attribute = pair[0]
+  #     proper_units = pair[1]
+  #     units = BusClass.fallback.send(:"#{attribute}")
+  #     unless units == proper_units
+  #       raise "Invalid #{attribute.humanize.downcase} for fallback BusClass: #{units} (should be #{proper_units})"
+  #     end
+  #   end
+  # end
 end