earth 0.11.16 → 0.11.17

data/lib/earth/air/aircraft.rb

@@ -1,3 +1,5 @@
+require 'fuzzy_match/cached_result'
+
 class Aircraft < ActiveRecord::Base
   self.primary_key = "icao_code"
   
@@ -61,7 +63,7 @@ class Aircraft < ActiveRecord::Base
     # Cache fuzzy matches between FlightSegment aircraft_description and Aircraft description
     def manually_cache_flight_segments!
       FlightSegment.run_data_miner!
-      FuzzyMatch::CachedResult.setup
+      FuzzyMatch::CachedResult.auto_upgrade!
       connection.select_values("SELECT DISTINCT(aircraft_description) FROM flight_segments WHERE aircraft_description IS NOT NULL").each do |original_description|
         # If the flight segment's aircraft_description contains '/' then it describes multiple aircraft.
         # We need to synthesize descriptions for those aircraft, find all Aircraft that fuzzily match the

data/lib/earth/air/aircraft/data_miner.rb

@@ -32,8 +32,8 @@ Aircraft.class_eval do
              :encoding => 'windows-1252',
              :row_xpath => '//table[2]//table[1]//tr[3]//tr',
              :column_xpath => 'td',
-             :errata => { :url => 'https://spreadsheets.google.com/spreadsheet/pub?key=0AoQJbWqPrREqdGVBRnhkRGhSaVptSDJ5bXJGbkpUSWc&output=csv', :responder => Aircraft::Guru.new },
-             :select => lambda { |record| manufacturer_whitelist? record['Manufacturer'] }) do
+             :errata => { :url => "file://#{Earth::ERRATA_DIR}/aircraft/faa_errata.csv", :responder => Aircraft::Guru.new },
+             :select => proc { |record| Aircraft.manufacturer_whitelist? record['Manufacturer'] }) do
         key 'icao_code',           :field_name => 'Designator'
         store 'manufacturer_name', :field_name => 'Manufacturer'
         store 'model_name',        :field_name => 'Model'

data/lib/earth/air/airport.rb

@@ -1,4 +1,4 @@
-require ::File.join(Earth.vendor_dir, 'geokit-rails', 'lib', 'geokit-rails')
+require ::File.join(Earth::VENDOR_DIR, 'geokit-rails', 'lib', 'geokit-rails')
 require 'earth/locality'
 
 class Airport < ActiveRecord::Base

data/lib/earth/air/airport/data_miner.rb

@@ -16,21 +16,29 @@ Airport.class_eval do
     end
   end
   
+  def self.countries_dictionary
+    @countries_dictionary ||= ::FuzzyMatch.new Country.all, :read => :name
+  end
+  
   data_miner do
     process "Start from scratch" do
       delete_all
     end
     
+    process "Ensure Country is populated" do
+      Country.run_data_miner!
+    end
+    
     import "the OpenFlights.org airports database",
            :url => 'https://openflights.svn.sourceforge.net/svnroot/openflights/openflights/data/airports.dat',
            :headers => %w{ id name city country_name iata_code icao_code latitude longitude altitude timezone daylight_savings },
