earth 0.5.4 → 0.6.0

data/lib/earth/diet/food_group.rb

@@ -11,12 +11,10 @@ class FoodGroup < ActiveRecord::Base
     end
   end
   
-  force_schema do
-    string  'name'
-    float   'intensity'
-    string  'intensity_units'
-    float   'energy'
-    string  'energy_units'
-    string  'suggested_imperial_measurement' # ?
-  end
-end
+  col :name
+  col :intensity, :type => :float
+  col :intensity_units
+  col :energy, :type => :float
+  col :energy_units
+  col :suggested_imperial_measurement # ?
+end

data/lib/earth/fuel/fuel.rb

@@ -3,21 +3,19 @@ class Fuel < ActiveRecord::Base
   
   has_many :fuel_years, :foreign_key => 'fuel_name'
   
-  force_schema do
-    string 'name'
-    float  'density'
-    string 'density_units'
-    float  'energy_content'
-    string 'energy_content_units'
-    float  'carbon_content'
-    string 'carbon_content_units'
-    float  'oxidation_factor'
-    float  'biogenic_fraction'
-    float  'co2_emission_factor'
-    string 'co2_emission_factor_units'
-    float  'co2_biogenic_emission_factor'
-    string 'co2_biogenic_emission_factor_units'
-  end
+  col :name
+  col :density, :type => :float
+  col :density_units
+  col :energy_content, :type => :float
+  col :energy_content_units
+  col :carbon_content, :type => :float
+  col :carbon_content_units
+  col :oxidation_factor, :type => :float
+  col :biogenic_fraction, :type => :float
+  col :co2_emission_factor, :type => :float
+  col :co2_emission_factor_units
+  col :co2_biogenic_emission_factor, :type => :float
+  col :co2_biogenic_emission_factor_units
   
   def latest_year
     fuel_years.find_by_year(fuel_years.maximum('year'))
@@ -102,4 +100,4 @@ class Fuel < ActiveRecord::Base
       latest_year.co2_biogenic_emission_factor_units
     end
   end
-end
+end

data/lib/earth/fuel/fuel/data_miner.rb

@@ -5,9 +5,13 @@ Fuel.class_eval do
     end
     
     process "Derive fuel names from FuelYear" do
-      INSERT_IGNORE %{INTO fuels(name)
-        SELECT DISTINCT fuel_years.fuel_name FROM fuel_years
-      }
+      ::Earth::Utils.insert_ignore(
+        :src => FuelYear,
+        :dest => Fuel,
+        :cols => {
+          :fuel_name => :name
+        }
+      )
     end
     
     import "fuels with non-variable characteristics",

data/lib/earth/fuel/fuel_price.rb

@@ -3,9 +3,7 @@ class FuelPrice < ActiveRecord::Base
   
   belongs_to :fuel_type, :foreign_key => 'name' # weird
   
-  force_schema do
-    string  'name'
-    float   'price'
-    string  'price_units'
-  end
-end
+  col :name
+  col :price, :type => :float
+  col :price_units
+end

data/lib/earth/fuel/fuel_type.rb

@@ -12,17 +12,15 @@ class FuelType < ActiveRecord::Base
     prices.average :price
   end
   
-  force_schema do
-    string 'name'
-    float  'emission_factor'
-    string 'emission_factor_units'
-    float  'density'
-    string 'density_units'
-    float  'average_purchase_volume'
-    string 'average_purchase_volume_units'
-    # float    'energy_content'
-    # string   'energy_content_units'
-    # float    'carbon_content'
-    # string   'carbon_content_units'
-  end
-end
+  col :name
+  col :emission_factor, :type => :float
+  col :emission_factor_units
+  col :density, :type => :float
+  col :density_units
+  col :average_purchase_volume, :type => :float
+  col :average_purchase_volume_units
+  # col :energy_content, :type => :float
+  # col :energy_content_units
+  # col :carbon_content, :type => :float
+  # col :carbon_content_units
+end

data/lib/earth/fuel/fuel_year.rb

@@ -1,19 +1,60 @@
 class FuelYear < ActiveRecord::Base
   set_primary_key :name
   
