Merge pull request #355 from emmanuel/issue/245.

DataMapper adapter improvements

lib/cancan/model_adapters/data_mapper_adapter.rb

@@ -10,23 +10,22 @@ module CanCan
       end
 
       def self.matches_conditions_hash?(subject, conditions)
-        subject.class.all(:conditions => conditions).include?(subject) # TODO don't use a database query here for performance and other instances
+        collection = DataMapper::Collection.new(subject.query, [ subject ])
+        !!collection.first(conditions)
       end
 
       def database_records
         scope = @model_class.all(:conditions => ["0 = 1"])
-        conditions.each do |condition|
-          scope += @model_class.all(:conditions => condition)
-        end
+        cans, cannots = @rules.partition { |r| r.base_behavior }
+        return scope if cans.empty?
+        # apply unions first, then differences. this mean cannot overrides can
+        cans.each    { |r| scope += @model_class.all(:conditions => r.conditions) }
+        cannots.each { |r| scope -= @model_class.all(:conditions => r.conditions) }
         scope
       end
-
-      def conditions
-        @rules.map(&:conditions)
-      end
-    end
-  end
-end
+    end # class DataMapper
+  end # module ModelAdapters
+end # module CanCan
 
 DataMapper::Model.class_eval do
   include CanCan::ModelAdditions::ClassMethods

spec/cancan/model_adapters/data_mapper_adapter_spec.rb

@@ -65,7 +65,6 @@ if ENV["MODEL_ADAPTER"] == "data_mapper"
     end
 
     it "should fetch only the articles that are published and not secret" do
-      pending "the `cannot` may require some custom SQL, maybe abstract out from Active Record adapter"
       @ability.can :read, Article, :published => true
       @ability.cannot :read, Article, :secret => true
       article1 = Article.create(:published => true, :secret => false)