-           :select => lambda { |record| record['iata_code'].present? },
-           :errata => { :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdFc2UzhQYU5PWEQ0N21yWFZGNmc2a3c&gid=0&output=csv',
+           :select => proc { |record| record['iata_code'].present? },
+           :errata => { :url => "file://#{Earth::ERRATA_DIR}/airport/openflights_errata.csv",
                         :responder => Airport::Guru.new } do
       key 'iata_code'
       store 'name'
       store 'city'
-      store 'country_name'
+      store 'country_name', :synthesize => proc { |row| Airport.countries_dictionary.find(row['country_name'], :must_match_at_least_one_word => true).try(:name) }
       store 'latitude'
       store 'longitude'
     end
@@ -45,39 +53,11 @@ Airport.class_eval do
       store 'longitude'
     end
     
-    process "Ensure Country is populated" do
-      Country.run_data_miner!
-    end
-    
     process "Fill in blank country codes" do
       Country.find_each do |country|
         next unless country.name.present? and country.iso_3166_code.present?
-        where(["country_name LIKE ?", country.name]).update_all :country_iso_3166_code => country.iso_3166_code
+        where(:country_name => country.name).update_all :country_iso_3166_code => country.iso_3166_code
       end
     end
-    
-    # 10/14/2011 cutting this b/c we don't use it - Ian
-    # sabshere 5/24/10 using temporary tables because the WHERE clause has a very slow OR condition: iata_code = destination_iata_code OR iata_code = origin_iata_code
-    # process "Derive some average flight characteristics from flight segments" do
-    #   FlightSegment.run_data_miner!
-    #   segments = FlightSegment.arel_table
-    #   airports = Airport.arel_table
-    #   
-    #   find_in_batches do |batch|
-    #     batch.each do |airport|
-    #       targeting_relation = airports[:iata_code].eq airport.iata_code
-    #       conditional_relation = segments[:origin_airport_iata_code].eq(airport.iata_code).or(segments[:destination_airport_iata_code].eq(airport.iata_code))
-    #       connection.execute "CREATE TEMPORARY TABLE tmp1 #{FlightSegment.where(conditional_relation).to_sql}"
-    #       update_all "seats                    = (#{FlightSegment.weighted_average_relation(:seats,         :weighted_by => :passengers                                           ).to_sql.gsub('flight_segments', 'tmp1')})", targeting_relation.to_sql
-    #       update_all "distance                 = (#{FlightSegment.weighted_average_relation(:distance,      :weighted_by => :passengers                                           ).to_sql.gsub('flight_segments', 'tmp1')})", targeting_relation.to_sql
-    #       update_all "load_factor              = (#{FlightSegment.weighted_average_relation(:load_factor,   :weighted_by => :passengers                                           ).to_sql.gsub('flight_segments', 'tmp1')})", targeting_relation.to_sql
-    #       update_all "freight_share            = (#{FlightSegment.weighted_average_relation(:freight_share, :weighted_by => :passengers                                           ).to_sql.gsub('flight_segments', 'tmp1')})", targeting_relation.to_sql
-    #       update_all "payload                  = (#{FlightSegment.weighted_average_relation(:payload,       :weighted_by => :passengers, :disaggregate_by => :departures_performed).to_sql.gsub('flight_segments', 'tmp1')})", targeting_relation.to_sql
-    #       connection.execute 'DROP TABLE tmp1'
-    #     end
-    #   end
-    # end
-    
-    # FIXME TODO verify this
   end
 end

data/lib/earth/air/bts_aircraft/data_miner.rb

@@ -2,7 +2,7 @@ BtsAircraft.class_eval do
   data_miner do
     import "the BTS aircraft type lookup table",
            :url => "http://www.transtats.bts.gov/Download_Lookup.asp?Lookup=L_AIRCRAFT_TYPE",
-           :errata => { :url => 'https://spreadsheets.google.com/spreadsheet/pub?key=0AoQJbWqPrREqdEZ2d3JQMzV5T1o1T3JmVlFyNUZxdEE&output=csv' } do
+           :errata => { :url => "file://#{Earth::ERRATA_DIR}/bts_aircraft/bts_errata.csv" } do
       key 'bts_code',      :field_name => 'Code'
       store 'description', :field_name => 'Description'
     end

data/lib/earth/air/flight_segment/data_miner.rb

@@ -4,11 +4,11 @@ FlightSegment.class_eval do
   # For import errata
   class FlightSegment::Guru
     def in_may_2009?(row)
-      row ['MONTH'] == 5 and row['YEAR'] == 2009
+      row ['MONTH'].to_i == 5 and row['YEAR'].to_i == 2009
     end
     
     def in_july_2009?(row)
-      row ['MONTH'] == 7 and row['YEAR'] == 2009
+      row ['MONTH'].to_i == 7 and row['YEAR'].to_i == 2009
     end
   end
   
@@ -186,16 +186,15 @@ FlightSegment.class_eval do
     process "Start from scratch" do
       delete_all
     end
-    
-    form_data_per_month(2009..::Time.now.year).each do |month, form_data|
+    FlightSegment.form_data_per_month(2011..2011).each do |month, form_data|
+    # FlightSegment.form_data_per_month(2009..::Time.now.year).each do |month, form_data|
       import "T100 flight segment data for #{month.strftime('%B %Y')}",
              :url => URL,
              :form_data => form_data,
              :compression => :zip,
              :glob => '/*.csv',
-             # FIXME TODO 6/6/2011 the errata doesn't work - still doesn't fill in missing airline in May and July 2009
-             :errata => { :url => 'https://spreadsheets.google.com/spreadsheet/pub?key=0AoQJbWqPrREqdGxpYU1qWFR3d0syTVMyQVVOaDd0V3c&output=csv', :responder => FlightSegment::Guru.new },
-             :select => lambda { |record| record['DEPARTURES_PERFORMED'].to_i > 0 } do
+             :errata => { :url => "file://#{Earth::ERRATA_DIR}/flight_segment/bts_errata.csv", :responder => FlightSegment::Guru.new },
+             :select => proc { |record| record['DEPARTURES_PERFORMED'].to_i > 0 } do
         key 'row_hash'
         store 'origin_airport_iata_code',          :field_name => 'ORIGIN'
         store 'origin_country_iso_3166_code',      :field_name => 'ORIGIN_COUNTRY'

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

@@ -36,7 +36,7 @@ AutomobileMakeModelYear.class_eval do
     # 2009 Dodge Durango HEV
     import "A list of hybrid make model years derived from the EPA fuel economy guide",
            :url => 'https://docs.google.com/spreadsheet/pub?hl=en_US&hl=en_US&key=0AoQJbWqPrREqdGtzekE4cGNoRGVmdmZMaTNvOWluSnc&output=csv' do
-      key 'name', :synthesize => lambda { |record| [record['make_name'], record['model_name'], record['year']].join(' ') }
+      key 'name', :synthesize => proc { |record| [record['make_name'], record['model_name'], record['year']].join(' ') }
       store 'hybridity'
     end
     

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

@@ -66,8 +66,8 @@ AutomobileMakeModelYearVariant.class_eval do
     '(GM-PONT)' => nil,
   }
   