-  force_schema do
-    string  'name'
-    string  'fuel_name'
-    integer 'year'
-    float   'energy_content'
-    string  'energy_content_units'
-    float   'carbon_content'
-    string  'carbon_content_units'
-    float   'oxidation_factor'
-    float   'biogenic_fraction'
-    float   'co2_emission_factor'
-    string  'co2_emission_factor_units'
-    float   'co2_biogenic_emission_factor'
-    string  'co2_biogenic_emission_factor_units'
-  end
-end
+  col :name
+  col :fuel_name
+  col :year, :type => :integer
+  col :energy_content, :type => :float
+  col :energy_content_units
+  col :carbon_content, :type => :float
+  col :carbon_content_units
+  col :oxidation_factor, :type => :float
+  col :biogenic_fraction, :type => :float
+  col :co2_emission_factor, :type => :float
+  col :co2_emission_factor_units
+  col :co2_biogenic_emission_factor, :type => :float
+  col :co2_biogenic_emission_factor_units
+  
+  # FIXME TODO verify fuel name is in Fuel
+  # verify "Fuel name should never be missing" do
+  #   FuelYear.all.each do |record|
+  #     fuel_name = record.send(:fuel_name)
+  #     if fuel_name.nil?
+  #       raise "Missing fuel name for FuelYear '#{record.name}'"
+  #     end
+  #   end
+  # end
+  # 
+  # verify "Year should be from 1990 to 2008" do
+  #   FuelYear.all.each do |record|
+  #     year = record.send(:year)
+  #     unless year > 1989 and year < 2009
+  #       raise "Invalid year for FuelYear '#{record.name}': #{year} (should be from 1990 to 2008)"
+  #     end
+  #   end
+  # end
+  # 
+  # verify "Carbon content and energy content should be greater than zero" do
+  #   FuelYear.all.each do |record|
+  #     %w{ carbon_content energy_content }.each do |attribute|
+  #       value = record.send(:"#{attribute}")
+  #       unless value > 0
+  #         raise "Invalid #{attribute} for FuelYear '#{record.name}': #{value} (should be > 0)"
+  #       end
+  #     end
+  #   end
+  # end
+  # 
+  # verify "Emission factors should be zero or more" do
+  #   FuelYear.all.each do |record|
+  #     %w{ co2_emission_factor co2_biogenic_emission_factor }.each do |attribute|
+  #       value = record.send(:"#{attribute}")
+  #       unless value >= 0
+  #         raise "Invalid #{attribute} for FuelYear '#{record.name}': #{value} (should be >= 0)"
+  #       end
+  #     end
+  #   end
+  # end
+  # 
+  # FIXME TODO verify units
+end

data/lib/earth/fuel/fuel_year/data_miner.rb

@@ -82,48 +82,5 @@ FuelYear.class_eval do
         WHERE energy_content_units = 'megajoules_per_cubic_metre'
       }
     end
-    
-    # FIXME TODO verify fuel name is in Fuel
-    verify "Fuel name should never be missing" do
-      FuelYear.all.each do |record|
-        fuel_name = record.send(:fuel_name)
-        if fuel_name.nil?
-          raise "Missing fuel name for FuelYear '#{record.name}'"
-        end
-      end
-    end
-    
-    verify "Year should be from 1990 to 2008" do
-      FuelYear.all.each do |record|
-        year = record.send(:year)
-        unless year > 1989 and year < 2009
-          raise "Invalid year for FuelYear '#{record.name}': #{year} (should be from 1990 to 2008)"
-        end
-      end
-    end
-    
-    verify "Carbon content and energy content should be greater than zero" do
-      FuelYear.all.each do |record|
-        %w{ carbon_content energy_content }.each do |attribute|
-          value = record.send(:"#{attribute}")
-          unless value > 0
-            raise "Invalid #{attribute} for FuelYear '#{record.name}': #{value} (should be > 0)"
-          end
-        end
-      end
-    end
-    
-    verify "Emission factors should be zero or more" do
-      FuelYear.all.each do |record|
-        %w{ co2_emission_factor co2_biogenic_emission_factor }.each do |attribute|
-          value = record.send(:"#{attribute}")
-          unless value >= 0
-            raise "Invalid #{attribute} for FuelYear '#{record.name}': #{value} (should be >= 0)"
-          end
-        end
-      end
-    end
-    
-    # FIXME TODO verify units
   end
 end

data/lib/earth/fuel/greenhouse_gas.rb

@@ -7,12 +7,49 @@ class GreenhouseGas < ActiveRecord::Base
     end
   end
   
