mordor 0.2.9 → 0.2.10

data/lib/mordor/resource.rb

@@ -161,20 +161,16 @@ module Mordor
         Collection.new(self, perform_collection_find(query, options))
       end
 
-      def find_by_day(day, options = {})
-        case day
-        when DateTime
-          start = day.to_date.to_time
-          end_of_day = (day.to_date + 1).to_time
-        when Date
-          start = day.to_time
-          end_of_day = (day + 1).to_time
-        when Time
-          start = day.to_datetime.to_date.to_time
-          end_of_day = (day.to_date + 1).to_datetime.to_date.to_time
+      def find_by_day(value, options = {})
+        if value.is_a?(Hash)
+          raise ArgumentError.new(":value missing from complex query hash") unless value.keys.include?(:value)
+          day = value.delete(:value)
+          query = value.merge(day_to_query(day))
+        else
+          query = day_to_query(value)
         end
-        hash = {:at => {'$gte' => start, '$lt' => end_of_day}}
-        cursor = perform_collection_find({:at => {'$gte' => start, '$lt' => end_of_day}}, options)
+
+        cursor = perform_collection_find(query, options)
         Collection.new(self, cursor)
       end
 
@@ -246,6 +242,29 @@ module Mordor
       def index_types
         @index_types ||= {}
       end
+
+      def day_to_range(day)
+        case day
+        when DateTime
+          start = day.to_date.to_time
+          end_of_day = (day.to_date + 1).to_time
+        when Date
+          start = day.to_time
+          end_of_day = (day + 1).to_time
+        when Time
+          start = day.to_datetime.to_date.to_time
+          end_of_day = (day.to_datetime + 1).to_date.to_time
+        end
+        [start, end_of_day]
+      end
+
+      def date_range_to_query(range)
+        {:at => {:$gte => range.first, :$lt => range.last}}
+      end
+
+      def day_to_query(day)
+        date_range_to_query( day_to_range(day) )
+      end
     end
   end
 end

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.9"
-  s.date    = "2012-01-04"
+  s.version = "0.2.10"
+  s.date    = "2012-01-19"
 
   s.summary     = "mordor"
   s.description = <<-eos

data/spec/mordor/resource_spec.rb

@@ -9,7 +9,8 @@ describe "with respect to resources" do
       attribute :first,  :index => true
       attribute :second, :index => true, :index_type => Mongo::ASCENDING
       attribute :third,  :finder_method => :find_by_third_attribute
-      attribute :at,     :timestamp => true
+      attribute :at
+      attribute :created_at,     :timestamp => true
 
       # Put this in here again to ensure the original method is still here
       class_eval do
@@ -50,7 +51,7 @@ describe "with respect to resources" do
 
   it "should be possible to designate an attribute as a timestamp" do
     TestResource.timestamped_attribute.should_not be_nil
-    TestResource.timestamped_attribute.should == :at
+    TestResource.timestamped_attribute.should == :created_at
   end
 
   it "should only be possible to have one attribute as a timestamp" do
@@ -103,7 +104,7 @@ describe "with respect to resources" do
       end
     end
 
-    it "should correctly replace BSON::Timestampls" do
+    it "should correctly replace BSON::Timestamps" do
       options = {
         "option" => BSON::Timestamp.new(324244, 12)
       }
@@ -117,12 +118,82 @@ describe "with respect to resources" do
     it "should correctly respond to to_hash" do
       resource = TestResource.new({:first => "first", :second => "second", :third => "third"})
       hash = resource.to_hash
-      hash.size.should     == 4
+      hash.size.should     == 5
       hash[:first].should  == "first"
       hash[:second].should == "second"
       hash[:third].should  == "third"
+      hash[:at].should     == ""
     end
