implemented lambda expression for exclude and or

lib/lotus/model/adapters/sql/query.rb

@@ -111,15 +111,8 @@ def all
           #        .where(framework: 'lotus')
           #
           #   # => SELECT * FROM `projects` WHERE (`language` = 'ruby') AND (`framework` = 'lotus')
-          #
-          # @example Expressions
-          #
-          #   query.where{ publish_at > function(:DATE, Date.today) }
-          #
-          #   # => SELECT * FROM `articles` WHERE (`publish_at` > DATE('2014-07-29'))
           def where(condition=nil, &blk)
-            condition or blk or raise ArgumentError.new("You need to specify an condition.")
-            condition = blk unless condition
+            condition = (condition or blk or raise ArgumentError.new('You need to specify an condition.'))
             conditions.push([:where, condition])
             self
           end
@@ -157,7 +150,8 @@ def where(condition=nil, &blk)
           #   query.where(country: 'italy').or(year: 1900..1982)
           #
           #   # => SELECT * FROM `people` WHERE ((`country` = 'italy') OR ((`year` >= 1900) AND (`year` <= 1982)))
-          def or(condition)
+          def or(condition=nil, &blk)
+            condition = (condition or blk or raise ArgumentError.new('You need to specify an condition.'))
             conditions.push([:or, condition])
             self
           end
@@ -198,7 +192,8 @@ def or(condition)
           #        .exclude(company: 'enterprise')
           #
           #   # => SELECT * FROM `projects` WHERE (`language` != 'java') AND (`company` != 'enterprise')
-          def exclude(condition)
+          def exclude(condition=nil, &blk)
+            condition = (condition or blk or raise ArgumentError.new('You need to specify an condition.'))
             conditions.push([:exclude, condition])
             self
           end

test/model/adapters/sql_adapter_test.rb

@@ -313,7 +313,7 @@
           result.must_equal [user1]
         end
 
-        it 'can use code block(sequel block) to describe where conditions' do
+        it 'can use lambda to describe where conditions' do
           query = Proc.new {
             where{ age > 31 }
           }
@@ -387,6 +387,24 @@
           result = @adapter.query(collection, &query).all
           result.must_equal [user3]
         end
+
+        it 'can use lambda to describe exclude conditions' do
+          query = Proc.new {
+            exclude{ age > 31 }
+          }
+
+          result = @adapter.query(collection, &query).all
+          result.must_equal [user2, user3]
+        end
+
+        it 'raises an error if you dont specify condition or block' do
+          -> {
+            query = Proc.new {
+              exclude()
+            }
+            @adapter.query(collection, &query).all
+          }.must_raise(ArgumentError)
+        end
       end
     end
 
@@ -418,6 +436,28 @@
           result = @adapter.query(collection, &query).all
           result.must_equal [user1, user2]
         end
+
+        it 'can use lambda to describe exclude conditions' do
+          name1 = user1.name
+
+          query = Proc.new {
+            where(name: name1).or{ age < 32 }
+          }
+
+          result = @adapter.query(collection, &query).all
+          result.must_equal [user1, user2]
+        end
+
+        it 'raises an error if you dont specify condition or block' do
+          -> {
+            name1 = user1.name
+
+            query = Proc.new {
+              where(name: name1).or()
+            }
+            @adapter.query(collection, &query).all
+          }.must_raise(ArgumentError)
+        end
       end
     end