earth 0.5.0 → 0.5.2

data/Gemfile

@@ -1,10 +1,9 @@
-source :rubygems
+gem 'data_miner', :path => ENV['LOCAL_DATA_MINER'] if ENV['LOCAL_DATA_MINER']
+gem 'create_table', :path => ENV['LOCAL_CREATE_TABLE'] if ENV['LOCAL_CREATE_TABLE']
 
-# Specify your gem's dependencies in earth.gemspec
-gemspec
+source :rubygems
 
-gem 'data_miner', :path => ENV['LOCAL_DATA_MINER'] if ENV['LOCAL_DATA_MINER']
-gem 'sniff', :path => ENV['LOCAL_SNIFF'] if ENV['LOCAL_SNIFF']
+gemspec :path => '.'
 
 if RUBY_VERSION < "1.9"
   gem 'fastercsv'

data/README.markdown

@@ -11,14 +11,6 @@ The data that these models represent can be pulled from http://data.brighterplan
     ft = AutomobileFuel.first
     ...
 
-You can also run data imports via the data_miner gem.
-
-    require 'earth'
-    Earth.init :fuel
-    Earth.taps_server # 'http://user:pass@data.brighterplanet.com'
-
-    DataMiner.run :resource_names #> [FuelPrice]</tt>
-
 ## Collaboration cycle 
 Brighter Planet vigorously encourages collaborative improvement of its emitter libraries. Collaboration requires a (free) GitHub account.
 

data/Rakefile

@@ -24,11 +24,13 @@ Cucumber::Rake::Task.new(:features) do |t|
   end
 end
 
-desc "Run cucumber tests with RCov"
-Cucumber::Rake::Task.new(:features_with_coverage) do |t|
-  t.cucumber_opts = "features --format pretty"
-  t.rcov = true
-  t.rcov_opts = ['--exclude', 'features']
+if RUBY_VERSION =~ /^1\.8/
+  desc "Run cucumber tests with RCov"
+  Cucumber::Rake::Task.new(:features_with_coverage) do |t|
+    t.cucumber_opts = "features --format pretty"
+    t.rcov = true
+    t.rcov_opts = ['--exclude', 'features']
+  end
 end
 
 require 'rspec/core/rake_task'
@@ -41,11 +43,13 @@ RSpec::Core::RakeTask.new(:examples) do |c|
   end
 end
 
-desc "Run specs with RCov"
-RSpec::Core::RakeTask.new(:examples_with_coverage) do |t|
-  t.rcov = true
-  t.rcov_opts = ['--exclude', 'spec']
-  t.rspec_opts = '-Ispec'
+if RUBY_VERSION =~ /^1\.8/
+  desc "Run specs with RCov"
+  RSpec::Core::RakeTask.new(:examples_with_coverage) do |t|
+    t.rcov = true
+    t.rcov_opts = ['--exclude', 'spec']
+    t.rspec_opts = '-Ispec'
+  end
 end
 
 task :test => [:features, :examples]

data/bin/earth_tester.rb

@@ -14,19 +14,19 @@ end
 require 'active_support/all'
 require 'active_record'
 
-ActiveRecord::Schema.verbose = false
-begin
-  ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
-rescue ArgumentError
-  ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :dbfile => ':memory:')
-end
+ActiveRecord::Base.establish_connection(
+  'adapter' => 'mysql',
+  'database' => 'test_earth',
+  'username' => 'root',
+  'password' => 'password',
+  'encoding' => 'utf8' # very, very important
+)
 
 require 'earth'
 
-Earth.init :load_data_miner => true, :apply_schemas => true
+Earth.init ARGV[0], :load_data_miner => true, :apply_schemas => true
 
-if ARGV[0].present?
-  eval ARGV[0]
-else
-  $stderr.puts "Usage: earth_tester.rb 'ResidenceFuelPrice.run_data_miner!' (Note single quotes)"
-end
+ActiveRecord::Base.logger = Logger.new $stderr
+ActiveRecord::Base.logger.level = Logger::INFO
+
+ARGV[1].camelcase.constantize.run_data_miner!

