mongoid_occurrence_views 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa268d9e2656e8b35616ab70bcf40d92bd40c9a7e4cf9a11b8aaf793579fa12f
-  data.tar.gz: 4892510c48dc5f11900721465971a7968a8d77b7fa22237ceb3af39afedcc6cd
+  metadata.gz: c3ffeb3d7b442d27f68887e73ec5d02b84d9e35b391d2d498a65c4982b636112
+  data.tar.gz: da20afd3da6af7d2f027bb16868ef74151c31f1403dcd6847337c15a8f914d55
 SHA512:
-  metadata.gz: 328d2122351ec35fb11b8fa09a72a0635e8d49aeab5cea001ae56b46c4b9ba527370658a5e20668c874aec01ea78163d703efe8fe32fa456fa5c605db085508d
-  data.tar.gz: 329f2f783191b3a038e2808e7c90ceceb52dde6ddb514f8c46a2c605d3d6a1794d4d0f76c4764e816d651c7c9a899df284b4dfb1bcf62ba2301d3d5cced9714f
+  metadata.gz: d2c07710cb02f5e2ac2c12b0bcc35acd64b01b830d44c1cf326c69fd2fb88e3e3b1b47483f8c6ad9b60ac2289079952976b4d4b79b061c8e2b9d2d1e1c462854
+  data.tar.gz: 563f4d924c63357793699d99539be0b724acb90d74e6364c262491726bd9c7b0c70c40d7d711653135dfc48a168e86d9a1a043ddca121ef3750df9406c7cbd32

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 0.2.0
+
+* [PR#3](https://github.com/tomasc/mongoid_occurrence_views/pull/3) `all_day` becomes a field
+
 ## 0.1.1
 
 * [PR#2](https://github.com/tomasc/mongoid_occurrence_views/pull/2) allow :assign_daily_occurrences to be triggerred manually

data/lib/mongoid_occurrence_views/event/has_views_on_occurrences.rb

@@ -18,6 +18,13 @@ module MongoidOccurrenceViews
         DateTime.demongoize(self[:_dtend])
       end
 
+      def all_day
+        return unless dtstart.present? && dtend.present?
+        dtstart.to_i == dtstart.beginning_of_day.to_i &&
+          dtend.to_i == dtend.end_of_day.to_i
+      end
+      alias all_day? all_day
+
       module ClassMethods
         def occurrences_ordering_view_name
           [collection.name, ORDERING_VIEW_NAME_SUFFIX].join('__').freeze

data/lib/mongoid_occurrence_views/event/occurrence.rb

@@ -12,6 +12,7 @@ module MongoidOccurrenceViews
         def embedded_in_event(options = {})
           field :dtstart, type: DateTime
           field :dtend, type: DateTime
+          field :all_day, type: Boolean
 
           field :schedule, type: MongoidIceCubeExtension::Schedule
           field :schedule_dtend, type: Time
@@ -38,17 +39,14 @@ module MongoidOccurrenceViews
       end
 
       def all_day
-        return unless dtstart.present?
-        return unless dtend.present?
+        return super unless dtstart.present? && dtend.present?
+        return super unless super.nil?
 
-        @all_day ||= dtstart == dtstart.beginning_of_day && dtend == dtend.end_of_day
+        dtstart.to_i == dtstart.beginning_of_day.to_i &&
+          dtend.to_i == dtend.end_of_day.to_i
       end
       alias all_day? all_day
 
-      def all_day=(val)
-        @all_day = [true, 'true', 1, '1'].include?(val)
-      end
-
       def recurring?
         schedule.present?
       end
@@ -66,8 +64,8 @@ module MongoidOccurrenceViews
       def adjust_dates_for_all_day
         return unless all_day?
 
-        self.dtstart = dtstart.beginning_of_day
-        self.dtend = dtend.end_of_day
+        write_attribute(:dtstart, dtstart.try(:beginning_of_day))
+        write_attribute(:dtend, dtend.try(:end_of_day))
       end
 
       def assign_daily_occurrences
@@ -87,6 +85,7 @@ module MongoidOccurrenceViews
 
       def daily_occurrences_from_date_range
         return [] if recurring?
+
         date_range = Range.new(dtstart.to_date, dtend.to_date)
         is_single_day = (date_range.first == date_range.last)
 
@@ -109,10 +108,10 @@ module MongoidOccurrenceViews
         field :de, as: :dtend, type: DateTime
 
         def all_day
-          return unless dtstart.present?
-          return unless dtend.present?
+          return unless dtstart.present? && dtend.present?
 
-          dtstart == dtstart.beginning_of_day && dtend == dtend.end_of_day
+          dtstart.to_i == dtstart.beginning_of_day.to_i &&
+            dtend.to_i == dtend.end_of_day.to_i
         end
         alias all_day? all_day
       end

data/lib/mongoid_occurrence_views/version.rb

@@ -1,3 +1,3 @@
 module MongoidOccurrenceViews
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.2.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_occurrence_views
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Tomas Celizna