lib/flight/characterization.rb in flight-0.0.23 vs lib/flight/characterization.rb in flight-0.1.0

@@ -1,31 +1,32 @@
+require 'characterizable'
+
 module BrighterPlanet
   module Flight
     module Characterization
       def self.included(base)
+        base.send :include, Characterizable
         base.characterize do
-          has :date, :trumps => :year
-          has :year
-          has :time_of_day
+          has :aviation_multiplier
+          has :distance_estimate, :trumps => :distance_class, :measures => :length, :precision => 0
+          has :distance_class
+          has :fuel_type
+          has :seats_estimate, :range => 1..500
+          has :load_factor, :measures => :percentage
+          has :trips
+          has :seat_class
+          has :country
+          has :date
           has :origin_airport do |origin_airport|
             origin_airport.reveals :destination_airport, 
-              :trumps => [:distance_class, :domesticity, :distance_estimate]
+              :trumps => [:distance_class, :distance_estimate, :country]
           end
-          has :distance_class
-          has :distance_estimate, :trumps => :distance_class, :measures => :length, :precision => 0
-          has :domesticity
+          has :aircraft, :trumps => [:aircraft_class, :seats_estimate, :fuel_type]
+          has :aircraft_class, :trumps => :fuel_type
           has :airline
-          has :trips
-          has :emplanements_per_trip
-          has :seat_class
-          has :load_factor, :measures => :percentage
-          has :seats_estimate, :range => 1..500
-          has :aircraft_class, :trumps => [:propulsion, :fuel_type]
-          has :aircraft, :trumps => [:propulsion, :aircraft_class, :seats_estimate, :fuel_type]
-          has :propulsion, :trumps => :fuel_type
-
-          has :creation_date, :hidden => true
+          has :segments_per_trip
         end
+        base.add_implicit_characteristics
       end
     end
   end
 end