mordor 0.2.0 → 0.2.1

data/lib/mordor/resource.rb

@@ -162,12 +162,18 @@ module Mordor
 
         method_name = options.key?(:finder_method) ? options[:finder_method] : "find_by_#{name}"
 
-
         class_eval <<-EOS, __FILE__, __LINE__
           attr_accessor name
 
           def self.#{method_name}(value, options = {})
-            col = perform_collection_find({:#{name} => value}, options)
+            if value.is_a?(Hash)
+              raise ArgumentError.new(":value missing from complex query hash") unless value.keys.include?(:value)
+              query = {:#{name} => value.delete(:value)}
+              query = query.merge(value)
+            else
+              query = {:#{name} => value}
+            end
+            col = perform_collection_find(query, options)
             Collection.new(self, col)
           end
         EOS

data/mordor.gemspec

@@ -2,8 +2,8 @@ Gem::Specification.new do |s|
   s.name    = "mordor"
   
   # Do not set the version and date field manually, this is done by the release script
-  s.version = "0.2.0"
-  s.date    = "2011-12-23"
+  s.version = "0.2.1"
+  s.date    = "2011-12-27"
 
   s.summary     = "mordor"
   s.description = <<-eos

data/spec/mordor/resource_spec.rb

@@ -242,6 +242,44 @@ describe "with respect to resources" do
       collection.should_not be_nil
       collection.size.should == 1
     end
+
+    describe "with respect to passing extra query parameters to finder methods" do
+      before :each do
+        5.times do |i|
+          TestResource.create({:first => "first", :second => "second-#{i}", :third => "third-#{i}"})
+        end
+      end
+
+      it "should raise an argument exception if the :value option is omitted from a complex finder query" do
+        collection = TestResource.find_by_first("first")
+        collection.size.should == 5
+
+        lambda{ TestResource.find_by_first({:second => "second-2"})}.should raise_error
+      end
+
+      it "should be possible to add extra query clauses to a finder method" do
+        collection = TestResource.find_by_first("first")
+        collection.size.should == 5
+
+        collection = TestResource.find_by_first({:value => "first", :second => "second-2"})
+        collection.size.should == 1
+        resource = collection.first
+        resource.first.should == "first"
+        resource.second.should == "second-2"
+      end
+
+      it "should be possible to add more complex query clauses to a finder method" do
+        collection = TestResource.find_by_first("first")
+        collection.size.should == 5
+
+        collection = TestResource.find_by_first({:value => "first", :second => {:$in => ["second-1", "second-2"]}})
+        collection.size.should == 2
+        collection.each do |res|
+          res.first.should == "first"
+          ["second-1", "second-2"].should include res.second
+        end
+      end
+    end
   end
 
   context "with respect to retrieving by day" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mordor
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Jan-Willem Koelewijn
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-23 00:00:00 +01:00
+date: 2011-12-27 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency