earth 0.11.10 → 0.11.11

data/vendor/geokit-rails/init.rb

@@ -1 +1,2 @@
-require 'geokit-rails'
+# rather than unvendor this, let's try to get rid of the acts_as_mappable dependency (?)
+require File.expand_path('../lib/geokit-rails', __FILE__)

data/vendor/geokit-rails/lib/geokit-rails.rb

@@ -7,6 +7,7 @@
 #
 require 'geokit'
 if defined? Geokit
+  # rather than unvendor this, let's try to get rid of the acts_as_mappable dependency (?)
   require File.expand_path('../geokit-rails/defaults', __FILE__)
   require File.expand_path('../geokit-rails/adapters/abstract', __FILE__)
   require File.expand_path('../geokit-rails/acts_as_mappable', __FILE__)

metadata

@@ -2,7 +2,7 @@
 name: earth
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.11.10
+  version: 0.11.11
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -12,21 +12,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-26 00:00:00 Z
+date: 2012-02-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: data_miner
+  name: activerecord
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "1.3"
+        version: "0"
   type: :runtime
   prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: to_regexp
+  name: activesupport
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -48,24 +48,24 @@ dependencies:
   prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: table_warnings
+  name: conversions
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.0.6
+        version: "0"
   type: :runtime
   prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: remote_table
+  name: data_miner
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.3.0
+        version: "1.3"
   type: :runtime
   prerelease: false
   version_requirements: *id005
@@ -92,62 +92,62 @@ dependencies:
   prerelease: false
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: geokit
+  name: fuzzy_match
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: fuzzy_match
+  name: geokit
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.1.0
+        version: "0"
   type: :runtime
   prerelease: false
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: weighted_average
+  name: mini_record-compat
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.2
+        version: "0"
   type: :runtime
   prerelease: false
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: mini_record-compat
+  name: remote_table
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: table_warnings
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.0.6
   type: :runtime
   prerelease: false
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
-  name: activerecord
+  name: to_regexp
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -158,14 +158,14 @@ dependencies:
   prerelease: false
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: weighted_average
   requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
+        version: 1.0.2
+  type: :runtime
   prerelease: false
   version_requirements: *id014
 - !ruby/object:Gem::Dependency 
@@ -180,7 +180,7 @@ dependencies:
   prerelease: false
   version_requirements: *id015
 - !ruby/object:Gem::Dependency 
-  name: cucumber
+  name: bundler
   requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -191,7 +191,7 @@ dependencies:
   prerelease: false
   version_requirements: *id016
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: charisma
   requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -202,7 +202,7 @@ dependencies:
   prerelease: false
   version_requirements: *id017
 - !ruby/object:Gem::Dependency 
-  name: rdoc
+  name: cucumber
   requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -213,7 +213,7 @@ dependencies:
   prerelease: false
   version_requirements: *id018
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: mysql
   requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -224,7 +224,7 @@ dependencies:
   prerelease: false
   version_requirements: *id019
 - !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
+  name: pg
   requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -235,7 +235,7 @@ dependencies:
   prerelease: false
   version_requirements: *id020
 - !ruby/object:Gem::Dependency 
-  name: mysql
+  name: rake
   requirement: &id021 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -246,7 +246,7 @@ dependencies:
   prerelease: false
   version_requirements: *id021
 - !ruby/object:Gem::Dependency 
-  name: pg
+  name: rdoc
   requirement: &id022 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -256,6 +256,28 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: *id022
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id023 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id023
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
+  requirement: &id024 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id024
 description: An earth-simulation environment with ActiveRecord models and data
 email: andy@rossmeissl.net
 executables: 
@@ -270,6 +292,7 @@ files:
 - .document
 - .gitignore
 - Gemfile
+- Guardfile
 - LICENSE
 - LICENSE-PREAMBLE
 - README.markdown
@@ -464,8 +487,6 @@ files:
 - lib/earth/hospitality/data_miner.rb
 - lib/earth/hospitality/lodging_class.rb
 - lib/earth/hospitality/lodging_class/data_miner.rb
-- lib/earth/hospitality/lodging_fuel_use_equation.rb
-- lib/earth/hospitality/lodging_fuel_use_equation/data_miner.rb
 - lib/earth/hospitality/lodging_property.rb
 - lib/earth/industry.rb
 - lib/earth/industry/cbecs_energy_intensity.rb
@@ -581,13 +602,16 @@ files:
 - spec/earth/bus/bus_class_spec.rb
 - spec/earth/bus/bus_fuel_control_spec.rb
 - spec/earth/bus/bus_fuel_year_control_spec.rb
+- spec/earth/fuel/fuel_spec.rb
+- spec/earth/hospitality/lodging_fuel_use_equation_spec.rb
+- spec/earth/industry/cbecs_energy_intensity_spec.rb
 - spec/earth/industry/mecs_energy_spec.rb
 - spec/earth/industry/mecs_ratio_spec.rb
 - spec/earth/locality/country_spec.rb
 - spec/earth/pet/species_spec.rb
 - spec/earth_spec.rb
 - spec/spec_helper.rb
-- test/test_aircraft_match.rb
+- spec/support/integration.rb
 - vendor/clean_find_in_batches/init.rb
 - vendor/geokit-rails/.gitignore
 - vendor/geokit-rails/CHANGELOG.rdoc
@@ -646,7 +670,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1670776732781702788
+      hash: -3928360334256672535
       segments: 
       - 0
       version: "0"
@@ -655,7 +679,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1670776732781702788
+      hash: -3928360334256672535
       segments: 
       - 0
       version: "0"
@@ -755,10 +779,13 @@ test_files:
 - spec/earth/bus/bus_class_spec.rb
 - spec/earth/bus/bus_fuel_control_spec.rb
 - spec/earth/bus/bus_fuel_year_control_spec.rb
+- spec/earth/fuel/fuel_spec.rb
+- spec/earth/hospitality/lodging_fuel_use_equation_spec.rb
+- spec/earth/industry/cbecs_energy_intensity_spec.rb
 - spec/earth/industry/mecs_energy_spec.rb
 - spec/earth/industry/mecs_ratio_spec.rb
 - spec/earth/locality/country_spec.rb
 - spec/earth/pet/species_spec.rb
 - spec/earth_spec.rb
 - spec/spec_helper.rb
-- test/test_aircraft_match.rb
+- spec/support/integration.rb

data/lib/earth/hospitality/lodging_fuel_use_equation.rb

@@ -1,26 +0,0 @@
-class LodgingFuelUseEquation < ActiveRecord::Base
-  set_primary_key :name
-  
-  def self.find_by_criteria(fuel, criteria)
-    first :conditions => {
-      :fuel => fuel,
-      :climate_zone_number => (criteria[:climate_zone_number].present? ? criteria[:climate_zone_number].value : nil),
-      :property_rooms => (criteria[:property_rooms].present? ? 1 : 0),
-      :construction_year => (criteria[:property_construction_year].present? ? 1 : 0)
-    }
-  end
-  
-  col :name
-  col :regression
-  col :fuel
-  col :climate_zone_number, :type => :integer
-  col :property_rooms,      :type => :boolean
-  col :construction_year,   :type => :boolean
-  col :rooms_factor,        :type => :float
-  col :year_factor,         :type => :float
-  col :constant,            :type => :float
-  col :units
-  col :oil_share,           :type => :float
-  col :gas_share,           :type => :float
-  col :steam_share,         :type => :float
-end

data/lib/earth/hospitality/lodging_fuel_use_equation/data_miner.rb

@@ -1,20 +0,0 @@
-LodgingFuelUseEquation.class_eval do
-  data_miner do
-    import "fuel use equations derived from CBECS 2003",
-           :url => 'https://docs.google.com/spreadsheet/pub?key=0AoQJbWqPrREqdGN0X2l3RjFaRTBFRWdseWJoc0ZvZkE&output=csv' do
-      key 'name'
-      store 'regression'
-      store 'fuel'
-      store 'climate_zone_number', :nullify => true
-      store 'property_rooms'
-      store 'construction_year'
-      store 'rooms_factor'
-      store 'year_factor'
-      store 'constant'
-      store 'units'
-      store 'oil_share'
-      store 'gas_share'
-      store 'steam_share'
-    end
-  end
-end

data/test/test_aircraft_match.rb

@@ -1,732 +0,0 @@
-class TestAircraftMatch < Test::Unit::TestCase
-  def test_014_user_input_matches_icao_codes
-    user_input = "Boeing 727-100RE"
-    assert_equal ["R721"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_015_user_input_matches_icao_codes
-    user_input = "Boeing 727 200RE"
-    assert_equal ["R722"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_006_user_input_matches_icao_codes
-    user_input = "Boeing 747400 domestic"
-    assert_equal ["B74D"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_006_user_input_matches_icao_codes
-    user_input = "Boeing 777-200lr"
-    assert_equal ["B77L"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_006_user_input_matches_icao_codes
-    user_input = "Boeing 707-100"
-    assert_equal ["B701"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_006_user_input_matches_icao_codes
-    user_input = "Boeing 707-200"
-    assert_equal ["B701", "B703"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_006_user_input_matches_icao_codes
-    user_input = "Boeing 717-200"
-    assert_equal ["B712"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_006_user_input_matches_icao_codes
-    user_input = "Boeing 717-100"
-    assert_equal ["B712"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_006_user_input_matches_icao_codes
-    user_input = "Boeing 727-100"
-    assert_equal ["B721"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_006_user_input_matches_icao_codes
-    user_input = "Boeing 727-300"
-    assert_equal ["B721", "B722"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_006_user_input_matches_icao_codes
-    user_input = "Boeing 737-900"
-    assert_equal ["B739"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_002_user_input_matches_icao_codes
-    user_input = "Boeing 747-100"
-    assert_equal ["B741"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_002_user_input_matches_icao_codes
-    user_input = "Boeing 747-500"
-    assert_equal ["B741", "B742", "B743", "B744", "B74D", "B74R", "B74S"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "Boeing 757-200"
-    assert_equal ["B752"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "Boeing 757-100"
-    assert_equal ["B752", "B753"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "Boeing 767-200"
-    assert_equal ["B762"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "Boeing 767-100"
-    assert_equal ["B762", "B763", "B764"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "Boeing 777-200"
-    assert_equal ["B772", "B77L"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "Boeing 777-100"
-    assert_equal ["B772", "B773", "B77L"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "Boeing 727 Stage 3"
-    assert_equal ["B72Q"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "Boeing 737 Stage 3"
-    assert_equal ["B73Q"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "Boeing 737 Stage 4"
-    assert_equal ["B731", "B732", "B733", "B734", "B735", "B736", "B737", "B738", "B739", "B73Q"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "Boeing 747SP"
-    assert_equal ["B74S"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "Boeing 747 SR"
-    assert_equal ["B74R"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "Boeing 747SCA"
-    assert_equal ["BSCA"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "Boeing 747S"
-    assert_equal ["B741", "B742", "B743", "B744", "B74D", "B74R", "B74S"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "Boeing 720"
-    assert_equal ["B720"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "Boeing 707"
-    assert_equal ["B701", "B703"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "Boeing 787"
-    assert_equal [], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "Airbus A300600"
-    assert_equal ["A306"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "Airbus A300 100"
-    assert_equal ["A306", "A30B"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "Airbus A300-600st"
-    assert_equal ["A3ST"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "Airbus Beluga"
-    assert_equal ["A3ST"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "Airbus A330-200"
-    assert_equal ["A332"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "Airbus A330-100"
-    assert_equal ["A332", "A333"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "Airbus A340-200"
-    assert_equal ["A342"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "Airbus A340-100"
-    assert_equal ["A342", "A343", "A345", "A346"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "Airbus A380-800"
-    assert_equal ["A388"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "Airbus A380-100"
-    assert_equal ["A388"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "Airbus A300C"
-    assert_equal ["A30B"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "Airbus A300X"
-    assert_equal ["A306", "A30B"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "Airbus A318"
-    assert_equal ["A318"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "Airbus A311"
-    assert_equal [], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "Airbus A321"
-    assert_equal ["A321"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "Airbus A322"
-    assert_equal [], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "Airbus A350"
-    assert_equal [], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "Canadair CL601"
-    assert_equal ["CL60"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "Canadair CL215"
-    assert_equal ["CL2P"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "Canadair CL215 turbine"
-    assert_equal ["CL2T"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "Canadair CL44O"
-    assert_equal ["CL4G"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "Canadair CRJ440"
-    assert_equal ["CRJ2"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "Canadair CRJ111"
-    assert_equal ["CRJ1"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "Embraer ERJ130"
-    assert_equal ["E135"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "Embraer ERJ145XR"
-    assert_equal ["E45X"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "Embraer EMB110"
-    assert_equal ["E110"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "Embraer Bandeirante"
-    assert_equal ["E110"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "Embraer EMB120"
-    assert_equal ["E120"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "Embraer Brasilia"
-    assert_equal ["E120"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "Embraer EMB121"
-    assert_equal ["E121"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "Embraer Xingu"
-    assert_equal ["E121"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "Embraer EMB201"
-    assert_equal ["IPAN"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "Embraer Ipanema"
-    assert_equal ["IPAN"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "McDonnell Douglas DC3"
-    assert_equal ["DC3", "DC3S"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "McDonnell Douglas DC3S"
-    assert_equal ["DC3S"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "McDonnell Douglas DC8-50"
-    assert_equal ["DC85"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "McDonnell Douglas DC8-40"
-    assert_equal ["DC85", "DC86", "DC87", "DC8Q"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "McDonnell Douglas DC8 Stage 3"
-    assert_equal ["DC8Q"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "McDonnell Douglas DC9-10"
-    assert_equal ["DC91"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "McDonnell Douglas DC9-60"
-    assert_equal ["DC91", "DC92", "DC93", "DC94", "DC95", "DC9Q"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "McDonnell Douglas DC9 Stage 3"
-    assert_equal ["DC9Q"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "McDonnell Douglas DC10-10"
-    assert_equal ["DC10"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "McDonnell Douglas DC4"
-    assert_equal ["DC4"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "McDonnell Douglas DC5"
-    assert_equal [], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "McDonnell Douglas MD81"
-    assert_equal ["MD81"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "McDonnell Douglas MD84"
-    assert_equal ["MD81", "MD82", "MD83", "MD87", "MD88"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "McDonnell Douglas MD11"
-    assert_equal ["MD11"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "McDonnell Douglas MD90"
-    assert_equal ["MD90"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "McDonnell Douglas C133"
-    assert_equal ["C133"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "McDonnell Douglas Cargomaster"
-    assert_equal ["C133"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "de Havilland DHC8-100"
-    assert_equal ["DH8A"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "de Havilland DHC8-500"
-    assert_equal ["DH8A", "DH8B", "DH8C", "DH8D"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "de Havilland DHC1"
-    assert_equal ["DHC1"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "de Havilland Chipmunk"
-    assert_equal ["DHC1"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "de Havilland DHC2 mk1"
-    assert_equal ["DHC2"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "de Havilland DHC2 mk3"
-    assert_equal ["DH2T"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "de Havilland Beaver"
-    assert_equal ["DHC2"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "de Havilland Turbo Beaver"
-    assert_equal ["DH2T"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "de Havilland DHC2"
-    assert_equal ["DHC2", "DH2T"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "de Havilland DHC3"
-    assert_equal ["DHC3", "DH3T"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "de Havilland Otter"
-    assert_equal ["DHC3"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "de Havilland Turbo Otter"
-    assert_equal ["DH3T"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "de Havilland DHC4"
-    assert_equal ["DHC4"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "de Havilland Caribou"
-    assert_equal ["DHC4"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "de Havilland DHC5"
-    assert_equal ["DHC5"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "de Havilland Buffalo"
-    assert_equal ["DHC5"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "de Havilland DHC6"
-    assert_equal ["DHC6"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "de Havilland Twin"
-    assert_equal ["DHC6"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "de Havilland DHC7"
-    assert_equal ["DHC7"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "de Havilland Dash 7"
-    assert_equal ["DHC7"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "aerospatiale atr42"
-    assert_equal ["AT43", "AT44", "AT45"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "aerospatiale atr72"
-    assert_equal ["AT72"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "bae bae 146 100"
-    assert_equal ["B461"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "bae bae146-400"
-    assert_equal ["B461", "B462", "B463"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "bae jetstream 32"
-    assert_equal ["JS32"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "bae jetstream super 31"
-    assert_equal ["JS32"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "bae jetstream 31"
-    assert_equal ["JS31"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "bae jetstream 41"
-    assert_equal ["JS41"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "bae atp"
-    assert_equal ["atp"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "bae bac one-eleven"
-    assert_equal ["BA11"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "bae bac111"
-    assert_equal ["BA11"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "bae bae125-1000"
-    assert_equal ["H25C"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "bae bae125-70"
-    assert_equal ["H25B"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "bae bae125-75"
-    assert_equal ["H25B"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "bae bae125-80"
-    assert_equal ["H25B"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "bae bae125-85"
-    assert_equal ["H25B"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "bae bae125-90"
-    assert_equal ["H25B"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "bae bae125-95"
-    assert_equal [], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "bae bae125"
-    assert_equal [], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "fokker 50"
-    assert_equal ["F50"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "fokker 61"
-    assert_equal ["F60"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "fokker 72"
-    assert_equal ["F70"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "fokker 103"
-    assert_equal ["F100"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "fokker 80"
-    assert_equal [], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "fokker F27"
-    assert_equal ["F27"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "fokker Friendship"
-    assert_equal ["F27"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "fokker F28"
-    assert_equal ["F28"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "fokker Fellowship"
-    assert_equal ["F28"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "fokker super"
-    assert_equal ["SUNV"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "saab 2000"
-    assert_equal ["SB20"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "saab 340"
-    assert_equal ["SF34"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "saab 91"
-    assert_equal ["SB91"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "saab safir"
-    assert_equal ["SB91"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "hawker beechcraft 1900"
-    assert_equal ["B190"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "cessna 401"
-    assert_equal ["C402"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "cessna 402"
-    assert_equal ["C402"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "cessna 208"
-    assert_equal ["C208"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "cessna caravan"
-    assert_equal ["C208"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "cessna cargomaster"
-    assert_equal ["C208"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  def test_003_user_input_matches_icao_codes
-    user_input = "cessna grand caravan"
-    assert_equal ["C208"], Aircraft.fuzzy_match.find_all(user_input).map(&:icao_code)
-  end
-  
-  
-  
-  # def test_001_flight_segments_match_icao_codes
-  #   flight_segment_bts_aircraft_type_description = 'BOEING 747-100' # aka type 816
-  #   assert_equal %w{ B741 B742 B743 B744 B74D B74R B74S }, Aircraft.fuzzy_match(flight_segment_bts_aircraft_type_description).map(&:icao_code)
-  # end
-  # 
-  # def test_003_user_input_matches_flight_segments
-  #   user_input = '747'
-  #   aircraft_suggested_by_user_input = Aircraft.fuzzy_match(user_input)
-  # 
-  #   # this is why the following query should work...
-  #   # FlightSegment.cohort(:aircraft => [ B731, B732 ])
-  #   # FlightSegment => FuzzyAircraftMatch <= Aircraft
-  #   # select * from flight_segments
-  #   # inner join
-  #   # fuzzy_aircraft_matches on
-  #   # flight_segments.aircraft_description = fuzzy_aircraft_matches.bbb # FlightSegment.has_many :aircraft [...] :foreign_key => :bbb
-  #   # where
-  #   # fuzzy_aircraft_matches.aaa in ('B731', 'B732') # Aircraft.has_many :aircraft [...] :foreign_key => :aaa
-  #   
-  #   assert_equal [...flight segments...], FlightSegment.cohort(:aircraft => aircraft_suggested_by_user_input)
-  # end
-  # 
-  # def test_004_user_input_matches_fuel_use_equations
-  #   user_input = '747'
-  #   aircraft_suggested_by_user_input = Aircraft.fuzzy_match(user_input)
-  # 
-  #   # see above for why this would work
-  #   # ...
-  #   # fuel_use_equations.aircraft_description = fuzzy_aircraft_matches.bbb # FuelUseEquation.has_many :aircraft [...] :foreign_key => :bbb
-  #   # ...
-  # 
-  #   assert_equal [...flight segments...], FuelUseEquation.cohort(:aircraft => aircraft_suggested_by_user_input)
-  # end
-end