earth 0.5.4 → 0.6.0

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

@@ -30,71 +30,5 @@ AutomobileSizeClass.class_eval do
       store 'conventional_fuel_efficiency_city_multiplier'
       store 'conventional_fuel_efficiency_highway_multiplier'
     end
-    
-    # FIXME TODO verify type_name?
-    
-    verify "Annual distance should be greater than zero" do
-      AutomobileSizeClass.all.each do |size_class|
-        unless size_class.annual_distance > 0
-          raise "Invalid annual distance for AutomobileSizeClass #{size_class.name}: #{size_class.annual_distance} (should be > 0)"
-        end
-      end
-    end
-    
-    verify "Annual distance units should be kilometres" do
-      AutomobileSizeClass.all.each do |size_class|
-        unless size_class.annual_distance_units == "kilometres"
-          raise "Invalid annual distance units for AutomobileSizeClass #{size_class.name}: #{size_class.annual_distance_units} (should be kilometres)"
-        end
-      end
-    end
-    
-     verify "Fuel efficiencies should be greater than zero" do
-      AutomobileSizeClass.all.each do |size_class|
-        %w{ city highway }.each do |type|
-          fuel_efficiency = size_class.send(:"fuel_efficiency_#{type}")
-          unless fuel_efficiency > 0
-            raise "Invalid fuel efficiency #{type} for AutomobileSizeClass #{size_class.name}: #{fuel_efficiency} (should be > 0)"
-          end
-        end
-      end
-    end
-    
-    verify "Fuel efficiency units should be kilometres per litre" do
-      AutomobileSizeClass.all.each do |size_class|
-        %w{ city highway }.each do |type|
-          units = size_class.send(:"fuel_efficiency_#{type}_units")
-          unless units == "kilometres_per_litre"
-            raise "Invalid fuel efficiency #{type} units for AutomobileSizeClass #{size_class.name}: #{units} (should be kilometres_per_litre)"
-          end
-        end
-      end
-    end
-    
-    verify "Any fuel efficiency multipliers should be greater than zero" do
-      AutomobileSizeClass.all.each do |size_class|
-        %w{ hybrid conventional }.each do |hybridity|
-          %w{ city highway }.each do |type|
-            multiplier = size_class.send(:"#{hybridity}_fuel_efficiency_#{type}_multiplier")
-            if multiplier.present?
-              unless multiplier > 0
-                raise "Invalid #{hybridity} fuel efficiency #{type} multiplier for AutomobileSizeClass #{size_class.name}: #{multiplier} (should be > 0)"
-              end
-            end
-          end
-        end
-      end
-    end
-    
-    verify "Fallback fuel efficiency multipliers should be greater than zero" do
-      %w{ hybrid conventional }.each do |hybridity|
-        %w{ city highway }.each do |type|
-          multiplier = AutomobileSizeClass.fallback.send(:"#{hybridity}_fuel_efficiency_#{type}_multiplier")
-          unless multiplier > 0
-            raise "Invalid AutomobileSizeClass fallback #{hybridity} fuel efficiency #{type} multiplier: #{multiplier} (should be > 0)"
-          end
-        end
-      end
-    end
   end
 end

data/lib/earth/automobile/automobile_size_class_year.rb

@@ -1,14 +1,42 @@
 class AutomobileSizeClassYear < ActiveRecord::Base
   set_primary_key :name
 
-  force_schema do
-    string  'name'
-    string  'size_class_name'
-    integer 'year'
-    string  'type_name'
-    float   'fuel_efficiency_city'
-    string  'fuel_efficiency_city_units'
-    float   'fuel_efficiency_highway'
-    string  'fuel_efficiency_highway_units'
-  end
+  col :name
+  col :size_class_name
+  col :year, :type => :integer
+  col :type_name
+  col :fuel_efficiency_city, :type => :float
+  col :fuel_efficiency_city_units
+  col :fuel_efficiency_highway, :type => :float
+  col :fuel_efficiency_highway_units
+  
+  # verify "Year should be from 1975 to 2010" do
+  #   AutomobileSizeClassYear.all.each do |record|
+  #     unless record.year > 1974 and record.year < 2011
+  #       raise "Invalid year for AutomobileSizeClassYear #{record.name}: #{record.year} (should be from 1975 to 2010)"
+  #     end
+  #   end
+  # end
+  # 
+  # verify "Fuel efficiencies should be greater than zero" do
+  #   AutomobileSizeClassYear.all.each do |year|
+  #     %w{ fuel_efficiency_city fuel_efficiency_highway }.each do |attribute|
+  #       value = year.send(:"#{attribute}")
+  #       unless value > 0
+  #         raise "Invalid #{attribute} for AutomobileSizeClassYear #{year.name}: #{value} (should be > 0)"
+  #       end
+  #     end
+  #   end
+  # end
+  # 
+  # verify "Fuel efficiency units should be kilometres per litre" do
+  #   AutomobileSizeClassYear.all.each do |year|
+  #     %w{ fuel_efficiency_city_units fuel_efficiency_highway_units }.each do |attribute|
+  #       value = year.send(:"#{attribute}")
+  #       unless value == "kilometres_per_litre"
+  #         raise "Invalid #{attribute} for AutomobileSizeClassYear #{year.name}: #{value} (should be kilometres_per_litre)"
+  #       end
+  #     end
+  #   end
+  # end
 end

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

