flight 0.0.5 → 0.0.6

data/features/step_definitions/carbon_steps.rb

@@ -23,10 +23,10 @@ When /^emissions are calculated$/ do
   @activity = FlightRecord.from_params_hash @activity_hash
   if @current_date
     Timecop.travel(@current_date) do
-      @emission = @activity.emission Sniff::Timeframe.this_year
+      @emission = @activity.emission Timeframe.this_year
     end
   else
-    @emission = @activity.emission Sniff::Timeframe.this_year
+    @emission = @activity.emission Timeframe.this_year
   end
   @characteristics = @activity.deliberations[:emission].characteristics
 end

data/features/support/env.rb

@@ -5,15 +5,4 @@ require 'cucumber'
 require 'cucumber/formatter/unicode' # Remove this line if you don't want Cucumber Unicode support
 
 require 'sniff'
-
-Sniff.init File.join(File.dirname(__FILE__), '..', '..')
-
-## How to clean your database when transactions are turned off. See
-## http://github.com/bmabey/database_cleaner for more info.
-#if defined?(ActiveRecord::Base)
-#  begin
-#    require 'database_cleaner'
-#    DatabaseCleaner.strategy = :truncation
-#  rescue LoadError => ignore_if_database_cleaner_not_present
-#  end
-#end
+Sniff.init File.join(File.dirname(__FILE__), '..', '..'), :earth => :air

data/lib/flight.rb

@@ -1,16 +1,16 @@
-require 'flight/carbon_model'
-require 'flight/characterization'
-require 'flight/data'
-require 'flight/summarization'
-
 module BrighterPlanet
   module Flight
     extend self
 
     def included(base)
+      require 'flight/carbon_model'
+      require 'flight/characterization'
+      require 'flight/data'
+      require 'flight/summarization'
+
       base.send :include, BrighterPlanet::Flight::CarbonModel
       base.send :include, BrighterPlanet::Flight::Characterization
-#      base.send :include, BrighterPlanet::Flight::Data
+      base.send :include, BrighterPlanet::Flight::Data
       base.send :include, BrighterPlanet::Flight::Summarization
     end
     def flight_model

data/lib/test_support/db/schema.rb

@@ -1,317 +1,6 @@
 require 'sniff/database'
 
 Sniff::Database.define_schema do
