earth 0.2.14 → 0.3.0

data/lib/earth/automobile/automobile_fuel_type.rb

@@ -1,7 +1,7 @@
 class AutomobileFuelType < ActiveRecord::Base
   set_primary_key :code
   
-  has_many :automobiles, :foreign_key => 'fuel_type_id'
+  has_many :automobiles, :foreign_key => 'fuel_type_code'
   
   scope :ordered, :order => 'name'
   

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

@@ -11,11 +11,11 @@ AutomobileMake.class_eval do
       string  'fuel_efficiency_units'
     end
 
-    process "Derive automobile makes from automobile variants" do
-      AutomobileVariant.run_data_miner!
+    process "Derive automobile makes from automobile make model year variants" do
+      AutomobileMakeModelYearVariant.run_data_miner!
       connection.execute %{
         INSERT IGNORE INTO automobile_makes(name)
-        SELECT automobile_variants.make_name FROM automobile_variants WHERE LENGTH(automobile_variants.make_name) > 0
+        SELECT automobile_make_model_year_variants.make_name FROM automobile_make_model_year_variants WHERE LENGTH(automobile_make_model_year_variants.make_name) > 0
       }
     end
     

data/lib/earth/automobile/automobile_make.rb

@@ -1,10 +1,10 @@
 class AutomobileMake < ActiveRecord::Base
   set_primary_key :name
   
-  has_many :make_years,   :class_name => 'AutomobileMakeYear',      :foreign_key => 'make_name'
-  has_many :models,       :class_name => 'AutomobileModel',         :foreign_key => 'make_name'
-  has_many :fleet_years,  :class_name => 'AutomobileMakeFleetYear', :foreign_key => 'make_name'
-  has_many :variants,     :class_name => 'AutomobileVariant',       :foreign_key => 'make_name'
+  has_many :make_years,               :class_name => 'AutomobileMakeYear',             :foreign_key => 'make_name'
+  has_many :models,                   :class_name => 'AutomobileMakeModel',            :foreign_key => 'make_name'
+  has_many :fleet_years,              :class_name => 'AutomobileMakeFleetYear',        :foreign_key => 'make_name'
+  has_many :make_model_year_variants, :class_name => 'AutomobileMakeModelYearVariant', :foreign_key => 'make_name'
   
   scope :major, :conditions => { :major => true }, :order => :name
 

data/lib/earth/automobile/automobile_make_fleet_year.rb

@@ -1,8 +1,7 @@
 class AutomobileMakeFleetYear < ActiveRecord::Base
   set_primary_key :name
   
-  belongs_to :make, :class_name => 'AutomobileMake', :foreign_key => 'make_name'
-  # WRONG belongs_to :model_year, :class_name => 'AutomobileModelYear', :foreign_key => 'automobile_model_year_name'
+  belongs_to :make,      :class_name => 'AutomobileMake',     :foreign_key => 'make_name'
   belongs_to :make_year, :class_name => 'AutomobileMakeYear', :foreign_key => 'make_year_name'
 
   data_miner do

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

@@ -0,0 +1,38 @@
+AutomobileMakeModel.class_eval do
+  data_miner do
+    process "Start from scratch" do
+      connection.drop_table table_name
+    end
+    
+    schema Earth.database_options do
+      string  'name' # make + model
+      string  'make_name'
+      float   'fuel_efficiency_city'
+      string  'fuel_efficiency_city_units'
+      float   'fuel_efficiency_highway'
+      string  'fuel_efficiency_highway_units'
+    end
+
+    process "Derive model names from automobile make model year variants" do
+      AutomobileMakeModelYearVariant.run_data_miner!
+      connection.execute %{
+        INSERT IGNORE INTO automobile_make_models(name, make_name)
+        SELECT automobile_make_model_year_variants.model_name, automobile_make_model_year_variants.make_name FROM automobile_make_model_year_variants WHERE LENGTH(automobile_make_model_year_variants.model_name) > 0 AND LENGTH(automobile_make_model_year_variants.make_name) > 0
+      }
+    end
+    
+    # TODO not weighted until we get weightings on auto variants
+    process "Derive average fuel economy from automobile make model year variants" do
+      AutomobileMakeModelYearVariant.run_data_miner!
+      automobile_make_models = AutomobileMakeModel.arel_table
+      automobile_make_model_year_variants = AutomobileMakeModelYearVariant.arel_table
+      conditional_relation = automobile_make_models[:name].eq(automobile_make_model_year_variants[:model_name])
+      %w{ city highway }.each do |i|
+        relation = AutomobileMakeModelYearVariant.where(conditional_relation).where("`automobile_make_model_year_variants`.`fuel_efficiency_#{i}` IS NOT NULL").project("AVG(`automobile_make_model_year_variants`.`fuel_efficiency_#{i}`)")
+        update_all "fuel_efficiency_#{i} = (#{relation.to_sql})"
+        update_all "fuel_efficiency_#{i}_units = 'kilometres_per_litre'"
+      end
+    end
+  end
+end
+