data/earth.gemspec

@@ -36,6 +36,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'geokit-rails'
   s.add_runtime_dependency 'loose_tight_dictionary', '>=0.2.3'
   s.add_runtime_dependency 'weighted_average'
+  s.add_runtime_dependency 'create_table', '>=0.0.2'
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'bueller'
   s.add_development_dependency 'cucumber'
@@ -43,6 +44,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rdoc'
   s.add_development_dependency 'rdoc'
   s.add_development_dependency 'rspec'
-  s.add_development_dependency 'ruby-debug19'
   s.add_development_dependency 'sqlite3-ruby'
+  s.add_development_dependency 'mysql' # for bin/earth_tester.rb
 end

data/features/automobile_make_fleet_year.feature

@@ -2,42 +2,32 @@ Feature: Data import for AutomobileMakeFleetYear
   As a data user
   I want to import MakeFleetYear data
   So that I can perform year-based calculations
-
-  Scenario: Successfully verifying that year is from 1978 to 2009
-    Given a "AutomobileMakeFleetYear" data import fetches results listed in "automobile_make_fleet_year_good"
-    When a data import verifies "Year should be from 1978 to 2009"
-    Then the verification should be successful
   
-  Scenario: Successfully verifying that fuel efficiency is greater than zero
+  Scenario: Successfully verifying that year is from 1978 to 2010
     Given a "AutomobileMakeFleetYear" data import fetches results listed in "automobile_make_fleet_year_good"
-    When a data import verifies "Fuel efficiency should be greater than zero"
+    When a data import verifies "Year should be from 1978 to 2010"
     Then the verification should be successful
   
-  Scenario: Successfully verifying that volume is greater than zero
+  Scenario: Successfully verifying that fuel efficiency and volume are greater than zero
     Given a "AutomobileMakeFleetYear" data import fetches results listed in "automobile_make_fleet_year_good"
-    When a data import verifies "Volume should be greater than zero"
+    When a data import verifies "Fuel efficiency and volume should be greater than zero"
     Then the verification should be successful
-
+  
   Scenario: Successfully verifying that fuel efficiency units are kilometres per litre
     Given a "AutomobileMakeFleetYear" data import fetches results listed in "automobile_make_fleet_year_good"
     When a data import verifies "Fuel efficiency units should be kilometres per litre"
     Then the verification should be successful
   
-  Scenario: Failing to verify that year is from 1978 to 2009
+  Scenario: Failing to verify that year is from 1978 to 2010
     Given a "AutomobileMakeFleetYear" data import fetches results listed in "automobile_make_fleet_year_bad"
-    When a data import verifies "Year should be from 1978 to 2009"
+    When a data import verifies "Year should be from 1978 to 2010"
     Then the verification should not be successful
   
-  Scenario: Failing to verify that fuel efficiency is greater than zero
+  Scenario: Failing to verify that fuel efficiency and volume are greater than zero
     Given a "AutomobileMakeFleetYear" data import fetches results listed in "automobile_make_fleet_year_bad"
-    When a data import verifies "Fuel efficiency should be greater than zero"
+    When a data import verifies "Fuel efficiency and volume should be greater than zero"
     Then the verification should not be successful
   
-  Scenario: Failing to verify that volume is greater than zero
-    Given a "AutomobileMakeFleetYear" data import fetches results listed in "automobile_make_fleet_year_bad"
-    When a data import verifies "Volume should be greater than zero"
-    Then the verification should not be successful
-
   Scenario: Failing to verify that fuel efficiency units are kilometres per litre
     Given a "AutomobileMakeFleetYear" data import fetches results listed in "automobile_make_fleet_year_bad"
     When a data import verifies "Fuel efficiency units should be kilometres per litre"

data/features/automobile_make_model_year.feature

@@ -3,9 +3,9 @@ Feature: Data import for AutomobileMakeModelYear
   I want to import MakeModelYear data
   So that I can perform model year-based calculations
 
-  Scenario: Successfully verifying that year is from 1985 to 2010
+  Scenario: Successfully verifying that year is from 1985 to 2011
     Given a "AutomobileMakeModelYear" data import fetches results listed in "automobile_make_model_year_good"
-    When a data import verifies "Year should be from 1985 to 2010"
+    When a data import verifies "Year should be from 1985 to 2011"
     Then the verification should be successful
 
   Scenario: Successfully verifying that fuel efficiences are greater than zero
@@ -18,9 +18,9 @@ Feature: Data import for AutomobileMakeModelYear
     When a data import verifies "Fuel efficiency units should be kilometres per litre"
     Then the verification should be successful
 
-  Scenario: Failing to verify that year is from 1985 to 2010
+  Scenario: Failing to verify that year is from 1985 to 2011
     Given a "AutomobileMakeModelYear" data import fetches results listed in "automobile_make_model_year_bad"
-    When a data import verifies "Year should be from 1985 to 2010"
+    When a data import verifies "Year should be from 1985 to 2011"
     Then the verification should not be successful
 
   Scenario: Failing to verify that fuel efficiences are greater than zero

data/features/support/env.rb

@@ -1,15 +1,19 @@
 require 'rubygems'
 require 'bundler'
-
 Bundler.setup
-
+require 'logger'
+require 'active_record'
+require 'data_miner'
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'earth'
 
-require 'data_miner'
-DataMiner.logger = Logger.new 'log/test.log'
+logger = Logger.new 'log/test.log'
+logger.level = Logger::DEBUG
 
-require 'active_record'
-require 'sqlite3'
-ActiveRecord::Base.logger = Logger.new 'log/test.log'
 ActiveRecord::Base.establish_connection :adapter => 'sqlite3', :database => ':memory:'
+ActiveRecord::Base.logger = logger
+
+DataMiner.logger = logger
+
 Earth.init :all, :apply_schemas => true

data/features/support/imports/automobile_make_fleet_year_bad.csv

@@ -1,2 +1,2 @@
 name,year,fuel_efficiency,volume,fuel_efficiency_units
-Honda 2010 DP,2010,0,0
+Honda 2011 DP,2011

data/features/support/imports/automobile_make_fleet_year_good.csv

@@ -1,2 +1,2 @@
 name,year,fuel_efficiency,volume,fuel_efficiency_units
-Honda 2009 DP,2009,15,2000,kilometres_per_litre
+Honda 2010 DP,2010,15,2000,kilometres_per_litre

data/features/support/imports/automobile_make_model_year_bad.csv

@@ -1,3 +1,3 @@
 name,year,fuel_efficiency_city,fuel_efficiency_highway,fuel_efficiency_city_units,fuel_efficiency_highway_units
 Toyota,2000,10,10.5,kilometres_per_litre,kilometres_per_litre
-Honda,2011,0,-10,foo
+Honda,2012,0,-10,foo

data/features/support/imports/automobile_make_model_year_good.csv

@@ -1,3 +1,3 @@
 name,year,fuel_efficiency_city,fuel_efficiency_highway,fuel_efficiency_city_units,fuel_efficiency_highway_units
 Toyota,2000,10,10.5,kilometres_per_litre,kilometres_per_litre
-Honda,2010,20,21,kilometres_per_litre,kilometres_per_litre
+Honda,2011,20,21,kilometres_per_litre,kilometres_per_litre

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

@@ -20,23 +20,23 @@ Aircraft.class_eval do
     @manufacturer_whitelist ||= RemoteTable.new(:url => 'https://spreadsheets.google.com/spreadsheet/pub?key=0AoQJbWqPrREqdFRFalpOdlg1cnF6amlSM1dDc1lya2c&output=csv').map { |record| record['Manufacturer'].to_regexp }
     @manufacturer_whitelist.any? { |manufacturer_regexp| manufacturer_regexp.match candidate }
   end
+
+  create_table do
+    string  'icao_code'
+    string  'manufacturer_name'
+    string  'model_name'
+    string  'description'
+    string  'aircraft_type'
+    string  'engine_type'
+    integer 'engines'
+    string  'weight_class'
+    string  'class_code'
+    string  'fuel_use_code'
+    float   'seats'
+    float   'passengers'
+  end
   
   data_miner do
-    schema Earth.database_options do
-      string  'icao_code'
-      string  'manufacturer_name'
-      string  'model_name'
-      string  'description'
-      string  'aircraft_type'
-      string  'engine_type'
-      integer 'engines'
-      string  'weight_class'
-      string  'class_code'
-      string  'fuel_use_code'
-      float   'seats'
-      float   'passengers'
-    end
-    
     ('A'..'Z').each do |letter|
       import("aircraft made by whitelisted manufacturers whose ICAO code starts with '#{letter}' from the FAA",
              :url => "http://www.faa.gov/air_traffic/publications/atpubs/CNT/5-2-#{letter}.htm",
@@ -96,6 +96,54 @@ Aircraft.class_eval do
       FlightSegment.run_data_miner!
     end
     
+    process "Cache fuzzy matches between FlightSegment aircraft_description and Aircraft description" do
+      LooseTightDictionary::CachedResult.setup
+      FlightSegment.find_by_sql("SELECT * FROM flight_segments GROUP BY aircraft_description HAVING aircraft_description IS NOT NULL").each do |flight_segment|
+        original_description = flight_segment.aircraft_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
+        # synthesized descriptions, and associate those Aircraft with the original aircraft_description.
+        # e.g. boeing 747-100/200
+        if original_description.include?("/")
+          # Pull out the complete first aircraft description
+          # e.g. 'boeing 747-100'
+          first_description = original_description.split('/')[0]
+          
+          # Pull out the root of the description - the text up to and including the last ' ' or '-'
+          # e.g. 'boeing 747-'
+          root_length = first_description.rindex(/[ \-]/)
+          root = first_description.slice(0..root_length)
+          
+          # Pull out the suffixes - the text separated by forward slashes
+          # e.g. ['100', '200']
+          suffixes = original_description.split(root)[1].split('/')
+          
+          # Create an array of synthesized descriptions by appending each suffix to the root
+          # e.g. ['boeing 747-100', 'boeing 747-200']
+          suffixes.map{ |suffix| root + suffix }.each do |synthesized_description|
+            # Look up the Aircraft that match each synthesized description and associate
+            # them with the original flight segment aircraft_description
+            Aircraft.loose_tight_dictionary.find_all(synthesized_description).each do |aircraft|
+              attrs = {
+                :a_class => "Aircraft",
+                :a => aircraft.description,
+                :b_class => "FlightSegment",
+                :b => original_description
+              }
+              unless ::LooseTightDictionary::CachedResult.exists? attrs
+                ::LooseTightDictionary::CachedResult.create! attrs
+              end
+            end
+          end
+        # If the flight segment's aircraft_description doesn't contain '/' we can use
+        # a method provided by loose_tight_dictionary to associate it with Aircraft
+        else
+          flight_segment.cache_aircraft!
+        end
+      end
+    end
+    
     # FIXME TODO do we want to restrict this to certain years?
     process "Derive some average characteristics from flight segments" do
       Aircraft.find_each do |aircraft|

data/lib/earth/air/aircraft.rb

@@ -1,6 +1,3 @@
-# need this for association with FlightSegment through loose_tight_dictionary_cached_results
-require 'loose_tight_dictionary/cached_result'
-
 class Aircraft < ActiveRecord::Base
   set_primary_key :icao_code
   
@@ -22,12 +19,4 @@ class Aircraft < ActiveRecord::Base
   
   # Enable aircraft.flight_segments
   cache_loose_tight_dictionary_matches_with :flight_segments, :primary_key => :description, :foreign_key => :aircraft_description
-  
-  data_miner do
-    tap "Brighter Planet's sanitized aircraft data", Earth.taps_server
-    
-    process "pull dependencies" do
-      run_data_miner_on_belongs_to_associations
-    end
-  end
 end

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

@@ -1,18 +1,5 @@
 AircraftClass.class_eval do
   data_miner do
-    schema Earth.database_options do
-      string 'code'
-      float  'm3'
-      string 'm3_units'
-      float  'm2'
-      string 'm2_units'
-      float  'm1'
-      string 'm1_units'
-      float  'b'
-      string 'b_units'
-      float  'seats'
-    end
-    
     process "Ensure Aircraft is populated" do
       Aircraft.run_data_miner!
     end

data/lib/earth/air/aircraft_class.rb

@@ -10,8 +10,17 @@ class AircraftClass < ActiveRecord::Base
   def valid_fuel_use_equation?
     fuel_use_coefficients.all?(&:present?) and fuel_use_coefficients.any?(&:nonzero?)
   end
-  
-  data_miner do
-    tap "Brighter Planet's aircraft class data", Earth.taps_server
+
+  create_table do
+    string 'code'
+    float  'm3'
+    string 'm3_units'
+    float  'm2'
+    string 'm2_units'
+    float  'm1'
+    string 'm1_units'
+    float  'b'
+    string 'b_units'
+    float  'seats'
   end
 end

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

@@ -1,18 +1,5 @@
 AircraftFuelUseEquation.class_eval do
   data_miner do
-    schema Earth.database_options do
-      string 'code'
-      string 'aircraft_description'
-      float  'm3'
-      string 'm3_units'
-      float  'm2'
-      string 'm2_units'
-      float  'm1'
-      string 'm1_units'
-      float  'b'
-      string 'b_units'
-    end
-    
     import "aircraft fuel use equations derived from EMEP/EEA and ICAO",
            :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdDltUVZVekVobEJPYlpFNUpWNkwyYXc&output=csv' do
       key 'code'

data/lib/earth/air/aircraft_fuel_use_equation.rb

@@ -19,8 +19,17 @@ class AircraftFuelUseEquation < ActiveRecord::Base
   def valid_fuel_use_equation?
     fuel_use_coefficients.all?(&:present?) and fuel_use_coefficients.any?(&:nonzero?)
   end
-  
-  data_miner do
-    tap "Brighter Planet's sanitized aircraft fuel use data", Earth.taps_server
+
+  create_table do
+    string 'code'
+    string 'aircraft_description'
+    float  'm3'
+    string 'm3_units'
+    float  'm2'
+    string 'm2_units'
+    float  'm1'
+    string 'm1_units'
+    float  'b'
+    string 'b_units'
   end
 end

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

@@ -1,12 +1,5 @@
 Airline.class_eval do
   data_miner do
-    schema Earth.database_options do
-      string 'name'
-      string 'bts_code'
-      string 'iata_code'
-      string 'icao_code'
-    end
-    
     import "a Brighter Planet-curated list of airlines",
            :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdDhoVHZmSTlZcHBsRUtPR0dPd0prMkE&output=csv' do
       key 'name'

data/lib/earth/air/airline.rb

@@ -1,7 +1,10 @@
 class Airline < ActiveRecord::Base
   set_primary_key :name
-  
-  data_miner do
-    tap "Brighter Planet's sanitized airlines data", Earth.taps_server
+
+  create_table do
+    string 'name'
+    string 'bts_code'
+    string 'iata_code'
+    string 'icao_code'
   end
 end

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

@@ -15,19 +15,10 @@ Airport.class_eval do
   end
   
   data_miner do
-    schema Earth.database_options do
-      string   'iata_code'
-      string   'name'
-      string   'city'
-      string   'country_name'
-      string   'country_iso_3166_code'
-      float    'latitude'
-      float    'longitude'
-    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',
                         :responder => Airport::Guru.new } do
       key 'iata_code'
@@ -52,10 +43,10 @@ Airport.class_eval do
       Country.run_data_miner!
     end
     
-    process "Replace country names with country ISO 3166 codes" do
-      connection.select_values("SELECT DISTINCT country_name FROM airports WHERE country_name IS NOT NULL").each do |name|
-        code = Country.find_by_name(name).iso_3166_code
-        update_all %{country_iso_3166_code = "#{code}"}, %{country_name = "#{name}"}
+    process "Fill in blank country codes" do
+      Country.find_each do |country|
+        next unless country.name.present? and country.iso_3166_code.present?
+        update_all %{country_iso_3166_code = "#{country.iso_3166_code}"}, %{country_name LIKE "#{country.name}"}
       end
     end
     

data/lib/earth/air/airport.rb

@@ -6,12 +6,14 @@ class Airport < ActiveRecord::Base
   acts_as_mappable :default_units => :nms,
                    :lat_column_name => :latitude,
                    :lng_column_name => :longitude
-  
-  data_miner do
-    tap "Brighter Planet's sanitized airports data", Earth.taps_server
-    
-    process "pull dependencies" do
-      run_data_miner_on_belongs_to_associations
-    end
+
+  create_table do
+    string   'iata_code'
+    string   'name'
+    string   'city'
+    string   'country_name'
+    string   'country_iso_3166_code'
+    float    'latitude'
+    float    'longitude'
   end
 end

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