+  end
+
+  context "with respect to times and ranges" do
+    context "when DateTime days are given" do
+      it "should return a correct range" do
+        day = DateTime.civil(2012, 1, 19, 10, 0)
+        range = TestResource.send(:day_to_range, day)
+        range.first.should == DateTime.civil(2012, 1, 19).to_time.gmtime
+        range.last.should  == DateTime.civil(2012, 1, 20).to_time.gmtime
+      end
+
+      it "should return an Array of 2 Time objects" do
+        day = DateTime.civil(2012, 1, 19, 10, 0)
+        range = TestResource.send(:day_to_range, day)
+        range.first.should be_a Time
+        range.last.should be_a Time
+      end
+    end
+
+    context "when Date days are given" do
+      it "should return a correct range" do
+        day = Date.parse("2012-1-19")
+        range = TestResource.send(:day_to_range, day)
+        range.first.should == Date.parse("2012-1-19").to_time.gmtime
+        range.last.should  == Date.parse("2012-1-20").to_time.gmtime
+      end
+
+      it "should return an Array of 2 Time objects" do
+        day = Date.parse("2012-1-19")
+        range = TestResource.send(:day_to_range, day)
+        range.first.should be_a Time
+        range.last.should be_a Time
+      end
+    end
+
+    context "when Time days are given" do
+      it "should return a correct range" do
+        day = DateTime.civil(2012, 1, 19, 10, 0).to_time
+        range = TestResource.send(:day_to_range, day)
+        range.first.should == DateTime.civil(2012, 1, 19).to_time.gmtime
+        range.last.should  == DateTime.civil(2012, 1, 20).to_time.gmtime
+      end
+
+      it "should return an Array of 2 Time objects" do
+        day = DateTime.civil(2012, 1, 19, 10, 0).to_time
+        range = TestResource.send(:day_to_range, day)
+        range.first.should be_a Time
+        range.last.should be_a Time
+      end
+    end
+
+    context "when ranges are changed to queries" do
+      before :all do
+        @range = TestResource.send(:day_to_range, DateTime.civil(2012, 1, 19))
+        @query = TestResource.send(:date_range_to_query, @range)
+      end
+
+      it "should scope the query to the 'at' attribute" do
+        @query.size.should == 1
+        @query[:at].should be_a Hash
+      end
 
+      it "should use the first of the range for the greater equal part" do
+        @query[:at][:$gte].should == @range.first
+      end
+
+      it "should use the last of the range for the smaller than part" do
+        @query[:at][:$lt].should == @range.last
+      end
+    end
   end
 
   context "with respect to indices" do
@@ -309,7 +380,7 @@ describe "with respect to resources" do
     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}"})
+          TestResource.create({:first => "first", :second => "second-#{i}", :third => "third-#{i}", :at => (Date.today).to_time})
         end
       end
 
@@ -320,6 +391,30 @@ describe "with respect to resources" do
         lambda{ TestResource.find_by_first({:second => "second-2"})}.should raise_error
       end
 
+      it "should be possible to add extra query clauses to the find_by_day method" do
+        collection = TestResource.find_by_day(Date.today)
+        collection.size.should == 5
+
+        collection = TestResource.find_by_day({:value => Date.today, :second => "second-1"})
+        collection.size.should == 1
+        resource = collection.first
+        resource.first.should == "first"
+        resource.at.should == Date.today.to_time
+      end
+
+      it "should be possible to add more complex query clauses to the find_by_day method" do
+        collection = TestResource.find_by_day(Date.today)
+        collection.size.should == 5
+
+        collection = TestResource.find_by_day({:value => Date.today, :second => {:$in => ["second-1", "second-2"]}})
+        collection.size.should == 2
+        collection.each do |res|
+          res.at.should == Date.today.to_time
+          ["second-1", "second-2"].should include res.second
+        end
+
+      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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mordor
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: false
   segments: 
   - 0
   - 2
-  - 9
-  version: 0.2.9
+  - 10
+  version: 0.2.10
 platform: ruby
 authors: 
 - Jan-Willem Koelewijn
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-04 00:00:00 +01:00
+date: 2012-01-19 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency