Merge pull request #17 from crystal-garage/refactor4

add Collection#find with parameters

Author: mamantoha

spec/model/collection_spec.cr

@@ -516,20 +516,56 @@ module CollectionSpec
       end
     end
 
-    it "find / find!" do
-      temporary do
-        reinit_example_models
+    context "find / find!" do
+      it "with block" do
+        temporary do
+          reinit_example_models
 
-        10.times do |x|
-          User.create! first_name: "user #{x}"
+          10.times do |x|
+            User.create! first_name: "user #{x}"
+          end
+
+          User.query.find! { first_name == "user 2" }.first_name.should eq("user 2")
+          User.query.find { first_name == "not_exists" }.should be_nil
+
+          expect_raises(Clear::SQL::RecordNotFoundError) {
+            User.query.find! { first_name == "not_exists" }
+          }
         end
+      end
 
-        User.query.find! { first_name == "user 2" }.first_name.should eq("user 2")
-        User.query.find { first_name == "not_exists" }.should be_nil
+      it "with NamedTuple" do
+        temporary do
+          reinit_example_models
 
-        expect_raises(Clear::SQL::RecordNotFoundError) {
-          User.query.find! { first_name == "not_exists" }
-        }
+          10.times do |x|
+            User.create! first_name: "user #{x}"
+          end
+
+          User.query.find!({first_name: "user 2"}).first_name.should eq("user 2")
+          User.query.find({first_name: "not_exists"}).should be_nil
+
+          expect_raises(Clear::SQL::RecordNotFoundError) {
+            User.query.find!({first_name: "not_exists"})
+          }
+        end
+      end
+
+      it "with arguments" do
+        temporary do
+          reinit_example_models
+
+          10.times do |x|
+            User.create!(first_name: "first #{x}", last_name: "last #{x}")
+          end
+
+          User.query.find!(first_name: "first 2", last_name: "last 2").first_name.should eq("first 2")
+          User.query.find(first_name: "not_exists").should be_nil
+
+          expect_raises(Clear::SQL::RecordNotFoundError) {
+            User.query.find!(first_name: "not_exists")
+          }
+        end
       end
     end
 

src/clear/model/collection.cr

@@ -547,28 +547,40 @@ module Clear::Model
       self.offset(range.begin).limit(range.end - range.begin).to_a(fetch_columns)
     end
 
-    # A convenient way to write `where { condition }.first`
+    # A convenient way to write `where { condition }.first(fetch_columns)`
     def find(fetch_columns = false, &block) : T?
       x = Clear::Expression.ensure_node!(with Clear::Expression.new yield)
+
       where(x).first(fetch_columns)
     end
 
-    # A convenient way to write `where({any_column: "any_value"}).first`
+    # A convenient way to write `where({any_column: "any_value"}).first(fetch_columns)`
     def find(tuple : NamedTuple, fetch_columns = false) : T?
       where(tuple).first(fetch_columns)
     end
 
-    # A convenient way to write `where({any_column: "any_value"}).first!`
+    # A convenient way to write `where({any_column: "any_value"}).first`
+    def find(**tuple) : T?
+      where(tuple).first
+    end
+
+    # A convenient way to write `where { condition }.first!(fetch_columns)`
     def find!(fetch_columns = false, &block) : T
       x = Clear::Expression.ensure_node!(with Clear::Expression.new yield)
+
       where(x).first!(fetch_columns)
     end
 
-    # A convenient way to write `where { condition }.first!`
+    # A convenient way to write `where({any_column: "any_value"}).first!(fetch_columns)`
     def find!(tuple : NamedTuple, fetch_columns = false) : T
       where(tuple).first!(fetch_columns)
     end
 
+    # A convenient way to write `where({any_column: "any_value"}).first!`
+    def find!(**tuple) : T
+      where(tuple).first!
+    end
+
     # Try to fetch a row. If not found, build a new object and setup
     # the fields like setup in the condition tuple.
     def find_or_build(**tuple, &block : T -> Nil) : T