@@ -1,10 +1,5 @@
 BtsAircraft.class_eval do
   data_miner do
-    schema Earth.database_options do
-      string 'bts_code'
-      string 'description'
-    end
-    
     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

data/lib/earth/air/bts_aircraft.rb

@@ -1,7 +1,7 @@
 class BtsAircraft < ActiveRecord::Base
   set_primary_key :bts_code
-  
-  data_miner do
-    tap "Brighter Planet's BTS Aircraft data", Earth.taps_server
+  create_table do
+    string 'bts_code'
+    string 'description'
   end
 end

data/lib/earth/air/data_miner.rb

@@ -1,12 +1,11 @@
-require 'earth/locality'
-require 'earth/locality/data_miner'
 require 'earth/air/aircraft/data_miner'
 require 'earth/air/aircraft_class/data_miner'
 require 'earth/air/aircraft_fuel_use_equation/data_miner'
-require 'earth/air/aircraft_manufacturer/data_miner'
 require 'earth/air/airline/data_miner'
 require 'earth/air/airport/data_miner'
 require 'earth/air/bts_aircraft/data_miner'
 require 'earth/air/flight_distance_class/data_miner'
 require 'earth/air/flight_seat_class/data_miner'
 require 'earth/air/flight_segment/data_miner'
+
+require 'earth/locality/data_miner'

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

@@ -1,11 +1,5 @@
 FlightDistanceClass.class_eval do
   data_miner do
-    schema Earth.database_options do
-      string 'name'
-      float  'distance'
-      string 'distance_units'
-    end
-    
     import "a list of distance classes taken from the WRI business travel tool and UK DEFRA/DECC GHG Conversion Factors for Company Reporting",
            :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdFBKM0xWaUhKVkxDRmdBVkE3VklxY2c&hl=en&gid=0&output=csv' do
       key   'name'

data/lib/earth/air/flight_distance_class.rb

@@ -1,7 +1,8 @@
 class FlightDistanceClass < ActiveRecord::Base
   set_primary_key :name
-  
-  data_miner do
-    tap "Brighter Planet's sanitized distance class data", Earth.taps_server
+  create_table do
+    string 'name'
+    float  'distance'
+    string 'distance_units'
   end
 end

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

@@ -1,12 +1,5 @@
 FlightSeatClass.class_eval do
   data_miner do
-    schema Earth.database_options do
-      string   'name'
-      string   'distance_class_name'
-      string   'seat_class_name'
-      float    'multiplier'
-    end
-    
     import "seat classes used in the WRI GHG Protocol calculation tools",
            :url => 'https://spreadsheets.google.com/pub?key=0AoQJbWqPrREqdG5zSER1QmFVVkhNcTM2cmhCMEJtWVE&hl=en&gid=0&output=csv' do
       key   'name'

data/lib/earth/air/flight_seat_class.rb

@@ -2,8 +2,11 @@ class FlightSeatClass < ActiveRecord::Base
   set_primary_key :name
   
   falls_back_on :multiplier => 1
-  
-  data_miner do
-    tap "Brighter Planet's sanitized flight seat class data", Earth.taps_server
+
+  create_table do
+    string   'name'
+    string   'distance_class_name'
+    string   'seat_class_name'
+    float    'multiplier'
   end
 end