data/lib/earth/automobile/automobile_make_model.rb

@@ -0,0 +1,14 @@
+class AutomobileMakeModel < ActiveRecord::Base
+  set_primary_key :name
+  
+  belongs_to :make,                   :class_name => 'AutomobileMake',                 :foreign_key => 'make_name'
+  has_many :make_model_year_variants, :class_name => 'AutomobileMakeModelYearVariant', :foreign_key => 'make_model_name'
+  
+  data_miner do
+    tap "Brighter Planet's auto model data", Earth.taps_server
+    
+    process "bring in dependencies" do
+      run_data_miner_on_belongs_to_associations
+    end
+  end
+end

data/lib/earth/automobile/{automobile_model_year → automobile_make_model_year}/data_miner.rb

@@ -1,4 +1,4 @@
-AutomobileModelYear.class_eval do
+AutomobileMakeModelYear.class_eval do
   data_miner do
     process "Start from scratch" do
       connection.drop_table table_name
@@ -7,7 +7,7 @@ AutomobileModelYear.class_eval do
     schema Earth.database_options do
       string   'name'
       string   'make_name'
-      string   'model_name'
+      string   'make_model_name'
       integer  'year'
       string   'make_year_name'
       float    'fuel_efficiency'
@@ -18,11 +18,11 @@ AutomobileModelYear.class_eval do
       string   'fuel_efficiency_highway_units'
     end
 
-    process "Derive model year names from automobile variants" do
-      AutomobileVariant.run_data_miner!
+    process "Derive model year names from automobile make model year variants" do
+      AutomobileMakeModelYearVariant.run_data_miner!
       connection.execute %{
-        INSERT IGNORE INTO automobile_model_years(name, make_name, model_name, year, make_year_name)
-        SELECT automobile_variants.model_year_name, automobile_variants.make_name, automobile_variants.model_name, automobile_variants.year, automobile_variants.make_year_name FROM automobile_variants WHERE LENGTH(automobile_variants.make_name) > 0 AND LENGTH(automobile_variants.model_name) > 0
+        INSERT IGNORE INTO automobile_make_model_years(name, make_name, model_name, year, make_year_name)
+        SELECT automobile_make_model_year_variants.model_year_name, automobile_make_model_year_variants.make_name, automobile_make_model_year_variants.model_name, automobile_make_model_year_variants.year, automobile_make_model_year_variants.make_year_name FROM automobile_make_model_year_variants WHERE LENGTH(automobile_make_model_year_variants.make_name) > 0 AND LENGTH(automobile_make_model_year_variants.model_name) > 0
       }
     end
     
@@ -30,13 +30,13 @@ AutomobileModelYear.class_eval do
     # note that we used to derive averages from make years, but here we get it from variants
     # even without volume-weighting, the values are much better.
     # for example, 20km/l for a toyota prius 2006 vs. 13km/l if you use make years
-    process "Calculate city and highway fuel efficiency from automobile variants" do
-      AutomobileVariant.run_data_miner!
-      automobile_model_years = AutomobileModelYear.arel_table
-      automobile_variants = AutomobileVariant.arel_table
-      conditional_relation = automobile_model_years[:name].eq(automobile_variants[:model_year_name])
+    process "Calculate city and highway fuel efficiency from automobile make model year variants" do
+      AutomobileMakeModelYearVariant.run_data_miner!
+      automobile_make_model_years = AutomobileMakeModelYear.arel_table
+      automobile_make_model_year_variants = AutomobileMakeModelYearVariant.arel_table
+      conditional_relation = automobile_make_model_years[:name].eq(automobile_make_model_year_variants[:model_year_name])
       %w{ city highway }.each do |i|
-        relation = AutomobileVariant.where(conditional_relation).where("`automobile_variants`.`fuel_efficiency_#{i}` IS NOT NULL").project("AVG(`automobile_variants`.`fuel_efficiency_#{i}`)")
+        relation = AutomobileMakeModelYearVariant.where(conditional_relation).where("`automobile_make_model_year_variants`.`fuel_efficiency_#{i}` IS NOT NULL").project("AVG(`automobile_make_model_year_variants`.`fuel_efficiency_#{i}`)")
         update_all "fuel_efficiency_#{i} = (#{relation.to_sql})"
         update_all "fuel_efficiency_#{i}_units = 'kilometres_per_litre'"
       end