-  class AutomobileMakeModelYearVariant::ParserB
-    ::FixedWidth.define :fuel_economy_guide_b do |d|
+  class AutomobileMakeModelYearVariant::ParserA
+    ::FixedWidth.define :fuel_economy_guide_a do |d|
       d.rows do |row|
         row.trap { true } # there's only one section
         row.column 'active_year'      , 4,    :type => :integer  #   ACTIVE YEAR
@@ -149,8 +149,8 @@ AutomobileMakeModelYearVariant.class_eval do
       engine_types.flatten.include?('turbo')
     end
   end
-  
-  class AutomobileMakeModelYearVariant::ParserC
+
+  class AutomobileMakeModelYearVariant::ParserB
     attr_reader :year
     def initialize(options = {})
       options = options.stringify_keys
@@ -171,8 +171,8 @@ AutomobileMakeModelYearVariant.class_eval do
       row
     end
   end
-  
-  class AutomobileMakeModelYearVariant::ParserD
+
+  class AutomobileMakeModelYearVariant::ParserC
     attr_reader :year
     def initialize(options = {})
       options = options.stringify_keys
@@ -194,7 +194,7 @@ AutomobileMakeModelYearVariant.class_eval do
     end
   end
   
-  class AutomobileMakeModelYearVariant::ParserE
+  class AutomobileMakeModelYearVariant::ParserD
     OLD_FUEL_CODES = {
       'CNG' => 'C',
       'DU' => 'D',
@@ -231,19 +231,16 @@ AutomobileMakeModelYearVariant.class_eval do
     # 1985---1997
     # FIXME TODO 14 records in the 1995 FEG are missing fuel efficiencies
     (85..97).each do |yy|
-    # [85, 95, 96].each do |yy|
       filename = (yy == 96) ? "#{yy}MFGUI.ASC" : "#{yy}MFGUI.DAT"
       import "19#{ yy } Fuel Economy Guide",
              :url => "http://www.fueleconomy.gov/FEG/epadata/#{yy}mfgui.zip",
-             # :url => "file:///Users/ian/Documents/brighter_planet/documents1/science/data/transport/automobiles/fuel_economy_guide/#{filename}",
              :format => :fixed_width,
              :cut => ((yy == 95) ? '13-' : nil),
-             :schema_name => :fuel_economy_guide_b,
-             :select => lambda { |row| row['model'].present? and (row['suppress_code'].blank? or row['suppress_code'].to_f == 0) and row['state_code'] == 'F' },
+             :schema_name => :fuel_economy_guide_a,
+             :select => proc { |row| row['model'].present? and (row['suppress_code'].blank? or row['suppress_code'].to_f == 0) and row['state_code'] == 'F' },
              :filename => filename,
-             :transform => { :class => AutomobileMakeModelYearVariant::ParserB, :year => "19#{yy}".to_i },
-             :errata => { :url => "https://docs.google.com/spreadsheet/pub?key=0AoQJbWqPrREqdDkxTElWRVlvUXB3Uy04SDhSYWkzakE&output=csv", :responder => AutomobileMakeModelYearVariant::Guru.new } do
-             # :errata => { :url => "file:///Users/ian/Documents/brighter_planet/documents1/science/data/transport/automobiles/fuel_economy_guide/errata_new.csv", :responder => AutomobileMakeModelYearVariant::Guru.new } do
+             :transform => { :class => AutomobileMakeModelYearVariant::ParserA, :year => "19#{yy}".to_i },
+             :errata => { :url => "file://#{Earth::ERRATA_DIR}/automobile_make_model_year_variant/feg_errata.csv", :responder => AutomobileMakeModelYearVariant::Guru.new } do
         key   'row_hash'
         store 'make_name',  :field_name => 'make'
         store 'model_name', :field_name => 'model'
@@ -278,20 +275,11 @@ AutomobileMakeModelYearVariant.class_eval do
       2003 => { :url => 'http://www.fueleconomy.gov/FEG/epadata/03data.zip', :filename => 'guide_2003_feb04-03b.csv' },
       2004 => { :url => 'http://www.fueleconomy.gov/FEG/epadata/04data.zip', :filename => 'gd04-Feb1804-RelDtFeb20.csv' },
       2005 => { :url => 'http://www.fueleconomy.gov/FEG/epadata/05data.zip', :filename => 'guide2005-2004oct15.csv' }
-      # 1998 => { :url => 'file:///Users/ian/Documents/brighter_planet/documents1/science/data/transport/automobiles/fuel_economy_guide/98guide6.csv' },
-      # 1999 => { :url => 'file:///Users/ian/Documents/brighter_planet/documents1/science/data/transport/automobiles/fuel_economy_guide/99guide6.csv' },
-      # 2000 => { :url => 'file:///Users/ian/Documents/brighter_planet/documents1/science/data/transport/automobiles/fuel_economy_guide/G6080900.csv' },
-      # 2001 => { :url => 'file:///Users/ian/Documents/brighter_planet/documents1/science/data/transport/automobiles/fuel_economy_guide/01guide0918.csv' },
-      # 2002 => { :url => 'file:///Users/ian/Documents/brighter_planet/documents1/science/data/transport/automobiles/fuel_economy_guide/guide_jan28.csv' },
-      # 2003 => { :url => 'file:///Users/ian/Documents/brighter_planet/documents1/science/data/transport/automobiles/fuel_economy_guide/guide_2003_feb04-03b.csv' },
-      # 2004 => { :url => 'file:///Users/ian/Documents/brighter_planet/documents1/science/data/transport/automobiles/fuel_economy_guide/gd04-Feb1804-RelDtFeb20.csv' },
-      # 2005 => { :url => 'file:///Users/ian/Documents/brighter_planet/documents1/science/data/transport/automobiles/fuel_economy_guide/guide2005-2004oct15.csv' }
     }.each do |year, options|
       import "#{ year } Fuel Economy Guide",