-  force_schema do
-    string  'name'
-    string  'abbreviation'
-    string  'ipcc_report'
-    integer 'time_horizon'
-    string  'time_horizon_units'
-    integer 'global_warming_potential'
-  end
-end
+  col :name
+  col :abbreviation
+  col :ipcc_report
+  col :time_horizon, :type => :integer
+  col :time_horizon_units
+  col :global_warming_potential, :type => :integer
+  
+  # verify "Abbreviation and IPCC report should never be missing" do
+  #   GreenhouseGas.all.each do |record|
+  #     %w{ abbreviation ipcc_report }.each do |attribute|
+  #       value = record.send(:"#{attribute}")
+  #       unless value.present?
+  #         raise "Missing #{attribute} for GreenhouseGas '#{record.name}'"
+  #       end
+  #     end
+  #   end
+  # end
+  # 
+  # verify "Time horizon should be 100" do
+  #   GreenhouseGas.all.each do |record|
+  #     value = record.send(:time_horizon)
+  #     unless value == 100
+  #       raise "Invalid time horizon for GreenhouseGas '#{record.name}': #{value} (should be 100)"
+  #     end
+  #   end
+  # end
+  # 
+  # verify "Time horizon units should be years" do
+  #   GreenhouseGas.all.each do |record|
+  #     units = record.send(:time_horizon_units)
+  #     unless units == "years"
+  #       raise "Invalid time horizon units for GreenhouseGas '#{record.name}': #{units} (should be years)"
+  #     end
+  #   end
+  # end
+  # 
+  # verify "Global warming potential should be one or more" do
+  #   GreenhouseGas.all.each do |record|
+  #     value = record.send(:global_warming_potential)
+  #     unless value >= 1
+  #       raise "Invalid global warming potential for GreenhouseGas '#{record.name}': #{value} (should >= 1)"
+  #     end
+  #   end
+  # end
+  
+end

data/lib/earth/fuel/greenhouse_gas/data_miner.rb

@@ -8,43 +8,5 @@ GreenhouseGas.class_eval do
       store 'time_horizon', :units_field_name => 'time_horizon_units'
       store 'global_warming_potential'
     end
-    
-    verify "Abbreviation and IPCC report should never be missing" do
-      GreenhouseGas.all.each do |record|
-        %w{ abbreviation ipcc_report }.each do |attribute|
-          value = record.send(:"#{attribute}")
-          unless value.present?
-            raise "Missing #{attribute} for GreenhouseGas '#{record.name}'"
-          end
-        end
-      end
-    end
-    
-    verify "Time horizon should be 100" do
-      GreenhouseGas.all.each do |record|
-        value = record.send(:time_horizon)
-        unless value == 100
-          raise "Invalid time horizon for GreenhouseGas '#{record.name}': #{value} (should be 100)"
-        end
-      end
-    end
-    
-    verify "Time horizon units should be years" do
-      GreenhouseGas.all.each do |record|
-        units = record.send(:time_horizon_units)
-        unless units == "years"
-          raise "Invalid time horizon units for GreenhouseGas '#{record.name}': #{units} (should be years)"
-        end
-      end
-    end
-    
-    verify "Global warming potential should be one or more" do
-      GreenhouseGas.all.each do |record|
-        value = record.send(:global_warming_potential)
-        unless value >= 1
-          raise "Invalid global warming potential for GreenhouseGas '#{record.name}': #{value} (should >= 1)"
-        end
-      end
-    end
   end
 end

data/lib/earth/hospitality/lodging_class.rb

@@ -1,15 +1,13 @@
 class LodgingClass < ActiveRecord::Base
   set_primary_key :name
   
-  force_schema do
-    string 'name'
-    float  'electricity_intensity'
-    string 'electricity_intensity_units'
-    float  'natural_gas_intensity'
-    string 'natural_gas_intensity_units'
-    float  'fuel_oil_intensity'
-    string 'fuel_oil_intensity_units'
-    float  'district_heat_intensity'
-    string 'district_heat_intensity_units'
-  end
-end
+  col :name
+  col :electricity_intensity, :type => :float
+  col :electricity_intensity_units
+  col :natural_gas_intensity, :type => :float
+  col :natural_gas_intensity_units
+  col :fuel_oil_intensity, :type => :float
+  col :fuel_oil_intensity_units
+  col :district_heat_intensity, :type => :float
+  col :district_heat_intensity_units
+end

data/lib/earth/industry/industry.rb

@@ -9,13 +9,11 @@ class Industry < ActiveRecord::Base
   has_many :industry_sectors, :foreign_key => 'naics_code'
   has_many :sectors, :through => :industry_sectors
   
-  force_schema do
-    string 'naics_code'
-    string 'description'
-  end
+  col :naics_code
+  col :description
 
   def trade_industry?
     prefix = naics_code.to_s[0,2]
     %w{42 44 45}.include?(prefix)
   end
-end
+end

data/lib/earth/industry/industry_product.rb

@@ -5,11 +5,9 @@ class IndustryProduct < ActiveRecord::Base
   
   belongs_to :industry, :foreign_key => 'naics_code'
   
-  force_schema do
-    string 'naics_product_code'
-    string 'description'
-    float  'value'
-    string 'value_units'
-    string 'naics_code'
-  end
-end
+  col :naics_product_code
+  col :description
+  col :value, :type => :float
+  col :value_units
+  col :naics_code
+end

data/lib/earth/industry/industry_product_line.rb

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

data/lib/earth/industry/industry_sector.rb

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