mongoid_recurring 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94d65ba8e9128113f411305a33c0772f28ec8bdd
-  data.tar.gz: eef1e3fa0d8780d7c249a057e69bf973b6ad5b5f
+  metadata.gz: d85b73b3c24c54091208f08e81cacb20de632f14
+  data.tar.gz: eac9e4fc14653e733a10d782a5b684f5bd4c1856
 SHA512:
-  metadata.gz: 4513dff61f133e65a3395d95fd56cc595f811061ba94a9820d7ec0a8d4e0fc5931eaa31129842535fbf1606837ddc7eee520d7cfcceff010a9a651598f00b99b
-  data.tar.gz: 3befbe40edcaf52f15117caa75ffea84cae1d06eab94c2d00695d5fc35a95fa81d355e472927be4ec25bcf84b1686b18616559463597e600209809b29aff4d70
+  metadata.gz: 0a01e15f26a9c90f8d3676a936fb031c912012db423407ba1af13a10b53960bcf31661b1b85f5acfa00d2600b3b3f28f9a4ffac8b700023838b1c6681cdf2382
+  data.tar.gz: 97aade14ef57dbfb29987a44fc5b7a2c2a7bc011d435b18e45e0d0d8ea1ad94c13802d4d249d9d6f3b97e0de3a4e1790875dbcac93b429c3a03fa002119ff5e6

data/lib/mongoid_recurring/has_recurring_fields.rb

@@ -35,19 +35,15 @@ module MongoidRecurring
         # ---------------------------------------------------------------------
 
         scope :for_datetime_range, -> (dtstart, dtend) {
-          dtstart = dtstart.beginning_of_day if dtstart.instance_of?(Date)
-          dtend = dtend.end_of_day if dtend.instance_of?(Date)
-          where({ occurrences: { "$elemMatch" => { :dtstart.lte => dtend.to_datetime, :dtend.gte => dtstart.to_datetime } } })
+          where({ occurrences: { "$elemMatch" => Occurence.for_datetime_range(dtstart, dtend).selector } })
         }
 
         scope :from_datetime, -> (dtstart) {
-          dtstart = dtstart.beginning_of_day if dtstart.instance_of?(Date)
-          where( occurrences: { "$elemMatch" => { :dtstart.gte => dtstart.to_datetime } } )
+          where( occurrences: { "$elemMatch" => Occurence.from_datetime(dtstart).selector } )
         }
 
         scope :to_datetime, -> (dtend) {
-          dtend = dtend.end_of_day if dtend.instance_of?(Date)
-          where( occurrences: { "$elemMatch" => { :dtend.lte => dtend.to_datetime } } )
+          where( occurrences: { "$elemMatch" => Occurence.to_datetime(dtend).selector } )
         }
       end
     end

data/lib/mongoid_recurring/occurence.rb

@@ -17,6 +17,24 @@ module MongoidRecurring
     before_save :set_dtend
     before_save :adjust_dates_for_all_day
 
+    # ---------------------------------------------------------------------
+
+    scope :for_datetime_range, -> (dtstart, dtend) {
+      dtstart = dtstart.beginning_of_day if dtstart.instance_of?(Date)
+      dtend = dtend.end_of_day if dtend.instance_of?(Date)
+      where( :dtstart.lte => dtend.to_datetime, :dtend.gte => dtstart.to_datetime )
+    }
+
+    scope :from_datetime, -> (dtstart) {
+      dtstart = dtstart.beginning_of_day if dtstart.instance_of?(Date)
+      where( :dtstart.gte => dtstart.to_datetime )
+    }
+
+    scope :to_datetime, -> (dtend) {
+      dtend = dtend.end_of_day if dtend.instance_of?(Date)
+      where( :dtend.lte => dtend.to_datetime )
+    }
+
     # =====================================================================
 
     def all_day?

data/lib/mongoid_recurring/version.rb

@@ -1,3 +1,3 @@
 module MongoidRecurring
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_recurring
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Tomáš Celizna