earth 0.11.16 → 0.11.17

Sign up to get free protection for your applications and to get access to all the features.
Files changed (115) hide show
  1. data/CHANGELOG +15 -0
  2. data/Gemfile +2 -2
  3. data/bin/earth_tester.rb +3 -1
  4. data/earth.gemspec +4 -8
  5. data/errata/aircraft/faa_errata.csv +375 -0
  6. data/errata/airport/openflights_errata.csv +1 -0
  7. data/errata/automobile_make_model_year_variant/feg_errata.csv +283 -0
  8. data/errata/automobile_make_year_fleet/cafe_errata.csv +1 -0
  9. data/errata/bts_aircraft/bts_errata.csv +68 -0
  10. data/errata/country/wri_errata.csv +25 -0
  11. data/errata/flight_segment/bts_errata.csv +1 -0
  12. data/errata/readme +3 -0
  13. data/features/step_definitions/data_steps.rb +1 -1
  14. data/lib/earth.rb +40 -75
  15. data/lib/earth/air/aircraft.rb +3 -1
  16. data/lib/earth/air/aircraft/data_miner.rb +2 -2
  17. data/lib/earth/air/airport.rb +1 -1
  18. data/lib/earth/air/airport/data_miner.rb +12 -32
  19. data/lib/earth/air/bts_aircraft/data_miner.rb +1 -1
  20. data/lib/earth/air/flight_segment/data_miner.rb +6 -7
  21. data/lib/earth/automobile/automobile_make_model_year/data_miner.rb +1 -1
  22. data/lib/earth/automobile/automobile_make_model_year_variant/data_miner.rb +21 -42
  23. data/lib/earth/automobile/automobile_make_year_fleet/data_miner.rb +4 -4
  24. data/lib/earth/automobile/automobile_type_fuel_year/data_miner.rb +8 -8
  25. data/lib/earth/automobile/automobile_type_fuel_year_age/data_miner.rb +24 -24
  26. data/lib/earth/fuel/fuel/data_miner.rb +2 -2
  27. data/lib/earth/fuel/fuel_price/data_miner.rb +1 -1
  28. data/lib/earth/industry/cbecs_energy_intensity/data_miner.rb +1 -1
  29. data/lib/earth/industry/naics_2002_naics_2007_concordance/data_miner.rb +3 -3
  30. data/lib/earth/industry/naics_2002_sic_1987_concordance/data_miner.rb +4 -4
  31. data/lib/earth/industry/sic_1987/data_miner.rb +3 -3
  32. data/lib/earth/locality/census_region/data_miner.rb +1 -1
  33. data/lib/earth/locality/country/data_miner.rb +2 -2
  34. data/lib/earth/locality/egrid_region/data_miner.rb +1 -1
  35. data/lib/earth/locality/egrid_subregion/data_miner.rb +1 -1
  36. data/lib/earth/locality/state/data_miner.rb +2 -2
  37. data/lib/earth/locality/zip_code.rb +1 -1
  38. data/lib/earth/pet/breed/data_miner.rb +1 -1
  39. data/lib/earth/pet/breed_gender/data_miner.rb +2 -2
  40. data/lib/earth/pet/gender/data_miner.rb +1 -1
  41. data/lib/earth/rail/country_rail_class/data_miner.rb +1 -1
  42. data/lib/earth/rail/country_rail_traction/data_miner.rb +1 -1
  43. data/lib/earth/rail/country_rail_traction_class/data_miner.rb +1 -1
  44. data/lib/earth/rail/national_transit_database_record/data_miner.rb +3 -3
  45. data/lib/earth/residence/residence_fuel_price/data_miner.rb +5 -5
  46. data/lib/earth/residence/residential_energy_consumption_survey_response/data_miner.rb +9 -9
  47. data/lib/earth/version.rb +1 -1
  48. data/spec/earth/air/aircraft_spec.rb +11 -5
  49. data/spec/earth/air/airport_spec.rb +40 -0
  50. data/spec/earth/air/bts_aircraft_spec.rb +19 -0
  51. data/spec/earth/air/flight_segment_spec.rb +49 -0
  52. data/spec/earth/automobile/automobile_make_model_year_variant_spec.rb +55 -0
  53. data/spec/earth/automobile/automobile_make_year_fleet_spec.rb +37 -0
  54. data/spec/earth/locality/country_spec.rb +4 -0
  55. metadata +198 -172
  56. data/features/automobile_make_fleet_year.feature +0 -34
  57. data/features/automobile_make_model_year_variant.feature +0 -46
  58. data/features/support/imports/automobile_fuel_bad.csv +0 -3
  59. data/features/support/imports/automobile_fuel_good.csv +0 -3
  60. data/features/support/imports/automobile_make_bad.csv +0 -3
  61. data/features/support/imports/automobile_make_fleet_year_bad.csv +0 -2
  62. data/features/support/imports/automobile_make_fleet_year_good.csv +0 -2
  63. data/features/support/imports/automobile_make_good.csv +0 -3
  64. data/features/support/imports/automobile_make_model_bad.csv +0 -3
  65. data/features/support/imports/automobile_make_model_good.csv +0 -3
  66. data/features/support/imports/automobile_make_model_year_bad.csv +0 -3
  67. data/features/support/imports/automobile_make_model_year_good.csv +0 -3
  68. data/features/support/imports/automobile_make_model_year_variant_bad.csv +0 -3
  69. data/features/support/imports/automobile_make_model_year_variant_good.csv +0 -3
  70. data/features/support/imports/automobile_make_year_bad.csv +0 -3
  71. data/features/support/imports/automobile_make_year_good.csv +0 -3
  72. data/features/support/imports/automobile_size_class_bad.csv +0 -3
  73. data/features/support/imports/automobile_size_class_good.csv +0 -3
  74. data/features/support/imports/automobile_size_class_year_bad.csv +0 -2
  75. data/features/support/imports/automobile_size_class_year_good.csv +0 -2
  76. data/features/support/imports/automobile_type_fuel_age_bad.csv +0 -3
  77. data/features/support/imports/automobile_type_fuel_age_good.csv +0 -3
  78. data/features/support/imports/automobile_type_fuel_control_bad.csv +0 -3
  79. data/features/support/imports/automobile_type_fuel_control_good.csv +0 -3
  80. data/features/support/imports/automobile_type_fuel_year_age_bad.csv +0 -2
  81. data/features/support/imports/automobile_type_fuel_year_age_good.csv +0 -2
  82. data/features/support/imports/automobile_type_fuel_year_bad.csv +0 -2
  83. data/features/support/imports/automobile_type_fuel_year_control_bad.csv +0 -2
  84. data/features/support/imports/automobile_type_fuel_year_control_good.csv +0 -2
  85. data/features/support/imports/automobile_type_fuel_year_good.csv +0 -2
  86. data/features/support/imports/automobile_type_year_bad.csv +0 -2
  87. data/features/support/imports/automobile_type_year_good.csv +0 -2
  88. data/features/support/imports/bus_class_bad.csv +0 -2
  89. data/features/support/imports/bus_class_good.csv +0 -2
  90. data/features/support/imports/bus_fuel_bad.csv +0 -3
  91. data/features/support/imports/bus_fuel_good.csv +0 -3
  92. data/features/support/imports/carrier_bad.csv +0 -3
  93. data/features/support/imports/carrier_good.csv +0 -3
  94. data/features/support/imports/carrier_mode_bad.csv +0 -2
  95. data/features/support/imports/carrier_mode_good.csv +0 -2
  96. data/features/support/imports/computation_carrier_bad.csv +0 -3
  97. data/features/support/imports/computation_carrier_good.csv +0 -3
  98. data/features/support/imports/computation_carrier_instance_class_bad.csv +0 -2
  99. data/features/support/imports/computation_carrier_instance_class_good.csv +0 -2
  100. data/features/support/imports/egrid_region_bad.csv +0 -3
  101. data/features/support/imports/egrid_region_good.csv +0 -3
  102. data/features/support/imports/egrid_subregion_bad.csv +0 -2
  103. data/features/support/imports/egrid_subregion_good.csv +0 -2
  104. data/features/support/imports/fuel_year_bad.csv +0 -2
  105. data/features/support/imports/fuel_year_good.csv +0 -2
  106. data/features/support/imports/greenhouse_gas_bad.csv +0 -2
  107. data/features/support/imports/greenhouse_gas_good.csv +0 -2
  108. data/features/support/imports/rail_class_bad.csv +0 -3
  109. data/features/support/imports/rail_class_good.csv +0 -3
  110. data/features/support/imports/shipment_mode_bad.csv +0 -3
  111. data/features/support/imports/shipment_mode_good.csv +0 -3
  112. data/lib/earth/air/aircraft_instance.rb +0 -11
  113. data/lib/earth/air/aircraft_instance_seat_class.rb +0 -13
  114. data/lib/earth/hospitality/lodging_property.rb +0 -33
  115. data/vendor/clean_find_in_batches/init.rb +0 -35