-  create_table "aircraft", :primary_key => "icao_code", :id => false, :force => true do |t|
-    t.string 'icao_code'
-    t.string   "manufacturer_name"
-    t.string   "name"
-    t.string   "bts_name"
-    t.string   "bts_aircraft_type_code"
-    t.string   "brighter_planet_aircraft_class_code"
-    t.string   "fuel_use_aircraft_name"
-    t.float    "m3"
-    t.float    "m2"
-    t.float    "m1"
-    t.float    "endpoint_fuel"
-    t.float    "seats"
-    t.float    "distance"
-    t.float    "load_factor"
-    t.float    "freight_share"
-    t.float    "payload"
-    t.float    "weighting"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "aircraft_classes", :primary_key => "brighter_planet_aircraft_class_code", :id => false, :force => true do |t|
-    t.string 'brighter_planet_aircraft_class_code'
-    t.string   "name"
-    t.float    "m1"
-    t.float    "m2"
-    t.float    "m3"
-    t.float    "endpoint_fuel"
-    t.integer  "seats"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "aircraft_manufacturers", :primary_key => "name", :id => false, :force => true do |t|
-    t.string 'name'
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "airlines", :primary_key => "iata_code", :id => false, :force => true do |t|
-    t.string 'iata_code'
-    t.string   "name"
-    t.string   "dot_airline_id_code"
-    t.boolean  "international"
-    t.float    "distance"
-    t.float    "load_factor"
-    t.float    "freight_share"
-    t.float    "payload"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.float    "seats"
-  end
-
-  create_table "airports", :primary_key => "iata_code", :id => false, :force => true do |t|
-    t.string 'iata_code'
-    t.string   "name"
-    t.string   "city"
-    t.string   "country_name"
-    t.string   "country_iso_3166_code"
-    t.float    "latitude"
-    t.float    "longitude"
-    t.float    "seats"
-    t.float    "distance"
-    t.float    "load_factor"
-    t.float    "freight_share"
-    t.float    "payload"
-    t.boolean  "international_origin"
-    t.boolean  "international_destination"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "flight_aircraft", :force => true do |t|
-    t.string   "name"
-    t.integer  "seats"
-    t.integer  "flight_fuel_type_id"
-    t.float    "endpoint_fuel"
-    t.integer  "flight_manufacturer_id"
-    t.datetime "updated_at"
-    t.datetime "created_at"
-    t.date     "bts_begin_date"
-    t.date     "bts_end_date"
-    t.float    "load_factor"
-    t.float    "freight_share"
-    t.float    "m3"
-    t.float    "m2"
-    t.float    "m1"
-    t.float    "distance"
-    t.float    "payload"
-    t.integer  "flight_aircraft_class_id"
-    t.float    "multiplier"
-    t.string   "manufacturer_name"
-    t.string   "brighter_planet_aircraft_class_code"
-    t.integer  "weighting"
-    t.integer  "bts_aircraft_type"
-  end
-
-  create_table "flight_aircraft_classes", :force => true do |t|
-    t.string  "name"
-    t.integer "seats"
-    t.integer "flight_fuel_type_id"
-    t.float   "endpoint_fuel"
-    t.string  "brighter_planet_aircraft_class_code"
-    t.float   "m1"
-    t.float   "m2"
-    t.float   "m3"
-  end
-
-  create_table "flight_aircraft_seat_classes", :force => true do |t|
-    t.integer  "flight_aircraft_id"
-    t.integer  "flight_seat_class_id"
-    t.integer  "seats"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.float    "multiplier"
-    t.boolean  "fresh"
-  end
-
-  create_table "flight_airline_aircraft", :force => true do |t|
-    t.integer  "flight_airline_id"
-    t.integer  "flight_aircraft_id"
-    t.integer  "seats"
-    t.datetime "updated_at"
-    t.datetime "created_at"
-    t.float    "total_seat_area"
-    t.float    "average_seat_area"
-    t.boolean  "fresh"
-    t.float    "multiplier"
-  end
-
-  create_table "flight_airline_aircraft_seat_classes", :force => true do |t|
-    t.integer  "seats"
-    t.float    "pitch"
-    t.float    "width"
-    t.float    "multiplier"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.float    "seat_area"
-    t.string   "name"
-    t.integer  "flight_airline_id"
-    t.integer  "flight_aircraft_id"
-    t.integer  "flight_seat_class_id"
-    t.integer  "weighting"
-    t.integer  "peers"
-  end
-
-  create_table "flight_airline_seat_classes", :force => true do |t|
-    t.integer  "flight_seat_class_id"
-    t.integer  "flight_airline_id"
-    t.float    "multiplier"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "seats"
-    t.boolean  "fresh"
-  end
-
-  create_table "flight_airlines", :force => true do |t|
-    t.string  "name"
-    t.string  "iata"
-    t.string  "us_dot_airline_id"
-    t.float   "load_factor"
-    t.float   "freight_share"
-    t.float   "distance"
-    t.float   "multiplier"
-    t.integer "seats"
-    t.float   "payload"
-    t.boolean "international"
-  end
-
-  create_table "flight_configurations", :primary_key => "name", :id => false, :force => true do |t|
-    t.string 'name'
-    t.string   "bts_aircraft_configuration_code"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "flight_distance_classes", :primary_key => "name", :id => false, :force => true do |t|
-    t.string 'name'
-    t.float    "distance"
-    t.string   "distance_units"
-    t.datetime "updated_at"
-    t.datetime "created_at"
-  end
-
-  create_table "flight_domesticities", :primary_key => "name", :id => false, :force => true do |t|
-    t.string 'name'
-    t.string   "bts_data_source_code"
-    t.float    "distance"
-    t.string   "distance_units"
-    t.float    "freight_share"
-    t.float    "load_factor"
-    t.float    "seats"
-    t.float    "payload"
-    t.string   "payload_units"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "flight_fuel_types", :force => true do |t|
-    t.string   "name"
-    t.float    "emission_factor"
-    t.float    "radiative_forcing_index"
-    t.float    "density"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "flight_manufacturers", :force => true do |t|
-    t.string   "name"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "flight_patterns", :force => true do |t|
-    t.string   "name"
-    t.integer  "flight_id"
-    t.date     "start_date"
-    t.date     "end_date"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.float    "monthly_flights"
-    t.integer  "profile_id"
-  end
-
-  create_table "flight_propulsions", :primary_key => "name", :id => false, :force => true do |t|
-    t.string 'name'
-    t.string   "bts_aircraft_group_code"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "flight_seat_classes", :primary_key => "name", :id => false, :force => true do |t|
-    t.string 'name'
-    t.float    "multiplier"
-    t.integer  "seats"
-    t.datetime "updated_at"
-    t.datetime "created_at"
-  end
-
-  create_table "flight_segments", :primary_key => "row_hash", :id => false, :force => true do |t|
-    t.string 'row_hash'
-    t.string   "propulsion_id"
-    t.integer  "bts_aircraft_group_code"
-    t.string   "configuration_id"
-    t.integer  "bts_aircraft_configuration_code"
-    t.string   "distance_group"
-    t.integer  "bts_distance_group_code"
-    t.string   "service_class_id"
-    t.string   "bts_service_class_code"
-    t.string   "domesticity_id"
-    t.string   "bts_data_source_code"
-    t.integer  "departures_performed"
-    t.integer  "payload"
-    t.integer  "total_seats"
-    t.integer  "passengers"
-    t.integer  "freight"
-    t.integer  "mail"
-    t.integer  "ramp_to_ramp"
-    t.integer  "air_time"
-    t.float    "load_factor"
-    t.float    "freight_share"
-    t.integer  "distance"
-    t.integer  "departures_scheduled"
-    t.string   "airline_iata_code"
-    t.string   "dot_airline_id_code"
-    t.string   "unique_carrier_name"
-    t.string   "unique_carrier_entity"
-    t.string   "region"
-    t.string   "current_airline_iata_code"
-    t.string   "carrier_name"
-    t.integer  "carrier_group"
-    t.integer  "carrier_group_new"
-    t.string   "origin_airport_iata_code"
-    t.string   "origin_city_name"
-    t.integer  "origin_city_num"
-    t.string   "origin_state_abr"
-    t.string   "origin_state_fips"
-    t.string   "origin_state_nm"
-    t.string   "origin_country_iso_3166_code"
-    t.string   "origin_country_name"
-    t.integer  "origin_wac"
-    t.string   "dest_airport_iata_code"
-    t.string   "dest_city_name"
-    t.integer  "dest_city_num"
-    t.string   "dest_state_abr"
-    t.string   "dest_state_fips"
-    t.string   "dest_state_nm"
-    t.string   "dest_country_iso_3166_code"
-    t.string   "dest_country_name"
-    t.integer  "dest_wac"
-    t.integer  "bts_aircraft_type_code"
-    t.integer  "year"
-    t.integer  "quarter"
-    t.integer  "month"
-    t.float    "seats"
-    t.string   "payload_units"
-    t.string   "freight_units"
-    t.string   "mail_units"
-    t.string   "distance_units"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "flight_services", :primary_key => "name", :id => false, :force => true do |t|
-    t.string 'name'
-    t.string   "bts_service_class_code"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
   create_table "flight_records", :force => true do |t|
     t.date     "date"
     t.datetime "created_at"

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: flight
 version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Andy Rossmeissl
