lib/cql/dsl.rb in cql-1.2.1 vs lib/cql/dsl.rb in cql-1.3.0

@@ -51,11 +51,23 @@
 
     #with clause
     def with(*conditions, &block)
       @filters ||= []
 
-      @filters << block if block
-      @filters.concat(conditions)
+      @filters << {:negate => false, :filter => block} if block
+      conditions.each do |condition|
+        @filters << {:negate => false, :filter => condition}
+      end
+    end
+
+    #without clause
+    def without(*conditions, &block)
+      @filters ||= []
+
+      @filters << {:negate => true, :filter => block} if block
+      conditions.each do |condition|
+        @filters << {:negate => true, :filter => condition}
+      end
     end
 
     class Comparison
       attr_accessor :operator, :amount