data/lib/earth/automobile/automobile_make_model_year.rb

@@ -0,0 +1,15 @@
+class AutomobileMakeModelYear < ActiveRecord::Base
+  set_primary_key :name
+  
+  belongs_to :make_year,              :class_name => 'AutomobileMakeYear',             :foreign_key => 'make_year_name'
+  has_many :make_model_year_variants, :class_name => 'AutomobileMakeModelYearVariant', :foreign_key => 'make_model_year_name'
+  has_many :automobiles,                                                               :foreign_key => 'make_model_year_name'
+  
+  data_miner do
+    tap "Brighter Planet's model year data", Earth.taps_server
+    
+    process "pull dependencies" do
+      run_data_miner_on_belongs_to_associations
+    end
+  end
+end

data/lib/earth/automobile/{automobile_variant → automobile_make_model_year_variant}/data_miner.rb

@@ -1,4 +1,4 @@
-AutomobileVariant.class_eval do
+AutomobileMakeModelYearVariant.class_eval do
   class << self
     def transmission_is_blank?(row)
       row['transmission'].blank?
@@ -105,7 +105,7 @@ AutomobileVariant.class_eval do
     '(GM-PONT)' => nil,
   }
   
-  class AutomobileVariant::ParserB
+  class AutomobileMakeModelYearVariant::ParserB
     attr_accessor :year
     def initialize(options = {})
       @year = options[:year]
@@ -189,7 +189,7 @@ AutomobileVariant.class_eval do
       end
     end
   end
-  class AutomobileVariant::ParserC
+  class AutomobileMakeModelYearVariant::ParserC
     attr_accessor :year
     def initialize(options = {})
       @year = options[:year]
@@ -214,7 +214,7 @@ AutomobileVariant.class_eval do
       row
     end
   end
-  class AutomobileVariant::ParserD
+  class AutomobileMakeModelYearVariant::ParserD
     attr_accessor :year
     def initialize(options = {})
       @year = options[:year]
@@ -238,7 +238,7 @@ AutomobileVariant.class_eval do
       row
     end
   end
-  class AutomobileVariant::ParserE
+  class AutomobileMakeModelYearVariant::ParserE
     OLD_FUEL_CODES = {
       'CNG' => 'C',
       'DU' => 'D',
@@ -277,9 +277,9 @@ AutomobileVariant.class_eval do
       string   'row_hash'
       string   'name' # short name!
       string   'make_name'
-      string   'model_name' # make + model
+      string   'make_model_name' # make + model
       string   'make_year_name' # make + year
-      string   'model_year_name' # make + model + year
+      string   'make_model_year_name' # make + model + year
       integer  'year'
       float    'fuel_efficiency_city'
       string   'fuel_efficiency_city_units'
@@ -304,9 +304,9 @@ AutomobileVariant.class_eval do
       string   'carline_class_name'
       string   'speeds'
       index    'make_name'
-      index    'model_name'
+      index    'make_model_name'
       index    'make_year_name'
-      index    'model_year_name'
+      index    'make_model_year_name'
     end
     
     # # 1985---1997
@@ -315,7 +315,7 @@ AutomobileVariant.class_eval do
       import("19#{ yy } Fuel Economy Guide",
              :url => "http://www.fueleconomy.gov/FEG/epadata/#{yy}mfgui.zip",
              :filename => filename,
-             :transform => { :class => AutomobileVariant::ParserB, :year => "19#{yy}".to_i },
+             :transform => { :class => AutomobileMakeModelYearVariant::ParserB, :year => "19#{yy}".to_i },
              :errata => 'http://static.brighterplanet.com/science/data/transport/automobiles/fuel_economy_guide/errata.csv') do
         key   'row_hash'
         store 'name', :field_name => 'model'
@@ -353,7 +353,7 @@ AutomobileVariant.class_eval do
       2005 => { :url => 'http://www.fueleconomy.gov/FEG/epadata/05data.zip', :filename => 'guide2005-2004oct15.csv' }
     }.sort { |a, b| a.first <=> b.first }.each do |year, options|
       import "#{ year } Fuel Economy Guide",
-             options.merge(:transform => { :class => AutomobileVariant::ParserC, :year => year },
+             options.merge(:transform => { :class => AutomobileMakeModelYearVariant::ParserC, :year => year },
                            :errata => 'http://static.brighterplanet.com/science/data/transport/automobiles/fuel_economy_guide/errata.csv') do
         key   'row_hash'
         store 'name', :field_name => 'model'
@@ -385,7 +385,7 @@ AutomobileVariant.class_eval do
       2009 => { :url => 'http://www.fueleconomy.gov/FEG/epadata/09data.zip', :filename => '2009_FE_guide for DOE_ALL-rel dates-no-sales-8-28-08download.csv' },
     }.sort { |a, b| a.first <=> b.first }.each do |year, options|
       import "#{ year } Fuel Economy Guide",
-             options.merge(:transform => { :class => AutomobileVariant::ParserD, :year => year },
+             options.merge(:transform => { :class => AutomobileMakeModelYearVariant::ParserD, :year => year },
                            :errata => 'http://static.brighterplanet.com/science/data/transport/automobiles/fuel_economy_guide/errata.csv') do
         key   'row_hash'
         store 'name', :field_name => 'model'
@@ -450,7 +450,7 @@ AutomobileVariant.class_eval do
       update_all 'fuel_efficiency_highway = 1 / ((0.001376 / 0.425143707) + (1.3466 / raw_fuel_efficiency_highway))'
     end
     
-    %w{ AutomobileMake AutomobileModelYear AutomobileModel }.each do |synthetic_resource|
+    %w{ AutomobileMake AutomobileMakeModelYear AutomobileMakeModel }.each do |synthetic_resource|
       process "Synthesize #{synthetic_resource}" do
         synthetic_resource.constantize.run_data_miner!
       end

data/lib/earth/automobile/automobile_make_model_year_variant.rb

@@ -0,0 +1,17 @@
+class AutomobileMakeModelYearVariant < ActiveRecord::Base
+  set_primary_key :row_hash
+  
+  belongs_to :make,            :class_name => 'AutomobileMake',          :foreign_key => 'make_name'
+  belongs_to :make_model,      :class_name => 'AutomobileMakeModel',     :foreign_key => 'make_model_name'
+  belongs_to :make_model_year, :class_name => 'AutomobileMakeModelYear', :foreign_key => 'make_model_year_name'
+  belongs_to :fuel_type,       :class_name => 'AutomobileFuelType',      :foreign_key => 'fuel_type_code'
+  has_many :automobiles,                                                 :foreign_key => 'make_model_year_variant_row_hash'
+
+  data_miner do
+    tap "Brighter Planet's sanitized automobile make model year variant data", Earth.taps_server
+    
+    process "pull dependencies" do
+      run_data_miner_on_belongs_to_associations
+    end
+  end
+end

data/lib/earth/automobile/automobile_make_year.rb

@@ -1,7 +1,7 @@
 class AutomobileMakeYear < ActiveRecord::Base
   set_primary_key :name
   
-  belongs_to :make, :class_name => 'AutomobileMake', :foreign_key => 'make_name'
+  belongs_to :make,      :class_name => 'AutomobileMake',          :foreign_key => 'make_name'
   has_many :fleet_years, :class_name => 'AutomobileMakeFleetYear', :foreign_key => 'make_year_name'
 
   data_miner do

data/lib/earth/automobile/automobile_size_class.rb

@@ -1,7 +1,7 @@
 class AutomobileSizeClass < ActiveRecord::Base
   set_primary_key :name
   
-  has_many :automobiles, :foreign_key => 'size_class_id'
+  has_many :automobiles, :foreign_key => 'size_class_name'
   
   falls_back_on :hybrid_fuel_efficiency_city_multiplier => 1.651, # https://brighterplanet.sifterapp.com/issue/667
                 :hybrid_fuel_efficiency_highway_multiplier => 1.213,

data/lib/earth/automobile/data_miner.rb

@@ -2,7 +2,7 @@ require 'earth/automobile/automobile_fuel_type/data_miner'
 require 'earth/automobile/automobile_make/data_miner'
 require 'earth/automobile/automobile_make_fleet_year/data_miner'
 require 'earth/automobile/automobile_make_year/data_miner'
-require 'earth/automobile/automobile_model/data_miner'
-require 'earth/automobile/automobile_model_year/data_miner'
+require 'earth/automobile/automobile_make_model/data_miner'
+require 'earth/automobile/automobile_make_model_year/data_miner'
 require 'earth/automobile/automobile_size_class/data_miner'
-require 'earth/automobile/automobile_variant/data_miner'
+require 'earth/automobile/automobile_make_model_year_variant/data_miner'

data/lib/earth/automobile.rb

@@ -2,7 +2,7 @@ require 'earth/automobile/automobile_fuel_type'
 require 'earth/automobile/automobile_make'
 require 'earth/automobile/automobile_make_fleet_year'
 require 'earth/automobile/automobile_make_year'
-require 'earth/automobile/automobile_model'
-require 'earth/automobile/automobile_model_year'
+require 'earth/automobile/automobile_make_model'
+require 'earth/automobile/automobile_make_model_year'
 require 'earth/automobile/automobile_size_class'
-require 'earth/automobile/automobile_variant'
+require 'earth/automobile/automobile_make_model_year_variant'

data/lib/earth/bus/bus_class/data_miner.rb

@@ -7,35 +7,23 @@ BusClass.class_eval do
       float  'passengers'
       float  'speed'
       string 'speed_units'
-      float  'duration'
-      string 'duration_units'
       float  'diesel_intensity'
       string 'diesel_intensity_units'
-      float  'gasoline_intensity'
-      string 'gasoline_intensity_units'
       float  'alternative_fuels_intensity'
       string 'alternative_fuels_intensity_units'
-      float  'fugitive_air_conditioning_emission'
-      string 'fugitive_air_conditioning_emission_units'
-    end
-    
-    process "Define some necessary conversions" do
-      Conversions.register :gallons_per_mile, :litres_per_kilometre, 2.35214583
-      Conversions.register :pounds_per_mile, :kilograms_per_kilometre, 0.281849232
+      float  'air_conditioning_emission_factor'
+      string 'air_conditioning_emission_factor_units'
     end
     
     import "a list of bus classes and pre-calculated trip and fuel use characteristics",
-           :url => 'http://static.brighterplanet.com/science/data/transport/bus/bus_classes.csv' do
+           :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdGRsSnJoS1hraGJvR012cDROWXFPbVE&hl=en&single=true&gid=0&output=csv' do
       key   'name'
-      store 'distance', :from_units => :miles, :to_units => :kilometres
+      store 'distance', :units_field_name => 'distance_units'
       store 'passengers'
-      store 'speed', :from_units => :miles, :to_units => :kilometres
-      store 'duration', :units => :minutes
-      store 'diesel_intensity', :field_name => 'diesel_per_vehicle_mile', :from_units => :gallons_per_mile, :to_units => :litres_per_kilometre
-      store 'gasoline_intensity', :field_name => 'gasoline_per_vehicle_mile', :from_units => :gallons_per_mile, :to_units => :litres_per_kilometre
-      store 'alternative_fuels_intensity', :field_name => 'alternative_fuels_per_vehicle_mile', :from_units => :gallons_per_mile, :to_units => :litres_per_kilometre
-      store 'fugitive_air_conditioning_emission', :field_name => 'fugitive_air_conditioning_emission_per_vehicle_mile', :from_units => :pounds_per_mile, :to_units => :kilograms_per_kilometre
+      store 'speed', :units_field_name => 'speed_units'
+      store 'diesel_intensity', :units_field_name => 'diesel_intensity_units'
+      store 'alternative_fuels_intensity', :units_field_name => 'alternative_fuels_intensity_units'
+      store 'air_conditioning_emission_factor', :units_field_name => 'air_conditioning_emission_factor_units'
     end
   end
 end
-

data/lib/earth/bus/bus_class.rb

@@ -7,11 +7,9 @@ class BusClass < ActiveRecord::Base
   falls_back_on :distance => 5.45.miles.to(:kilometres),
                 :passengers => 8.25,
                 :speed => 19.67.miles.to(:kilometres),
-                :duration => 0.277,
                 :diesel_intensity => 0.143.gallons_per_mile.to(:litres_per_kilometre),
-                :gasoline_intensity => 0.000123.gallons_per_mile.to(:litres_per_kilometre),
                 :alternative_fuels_intensity => 0.0517.gallons_per_mile.to(:litres_per_kilometre),
-                :fugitive_air_conditioning_emission => 0.0203.pounds_per_mile.to(:kilograms_per_kilometre)
+                :air_conditioning_emission_factor => 0.0203.pounds_per_mile.to(:kilograms_per_kilometre)
 
   data_miner do
     tap "Brighter Planet's sanitized bus class data", Earth.taps_server

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

@@ -2,18 +2,16 @@ RailClass.class_eval do
   data_miner do
     schema Earth.database_options do
       string 'name'
+      string 'description'
+      float  'passengers'
       float  'distance'
       string 'distance_units'
-      float  'passengers'
       float  'speed'
       string 'speed_units'
-      float  'duration'
-      string 'duration_units'
       float  'electricity_intensity'
       string 'electricity_intensity_units'
       float  'diesel_intensity'
       string 'diesel_intensity_units'
-      string 'description'
     end
     
     process "Define some unit conversions" do
@@ -24,13 +22,11 @@ RailClass.class_eval do
            :url => 'http://static.brighterplanet.com/science/data/transport/rail/rail_classes.csv' do
       key   'name'
       store 'description'
-      store 'distance', :from_units => :miles, :to_units => :kilometres
-      store 'speed', :from_units => :miles, :to_units => :kilometres
-      store 'duration'
       store 'passengers'
-      store 'electricity_intensity', :field_name => 'electricity_per_vehicle_mile', :from_units => :miles, :to_units => :kilometres
-      store 'diesel_intensity', :field_name => 'diesel_per_vehicle_mile', :from_units => :gallons_per_mile, :to_units => :litres_per_kilometre
+      store 'distance', :units_field_name => 'distance_units'
+      store 'speed', :units_field_name => 'speed_units'
+      store 'electricity_intensity', :units_field_name => 'electricity_intensity_units'
+      store 'diesel_intensity', :units_field_name => 'diesel_intensity_units'
     end
   end
 end
-

data/lib/earth/rail/rail_class.rb

@@ -2,15 +2,8 @@ class RailClass < ActiveRecord::Base
   set_primary_key :name
   
   has_many :rail_trips
-
+  
   data_miner do
     tap "Brighter Planet's rail class data", Earth.taps_server
   end
-  
-  # speed is missing
-  # https://brighterplanet.sifterapp.com/projects/30/issues/455
-  falls_back_on :passengers => 25.06,
-                :distance => 8.57.miles.to(:kilometres),
-                :diesel_intensity => 0.05.gallons_per_mile.to(:litres_per_kilometre),
-                :electricity_intensity => 8.89.miles.to(:kilometres)
 end

data/spec/earth/air/aircraft_spec.rb

@@ -3,7 +3,7 @@ require 'earth/air/aircraft'
 require 'earth/air/aircraft/data_miner'
 
 describe Aircraft do
-  describe 'import' do
+  describe 'import', :slow => true do
     it 'should treat empty cells as null' do
       Aircraft.execute_schema
       Aircraft.run_data_miner!

data/spec/spec_helper.rb

@@ -9,3 +9,7 @@ ActiveRecord::Base.establish_connection :adapter => 'sqlite3',
 
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'earth' # we do require Earth to live
+
+RSpec.configure do |c|
+  c.filter_run_excluding :slow => true
+end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: earth
 version: !ruby/object:Gem::Version 
-  hash: 11
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 14
-  version: 0.2.14
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -17,18 +16,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-18 00:00:00 -05:00
+date: 2010-11-19 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activerecord
-  prerelease: false
+  name: earth
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 299253624
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         segments: 
         - 3
         - 0
@@ -36,128 +46,120 @@ dependencies:
         - beta4
         version: 3.0.0.beta4
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: data_miner
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 0
         - 5
         - 6
         version: 0.5.6
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: falls_back_on
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
         segments: 
         - 0
         - 0
         - 3
         version: 0.0.3
   type: :runtime
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: geokit
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 1
         - 5
         - 0
         version: 1.5.0
   type: :runtime
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: cohort_scope
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 17
         segments: 
         - 0
         - 0
         - 7
         version: 0.0.7
   type: :runtime
-  version_requirements: *id005
+  prerelease: false
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: conversions
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
         segments: 
         - 1
         - 4
         - 5
         version: 1.4.5
   type: :runtime
-  version_requirements: *id006
+  prerelease: false
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: weighted_average
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 0
         - 0
         - 4
         version: 0.0.4
   type: :runtime
-  version_requirements: *id007
+  prerelease: false
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: loose_tight_dictionary
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 0
         - 0
         - 8
         version: 0.0.8
   type: :runtime
-  version_requirements: *id008
+  prerelease: false
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: rspec
-  prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 62196417
         segments: 
         - 2
         - 0
@@ -166,79 +168,280 @@ dependencies:
         - 17
         version: 2.0.0.beta.17
   type: :development
-  version_requirements: *id009
+  prerelease: false
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: rake
-  prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
-  version_requirements: *id010
+  prerelease: false
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
-  version_requirements: *id011
+  prerelease: false
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: rcov
-  prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
-  version_requirements: *id012
+  prerelease: false
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: rdoc
-  prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
-  version_requirements: *id013
+  prerelease: false
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
+  requirement: &id015 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 3
+        - 0
+        version: 1.3.0
+  type: :development
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  version_requirements: *id015
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  requirement: &id016 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        - 0
+        - beta4
+        version: 3.0.0.beta4
+  type: :runtime
+  prerelease: false
+  version_requirements: *id016
+- !ruby/object:Gem::Dependency 
+  name: data_miner
+  requirement: &id017 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 5
+        - 6
+        version: 0.5.6
+  type: :runtime
+  prerelease: false
+  version_requirements: *id017
+- !ruby/object:Gem::Dependency 
+  name: falls_back_on
+  requirement: &id018 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 0
+        - 3
+        version: 0.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: *id018
+- !ruby/object:Gem::Dependency 
+  name: geokit
+  requirement: &id019 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 5
+        - 0
+        version: 1.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *id019
+- !ruby/object:Gem::Dependency 
+  name: cohort_scope
+  requirement: &id020 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 0
+        - 7
+        version: 0.0.7
+  type: :runtime
+  prerelease: false
+  version_requirements: *id020
+- !ruby/object:Gem::Dependency 
+  name: conversions
+  requirement: &id021 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 4
+        - 5
+        version: 1.4.5
+  type: :runtime
+  prerelease: false
+  version_requirements: *id021
+- !ruby/object:Gem::Dependency 
+  name: weighted_average
+  requirement: &id022 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 0
+        - 4
+        version: 0.0.4
+  type: :runtime
+  prerelease: false
+  version_requirements: *id022
+- !ruby/object:Gem::Dependency 
+  name: loose_tight_dictionary
+  requirement: &id023 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 0
+        - 8
+        version: 0.0.8
+  type: :runtime
+  prerelease: false
+  version_requirements: *id023
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id024 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        - 0
+        - beta
+        - 17
+        version: 2.0.0.beta.17
+  type: :development
+  prerelease: false
+  version_requirements: *id024
+- !ruby/object:Gem::Dependency 
+  name: rake
+  requirement: &id025 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id025
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  requirement: &id026 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id026
+- !ruby/object:Gem::Dependency 
+  name: rcov
+  requirement: &id027 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id027
+- !ruby/object:Gem::Dependency 
+  name: rdoc
+  requirement: &id028 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id028
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
+  requirement: &id029 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
         segments: 
         - 1
         - 3
         - 0
         version: 1.3.0
   type: :development
-  version_requirements: *id014
+  prerelease: false
+  version_requirements: *id029
 description: An earth-simulation environment with ActiveRecord models and data
 email: andy@rossmeissl.net
 executables: []
@@ -281,16 +484,16 @@ files:
 - lib/earth/automobile/automobile_make/data_miner.rb
 - lib/earth/automobile/automobile_make_fleet_year.rb
 - lib/earth/automobile/automobile_make_fleet_year/data_miner.rb
+- lib/earth/automobile/automobile_make_model.rb
+- lib/earth/automobile/automobile_make_model/data_miner.rb
+- lib/earth/automobile/automobile_make_model_year.rb
+- lib/earth/automobile/automobile_make_model_year/data_miner.rb
+- lib/earth/automobile/automobile_make_model_year_variant.rb
+- lib/earth/automobile/automobile_make_model_year_variant/data_miner.rb
 - lib/earth/automobile/automobile_make_year.rb
 - lib/earth/automobile/automobile_make_year/data_miner.rb
-- lib/earth/automobile/automobile_model.rb
-- lib/earth/automobile/automobile_model/data_miner.rb
-- lib/earth/automobile/automobile_model_year.rb
-- lib/earth/automobile/automobile_model_year/data_miner.rb
 - lib/earth/automobile/automobile_size_class.rb
 - lib/earth/automobile/automobile_size_class/data_miner.rb
-- lib/earth/automobile/automobile_variant.rb
-- lib/earth/automobile/automobile_variant/data_miner.rb
 - lib/earth/automobile/data_miner.rb
 - lib/earth/base.rb
 - lib/earth/bus.rb
@@ -423,18 +626,18 @@ files:
 - vendor/geokit-rails/test/schema.rb
 - vendor/geokit-rails/test/tasks.rake
 - vendor/geokit-rails/test/test_helper.rb
+- Gemfile
+- Gemfile.lock
 - spec/earth/air/aircraft_spec.rb
 - spec/earth_spec.rb
 - spec/spec_helper.rb
-- Gemfile
-- Gemfile.lock
 has_rdoc: true
 homepage: http://github.com/brighterplanet/earth
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -442,7 +645,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -451,7 +653,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -463,8 +664,8 @@ signing_key:
 specification_version: 3
 summary: Land, sky, and sea
 test_files: 
+- Gemfile
+- Gemfile.lock
 - spec/earth/air/aircraft_spec.rb
 - spec/earth_spec.rb
 - spec/spec_helper.rb
-- Gemfile
-- Gemfile.lock

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

@@ -1,38 +0,0 @@
-AutomobileModel.class_eval do
-  data_miner do
-    process "Start from scratch" do
-      connection.drop_table table_name
-    end
-    
-    schema Earth.database_options do
-      string  'name' # make + model
-      string  'make_name'
-      float   'fuel_efficiency_city'
-      string  'fuel_efficiency_city_units'
-      float   'fuel_efficiency_highway'
-      string  'fuel_efficiency_highway_units'
-    end
-
-    process "Derive model names from automobile variants" do
-      AutomobileVariant.run_data_miner!
-      connection.execute %{
-        INSERT IGNORE INTO automobile_models(name, make_name)
-        SELECT automobile_variants.model_name, automobile_variants.make_name FROM automobile_variants WHERE LENGTH(automobile_variants.model_name) > 0 AND LENGTH(automobile_variants.make_name) > 0
-      }
-    end
-    
-    # TODO not weighted until we get weightings on auto variants
-    process "Derive average fuel economy from automobile variants" do
-      AutomobileVariant.run_data_miner!
-      automobile_models = AutomobileModel.arel_table
-      automobile_variants = AutomobileVariant.arel_table
-      conditional_relation = automobile_models[:name].eq(automobile_variants[:model_name])
-      %w{ city highway }.each do |i|
-        relation = AutomobileVariant.where(conditional_relation).where("`automobile_variants`.`fuel_efficiency_#{i}` IS NOT NULL").project("AVG(`automobile_variants`.`fuel_efficiency_#{i}`)")
-        update_all "fuel_efficiency_#{i} = (#{relation.to_sql})"
-        update_all "fuel_efficiency_#{i}_units = 'kilometres_per_litre'"
-      end
-    end
-  end
-end
-

data/lib/earth/automobile/automobile_model.rb

@@ -1,14 +0,0 @@
-class AutomobileModel < ActiveRecord::Base
-  set_primary_key :name
-  
-  has_many :variants, :class_name => 'AutomobileVariant', :foreign_key => 'model_name'
-  belongs_to :make, :class_name => 'AutomobileMake', :foreign_key => 'make_name'
-  
-  data_miner do
-    tap "Brighter Planet's auto model data", Earth.taps_server
-    
-    process "bring in dependencies" do
-      run_data_miner_on_belongs_to_associations
-    end
-  end
-end

data/lib/earth/automobile/automobile_model_year.rb

@@ -1,15 +0,0 @@
-class AutomobileModelYear < ActiveRecord::Base
-  set_primary_key :name
-  
-  belongs_to :make_year, :class_name => 'AutomobileMakeYear', :foreign_key => 'make_year_name'
-  has_many :variants, :class_name => 'AutomobileVariant', :foreign_key => 'model_year_name'
-  has_many :automobiles, :foreign_key => 'model_year_id'
-  
-  data_miner do
-    tap "Brighter Planet's model year data", Earth.taps_server
-    
-    process "pull dependencies" do
-      run_data_miner_on_belongs_to_associations
-    end
-  end
-end

data/lib/earth/automobile/automobile_variant.rb

@@ -1,17 +0,0 @@
-class AutomobileVariant < ActiveRecord::Base
-  set_primary_key :row_hash
-  
-  has_many :automobiles, :foreign_key => 'variant_id'
-  belongs_to :make,       :class_name => 'AutomobileMake',      :foreign_key => 'make_name'
-  belongs_to :model,      :class_name => 'AutomobileModel',     :foreign_key => 'model_name'
-  belongs_to :model_year, :class_name => 'AutomobileModelYear', :foreign_key => 'model_year_name'
-  belongs_to :fuel_type,  :class_name => 'AutomobileFuelType',  :foreign_key => 'fuel_type_code'
-
-  data_miner do
-    tap "Brighter Planet's sanitized automobile variant data", Earth.taps_server
-    
-    process "pull dependencies" do
-      run_data_miner_on_belongs_to_associations
-    end
-  end
-end