@@ -18,28 +19,33 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-15 00:00:00 -04:00
+date: 2010-07-20 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rake
+  type: :development
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  name: rake
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
-  type: :development
-  version_requirements: *id001
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  type: :development
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  name: bundler
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 62196359
         segments: 
         - 1
         - 0
@@ -47,76 +53,119 @@ dependencies:
         - beta
         - 2
         version: 1.0.0.beta.2
-  type: :development
-  version_requirements: *id002
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  type: :development
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  name: jeweler
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 1
         - 4
         - 0
         version: 1.4.0
-  type: :development
-  version_requirements: *id003
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  name: cucumber
+  type: :development
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  name: cucumber
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 57
         segments: 
         - 0
         - 8
         - 3
         version: 0.8.3
-  type: :development
-  version_requirements: *id004
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
-  name: rdoc
+  type: :development
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  name: rdoc
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
-  type: :development
-  version_requirements: *id005
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
-  name: sniff
+  type: :development
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  name: rspec
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 62196417
         segments: 
+        - 2
         - 0
         - 0
-        - 3
-        version: 0.0.3
+        - beta
+        - 17
+        version: 2.0.0.beta.17
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: *id006
+  prerelease: false
+  name: sniff
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 0
+        - 0
+        - 5
+        version: 0.0.5
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
-  name: weighted_average
+  type: :runtime
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  name: weighted_average
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 0
         - 0
         - 4
         version: 0.0.4
