lib/dm-ambition.rb in dm-ambition-1.0.0.rc2 vs lib/dm-ambition.rb in dm-ambition-1.0.0.rc3

@@ -1,50 +1,10 @@
-require 'pathname'
+require 'dm-ambition/collection'
+require 'dm-ambition/model'
+require 'dm-ambition/query'
+require 'dm-ambition/version'
 
-dir = Pathname(__FILE__).dirname.expand_path + 'dm-ambition'
-
-require dir / 'collection'
-require dir / 'model'
-require dir / 'query'
-require dir / 'version'
-
 module DataMapper
-  class Collection
-    include Ambition::Collection
-  end
-
-  module Model
-    include Ambition::Model
-  end
-
-  class Query
-    include Ambition::Query
-  end
-
-  if Gem::Version.new(DataMapper::VERSION) < Gem::Version.new('0.10')
-    module Model
-      def self.descendants
-        Resource.descendants
-      end
-    end
-
-    class Collection
-      def new_collection(query, resources = nil, &block)
-        collection = self.class.new(query, &block)
-
-        if resources
-          collection.replace(resources)
-        end
-
-        collection
-      end
-    end
-
-    module Resource
-      def saved?
-        !new_record?
-      end
-
-      alias new? new_record?
-    end
+  %w[ Collection Model Query ].each do |mod|
+    const_get(mod).class_eval { include Ambition.const_get(mod) }
   end
 end