-             options.merge(:transform => { :class => AutomobileMakeModelYearVariant::ParserC, :year => year },
-                           :errata => { :url => "https://docs.google.com/spreadsheet/pub?key=0AoQJbWqPrREqdDkxTElWRVlvUXB3Uy04SDhSYWkzakE&output=csv", :responder => AutomobileMakeModelYearVariant::Guru.new },
-                           # :errata => { :url => 'file:///Users/ian/Documents/brighter_planet/documents1/science/data/transport/automobiles/fuel_economy_guide/errata_new.csv', :responder => AutomobileMakeModelYearVariant::Guru.new },
-                           :select => lambda { |row| row['model'].present? }) do
+             options.merge(:transform => { :class => AutomobileMakeModelYearVariant::ParserB, :year => year },
+                           :errata => { :url => "file://#{Earth::ERRATA_DIR}/automobile_make_model_year_variant/feg_errata.csv", :responder => AutomobileMakeModelYearVariant::Guru.new },
+                           :select => proc { |row| row['model'].present? }) do
         key   'row_hash'
         store 'make_name',  :field_name => 'make'
         store 'model_name', :field_name => 'model'
@@ -315,20 +303,14 @@ AutomobileMakeModelYearVariant.class_eval do
     # 2006--2009
     {
       2006 => { :url => 'http://www.fueleconomy.gov/FEG/epadata/06data.zip', :filename => '2006_FE_Guide_14-Nov-2005_download.csv' },
-      # the 07data.xls file provided by the government has a bad encoding
-      2007 => { :url => 'http://static.brighterplanet.com/science/data/transport/automobiles/fuel_economy_guide/2007_FE_guide_ALL_no_sales_May_01_2007.csv' },
+      2007 => { :url => 'http://static.brighterplanet.com/science/data/transport/automobiles/fuel_economy_guide/2007_FE_guide_ALL_no_sales_May_01_2007.csv' }, # the 07data.xls file provided by the government has a bad encoding
       2008 => { :url => 'http://www.fueleconomy.gov/FEG/epadata/08data.zip', :filename => '2008_FE_guide_ALL_rel_dates_-no sales-for DOE-5-1-08.csv' },
       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' }
-      # 2006 => { :url => 'file:///Users/ian/Documents/brighter_planet/documents1/science/data/transport/automobiles/fuel_economy_guide/2006_FE_Guide_14-Nov-2005_download.csv' },
-      # 2007 => { :url => 'file:///Users/ian/Documents/brighter_planet/documents1/science/data/transport/automobiles/fuel_economy_guide/2007_FE_guide_ALL_no_sales_May_01_2007.csv' },
-      # 2008 => { :url => 'file:///Users/ian/Documents/brighter_planet/documents1/science/data/transport/automobiles/fuel_economy_guide/2008_FE_guide.csv' },
-      # 2009 => { :url => 'file:///Users/ian/Documents/brighter_planet/documents1/science/data/transport/automobiles/fuel_economy_guide/2009_FE_guide.csv' }
     }.each do |year, options|
       import "#{ year } Fuel Economy Guide",