+  requirement: *id008
+- !ruby/object:Gem::Dependency 
   type: :runtime
-  version_requirements: *id007
+  prerelease: false
+  name: earth
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 0
+        - 0
+        - 7
+        version: 0.0.7
+  requirement: *id009
 description: A software model in Ruby for the greenhouse gas emissions of a flight
 email: andy@rossmeissl.net
 executables: []
@@ -134,21 +183,12 @@ files:
 - lib/flight/characterization.rb
 - lib/flight/data.rb
 - lib/flight/summarization.rb
-- lib/test_support/data_models/aircraft.rb
-- lib/test_support/data_models/aircraft_class.rb
-- lib/test_support/data_models/aircraft_manufacturer.rb
-- lib/test_support/data_models/airline.rb
-- lib/test_support/data_models/airport.rb
-- lib/test_support/data_models/flight_configuration.rb
-- lib/test_support/data_models/flight_distance_class.rb
-- lib/test_support/data_models/flight_domesticity.rb
-- lib/test_support/data_models/flight_fuel_type.rb
-- lib/test_support/data_models/flight_propulsion.rb
-- lib/test_support/data_models/flight_seat_class.rb
-- lib/test_support/data_models/flight_segment.rb
-- lib/test_support/data_models/flight_service.rb
 - lib/test_support/db/schema.rb
 - lib/test_support/flight_record.rb
+- features/step_definitions/carbon_steps.rb
+- features/support/env.rb
+- features/flight_committees.feature
+- features/flight_emissions.feature
 has_rdoc: true
 homepage: http://github.com/brighterplanet/flight
 licenses: []
@@ -159,23 +199,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A carbon model
@@ -184,18 +228,5 @@ test_files:
 - features/support/env.rb
 - features/flight_committees.feature
 - features/flight_emissions.feature
-- lib/test_support/data_models/aircraft.rb
-- lib/test_support/data_models/aircraft_class.rb
-- lib/test_support/data_models/aircraft_manufacturer.rb
-- lib/test_support/data_models/airline.rb
-- lib/test_support/data_models/airport.rb
-- lib/test_support/data_models/flight_configuration.rb
-- lib/test_support/data_models/flight_distance_class.rb
-- lib/test_support/data_models/flight_domesticity.rb
-- lib/test_support/data_models/flight_fuel_type.rb
-- lib/test_support/data_models/flight_propulsion.rb
-- lib/test_support/data_models/flight_seat_class.rb
-- lib/test_support/data_models/flight_segment.rb
-- lib/test_support/data_models/flight_service.rb
 - lib/test_support/db/schema.rb
 - lib/test_support/flight_record.rb

data/lib/test_support/data_models/aircraft.rb

