0
@@ -24,6 +24,8 @@ spec = Gem::Specification.new do |s|
0
   
0
   # Uncomment this to add a dependency
0
   # s.add_dependency "foo"
0
+  s.add_dependency "dm-core", ">= 0.9.1"
0
+  s.add_dependency "extlib"
0
   
0
   s.require_path = 'lib'
0
   s.autorequire = GEM

0
@@ -74,7 +74,7 @@ module DataMapper
0
       def initialize(name, uri_or_options)
0
         super
0
         @resource_naming_convention = proc {|value| value.split("::").last}
0
-        @field_naming_convention = proc {|value| DataMapper::Inflection.camelize(value)}
0
+        @field_naming_convention = proc {|value| Extlib::Inflection.camelize(value)}
0
         connect!
0
       end
0
       
0
@@ -109,7 +109,7 @@ module DataMapper
0
         properties = query.fields
0
         properties_with_indexes = Hash[*properties.zip((0...properties.size).to_a).flatten]
0
         
0
-        set = Collection.new(repository, query.model, properties_with_indexes)
0
+        set = Collection.new(query)
0
         
0
         conditions = query.conditions.map {|c| SQL.from_condition(c, repository)}.compact.join(") AND (")
0