@@ -12,35 +12,5 @@ AutomobileSizeClassYear.class_eval do
     
     # FIXME TODO verify that size_class_name is never missing?
     # FIXME TODO verify that type_name appears in AutomobileTypeFuelYearAges
-    
-    verify "Year should be from 1975 to 2010" do
-      AutomobileSizeClassYear.all.each do |record|
-        unless record.year > 1974 and record.year < 2011
-          raise "Invalid year for AutomobileSizeClassYear #{record.name}: #{record.year} (should be from 1975 to 2010)"
-        end
-      end
-    end
-    
-    verify "Fuel efficiencies should be greater than zero" do
-      AutomobileSizeClassYear.all.each do |year|
-        %w{ fuel_efficiency_city fuel_efficiency_highway }.each do |attribute|
-          value = year.send(:"#{attribute}")
-          unless value > 0
-            raise "Invalid #{attribute} for AutomobileSizeClassYear #{year.name}: #{value} (should be > 0)"
-          end
-        end
-      end
-    end
-    
-    verify "Fuel efficiency units should be kilometres per litre" do
-      AutomobileSizeClassYear.all.each do |year|
-        %w{ fuel_efficiency_city_units fuel_efficiency_highway_units }.each do |attribute|
-          value = year.send(:"#{attribute}")
-          unless value == "kilometres_per_litre"
-            raise "Invalid #{attribute} for AutomobileSizeClassYear #{year.name}: #{value} (should be kilometres_per_litre)"
-          end
-        end
-      end
-    end
   end
 end

data/lib/earth/automobile/automobile_type_fuel_age.rb

@@ -2,15 +2,64 @@
 class AutomobileTypeFuelAge < ActiveRecord::Base
   set_primary_key :name
   
-  force_schema do
-    string  'name'
-    string  'type_name'
-    string  'fuel_common_name'
-    integer 'age'
-    float   'age_percent'
-    float   'total_travel_percent'
-    float   'annual_distance'
-    string  'annual_distance_units'
-    integer 'vehicles'
-  end
+  col :name
+  col :type_name
+  col :fuel_common_name
+  col :age, :type => :integer
+  col :age_percent, :type => :float
+  col :total_travel_percent, :type => :float
+  col :annual_distance, :type => :float
+  col :annual_distance_units
+  col :vehicles, :type => :integer
+  
+  # verify "Type name and fuel common name should never be missing" do
+  #   AutomobileTypeFuelAge.all.each do |record|
+  #     %w{ type_name fuel_common_name }.each do |attribute|
+  #       value = record.send(:"#{attribute}")
+  #       unless value.present?
+  #         raise "Missing #{attribute} for AutomobileTypeFuelAge '#{record.name}'"
+  #       end
+  #     end
+  #   end
+  # end
+  # 
+  # verify "Age should be from zero to thirty" do
+  #   AutomobileTypeFuelAge.all.each do |record|
+  #     value = record.send(:age)
+  #     unless value >= 0 and value < 31
+  #       raise "Invalid age for AutomobileTypeFuelAge '#{record.name}': #{value} (should be from 0 to 30)"
+  #     end
+  #   end
+  # end
+  # 
+  # verify "Age percent and total travel percent should be from zero to one" do
+  #   AutomobileTypeFuelAge.all.each do |record|
+  #     %w{ age_percent total_travel_percent }.each do |attribute|
+  #       percent = record.send(:"#{attribute}")
+  #       unless percent > 0 and percent < 1
+  #         raise "Invalid #{attribute} for AutomobileTypeFuelAge '#{record.name}': #{percent} (should be from 0 to 1)"
+  #       end
+  #     end
+  #   end
+  # end
+  # 
+  # verify "Annual distance and vehicles should be greater than zero" do
+  #   AutomobileTypeFuelAge.all.each do |record|
+  #     %w{ annual_distance vehicles }.each do |attribute|
+  #       value = record.send(:"#{attribute}")
+  #       unless value > 0
+  #         raise "Invalid #{attribute} for AutomobileTypeFuelAge '#{record.name}': #{value} (should be > 0)"
+  #       end
+  #     end
+  #   end
+  # end
+  # 
+  # verify "Annual distance units should be kilometres" do
+  #   AutomobileTypeFuelAge.all.each do |record|
+  #     units = record.send(:annual_distance_units)
+  #     unless units == "kilometres"
+  #       raise "Invalid annual distance units for AutomobileTypeFuelAge '#{record.name}': #{units} (should be kilometres)"
+  #     end
+  #   end
+  # end
 end

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