@@ -1,25 +0,0 @@
-class Aircraft < ActiveRecord::Base
-  set_table_name 'aircraft'
-  set_primary_key :icao_code
-  
-  belongs_to :aircraft_class, :foreign_key => 'brighter_planet_aircraft_class_code'
-  belongs_to :manufacturer,   :foreign_key => 'manufacturer_name',                  :class_name => 'AircraftManufacturer'
-  has_many   :segments,       :foreign_key => 'bts_aircraft_type_code',             :class_name => "FlightSegment", :primary_key => 'bts_aircraft_type_code'
-
-  falls_back_on :m3 =>                      lambda { weighted_average(:m3,             :weighted_by => [:segments, :passengers]) }, # 9.73423082858437e-08   r7110: 8.6540464368905e-8      r6972: 8.37e-8
-                :m2 =>                      lambda { weighted_average(:m2,             :weighted_by => [:segments, :passengers]) }, # -0.000134350543484608  r7110: -0.00015337661447817    r6972: -4.09e-5
-                :m1 =>                      lambda { weighted_average(:m1,             :weighted_by => [:segments, :passengers]) }, # 6.7728101555467        r7110: 4.7781966869412         r6972: 7.85
-                :endpoint_fuel =>           lambda { weighted_average(:endpoint_fuel,  :weighted_by => [:segments, :passengers]) }, # 1527.81790006167       r7110: 1065.3476555284         r6972: 1.72e3
-                :seats =>                   lambda { weighted_average(:seats,          :weighted_by => [:segments, :passengers]) } # 62.1741
-
-  class << self
-    def loose_search_columns
-      @_loose_search_columns ||= [primary_key, :manufacturer_name, :name]
-    end
-
-    # search by name
-    def loose_right_reader
-      @_loose_right_reader ||= lambda { |record| record[1,2].join ' ' }
-    end
-  end
-end

data/lib/test_support/data_models/aircraft_class.rb

@@ -1,6 +0,0 @@
-class AircraftClass < ActiveRecord::Base
-  set_primary_key :brighter_planet_aircraft_class_code
-  
-  has_many :aircraft, :foreign_key => 'brighter_planet_aircraft_class_code'
-#  has_many :airline_aircraft_seat_classes, :through => :aircraft
-end

data/lib/test_support/data_models/aircraft_manufacturer.rb

@@ -1,5 +0,0 @@
-class AircraftManufacturer < ActiveRecord::Base
-  set_primary_key :name
-  
-  has_many :aircraft, :foreign_key => 'manufacturer_name'
-end

data/lib/test_support/data_models/airline.rb

@@ -1,24 +0,0 @@
-class Airline < ActiveRecord::Base
-  set_primary_key :iata_code
-
-#  has_many :airline_aircraft, :class_name => 'AirlineAircraft'
-#  has_many :seat_classes, :class_name => 'AirlineSeatClass'
-  has_many :segments, :class_name => "FlightSegment", :foreign_key => 'airline_iata_code'
-#  has_many :airline_aircraft_seat_classes, :class_name => 'AirlineAircraftSeatClass'
-
-  
-  class << self
-    def loose_search_columns
-      @_loose_search_columns ||= [primary_key, :name]
-    end
-  
-    # search by name
-    def loose_right_reader
-      @_loose_right_reader ||= lambda { |record| record[1] }
-    end
-  end
-  
-  def all_flights_domestic?
-    !international?
-  end
-end

data/lib/test_support/data_models/airport.rb

@@ -1,52 +0,0 @@
-class Airport < ActiveRecord::Base
-  set_primary_key :iata_code
-
-  acts_as_mappable :default_units => :nms,
-                   :lat_column_name => :latitude,
-                   :lng_column_name => :longitude
-  
-  class << self
-    def loose_search_columns
-      @_loose_search_columns ||= [primary_key, :city]
-    end
-
-    # search by name
-    def loose_right_reader
-      @_loose_right_reader ||= lambda { |record| record[1] }
-    end
-  end
-  
-  def name_and_location
-    [ name.to_s.titleize, city, country.andand.name ].select(&:present?).join ', '
-  end
-  
-  # --------------------------------
-  # virtual has_many association
-  # has_many :segments won't work because there's no general way to specify the correct conditions
-  # even if you get clever with it, like
-  # has_many  :segments,
-  #           :class_name => 'FlightSegment',
-  #           :foreign_key => 'origin_airport_id',
-  #           :conditions => 'flight_segments.destination_airport_id = #{id}'
-  # you get queries like "`flight_segments`.origin_airport_id = 3654 AND (flight_segments.destination_airport_id = 3654))"
-  # in which you notice the AND which must be an OR
-  # and you can't just do finder_sql, because that breaks any other :select
-  def segments
-    FlightSegment.scoped :conditions => ['origin_airport_id = ? OR destination_airport_id = ?', id, id]
-  end
-  # --------------------------------
-  
-  belongs_to :country, :foreign_key => 'country_iso_3166_code'
-
-  def all_flights_from_here_domestic?
-    !international_origin?
-  end
-
-  def all_flights_to_here_domestic?
-    !international_destination?
-  end
-  
-  def united_states?
-    country == Country.united_states
-  end
-end