@@ -0,0 +1 @@
1
+ date,name,email,type,section,action,x,y,condition,notes
@@ -0,0 +1,283 @@
1
+ date,name,email,type,section,action,x,y,condition,notes
2
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,meta,Intended use,,http://www.fueleconomy.gov/FEG/download.shtml
3
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,reject,/^AM GENERAL$/i,,,1985
4
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,reject,/^ASC INC/i,,,"1987, 1989, 1990"
5
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,reject,/^AURORA CARS/i,,,1988
6
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,reject,/^AUTOKRAFT/i,,,"1986, 1987"
7
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,reject,/^BILL DOVELL/i,,,1985
8
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,reject,/^CALLAWAY CARS/i,,,"1990, 1991"
9
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,reject,/^CCC ENGINEERING/i,,,"1987, 1988"
10
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,reject,/^CONSULIER INDUSTRIES/i,,,1990-1992
11
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,reject,/^E\. P\. DUTTON/i,,,1985
12
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,reject,/^ENVIRONMENTAL RSCH/i,,,1989
13
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,reject,/^EVANS AUTOMOBILES/i,,,1989-1991
14
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,reject,/^G&K AUTOMOTIVE/i,,,1991
15
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,reject,/^GENERAL MOTORS/i,,,1989
16
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,reject,/^GOLDACRE/i,,,1991
17
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,reject,/^GRUMMAN/i,,,"1985, 1988"
18
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,reject,/^ICI INTERNATIONAL/i,,,"1991, 1992"
19
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,reject,/^INTERNATIONAL MOTORS/i,,,1985
20
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,reject,/^J\.K\. MOTORS/i,,,1991
21
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,reject,/^JBA MOTORCARS/i,,,"1988, 1989, 1991"
22
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,reject,/^LAMBDA CONTROL SYSTEMS/i,,,1986
23
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,reject,/^LIPHARDT/i,,,1991
24
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,reject,/^MCEVOY/i,,,"1987, 1988"
25
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,reject,/^PAS/i,,,"1989, 1991-1993"
26
+ 11/19/2011,Ian Hough,ian@brighterplanet.com,technical,make,reject,/^QUANTUM/i,,,appears to be just chevy cavaliers
27
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,reject,/^RED SHIFT/i,,,"1987, 1988"
28
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,reject,/^ROUSH/i,,,"2002-2004, 2007-2010"
29
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,reject,/^RUF AUTOMOBILE/i,,,"1987, 1988"
30
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,reject,/^VIXEN MOTOR COMPANY/i,,,1986
31
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,reject,/^VOLGA ASSOCIATED/i,,,1986
32
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,reject,/^WALLACE ENVIRONMENTAL/i,,,"1991, 1992"
33
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,reject,/COACH/i,,,"1986, 1995"
34
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,reject,/IMPORT/i,,,"1988, 1989, 1991, 1992"
35
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,editorial,make,replace,/^AMERICAN MOTORS.*/i,Eagle,,1985-1987
36
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,editorial,make,replace,/^(AUSTIN )?ROVER.*/i,Land Rover,,"1987-1991, 1993-1996"
37
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,editorial,make,replace,/^BMW.*/i,Alpina,Model contains Alpina,2011
38
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,editorial,make,replace,/^CX ?AUTOMOTIVE.*/i,Citroën,,"1987-1989, 1991-1993"
39
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,editorial,make,replace,/^GM$/i,Chevrolet,,"2003, 2004"
40
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,replace,/^MERCEDES-BENZ$/i,Maybach,Model contains Maybach,2004-2010
41
+ 6/8/2011,Ian Hough,ian@brighterplanet.com,editorial,make,replace,/^MERCEDES-BENZ.*/i,Smart,Model contains Smart,"2008, 2010, 2011"
42
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,replace,/^ROLLS-ROYCE.*/i,Bentley,Model contains Bentley,1987-1997
43
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,replace,/^ROLLS-ROYCE.*/i,Bentley,Is a Turbo Brooklands,1995
44
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,editorial,make,replace,/^R-R MTR.+/i,Rolls-Royce,,1998-2002
45
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,editorial,make,replace,/^SHLBY$/i,Shelby,,2008
46
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,editorial,make,replace,/^SPYKR$/i,Spyker,,"2007, 2009"
47
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,editorial,make,replace,/^TCSTR$/i,Tecstar,,2008
48
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,editorial,make,replace,/^VEHICLE PRODUCTION GROUP.*/i,VPG,,2011
49
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,editorial,make,replace,/^VW$/,Volkswagen,,2009
50
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Acura
51
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Alfa Romeo
52
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Alpina
53
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Aston Martin
54
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Audi
55
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Bentley
56
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Bertone
57
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Bitter
58
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Bugatti
59
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Buick
60
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Cadillac
61
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Chevrolet
62
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Chrysler
63
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Daewoo
64
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Daihatsu
65
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Dodge
66
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Eagle
67
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Excalibur
68
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Ferrari
69
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Ford
70
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Geo
71
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Honda
72
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Hummer
73
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Hyundai
74
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Impco
75
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Infiniti
76
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Isuzu
77
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Jaguar
78
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Jeep
79
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Kia
80
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Laforza
81
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Lamborghini
82
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Land Rover
83
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Lexus
84
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Lincoln-Mercury,,,must precede replace on 'Lincoln'
85
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,replace,/^lincoln .+/i,Lincoln
86
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Lotus
87
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,technical,make,truncate,Mahindra
88
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Maserati
89
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Mazda
90
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Mercedes-Benz
91
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Mercury
92
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Merkur
93
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Mini
94
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Mitsubishi
95
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Morgan
96
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Nissan
97
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Oldsmobile
98
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Panoz
99
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Panther
100
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Peugeot
101
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Pininfarina
102
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Plymouth
103
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Pontiac
104
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Porsche
105
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Qvale
106
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Renault
107
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Rolls-Royce
108
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Saab
109
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Saleen
110
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Saturn
111
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,technical,make,truncate,Scion
112
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Shelby
113
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Subaru
114
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Suzuki
115
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,TVR
116
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Toyota
117
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Vector
118
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Volkswagen
119
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Volvo
120
+ 7/8/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,make,truncate,Yugo
121
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,model,reject,/KIT$/i,,,"porsche 2003-2005, 2010"
122
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,model,reject,/NATIVA/i,,,"mitsubishi 1998-2000, 2002-2004"
123
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,model,replace,/ - /,,,clean -: ' - ' -> ' '
124
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,model,replace,/ \/ /,/,,clean /: ' / ' -> '/'
125
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,technical,model,replace,/\/ /,,,clean /: '/ ' -> ' '
126
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,model,delete,/( +)?\((F|R|A|2|4)WD\)/i,,,clean drive: '(4wd)' etc.
127
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,model,delete,/( +|-)?(F|R|A|2|4)WD/i,,,clean drive: ' 4wd' etc.
128
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,model,delete,/ all wheel dri(ve)?$/i,,,clean drive: ' all wheel drive' etc.
129
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,model,delete,/ 2W$/,,,clean drive: terminal ' 2W'
130
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,technical,model,delete,/ 4x(4|2)/i,,,clean drive: '4x4' and '4x2'
131
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,model,delete,/( |-)\(?4matic\)?/i,,,clean drive: '4matic' (mercedes 4wd)
132
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,technical,model,delete,/ \(new version\)/i,,,clean (): cut '(new version)'
133
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,technical,model,delete,/ \(new v$/i,,,clean (): cut terminal '(new v'
134
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,model,delete,/ \(incl\. outback\)/i,,,clean (): cut '(incl. outback)'
135
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,technical,model,replace,/ ?\((.+)\)/i, \1,,clean (): cut keeping interior text
136
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,technical,model,replace,/(\d)-?dr/i,\1-DOOR,,clean doors: 'x-dr' -> 'x-DOOR'
137
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,technical,model,replace,/(\d) door/i,\1-DOOR,,clean doors: 'x door' -> 'x-DOOR'
138
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,technical,model,replace,/2d hatchback/i,2-DOOR HATCHBACK,,clean doors: '2d' -> '2-DOOR'
139
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,technical,model,replace,/conv cargo$/i,CARGO CONVERSION,,clean conv
140
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,technical,model,replace,/cargo conv$/i,CARGO CONVERSION,,clean conv
141
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,technical,model,replace,/van conv$/i,VAN CONVERSION,,clean conv
142
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,model,replace,/conv$/i,CONVERTIBLE,,clean conv
143
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,model,replace,/conv(ert)?\./i,CONVERTIBLE,,clean conv
144
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,model,replace,/conv\//i,CONVERTIBLE/,,clean conv
145
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,technical,model,replace,/ pass(e)?(n)?$/i, PASSENGER,,clean pass
146
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,technical,model,replace,/ pass /i, PASSENGER ,,clean pass
147
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,model,replace,/ turb$/i, TURBO,,clean turbo
148
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,model,replace,/soft( -)top/i,SOFTTOP,,clean softtop
149
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,model,delete,/ (turbo)?diesel$/i,,,clean fuel
150
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,technical,model,delete,/ natural gas$/i,,,clean fuel
151
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,model,delete,/ ffv/i,,,clean fuel
152
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,model,delete,/ inc$/i,,,delete terminal ' inc'
153
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,model,delete,/^alfa romeo /i,,,clean up alfa romeo
154
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,model,replace,/^GTV6 2.5$/i,GTV,,clean up alfa romeo
155
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,technical,model,delete,/^(bmw( |\/))?alpina /i,,is a alpina,clean up alpina
156
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,model,delete,/^aston martin /i,,,clean up aston martin
157
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,technical,model,delete,/ manual$/i,,,clean up aston martin
158
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,technical,model,replace,/^db-7/i,DB7,,clean up aston martin
159
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,technical,model,delete,/bentley /i,,is a bentley,clean up bentley
160
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,model,delete,/& /i,,is a bentley,clean up bentley
161
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,technical,model,replace,/br?kln?ds/i,BROOKLANDS,,clean up bentley
162
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,technical,model,replace,/^cont supersports/i,CONTINENTAL SUPERSPORTS,,clean up bentley
163
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,model,replace,/s&s\(l$/i,LWB,,clean up bentley
164
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,editorial,model,replace,/limo$/i,LIMOUSINE,,clean up bentley
165
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,technical,model,delete,/^bertone /i,,,clean up bertone
166
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,technical,model,delete,/^bitter /i,,,clean up bitter
167
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,technical,model,delete,/^bmw /i,,,clean up bmw
168
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,model,replace,"/, /i",/,,clean up bmw
169
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,technical,model,delete,/^cadillac /i,,,clean up cadillac
170
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,technical,model,delete,/^chevrolet /i,,,clean up chevrolet
171
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,technical,model,delete,/chevy /i,,is a chevrolet,clean up chevrolet
172
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,technical,model,replace,/25chev van/i,25 VAN,is a chevrolet,clean up chevrolet
173
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,model,replace,/15slvradoclassichybrid/i,15 SILVERADO CLASSIC HYBRID,,clean up chevrolet
174
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,technical,model,replace,/slvrd$/i,SILVERADO,,clean up chevrolet
175
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,model,replace,/montecarlo/i,MONTE CARLO,,clean up chevrolet
176
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,model,replace,/postal\*cab\*chassis.*/i,POSTAL CAB CHASSIS,,clean up chevrolet
177
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,technical,model,replace,/suburbn/i,SUBURBAN,,clean up chevrolet
178
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,technical,model,replace,/^g1500\/g2500/i,G1500/2500,,clean up chevrolet
179
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,technical,model,delete,/^chrysler /i,,,clean up chrysler
180
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,model,replace,/impe$/i,IMPERIAL,,clean up chrysler
181
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,model,replace,/5th/i,FIFTH,,clean up chrysler
182
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,model,replace,/town and country/i,TOWN & COUNTRY,,clean up chrysler
183
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,model,replace,/town&c(oun)?try/i,TOWN & COUNTRY,,clean up chrysler
184
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,model,delete,/^daewoo /i,,,clean up daewoo
185
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,model,delete,/ ?dodge ?/i,,is a dodge,clean up dodge
186
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,model,replace,/p\/u/i,PICKUP,is a dodge,clean up dodge
187
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,model,replace,/ram50/i,RAM 50,is a dodge,clean up dodge
188
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,technical,model,delete,/^eagle /i,,,clean up eagle
189
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,technical,model,delete,/^renault /i,,,clean up eagle
190
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,technical,model,delete,/ ?ferrari ?/i,,is a ferrari,clean up ferrari
191
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,technical,model,replace,/f 40/i,F40,is a ferrari,clean up ferrari
192
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,model,replace,/^599 GTB$/,599 GTB Fiorano,,clean up ferrari
193
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,technical,model,delete,/^ford /i,,,clean up ford
194
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,technical,model,replace,/^escape hev$/i,ESCAPE HYBRID,,clean up ford
195
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,technical,model,replace,/chassis cab/i,CAB CHASSIS,,clean up ford
196
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,editorial,model,replace,/station wag$/i,STATION WAGON,,clean up ford
197
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,model,replace,/^F(1|2)50$/,F\150 PICKUP,,clean up ford
198
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,model,replace,/^taurus wagon.+$/i,TAURUS WAGON,,clean up ford
199
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,model,replace,/15sierraclassichybrid/i,15 SIERRA CLASSIC HYBRID,,clean up gmc
200
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,technical,model,replace,/^xg 350$/i,XG350,,clean up hyundai
201
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,technical,model,delete,/^isuzu /i,,,clean up isuzu
202
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,technical,model,replace,/^p'up.+/i,PICKUP,,clean up isuzu
203
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,editorial,model,replace,/1 ?ton/i,1-TON,,clean up isuzu and toyota
204
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,editorial,model,replace,/pickup truck/i,PICKUP,,clean up isuzu and jeep
205
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,technical,model,delete,/^jaguar /i,,,clean up jaguar
206
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,model,delete,/ \d\.\d litre$/i,,,clean up jaguar
207
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,editorial,model,replace,/^jaguar$/i,XJ6,,1990 Jaguar XJ6 has just 'jaguar' for model name
208
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,editorial,model,replace,/^vanden plas s\.c\.$/i,VANDEN PLAS S/C,,clean up jaguar
209
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,editorial,model,replace,/pick\/up/i,PICKUP,,clean up jeep
210
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,model,delete,/kia /i,,is a kia,clean up kia
211
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,editorial,model,replace,/^optimams$/i,OPTIMA MS,,clean up kia
212
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,editorial,model,replace,/^riojb$/i,RIO JB,,clean up kia
213
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,editorial,model,replace,/^sedonavq$/i,SEDONA VQ,,clean up kia
214
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,editorial,model,replace,/^spectrald$/i,SPECTRA LD,,clean up kia
215
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,editorial,model,replace,/^sportagekm$/i,SPORTAGE KM,,clean up kia
216
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,model,delete,/^db132\//i,,,clean up lamborghini
217
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,model,delete,/^l-\d{3}(\/\d{3})? /i,,,clean up lamborghini
218
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,model,replace,/144 Diablo/i,DIABLO,,clean up lamborghini
219
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,model,replace,/gallard0/i,GALLARDO,,clean up lamborghini
220
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,model,delete,/^land rover /i,,,clean up land rover
221
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,editorial,model,delete,/^austin rover /i,,,clean up land rover
222
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,editorial,model,replace,/discovery ser ii/i,DISCOVERY SERIES II,,clean up land rover
223
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,editorial,model,replace,/([a-z]{2}) (\d{3})/i,\1\2,is a lexus,clean up lexus
224
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,editorial,model,delete,/^lincoli?n /i,,,clean up lincoln-mercury
225
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,model,replace,/^sable wagon.+/i,SABLE WAGON,,clean up lincoln-mercury
226
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,editorial,model,delete,/^lotus /i,,,clean up lotus
227
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,editorial,model,replace,/^98 esrit V8$/i,ESPRIT V8,,clean up lotus
228
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,editorial,model,replace,/^esprit\.v8$/i,ESPRIT V8,,clean up lotus
229
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,editorial,model,replace,/^espirit turbo$/i,ESPRIT TURBO,,clean up lotus
230
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,editorial,model,delete,/^maserati /i,,,clean up maserati
231
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,editorial,model,delete,/^maybach /i,,,clean up maybach
232
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,editorial,model,replace,/^57 S$/i,57S,is a maybach,clean up maybach
233
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,editorial,model,delete,/^mazda ?/i,,,clean up mazda
234
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,model,delete,/-16$/i,,is a mercedes benz,clean up mercedes-benz
235
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,editorial,model,replace,/^(\d{3}[de])(\d\.\d)/i,\1 \2,is a mercedes benz,clean up mercedes-benz
236
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,editorial,model,replace,"/^([a-z]{1,3}) (\d{2,3})/i",\1\2,is a mercedes benz,clean up mercedes-benz
237
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,editorial,model,replace,/^clk320cabriolet$/i,CLK320 CABRIOLET,,clean up mercedes-benz
238
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,editorial,model,replace,/^mountainer$/i,MOUNTAINEER,,clean up mercury
239
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,editorial,model,delete,/^mini /i,,,clean up mini
240
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,editorial,model,replace,/ clubm$/i, CLUBMAN,,clean up mini
241
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,editorial,model,delete,/^mitsubishi /i,,,clean up mitsubishi
242
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,technical,model,replace,/^expo\.lrv$/i,EXPO LRV,,clean up mitsubishi
243
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,editorial,model,replace,/^3000 gt/i,3000GT,is a mitsubishi,clean up mitsubishi
244
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,editorial,model,replace,/ty eight/i,TY-EIGHT,,clean up oldsmobile
245
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,editorial,model,delete,/^panoz /i,,,clean up panoz
246
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,editorial,model,delete,/^pininfarina /i,,,clean up plymouth
247
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,editorial,model,delete,/ plymouth$/i,,,clean up porsche
248
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,editorial,model,delete,/^gt3 /i,,is a porsche,clean up porsche
249
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,editorial,model,delete,/^rs /i,,is a porsche,clean up porsche
250
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,editorial,model,delete,/^turbo +4 /i,,is a porsche,clean up porsche
251
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,editorial,model,replace,/^carrera 2 911 gt3$/i,911 CARRERA 2 GT3,,clean up porsche
252
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,editorial,model,replace,/^carrera /i,911 CARRERA ,,clean up porsche
253
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,editorial,model,replace,/^targa$/i,911 TARGA,,clean up porsche
254
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,editorial,model,replace,/^turbo$/i,911 TURBO,,clean up porsche
255
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,editorial,model,replace,/^turbo +2 911 gt2$/i,911 TURBO GT2,,clean up porsche
256
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,editorial,model,replace,/^turbo gt2$/i,911 TURBO GT2,,clean up porsche
257
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,editorial,model,replace,/carrera 2\/4/i,CARRERA 4/2,,clean up porsche
258
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,editorial,model,replace,/carrera (2|4) s/i,CARRERA \1S ,,clean up porsche
259
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,editorial,model,replace,/ cab( S)?$/i,\1 CABRIOLET,is a porsche,clean up porsche
260
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,editorial,model,replace,/928s/i,928 S,is a porsche,clean up porsche
261
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,editorial,model,delete,/^rolls( |-)royce /i,,,clean up rolls-royce
262
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,editorial,model,delete,/^r-r /i,,,clean up rolls-royce
263
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,editorial,model,delete,/^saab ?/i,,,clean up saab
264
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,editorial,model,replace,/sportcombi/i,SPORT COMBI,,clean up saab
265
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,editorial,model,delete,/^saleen /i,,,clean up saleen
266
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,editorial,model,delete,/^shelby /i,,,clean up shelby
267
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,editorial,model,delete,/^smart fortwo /i,,,clean up smart
268
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,editorial,model,replace,/^elec\. drive/i,ELECTRIC,,clean up smart
269
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,editorial,model,replace,/12 s$/i,12 SPYDER,,clean up spyker
270
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,editorial,model,delete,/^subaru /i,,,clean up subaru
271
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,editorial,model,replace,/^IMPREZA WGN/OUTBACK SPT$/i,IMPREZA WAGON/OUTBACK SPORT,,clean up subaru
272
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,editorial,model,delete,/^suzuki /i,,,clean up suzuki
273
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,editorial,model,replace,/^grand vitara xl-7$/i,GRAND VITARA XL7,,clean up suzuki
274
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,editorial,model,delete,/toyota /i,,is a toyota,clean up toyota
275
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,model,replace,/^4-runner$/i,4RUNNER,,clean up toyota
276
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,editorial,model,replace,/^cab\/chassis$/i,CAB CHASSIS,,clean up toyota
277
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,editorial,model,delete,/^tvr /i,,is a tvr,clean up tvr
278
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,editorial,model,delete,/^vector /i,,,clean up vector
279
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,editorial,model,delete,/ 16-Valve/i,,,clean up volvo
280
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,editorial,model,replace,/^240 DL\/240 GL/i,240DL/240GL,is a volvo,clean up volvo
281
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,editorial,model,replace,/^XC (\d{2})$/i,XC\1,is a volvo,clean up volvo
282
+ 7/7/2009,Andy Rossmeissl,andy@brighterplanet.com,technical,model,replace,/^s80\/s80 (executive|premier)$/i,S80,,clean up volvo
283
+ 10/18/2011,Ian Hough,ian@brighterplanet.com,editorial,model,delete,/yugo /i,,is a yugo,clean up yugo
@@ -0,0 +1 @@
1
+ date,name,email,type,section,action,x,y,condition,notes
@@ -0,0 +1,68 @@
1
+ date,name,email,type,section,action,x,y,condition,notes
2
+ 10/18/2010,Ian Hough,ian@brighterplanet.com,meta,Intended use,,http://www.transtats.bts.gov/Download_Lookup.asp?Lookup=L_AIRCRAFT_TYPE,,,Tweak the BTS list of aircraft types
3
+ 10/18/2010,Ian Hough,ian@brighterplanet.com,editorial,Code,reject,999,,,This is a special code used only for capturing expenses not attributed to specific aircraft types
4
+ 4/23/2009,Seamus Abshere,seamus@brighterplanet.com,editorial,Description,delete,/\(Gates\) /i,,,Make it the Bombardier Learjet 60
5
+ 10/18/2010,Ian Hough,ian@brighterplanet.com,technical,Description,delete,"/ \(Federal Express has waiver to report all its small aircraft under code 110, regardless of actual aircraft type\)/i",,,Cut the note about FedEx's waiver from the description
6
+ 5/11/2011,Ian Hough,ian@brighterplanet.com,technical,Description,replace,/Aerospatiale\/Aeritalia/i,Aerospatiale,,fix manufacturer name
7
+ 5/11/2011,Ian Hough,ian@brighterplanet.com,technical,Description,replace,/^Beech/i,Hawker Beechcraft,,fix manufacturer name
8
+ 5/11/2011,Ian Hough,ian@brighterplanet.com,technical,Description,replace,/^Dehavilland/i,de Havilland,,fix manufacturer name
9
+ 5/11/2011,Ian Hough,ian@brighterplanet.com,technical,Description,replace,/Aero Commander \(500\/600 Series Excpt 680fl\)/i,Aero Commander 500/520/560/680,,fix name
10
+ 5/11/2011,Ian Hough,ian@brighterplanet.com,technical,Description,replace,/^Aerospatiale\/British Aerospace Concorde$/i,BAe Concorde,,fix name
11
+ 5/12/2011,Ian Hough,ian@brighterplanet.com,technical,Description,replace,/Atr-([47]2)/i,ATR\1,,fix name
12
+ 7/8/2009,Seamus Abshere,seamus@brighterplanet.com,editorial,Description,replace,/Airbus Industrie/i,Airbus,,Cut this from all Airbus descriptions
13
+ 4/23/2009,Seamus Abshere,seamus@brighterplanet.com,editorial,Description,replace,/Airbus Industrai/i,Airbus,,Cut this from all Airbus descriptions
14
+ 5/11/2011,Ian Hough,ian@brighterplanet.com,technical,Description,replace,/^Airbus A300b\/C\/F-100\/200$/i,Airbus A300 B/C/F,,fix name
15
+ 5/13/2011,Ian Hough,ian@brighterplanet.com,technical,Description,replace,/^Airbus A300-B2$/i,Airbus A300B2,,fix name
16
+ 5/12/2011,Ian Hough,ian@brighterplanet.com,technical,Description,replace,/^Airbus A300-600\/R\/Cf\/Rcf$/i,Airbus A300-600,,fix name
17
+ 5/12/2011,Ian Hough,ian@brighterplanet.com,technical,Description,replace,/^Airbus A330-600st \(Beluga\)$/i,Airbus A300-600ST Beluga,,fix name
18
+ 5/11/2011,Ian Hough,ian@brighterplanet.com,technical,Description,replace,/^Airbus A310-200c\/F$/i,Airbus A310-200 C/F,,fix name
19
+ 7/10/2009,Seamus Abshere,seamus@brighterplanet.com,editorial,Description,replace,/^Airbus A-318$/i,Airbus A318,,fix name
20
+ 5/13/2011,Ian Hough,ian@brighterplanet.com,technical,Description,replace,/^Antonov (?:An-)?(\d)/i,Antonov AN\1,,no space between 'an' and model number
21
+ 5/13/2011,Ian Hough,ian@brighterplanet.com,technical,Description,replace,/^Antonov AN(\d{2}\/)/i,Antonov AN \1,,add a space after 'an' if multiple model numbers
22
+ 5/16/2011,Ian Hough,ian@brighterplanet.com,technical,Description,replace,/^Boeing 727-100c\/Qc/i,Boeing 727-100 c/qc,,fix name
23
+ 5/16/2011,Ian Hough,ian@brighterplanet.com,technical,Description,replace,/^Boeing 737-5\/600lr$/i,Boeing 737-500/600lr,,fix name
24
+ 5/11/2011,Ian Hough,ian@brighterplanet.com,technical,Description,replace,/^Boeing 767-200\/er\/em$/i,Boeing 767-200/200ER/200EM,,fix name
25
+ 5/11/2011,Ian Hough,ian@brighterplanet.com,technical,Description,replace,/^Boeing 767-400\/er$/i,Boeing 767-400/400ER,,fix name
26
+ 5/11/2011,Ian Hough,ian@brighterplanet.com,technical,Description,replace,/^Bombardier Crj 705$/i,Canadair CRJ705,,fix name
27
+ 5/11/2011,Ian Hough,ian@brighterplanet.com,technical,Description,replace,/^British Aerospace \(Hawker-Siddeley\) Bae-748$/i,Hawker Siddeley HS748,,fix name
28
+ 5/16/2011,Ian Hough,ian@brighterplanet.com,technical,Description,replace,/^British Aerospace/i,BAe,,fix name
29
+ 5/16/2011,Ian Hough,ian@brighterplanet.com,technical,Description,replace,/^BAe ba(c|e)-(\d)/i,BAe ba\1\2,,fix name
30
+ 5/12/2011,Ian Hough,ian@brighterplanet.com,technical,Description,replace,/^Canadair Cl-600 Challenger$/i,Canadair CL600 Challenger,,fix name
31
+ 4/23/2009,Seamus Abshere,seamus@brighterplanet.com,editorial,Description,replace,/^Canadair \(Bombardier\) Challlenger 601$/i,Canadair CL601 Challenger,,fix name
32
+ 5/12/2011,Ian Hough,ian@brighterplanet.com,technical,Description,replace,/^Canadair Rj-100\/Rj-100er$/i,Canadair CRJ100,,fix name
33
+ 5/12/2011,Ian Hough,ian@brighterplanet.com,technical,Description,replace,/^Canadair Rj-200er \/Rj-440$/i,Canadair CRJ 200/440,,fix name
34
+ 5/12/2011,Ian Hough,ian@brighterplanet.com,technical,Description,replace,/^Canadair Rj-700$/i,Canadair CRJ700,,fix name
35
+ 5/11/2011,Ian Hough,ian@brighterplanet.com,technical,Description,replace,/^Casa\/Nurtanio C212 Aviocar$/i,Casa C212 Aviocar,,fix name
36
+ 5/11/2011,Ian Hough,ian@brighterplanet.com,technical,Description,replace,/^Cessna 185a\/B\/C Skywagon$/i,Cessna 185 A/B/C Skywagon,,fix name
37
+ 5/11/2011,Ian Hough,ian@brighterplanet.com,technical,Description,replace,/^Cessna C-402\/402a\/402b$/i,Cessna 402/402A/402B,,fix name
38
+ 5/11/2011,Ian Hough,ian@brighterplanet.com,technical,Description,replace,/^Cessna C206\/207\/209\/210 Stationair$/i,Cessna 206/207/209/210/Stationair,,fix name
39
+ 5/11/2011,Ian Hough,ian@brighterplanet.com,technical,Description,replace,/^Cessna Citation Ii\/ Bravo$/i,Cessna 550 Citation 2,,fix name
40
+ 5/11/2011,Ian Hough,ian@brighterplanet.com,technical,Description,replace,/^Cessna Citation X Model 650\/550b\/550xl\/560xl$/i,Cessna 550B/550XL/560XL/650/750,,fix name
41
+ 5/11/2011,Ian Hough,ian@brighterplanet.com,technical,Description,replace,/^Curtiss C46\/20t\/A\/D\/F\/R Commando$/i,Curtiss C46 Commando,,fix name
42
+ 5/11/2011,Ian Hough,ian@brighterplanet.com,technical,Description,replace,/^de Havilland Twin Otter Dhc-6$/i,de Havilland DHC6 Twin Otter,,fix name
43
+ 5/13/2011,Ian Hough,ian@brighterplanet.com,technical,Description,replace,/DHC8-(\d{3}[a-z]?) dash[ -]8/i,DHC8-\1,,fix name
44
+ 5/11/2011,Ian Hough,ian@brighterplanet.com,technical,Description,replace,/^Embraer[ -](\d)/i,Embraer ERJ\1,,fix name
45
+ 5/13/2011,Ian Hough,ian@brighterplanet.com,technical,Description,replace,/Embraer ERJ-(\d{3})/i,Embraer ERJ\1,,fix name
46
+ 5/13/2011,Ian Hough,ian@brighterplanet.com,technical,Description,replace,/Embraer EMB-(\d{3})/i,Embraer EMB\1,,fix name
47
+ 5/11/2011,Ian Hough,ian@brighterplanet.com,technical,Description,replace,/^Float\/Amphib Turbine$/i,Float or Amphib Turbine,,fix name
48
+ 5/11/2011,Ian Hough,ian@brighterplanet.com,technical,Description,replace,/^Fokker Friendship F-27\/Fairchild F-27\/A\/B\/F\/J$/i,Fokker F27 Friendship,,fix name
49
+ 5/11/2011,Ian Hough,ian@brighterplanet.com,technical,Description,replace,/^Grumman G-1159 Gulfstream Ii\/Iii$/i,Grumman G 1159/1159A,,fix name
50
+ 5/11/2011,Ian Hough,ian@brighterplanet.com,technical,Description,replace,/^Gulfstream Aerospace G-Iii\/G-Iv$/i,Gulfstream Aerospace G1159 A/C,,fix name
51
+ 5/11/2011,Ian Hough,ian@brighterplanet.com,technical,Description,replace,/^Gulfstream Iii\/V\/ G-V Exec\/ G-5\/550$/i,Gulfstream Aerospace G1159 A/D,,fix name
52
+ 5/11/2011,Ian Hough,ian@brighterplanet.com,technical,Description,replace,/^Hawker Beechcraft 65\/65a-80\/65b-80 \(Queen Air\)$/i,Hawker Beechcraft 65 Queen Air,,fix name
53
+ 5/11/2011,Ian Hough,ian@brighterplanet.com,technical,Description,replace,/^Hawker Beechcraft Bonanza 35a\/C\/D\/E\/G\/H\/J\/K\/S\/V\/ 36a$/i,Hawker Beechcraft 35/36 Bonanza,,fix name
54
+ 5/13/2011,Ian Hough,ian@brighterplanet.com,technical,Description,replace,/^Ilyushin (\d{2})/i,Ilyushin il\1,,fix name
55
+ 5/11/2011,Ian Hough,ian@brighterplanet.com,technical,Description,replace,/^Ilyushin il76\/Td$/i,Ilyushin il76,,fix name
56
+ 5/13/2011,Ian Hough,ian@brighterplanet.com,technical,Description,replace,/Douglas DC-(\d)/i,Douglas DC\1,,cut dash from Douglas DC-x
57
+ 5/13/2011,Ian Hough,ian@brighterplanet.com,technical,Description,replace,/Douglas MD-(\d)/i,Douglas MD\1,,cut dash from Douglas MD-x
58
+ 5/11/2011,Ian Hough,ian@brighterplanet.com,technical,Description,replace,"/^Mcdonnell Douglas Dc3\/A\/C,c-47\/B$/i",McDonnell Douglas DC3,,fix name
59
+ 5/11/2011,Ian Hough,ian@brighterplanet.com,technical,Description,replace,/^Mcdonnell Douglas Dc4\(C54\/C54a\/C54b\/C54e\)$/i,McDonnell Douglas DC4,,fix name
60
+ 5/11/2011,Ian Hough,ian@brighterplanet.com,technical,Description,replace,/^Mcdonnell Douglas Dc9 Super 80\/Md81\/82\/83\/88$/i,McDonnell Douglas MD 81/82/83/88,,fix name
61
+ 5/11/2011,Ian Hough,ian@brighterplanet.com,technical,Description,replace,/^Pilatus Britten-Norman Bn2\/A Islander$/i,Britten-Norman BN2A Islander,,fix name
62
+ 5/16/2011,Ian Hough,ian@brighterplanet.com,technical,Description,replace,/^Pilatus Britten-Norman Bn2a Trislander$/i,Britten-Norman BN2A MkIII Trislander,,fix name
63
+ 5/11/2011,Ian Hough,ian@brighterplanet.com,technical,Description,replace,/^Piper Pa-30\/31t Cheyenne Ii Xl$/i,Piper PA 30/31T Cheyenne II,,fix name
64
+ 5/11/2011,Ian Hough,ian@brighterplanet.com,technical,Description,replace,/^Piper Pa-34\/39 \(Twin Commanche\)$/i,Piper PA 34/39 Twin Commanche,,fix name
65
+ 5/13/2011,Ian Hough,ian@brighterplanet.com,technical,Description,replace,/Piper Pa-32 \(Cherokee 6\)/i,Piper PA32 Cherkokee Six,,fix name
66
+ 5/13/2011,Ian Hough,ian@brighterplanet.com,technical,Description,replace,/Piper Pa-31 \(Navajo\)\/T-1020/i,Piper PA31 Navajo,,fix name
67
+ 5/11/2011,Ian Hough,ian@brighterplanet.com,technical,Description,replace,/^Saab-Fairchild 340\/A/i,Saab 340A,,fix name
68
+ 5/11/2011,Ian Hough,ian@brighterplanet.com,technical,Description,replace,/^Saab-Fairchild 340\/B/i,Saab 340B,,fix name
@@ -0,0 +1,25 @@
1
+ date,name,email,type,section,action,x,y,condition,notes
2
+ 1/25/2012,Ian Hough,ian@brighterplanet.com,meta,Intended use,,Country degree days import
3
+ 1/25/2012,Ian Hough,ian@brighterplanet.com,technical,country,replace,Bolivia,"Bolivia, Plurinational State of",,match iso country names
4
+ 1/25/2012,Ian Hough,ian@brighterplanet.com,technical,country,replace,Bosnia & Herzegovina,Bosnia and Herzegovina,,match iso country names
5
+ 1/25/2012,Ian Hough,ian@brighterplanet.com,technical,country,replace,Brunei*,Brunei Darussalam,,match iso country names
6
+ 1/25/2012,Ian Hough,ian@brighterplanet.com,technical,country,replace,"Congo, Dem. Republic","Congo, The Democratic Republic of the",,match iso country names
7
+ 3/15/2012,Ian Hough,ian@brighterplanet.com,technical,country,replace,Cote d'Ivoire,Côte d'Ivoire,,be sure to include utf8 chars
8
+ 1/25/2012,Ian Hough,ian@brighterplanet.com,technical,country,replace,Iran,"Iran, Islamic Republic of",,match iso country names
9
+ 1/25/2012,Ian Hough,ian@brighterplanet.com,technical,country,replace,Iraq*,Iraq,,match iso country names
10
+ 1/25/2012,Ian Hough,ian@brighterplanet.com,technical,country,replace,Korea (North),"Korea, Democratic People's Republic of ",,match iso country names
11
+ 1/25/2012,Ian Hough,ian@brighterplanet.com,technical,country,replace,Korea (South),"Korea, Republic of ",,match iso country names
12
+ 1/25/2012,Ian Hough,ian@brighterplanet.com,technical,country,replace,Laos,Lao People's Democratic Republic,,match iso country names
13
+ 1/25/2012,Ian Hough,ian@brighterplanet.com,technical,country,replace,Libya,Libyan Arab Jamahiriya,,match iso country names
14
+ 1/25/2012,Ian Hough,ian@brighterplanet.com,technical,country,replace,"Macedonia, FYR","Macedonia, The Former Yugoslav Republic of",,match iso country names
15
+ 1/25/2012,Ian Hough,ian@brighterplanet.com,technical,country,replace,Moldova,"Moldova, Republic of",,match iso country names
16
+ 1/25/2012,Ian Hough,ian@brighterplanet.com,technical,country,replace,Saint Kitts & Nevis,Saint Kitts and Nevis,,match iso country names
17
+ 1/25/2012,Ian Hough,ian@brighterplanet.com,technical,country,replace,Sao Tome & Principe,Sao Tome and Principe,,match iso country names
18
+ 1/25/2012,Ian Hough,ian@brighterplanet.com,technical,country,replace,Serbia & Montenegro,Serbia,,match iso country names
19
+ 1/25/2012,Ian Hough,ian@brighterplanet.com,technical,country,replace,Syria,Syrian Arab Republic,,match iso country names
20
+ 1/25/2012,Ian Hough,ian@brighterplanet.com,technical,country,replace,Taiwan*,"Taiwan, Province of China",,match iso country names
21
+ 1/25/2012,Ian Hough,ian@brighterplanet.com,technical,country,replace,Tanzania,"Tanzania, United Republic of",,match iso country names
22
+ 1/25/2012,Ian Hough,ian@brighterplanet.com,technical,country,replace,Trinidad & Tobago,Trinidad and Tobago,,match iso country names
23
+ 1/25/2012,Ian Hough,ian@brighterplanet.com,technical,country,replace,United States of America,United States,,match iso country names
24
+ 1/25/2012,Ian Hough,ian@brighterplanet.com,technical,country,replace,Venezuela,"Venezuela, Bolivarian Republic of",,match iso country names
25
+ 1/25/2012,Ian Hough,ian@brighterplanet.com,technical,country,replace,Vietnam,Viet Nam,,match iso country names
@@ -0,0 +1 @@
1
+ date,name,email,type,section,action,x,y,condition,notes
@@ -0,0 +1,3 @@
1
+ DO NOT EDIT ERRATA WITH EXCEL
2
+
3
+ Some of them contain UTF-8 characters, but Excel cannot save to csv in UTF-8.
@@ -16,7 +16,7 @@ Given /^an? "([^\"]*)" data import fetches results listed in "(.*)"$/ do |model,
16
16
  end
17
17
 
18
18
  When /^a data import verifies "(.*)"$/ do |verification_step_name|
19
- @verification = @data_import_model.data_miner_config.steps.find { |f|
19
+ @verification = @data_import_model.data_miner_script.steps.find { |f|
20
20
  f.respond_to?(:description) and f.description == verification_step_name
21
21
  }
22
22
  @verification_result = begin
@@ -1,7 +1,5 @@
1
1
  require 'active_support/core_ext'
2
2
  require 'active_record'
3
- require 'earth/conversions_ext'
4
- require 'earth/inflectors'
5
3
  require 'data_miner'
6
4
  require 'falls_back_on'
7
5
  require 'weighted_average'
@@ -10,44 +8,40 @@ require 'errata'
10
8
  require 'active_record_inline_schema'
11
9
  require 'table_warnings'
12
10
  require 'fuzzy_match'
13
- require 'fuzzy_match/cached_result'
11
+
12
+ require 'earth/utils'
13
+ require 'earth/conversions_ext'
14
+ require 'earth/inflectors'
14
15
 
15
16
  # The earth module is an interface for loading data models from various domains.
16
17
  module Earth
17
- extend ::ActiveSupport::Memoizable
18
- extend self
18
+ TAPS_SOURCE = 'http://carbon:neutral@data.brighterplanet.com:5000'
19
+ TAPS_DESCRIPTION = "Brighter Planet's reference data web service"
20
+ VENDOR_DIR = ::File.expand_path '../../vendor', __FILE__
21
+ LIB_DIR = ::File.expand_path '../earth', __FILE__
22
+ ERRATA_DIR = ::File.expand_path '../../errata', __FILE__
19
23
 
20
- def domains
21
- ::Dir[::File.join(lib_dir, '*')].map do |path|
24
+ def Earth.domains
25
+ @domains ||= ::Dir[::File.join(LIB_DIR, '*')].map do |path|
22
26
  if ::File.directory? path
23
27
  ::File.basename path
24
28
  end
25
29
  end.compact.uniq.sort
26
30
  end
27
- memoize :domains
28
31
 
29
- def resources(*search_domains)
32
+ def Earth.resources(*search_domains)
30
33
  search_domains = search_domains.flatten.compact.map(&:to_s)
31
34
  if search_domains.empty?
32
35
  search_domains = domains
33
36
  end
34
37
  search_domains.map do |domain|
35
- ::Dir[::File.join(lib_dir, domain, '**', '*.rb')].map do |possible_resource|
38
+ ::Dir[::File.join(LIB_DIR, domain, '**', '*.rb')].map do |possible_resource|
36
39
  unless possible_resource.include?('data_miner')
37
40
  ::File.basename(possible_resource, '.rb').camelcase
38
41
  end
39
42
  end
40
43
  end.flatten.compact.sort
41
44
  end
42
- memoize :resources
43
-
44
- def vendor_dir
45
- ::File.expand_path '../../vendor', __FILE__
46
- end
47
-
48
- def lib_dir
49
- ::File.expand_path '../earth', __FILE__
50
- end
51
45
 
52
46
  # Earth.init will load any specified domains, any needed ActiveRecord plugins,
53
47
  # and will apply each domain model's schema to the database if the
@@ -56,14 +50,12 @@ module Earth
56
50
  #
57
51
  # Earth.init should be performed after a connection is made to the database and
58
52
  # before any domain models are referenced.
59
- def init(*args)
53
+ def Earth.init(*args)
60
54
  options = args.extract_options!
61
55
  domains = args
62
56
 
63
- options[:load_data_miner] = true if options[:apply_schemas]
64
-
65
- _warn_unless_mysql_ansi_mode
66
- _load_plugins
57
+ warn_unless_mysql_ansi_mode
58
+ load_plugins
67
59
 
68
60
  if domains.include?(:none)
69
61
  # don't load anything
@@ -76,18 +68,16 @@ module Earth
76
68
  end
77
69
 
78
70
  # be sure to look at both explicitly and implicitly loaded resources
79
- resources.each do |resource|
80
- next unless ::Object.const_defined?(resource)
71
+ resources.select do |resource|
72
+ ::Object.const_defined?(resource)
73
+ end.each do |resource|
81
74
  resource_model = resource.constantize
82
-
83
- _append_pull_dependencies_step_to_data_miner resource_model
84
-
75
+ resource_model.data_miner_script.append_once :process, :run_data_miner_on_parent_associations!
85
76
  if options[:load_data_miner]
86
- _prepend_auto_upgrade_step_to_data_miner resource_model
77
+ resource_model.data_miner_script.prepend_once :process, :auto_upgrade!
87
78
  else
88
- _prepend_taps_step_to_data_miner resource_model
79
+ resource_model.data_miner_script.prepend_once :tap, TAPS_DESCRIPTION, TAPS_SOURCE
89
80
  end
90
-
91
81
  if options[:apply_schemas]
92
82
  resource_model.auto_upgrade!
93
83
  end
@@ -95,25 +85,29 @@ module Earth
95
85
  end
96
86
 
97
87
  # internal use
98
- def require_related(path)
88
+ def Earth.require_related(path)
99
89
  path = ::File.expand_path path
100
- raise ::ArgumentError, %{[earth gem] #{path} is not in #{lib_dir}} unless path.start_with?(lib_dir)
101
- domain = %r{#{lib_dir}/([^\./]+)}.match(path).captures.first
90
+ raise ::ArgumentError, %{[earth gem] #{path} is not in #{LIB_DIR}} unless path.start_with?(LIB_DIR)
91
+ domain = %r{#{LIB_DIR}/([^\./]+)}.match(path).captures.first
102
92
  require_domain domain, :load_data_miner => path.include?('data_miner')
103
93
  end
104
94
 
105
95
  # internal use
106
- def require_all(options = {})
107
- require_glob ::File.join(lib_dir, '**', '*.rb'), options
96
+ def Earth.require_all(options = {})
97
+ require_glob ::File.join(LIB_DIR, '**', '*.rb'), options
108
98
  end
109
-
99
+
110
100
  private
111
101
 
112
- def require_domain(domain, options = {})
113
- require_glob ::File.join(lib_dir, domain.to_s, '**', '*.rb'), options
102
+ def Earth.require_domain(domain, options = {})
103
+ require_glob ::File.join(LIB_DIR, domain.to_s, '**', '*.rb'), options
114
104
  end
115
105
 
116
- def require_glob(glob, options = {})
106
+ def Earth.require_glob(glob, options = {})
107
+ @require_glob ||= []
108
+ args = [glob, options]
109
+ return if @require_glob.include?(args)
110
+ @require_glob << args
117
111
  data_miner_paths = []
118
112
  ::Dir[glob].each do |path|
119
113
  if path.include?('data_miner')
@@ -128,49 +122,20 @@ module Earth
128
122
  end if options[:load_data_miner]
129
123
  nil
130
124
  end
131
- memoize :require_glob
132
125
 
133
- def _warn_unless_mysql_ansi_mode
126
+ def Earth.warn_unless_mysql_ansi_mode
134
127
  if ::ActiveRecord::Base.connection.adapter_name =~ /mysql/i
135
128
  sql_mode = ::ActiveRecord::Base.connection.select_value("SELECT @@GLOBAL.sql_mode") + ::ActiveRecord::Base.connection.select_value("SELECT @@SESSION.sql_mode")
136
- $stderr.puts "[earth gem] Warning: MySQL detected, but PIPES_AS_CONCAT not set. Importing from scratch will fail. Consider setting sql-mode=ANSI in my.cnf." unless sql_mode =~ /pipes_as_concat/i
129
+ unless sql_mode.downcase.include? 'pipes_as_concat'
130
+ ::Kernel.warn "[earth gem] Warning: MySQL detected, but PIPES_AS_CONCAT not set. Importing from scratch will fail. Consider setting sql-mode=ANSI in my.cnf."
131
+ end
137
132
  end
138
133
  end
139
134
 
140
- def _load_plugins
135
+ def Earth.load_plugins
141
136
  ::Dir[::File.expand_path('../../vendor/**/init.rb', __FILE__)].each do |pluginit|
142
137
  $LOAD_PATH.unshift ::File.join(::File.dirname(pluginit), 'lib')
143
138
  ::Kernel.load pluginit
144
139
  end
145
140
  end
146
-
147
- def _append_pull_dependencies_step_to_data_miner(resource_model)
148
- return if resource_model.data_miner_config.steps.any? { |step| step.description == :run_data_miner_on_parent_associations! }
149
-
150
- pull_dependencies_step = DataMiner::Process.new resource_model.data_miner_config, :run_data_miner_on_parent_associations!
151
-
152
- resource_model.data_miner_config.steps.push pull_dependencies_step
153
- end
154
-
155
- def _prepend_auto_upgrade_step_to_data_miner(resource_model)
156
- return if resource_model.data_miner_config.steps.any? { |step| step.description == :auto_upgrade! }
157
-
158
- auto_upgrade_step = DataMiner::Process.new resource_model.data_miner_config, :auto_upgrade!
159
-
160
- resource_model.data_miner_config.steps.unshift auto_upgrade_step
161
- end
162
-
163
- TAPS_STEP = 'Tap the Brighter Planet data server'
164
- TAPS_SOURCE = 'http://carbon:neutral@data.brighterplanet.com:5000'
165
- def _prepend_taps_step_to_data_miner(resource_model)
166
- return if resource_model.data_miner_config.steps.any? { |step| step.description == TAPS_STEP }
167
-
168
- taps_step = DataMiner::Tap.new resource_model.data_miner_config, TAPS_STEP, TAPS_SOURCE
169
-
170
- resource_model.data_miner_config.steps.unshift taps_step
171
- end
172
141
  end
173
-
174
- require 'earth/utils'
175
- # TODO move this into a gem or into its own namespace in this gem
176
- require ::File.join(Earth.vendor_dir, 'clean_find_in_batches', 'init')