lib/flight.rb in flight-0.0.16 vs lib/flight.rb in flight-0.0.17

@@ -1,24 +1,11 @@
+require 'emitter'
+
 module BrighterPlanet
   module Flight
-    extend self
+    extend BrighterPlanet::Emitter
 
-    def included(base)
-      require 'cohort_scope'
-      require 'falls_back_on'
-      require 'falls_back_on/active_record_ext'
-
-      require 'flight/carbon_model'
-      require 'flight/characterization'
-      require 'flight/data'
-      require 'flight/summarization'
-
-      base.send :include, BrighterPlanet::Flight::CarbonModel
-      base.send :include, BrighterPlanet::Flight::Characterization
-      base.send :include, BrighterPlanet::Flight::Data
-      base.send :include, BrighterPlanet::Flight::Summarization
-    end
-    def flight_model
+    def self.flight_model
       if Object.const_defined? 'Flight'
         ::Flight
       elsif Object.const_defined? 'FlightRecord'
         FlightRecord
       else