@@ -133,72 +133,17 @@ AutomobileTypeFuelAge.class_eval do
     
     # FIXME TODO maybe make this a method on AutomobileTypeFuelAge?
     process "Calculate number of vehicles from total travel percent and AutomobileTypeFuelYear" do
-      connection.execute %{
-        UPDATE automobile_type_fuel_ages
-        SET vehicles =
-          (
-            (
-              SELECT automobile_type_fuel_years.total_travel
-              FROM automobile_type_fuel_years
-              WHERE automobile_type_fuel_years.`year` =
-              (SELECT max(automobile_type_fuel_years.`year`) FROM automobile_type_fuel_years)
-              AND automobile_type_fuel_years.`type_name` = automobile_type_fuel_ages.`type_name`
-              AND automobile_type_fuel_years.fuel_common_name = automobile_type_fuel_ages.fuel_common_name
-            ) *
-            automobile_type_fuel_ages.total_travel_percent / automobile_type_fuel_ages.annual_distance
-          )
+      max_year = AutomobileTypeFuelYear.maximum :year
+      update_all %{
+        vehicles =
+          ( SELECT t1.total_travel
+            FROM #{AutomobileTypeFuelYear.quoted_table_name} AS t1
+            WHERE
+              t1.year = #{max_year}
+              AND t1.type_name = #{quoted_table_name}.type_name
+              AND t1.fuel_common_name = #{quoted_table_name}.fuel_common_name )
+          * #{quoted_table_name}.total_travel_percent / #{quoted_table_name}.annual_distance
       }
     end
-    
-    verify "Type name and fuel common name should never be missing" do
-      AutomobileTypeFuelAge.all.each do |record|
-        %w{ type_name fuel_common_name }.each do |attribute|
-          value = record.send(:"#{attribute}")
-          unless value.present?
-            raise "Missing #{attribute} for AutomobileTypeFuelAge '#{record.name}'"
-          end
-        end
-      end
-    end
-    
-    verify "Age should be from zero to thirty" do
-      AutomobileTypeFuelAge.all.each do |record|
-        value = record.send(:age)
-        unless value >= 0 and value < 31
-          raise "Invalid age for AutomobileTypeFuelAge '#{record.name}': #{value} (should be from 0 to 30)"
-        end
-      end
-    end
-    
-    verify "Age percent and total travel percent should be from zero to one" do
-      AutomobileTypeFuelAge.all.each do |record|
-        %w{ age_percent total_travel_percent }.each do |attribute|
-          percent = record.send(:"#{attribute}")
-          unless percent > 0 and percent < 1
-            raise "Invalid #{attribute} for AutomobileTypeFuelAge '#{record.name}': #{percent} (should be from 0 to 1)"
-          end
-        end
-      end
-    end
-    
-    verify "Annual distance and vehicles should be greater than zero" do
-      AutomobileTypeFuelAge.all.each do |record|
-        %w{ annual_distance vehicles }.each do |attribute|
-          value = record.send(:"#{attribute}")
-          unless value > 0
-            raise "Invalid #{attribute} for AutomobileTypeFuelAge '#{record.name}': #{value} (should be > 0)"
-          end
-        end
-      end
-    end
-    
-    verify "Annual distance units should be kilometres" do
-      AutomobileTypeFuelAge.all.each do |record|
-        units = record.send(:annual_distance_units)
-        unless units == "kilometres"
-          raise "Invalid annual distance units for AutomobileTypeFuelAge '#{record.name}': #{units} (should be kilometres)"
-        end
-      end
-    end
   end
 end

data/lib/earth/automobile/automobile_type_fuel_control.rb

@@ -1,13 +1,44 @@
 class AutomobileTypeFuelControl < ActiveRecord::Base
   set_primary_key :name
-  force_schema do
-    string  'name'
-    string  'type_name'
-    string  'fuel_common_name'
-    string  'control_name'
-    float   'ch4_emission_factor'
-    string  'ch4_emission_factor_units'
-    float   'n2o_emission_factor'
-    string  'n2o_emission_factor_units'
-  end
+  col :name
+  col :type_name
+  col :fuel_common_name
+  col :control_name
+  col :ch4_emission_factor, :type => :float
+  col :ch4_emission_factor_units
+  col :n2o_emission_factor, :type => :float
+  col :n2o_emission_factor_units
+  
+  # verify "Type name, fuel common name, and control name should never be missing" do
+  #   AutomobileTypeFuelControl.all.each do |record|
+  #     %w{ type_name fuel_common_name control_name }.each do |attribute|
+  #       value = record.send(:"#{attribute}")
+  #       unless value.present?
+  #         raise "Missing #{attribute} for AutomobileTypeFuelControl '#{record.name}'"
+  #       end
+  #     end
+  #   end
+  # end
+  # 
+  # verify "Emission factors should be greater than zero" do
+  #   AutomobileTypeFuelControl.all.each do |record|
+  #     %w{ ch4_emission_factor n2o_emission_factor }.each do |factor|
+  #       value = record.send(:"#{factor}")
+  #       unless value > 0
+  #         raise "Invalid #{factor} for AutomobileTypeFuelControl '#{record.name}': #{valuel} (should be > 0)"
+  #       end
+  #     end
+  #   end
+  # end
+  # 
+  # verify "Emission factor units should be kilograms per kilometre" do
+  #   AutomobileTypeFuelControl.all.each do |record|
+  #     %w{ ch4_emission_factor_units n2o_emission_factor_units }.each do |attribute|
+  #       units = record.send(:"#{attribute}")
+  #       unless units == "kilograms_per_kilometre"
+  #         raise "Invalid #{attribute} for AutomobileTypeFuelControl '#{record.name}': #{units} (should be kilograms_per_kilometre)"
+  #       end
+  #     end
+  #   end
+  # end
 end

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

@@ -9,38 +9,5 @@ AutomobileTypeFuelControl.class_eval do
       store 'ch4_emission_factor', :units_field_name => 'ch4_emission_factor_units'
       store 'n2o_emission_factor', :units_field_name => 'n2o_emission_factor_units'
     end
-    
-    verify "Type name, fuel common name, and control name should never be missing" do
-      AutomobileTypeFuelControl.all.each do |record|
-        %w{ type_name fuel_common_name control_name }.each do |attribute|
-          value = record.send(:"#{attribute}")
-          unless value.present?
-            raise "Missing #{attribute} for AutomobileTypeFuelControl '#{record.name}'"
-          end
-        end
-      end
-    end
-    
-    verify "Emission factors should be greater than zero" do
-      AutomobileTypeFuelControl.all.each do |record|
-        %w{ ch4_emission_factor n2o_emission_factor }.each do |factor|
-          value = record.send(:"#{factor}")
-          unless value > 0
-            raise "Invalid #{factor} for AutomobileTypeFuelControl '#{record.name}': #{valuel} (should be > 0)"
-          end
-        end
-      end
-    end
-    
-    verify "Emission factor units should be kilograms per kilometre" do
-      AutomobileTypeFuelControl.all.each do |record|
-        %w{ ch4_emission_factor_units n2o_emission_factor_units }.each do |attribute|
-          units = record.send(:"#{attribute}")
-          unless units == "kilograms_per_kilometre"
-            raise "Invalid #{attribute} for AutomobileTypeFuelControl '#{record.name}': #{units} (should be kilograms_per_kilometre)"
-          end
-        end
-      end
-    end
   end
 end

data/lib/earth/automobile/automobile_type_fuel_year.rb

@@ -4,19 +4,64 @@ class AutomobileTypeFuelYear < ActiveRecord::Base
   has_many :year_controls, :class_name => 'AutomobileTypeFuelYearControl', :foreign_key => 'type_fuel_year_name'
   belongs_to :type_year, :class_name => 'AutomobileTypeYear', :foreign_key => 'type_year_name'
   
-  force_schema do
-    string  'name'
-    string  'type_name'
-    string  'fuel_common_name'
-    integer 'year'
-    string  'type_year_name'
-    float   'total_travel'
-    string  'total_travel_units'
-    float   'fuel_consumption'
-    string  'fuel_consumption_units'
-    float   'ch4_emission_factor'
-    string  'ch4_emission_factor_units'
-    float   'n2o_emission_factor'
-    string  'n2o_emission_factor_units'
-  end
+  col :name
+  col :type_name
+  col :fuel_common_name
+  col :year, :type => :integer
+  col :type_year_name
+  col :total_travel, :type => :float
+  col :total_travel_units
+  col :fuel_consumption, :type => :float
+  col :fuel_consumption_units
+  col :ch4_emission_factor, :type => :float
+  col :ch4_emission_factor_units
+  col :n2o_emission_factor, :type => :float
+  col :n2o_emission_factor_units
+  
+  # %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