-             options.merge(:transform => { :class => AutomobileMakeModelYearVariant::ParserD, :year => year },
-                           :errata => { :url => "https://docs.google.com/spreadsheet/pub?key=0AoQJbWqPrREqdDkxTElWRVlvUXB3Uy04SDhSYWkzakE&output=csv", :responder => AutomobileMakeModelYearVariant::Guru.new },
-                           # :errata => { :url => 'file:///Users/ian/Documents/brighter_planet/documents1/science/data/transport/automobiles/fuel_economy_guide/errata_new.csv', :responder => AutomobileMakeModelYearVariant::Guru.new },
-                           :select => lambda { |row| row['model'].present? }) do
+             options.merge(:transform => { :class => AutomobileMakeModelYearVariant::ParserC, :year => year },
+                           :errata => { :url => "file://#{Earth::ERRATA_DIR}/automobile_make_model_year_variant/feg_errata.csv", :responder => AutomobileMakeModelYearVariant::Guru.new },
+                           :select => proc { |row| row['model'].present? }) do
         key   'row_hash'
         store 'make_name', :field_name => 'make'
         store 'model_name', :field_name => 'model'
@@ -357,14 +339,11 @@ AutomobileMakeModelYearVariant.class_eval do
       # Note: it's ok for electric vehicles to be missing cylinders and displacement
       2010 => { :url => 'http://www.fueleconomy.gov/FEG/epadata/10data.zip', :filename => '2010FEGuide for DOE-all rel dates-no-sales-02-22-2011public.xlsx' },
       2011 => { :url => 'http://www.fueleconomy.gov/FEG/epadata/11data.zip', :filename => '2011FEGuide-for DOE rel-dates before 1-23-2011-no-sales-01-10-2011_All_public.xlsx' }
-      # 2010 => { :url => 'file:///Users/ian/Documents/brighter_planet/documents1/science/data/transport/automobiles/fuel_economy_guide/2010FEGuide.xlsx' },
-      # 2011 => { :url => 'file:///Users/ian/Documents/brighter_planet/documents1/science/data/transport/automobiles/fuel_economy_guide/2011FEGuide.xlsx' }
     }.each do |year, options|
       import "#{ year } Fuel Economy Guide",
-             options.merge(:transform => { :class => AutomobileMakeModelYearVariant::ParserE, :year => year },
-                           :errata => { :url => "https://docs.google.com/spreadsheet/pub?key=0AoQJbWqPrREqdDkxTElWRVlvUXB3Uy04SDhSYWkzakE&output=csv", :responder => AutomobileMakeModelYearVariant::Guru.new },
-                           # :errata => { :url => 'file:///Users/ian/Documents/brighter_planet/documents1/science/data/transport/automobiles/fuel_economy_guide/errata_new.csv', :responder => AutomobileMakeModelYearVariant::Guru.new },
-                           :select => lambda { |row| row['model'].present? }) do
+             options.merge(:transform => { :class => AutomobileMakeModelYearVariant::ParserD, :year => year },
+                           :errata => { :url => "file://#{Earth::ERRATA_DIR}/automobile_make_model_year_variant/feg_errata.csv", :responder => AutomobileMakeModelYearVariant::Guru.new },
+                           :select => proc { |row| row['model'].present? }) do
         key   'row_hash'
         store 'make_name', :field_name => 'make'
         store 'model_name', :field_name => 'model'

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

@@ -2,10 +2,10 @@ require 'earth/fuel/data_miner'
 AutomobileMakeYearFleet.class_eval do
   data_miner do
     import "annual corporate average fuel economy data for domestic and imported vehicle fleets from the NHTSA",