data/lib/test_support/data_models/flight_configuration.rb

@@ -1,3 +0,0 @@
-class FlightConfiguration < ActiveRecord::Base
-  set_primary_key :name
-end

data/lib/test_support/data_models/flight_distance_class.rb

@@ -1,3 +0,0 @@
-class FlightDistanceClass < ActiveRecord::Base
-  set_primary_key :name
-end

data/lib/test_support/data_models/flight_domesticity.rb

@@ -1,3 +0,0 @@
-class FlightDomesticity < ActiveRecord::Base
-  set_primary_key :name
-end

data/lib/test_support/data_models/flight_fuel_type.rb

@@ -1,6 +0,0 @@
-class FlightFuelType < ActiveRecord::Base
-  # this fallback is jet fuel
-  falls_back_on :emission_factor =>           (21.09.pounds.to(:kilograms) / 1.gallons.to(:litres)),  # in pounds CO2/gallon fuel: http://www.eia.doe.gov/oiaf/1605/excel/Fuel%20Emission%20Factors.xls
-                :radiative_forcing_index =>   2,                                                      # from Matt
-                :density =>                   3.057                                                   # kg / gal
-end

data/lib/test_support/data_models/flight_propulsion.rb

@@ -1,3 +0,0 @@
-class FlightPropulsion < ActiveRecord::Base
-  set_primary_key :name
-end

data/lib/test_support/data_models/flight_seat_class.rb

@@ -1,8 +0,0 @@
-class FlightSeatClass < ActiveRecord::Base
-  set_primary_key :name
-#  has_many :airline_seat_classes, :class_name => 'AirlineSeatClass'
-#  has_many :aircraft_seat_classes, :class_name => 'AircraftSeatClass'
-#  has_many :airline_aircraft_seat_classes, :class_name => 'AirlineAircraftSeatClass'
-  
-  falls_back_on :multiplier => 1
-end

data/lib/test_support/data_models/flight_segment.rb

@@ -1,30 +0,0 @@
-class FlightSegment < ActiveRecord::Base
-  set_primary_key :row_hash
-  
-  extend CohortScope
-  self.minimum_cohort_size = 5 #FIXME ??
-  
-  belongs_to :airline,             :foreign_key => 'airline_iata_code'
-  belongs_to :origin_airport,      :foreign_key => "origin_airport_iata_code",     :class_name => 'Airport'
-  belongs_to :destination_airport, :foreign_key => "dest_airport_iata_code",       :class_name => 'Airport'
-  belongs_to :origin_country,      :foreign_key => 'origin_country_iso_3166_code', :class_name => 'Country'
-  belongs_to :destination_country, :foreign_key => 'dest_country_iso_3166_code',   :class_name => 'Country'
-  belongs_to :aircraft,            :foreign_key => 'bts_aircraft_type_code',                                              :primary_key => 'bts_aircraft_type_code'
-  belongs_to :propulsion,                                                          :class_name => 'FlightPropulsion'
-  belongs_to :configuration,                                                       :class_name => 'FlightConfiguration'
-  belongs_to :service_class,                                                       :class_name => 'FlightService'
-  belongs_to :domesticity,                                                         :class_name => 'FlightDomesticity'
-  
-  falls_back_on :load_factor =>   lambda { weighted_average(:load_factor,   :weighted_by => :passengers) }, # 0.78222911236768
-                :freight_share => lambda { weighted_average(:freight_share, :weighted_by => :passengers) },  # 0.024017329363736
-                :seats => lambda { weighted_average :seats, :weighted_by => :passengers }
-
-  INPUT_CHARACTERISTICS = [
-    :origin_airport,
-    :destination_airport,
-    :aircraft,
-    :airline,
-    :propulsion,
-    :domesticity
-  ]
-end

data/lib/test_support/data_models/flight_service.rb

@@ -1,3 +0,0 @@
-class FlightService < ActiveRecord::Base
-  set_primary_key :name
-end