mongoid_occurrences 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2a314d87b9ef1b779dd6b1d267225fa9e8d0aed71ec3cd50aa0985eb8ba18d0
-  data.tar.gz: 68b93f8530a9d9ee95a27819e8d1351a819080e0fd37d1aabfbf29242b9df068
+  metadata.gz: 475b41580d7ffc83d7c4d794425a52f53a6e56e31d0a979f18d44f99339a1904
+  data.tar.gz: 869e8ff6af04f48fa176cefc0753833b320f225d937e956449820c8f1e2a3206
 SHA512:
-  metadata.gz: 22a2554e94b5512fc9ab6393050b1c3b959a3410ceda5b31508d5b93a4164b8cb2cc1a94293f411859a2eeb58f6daf178dcb3c1a8307a2dc4b47c60c4706ec7d
-  data.tar.gz: 1a3b5c2b93f38e83d35558fa7d94c878b50abda16d7509657fea8b017091e7b0558720e34696c1ee1920395f97fb14b012b2168324cb31c20c76996e66f18b6f
+  metadata.gz: 6a80de303c833964bd19546d4f76fd818e0bafff5c81f52204f206e2f90d24bc504ce33b4a13473c04d5a4f896f815ea26d68b95440d07dd076dd2ea785cd7d3
+  data.tar.gz: 1b5499f8123d85bcbd9f4b68fece8269f8471e32e2e8d130a30fd69170aa70c0be5c3c0c5fb6a3263fd4b680111bfeec56194862fafe83f9a6f08f00926f54d4

data/.travis.yml

@@ -2,7 +2,7 @@ language: ruby
 cache: bundler
 script: 'bundle exec rake'
 rvm:
-  - 2.5.1
+  - 2.6.0
 services:
   - mongodb
 
@@ -15,5 +15,5 @@ notifications:
 
 matrix:
   include:
-    - rvm: 2.5.1
+    - rvm: 2.6.0
       env: MONGOID_VERSION=7

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 1.1.1
+
+* FIX: issues with handling time zone in daily occurrences and queries
+* ADD: validation on `Occurrence` for `dtend` being after `dtstart`
+
 ## 1.1.0
 
 * CHANGE: `#embedded_in_event` requires `name` (`#embedded_in_event(name, options)`)

data/lib/mongoid_occurrences/occurrence/has_daily_occurrences.rb

@@ -3,9 +3,7 @@ module MongoidOccurrences
     module HasDailyOccurrences
       def daily_occurrences
         adjust_dates_for_all_day!
-
-        daily_occurrences_from_schedule +
-          daily_occurrences_from_date_range
+        daily_occurrences_from_schedule + daily_occurrences_from_date_range
       end
 
       private
@@ -13,14 +11,11 @@ module MongoidOccurrences
       def daily_occurrences_from_schedule
         return [] unless dtstart? && dtend?
         return [] unless recurring?
-
         schedule.occurrences(schedule_dtend).map do |occurrence|
-          MongoidOccurrences::DailyOccurrence.new(
-            dtstart: occurrence.start_time.change(hour: dtstart.hour, min: dtstart.minute),
-            dtend: occurrence.end_time.change(hour: dtend.hour, min: dtend.minute),
-            occurrence_id: id,
-            operator: operator
-          )
+          occurrence_dtstart = occurrence.start_time.in_time_zone(Time.zone).change(hour: dtstart.hour, minute: dtstart.minute)
+          occurrence_dtend = occurrence.end_time.in_time_zone(Time.zone).change(hour: dtend.hour, minute: dtend.minute)
+
+          build_daily_occurrence(occurrence_dtstart, occurrence_dtend, id, operator)
         end
       end
 
@@ -32,17 +27,15 @@ module MongoidOccurrences
         is_single_day = (date_range.first == date_range.last)
 
         date_range.map do |date|
-          occurence_dtstart = is_single_day || date == date_range.first ? dtstart : date.beginning_of_day
-          occurence_dtend = is_single_day || date == date_range.last ? dtend : date.end_of_day
-
-          MongoidOccurrences::DailyOccurrence.new(
-            dtstart: occurence_dtstart,
-            dtend: occurence_dtend,
-            occurrence_id: id,
-            operator: operator
-          )
+          occurrence_dtstart = is_single_day || date == date_range.first ? dtstart : date.beginning_of_day
+          occurrence_dtend = is_single_day || date == date_range.last ? dtend : date.end_of_day
+          build_daily_occurrence(occurrence_dtstart, occurrence_dtend, id, operator)
         end
       end
+
+      def build_daily_occurrence(dtstart, dtend, occurrence_id, operator)
+        MongoidOccurrences::DailyOccurrence.new(dtstart: dtstart, dtend: dtend, occurrence_id: occurrence_id, operator: operator)
+      end
     end
   end
 end

data/lib/mongoid_occurrences/occurrence/has_schedule.rb

@@ -17,7 +17,7 @@ module MongoidOccurrences
 
       def schedule_dtstart
         read_attribute(:schedule_dtstart) ||
-          (dtstart.try(:to_time) || Time.now)
+          (dtstart.try(:to_time) || Time.zone.now)
       end
 
       def schedule_dtend

data/lib/mongoid_occurrences/occurrence.rb

@@ -30,6 +30,8 @@ module MongoidOccurrences
 
         validates :dtstart, presence: true
         validates :dtend, presence: true
+
+        validate :dtend_must_be_after_dtstart
       end
     end
 
@@ -49,5 +51,15 @@ module MongoidOccurrences
       self.dtstart = dtstart.beginning_of_day
       self.dtend = dtend.end_of_day
     end
+
+    private
+
+    def dtend_must_be_after_dtstart
+      return unless dtstart.present? && dtend.present?
+
+      if dtend < dtstart
+        errors.add(:dtend, :must_be_after_dtstart)
+      end
+    end
   end
 end

data/lib/mongoid_occurrences/queries/occurs_between.rb

@@ -14,8 +14,8 @@ module MongoidOccurrences
       end
 
       def criteria
-        base_criteria.lte(dtstart_field => adjusted_dtend)
-                     .gte(dtend_field => adjusted_dtstart)
+        base_criteria.lte(dtstart_field => adjusted_dtend.utc)
+                     .gte(dtend_field => adjusted_dtstart.utc)
       end
 
       private

data/lib/mongoid_occurrences/queries/occurs_on.rb

@@ -10,7 +10,7 @@ module MongoidOccurrences
       end
 
       def criteria
-        OccursBetween.criteria(base_criteria, adjusted_dtstart, adjusted_dtend, options)
+        OccursBetween.criteria(base_criteria, adjusted_dtstart.utc, adjusted_dtend.utc, options)
       end
 
       private

data/lib/mongoid_occurrences/queries/occurs_until.rb

@@ -12,7 +12,7 @@ module MongoidOccurrences
       end
 
       def criteria
-        base_criteria.lte(dtend_field => adjusted_date_time)
+        base_criteria.lte(dtend_field => adjusted_date_time.utc)
       end
 
       private

data/lib/mongoid_occurrences/version.rb

@@ -1,3 +1,3 @@
 module MongoidOccurrences
-  VERSION = '1.1.0'.freeze
+  VERSION = '1.1.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_occurrences
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Tomas Celizna
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-23 00:00:00.000000000 Z
+date: 2019-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ice_cube