-           :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdEdXWXB6dkVLWkowLXhYSFVUT01sS2c&hl=en&gid=0&output=csv',
-           :errata => { 'url' => 'http://static.brighterplanet.com/science/data/transport/automobiles/make_fleet_years/errata.csv' },
-           :select => lambda { |row| row['volume'].to_i > 0 } do
-      key   'name', :synthesize => lambda { |row| [ row['manufacturer_name'], row['year_content'], row['fleet'][2,2] ].join ' ' }
+           :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdEdXWXB6dkVLWkowLXhYSFVUT01sS2c&output=csv',
+           :errata => { :url => "file://#{Earth::ERRATA_DIR}/automobile_make_year_fleet/cafe_errata.csv", :encoding => 'ISO-8859-1' },
+           :select => proc { |row| row['volume'].to_i > 0 } do
+      key   'name', :synthesize => proc { |row| [ row['manufacturer_name'], row['year_content'], row['fleet'][2,2] ].join ' ' }
       store 'make_name', :field_name => 'manufacturer_name'
       store 'year', :field_name => 'year_content'
       store 'fleet', :chars => 2..3 # zero-based

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

@@ -5,8 +5,8 @@ AutomobileTypeFuelYear.class_eval do
            :url => 'http://www.epa.gov/climatechange/emissions/downloads10/2010-Inventory-Annex-Tables.zip',
            :filename => 'Annex Tables/Annex 3/Table A-87.csv',
            :skip => 1,
-           :select => lambda { |row| row['Year'].to_i.to_s == row['Year'] } do
-      key   'name', :synthesize => lambda { |row| "Passenger cars gasoline #{row['Year']}" }
+           :select => proc { |row| row['Year'].to_i.to_s == row['Year'] } do
+      key   'name', :synthesize => proc { |row| "Passenger cars gasoline #{row['Year']}" }
       store 'type_name', :static => 'Passenger cars'
       store 'fuel_common_name', :static => 'gasoline'
       store 'year', :field_name => 'Year'
@@ -17,8 +17,8 @@ AutomobileTypeFuelYear.class_eval do
            :url => 'http://www.epa.gov/climatechange/emissions/downloads10/2010-Inventory-Annex-Tables.zip',
            :filename => 'Annex Tables/Annex 3/Table A-87.csv',
            :skip => 1,
-           :select => lambda { |row| row['Year'].to_i.to_s == row['Year'] } do
-      key   'name', :synthesize => lambda { |row| "Light-duty trucks gasoline #{row['Year']}" }
+           :select => proc { |row| row['Year'].to_i.to_s == row['Year'] } do
+      key   'name', :synthesize => proc { |row| "Light-duty trucks gasoline #{row['Year']}" }
       store 'type_name', :static => 'Light-duty trucks'
       store 'fuel_common_name', :static => 'gasoline'
       store 'year', :field_name => 'Year'
@@ -29,8 +29,8 @@ AutomobileTypeFuelYear.class_eval do
            :url => 'http://www.epa.gov/climatechange/emissions/downloads10/2010-Inventory-Annex-Tables.zip',
            :filename => 'Annex Tables/Annex 3/Table A-88.csv',
            :skip => 1,
-           :select => lambda { |row| row['Year'].to_i.to_s == row['Year'] } do
-      key   'name', :synthesize => lambda { |row| "Passenger cars diesel #{row['Year']}" }
+           :select => proc { |row| row['Year'].to_i.to_s == row['Year'] } do
+      key   'name', :synthesize => proc { |row| "Passenger cars diesel #{row['Year']}" }
       store 'type_name', :static => 'Passenger cars'
       store 'fuel_common_name', :static => 'diesel'
       store 'year', :field_name => 'Year'
@@ -41,8 +41,8 @@ AutomobileTypeFuelYear.class_eval do
            :url => 'http://www.epa.gov/climatechange/emissions/downloads10/2010-Inventory-Annex-Tables.zip',
            :filename => 'Annex Tables/Annex 3/Table A-88.csv',
            :skip => 1,
-           :select => lambda { |row| row['Year'].to_i.to_s == row['Year'] } do
-      key   'name', :synthesize => lambda { |row| "Light-duty trucks diesel #{row['Year']}" }
+           :select => proc { |row| row['Year'].to_i.to_s == row['Year'] } do
+      key   'name', :synthesize => proc { |row| "Light-duty trucks diesel #{row['Year']}" }
       store 'type_name', :static => 'Light-duty trucks'
       store 'fuel_common_name', :static => 'diesel'
       store 'year', :field_name => 'Year'

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

@@ -5,88 +5,88 @@ AutomobileTypeFuelYearAge.class_eval do
            :url => 'http://www.epa.gov/climatechange/emissions/downloads10/2010-Inventory-Annex-Tables.zip',
            :filename => 'Annex Tables/Annex 3/Table A-93.csv',
            :skip => 1,
-           :select => lambda { |row| row['Vehicle Age'].to_i.to_s == row['Vehicle Age'] } do
-      key 'name', :synthesize => lambda { |row| "Passenger cars gasoline 2008 age #{row['Vehicle Age']}" }
+           :select => proc { |row| row['Vehicle Age'].to_i.to_s == row['Vehicle Age'] } do
+      key 'name', :synthesize => proc { |row| "Passenger cars gasoline 2008 age #{row['Vehicle Age']}" }
       store 'type_name', :static => 'Passenger cars'
       store 'fuel_common_name', :static => 'gasoline'
       store 'year', :static => '2008'
       store 'age', :field_name => 'Vehicle Age'
-      store 'total_travel_percent', :synthesize => lambda { |row| row['LDGV'].to_f / 100 }
+      store 'total_travel_percent', :synthesize => proc { |row| row['LDGV'].to_f / 100 }
     end
     
     import "total travel distribution of gasoline light-duty trucks from the 2010 EPA GHG Inventory",
            :url => 'http://www.epa.gov/climatechange/emissions/downloads10/2010-Inventory-Annex-Tables.zip',
            :filename => 'Annex Tables/Annex 3/Table A-93.csv',
            :skip => 1,
-           :select => lambda { |row| row['Vehicle Age'].to_i.to_s == row['Vehicle Age'] } do
-      key 'name', :synthesize => lambda { |row| "Light-duty trucks gasoline 2008 age #{row['Vehicle Age']}" }
+           :select => proc { |row| row['Vehicle Age'].to_i.to_s == row['Vehicle Age'] } do
+      key 'name', :synthesize => proc { |row| "Light-duty trucks gasoline 2008 age #{row['Vehicle Age']}" }
       store 'type_name', :static => 'Light-duty trucks'
       store 'fuel_common_name', :static => 'gasoline'
       store 'year', :static => '2008'
       store 'age', :field_name => 'Vehicle Age'
-      store 'total_travel_percent', :synthesize => lambda { |row| row['LDGT'].to_f / 100 }
+      store 'total_travel_percent', :synthesize => proc { |row| row['LDGT'].to_f / 100 }
     end
     
     import "total travel distribution of diesel passenger cars from the 2010 EPA GHG Inventory",
            :url => 'http://www.epa.gov/climatechange/emissions/downloads10/2010-Inventory-Annex-Tables.zip',
            :filename => 'Annex Tables/Annex 3/Table A-93.csv',
            :skip => 1,
-           :select => lambda { |row| row['Vehicle Age'].to_i.to_s == row['Vehicle Age'] } do
-      key 'name', :synthesize => lambda { |row| "Passenger cars diesel 2008 age #{row['Vehicle Age']}" }
+           :select => proc { |row| row['Vehicle Age'].to_i.to_s == row['Vehicle Age'] } do
+      key 'name', :synthesize => proc { |row| "Passenger cars diesel 2008 age #{row['Vehicle Age']}" }
       store 'type_name', :static => 'Passenger cars'
       store 'fuel_common_name', :static => 'diesel'
       store 'year', :static => '2008'
       store 'age', :field_name => 'Vehicle Age'
-      store 'total_travel_percent', :synthesize => lambda { |row| row['LDDV'].to_f / 100 }
+      store 'total_travel_percent', :synthesize => proc { |row| row['LDDV'].to_f / 100 }
     end
     
     import "total travel distribution of diesel light-duty trucks from the 2010 EPA GHG Inventory",
            :url => 'http://www.epa.gov/climatechange/emissions/downloads10/2010-Inventory-Annex-Tables.zip',
            :filename => 'Annex Tables/Annex 3/Table A-93.csv',
            :skip => 1,
-           :select => lambda { |row| row['Vehicle Age'].to_i.to_s == row['Vehicle Age'] } do
-      key 'name', :synthesize => lambda { |row| "Light-duty trucks diesel 2008 age #{row['Vehicle Age']}" }
+           :select => proc { |row| row['Vehicle Age'].to_i.to_s == row['Vehicle Age'] } do
+      key 'name', :synthesize => proc { |row| "Light-duty trucks diesel 2008 age #{row['Vehicle Age']}" }
       store 'type_name', :static => 'Light-duty trucks'
       store 'fuel_common_name', :static => 'diesel'
       store 'year', :static => '2008'
       store 'age', :field_name => 'Vehicle Age'
-      store 'total_travel_percent', :synthesize => lambda { |row| row['LDDT'].to_f / 100 }
+      store 'total_travel_percent', :synthesize => proc { |row| row['LDDT'].to_f / 100 }
     end
     
     import "average annual distance for gasoline passenger cars from the 2010 EPA GHG Inventory",
            :url => 'http://www.epa.gov/climatechange/emissions/downloads10/2010-Inventory-Annex-Tables.zip',
            :filename => 'Annex Tables/Annex 3/Table A-92.csv',
            :skip => 1,
-           :select => lambda { |row| row['Vehicle Age'].to_i.to_s == row['Vehicle Age'] } do
-      key 'name', :synthesize => lambda { |row| "Passenger cars gasoline 2008 age #{row['Vehicle Age']}" }
-      store 'annual_distance', :synthesize => lambda { |row| row['LDGV'].to_s.sub(',', '') }, :units => :miles
+           :select => proc { |row| row['Vehicle Age'].to_i.to_s == row['Vehicle Age'] } do
+      key 'name', :synthesize => proc { |row| "Passenger cars gasoline 2008 age #{row['Vehicle Age']}" }
+      store 'annual_distance', :synthesize => proc { |row| row['LDGV'].to_s.sub(',', '') }, :units => :miles
     end
     
     import "average annual distance for gasoline light-duty trucks from the 2010 EPA GHG Inventory",
            :url => 'http://www.epa.gov/climatechange/emissions/downloads10/2010-Inventory-Annex-Tables.zip',
            :filename => 'Annex Tables/Annex 3/Table A-92.csv',
            :skip => 1,
-           :select => lambda { |row| row['Vehicle Age'].to_i.to_s == row['Vehicle Age'] } do
-      key 'name', :synthesize => lambda { |row| "Light-duty trucks gasoline 2008 age #{row['Vehicle Age']}" }
-      store 'annual_distance', :synthesize => lambda { |row| row['LDGT'].to_s.sub(',', '') }, :units => :miles
+           :select => proc { |row| row['Vehicle Age'].to_i.to_s == row['Vehicle Age'] } do
+      key 'name', :synthesize => proc { |row| "Light-duty trucks gasoline 2008 age #{row['Vehicle Age']}" }
+      store 'annual_distance', :synthesize => proc { |row| row['LDGT'].to_s.sub(',', '') }, :units => :miles
     end
     
     import "average annual distance for diesel passenger cars from the 2010 EPA GHG Inventory",
            :url => 'http://www.epa.gov/climatechange/emissions/downloads10/2010-Inventory-Annex-Tables.zip',
            :filename => 'Annex Tables/Annex 3/Table A-92.csv',
            :skip => 1,
-           :select => lambda { |row| row['Vehicle Age'].to_i.to_s == row['Vehicle Age'] } do
-      key 'name', :synthesize => lambda { |row| "Passenger cars diesel 2008 age #{row['Vehicle Age']}" }
-      store 'annual_distance', :synthesize => lambda { |row| row['LDDV'].to_s.sub(',', '') }, :units => :miles
+           :select => proc { |row| row['Vehicle Age'].to_i.to_s == row['Vehicle Age'] } do
+      key 'name', :synthesize => proc { |row| "Passenger cars diesel 2008 age #{row['Vehicle Age']}" }
+      store 'annual_distance', :synthesize => proc { |row| row['LDDV'].to_s.sub(',', '') }, :units => :miles
     end
     
     import "average annual distance for diesel light-duty trucks from the 2010 EPA GHG Inventory",
            :url => 'http://www.epa.gov/climatechange/emissions/downloads10/2010-Inventory-Annex-Tables.zip',
            :filename => 'Annex Tables/Annex 3/Table A-92.csv',
            :skip => 1,
-           :select => lambda { |row| row['Vehicle Age'].to_i.to_s == row['Vehicle Age'] } do
-      key 'name', :synthesize => lambda { |row| "Light-duty trucks diesel 2008 age #{row['Vehicle Age']}" }
-      store 'annual_distance', :synthesize => lambda { |row| row['LDDT'].to_s.sub(',', '') }, :units => :miles
+           :select => proc { |row| row['Vehicle Age'].to_i.to_s == row['Vehicle Age'] } do
+      key 'name', :synthesize => proc { |row| "Light-duty trucks diesel 2008 age #{row['Vehicle Age']}" }
+      store 'annual_distance', :synthesize => proc { |row| row['LDDT'].to_s.sub(',', '') }, :units => :miles
     end
     
     process "Convert annual distance from miles to kilometres" do