trusty-festivity-extension 2.5.9 → 2.5.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f55561d45167133b7bebf3a6729685b61cfc4821
-  data.tar.gz: 8a122a3632a7b5022b96413fd11a53fbdfba56d0
+  metadata.gz: 44383c49334ea5a2c25ae9728bae5be584603a68
+  data.tar.gz: 5ecae9f15afd3811836a2f9f8ca6fe5ef34f76b3
 SHA512:
-  metadata.gz: a5b69b577ec749dfc7ae769d6e8b4fe073313c8eb93fa0e363443cde9f49693a869e548416f68de36d08f9d33fbbd2a6f918bb96c51f84462de11c85caf820ee
-  data.tar.gz: 009f45970ddc9afc3f5cdefef12538bfa87fcca24c059289baf6ff38de504cefd7ae6c1f1f80dc16f6ad230cbbd3a0198af35c3e62ece46142cfa57ad428a6f4
+  metadata.gz: 431e0e613a82bd487bd5c790e3073c3304d01cdd5cf9456ba74cd43346a2845e3db2b2a7bc36da68f85b295cfa8100a5c0f8748c62255457ffdddc6705a2c0d0
+  data.tar.gz: 3d7b3f8e6ff8a1b6e94008c068a5af3c8067cd758cb47d19dff8219f2443f9c4dff26029b082ac53e6d24a99aa2e53f622ab69e188e9e45bf560699a93e35be3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-festivity-extension (2.5.9)
+    trusty-festivity-extension (2.5.10)
       actionpack-action_caching (~> 1.1.1)
       chronic (~> 0.10.2)
       dalli-elasticache (~> 0.1.2)

data/app/models/festivity_event_list.rb

@@ -33,10 +33,11 @@ class FestivityEventList
     current_site = Page.current_site
     festival_date_times = FestivityEventList.collect_festival_dates(current_site)
     festival_dates = festival_date_times.map! {|date| date.to_date}
+    now = DateTime.now.in_time_zone("Eastern Time (US & Canada)")
 
-    if festival_dates.include?(DateTime.now.to_date)
-      FestivityPerformance.where(start_date: DateTime.now...DateTime.now + 1.day).includes(:festivity_event_page).where(pages: {status_id: 100, site_id: Page.current_site.id, layout_id: nil}).compact.sort_by{|e| e[:date]}.first(3)
-    elsif festival_dates.first > DateTime.now.to_date
+    if festival_dates.include?(now.to_date)
+      FestivityPerformance.where(start_date: now...now + 1.day).includes(:festivity_event_page).where(pages: {status_id: 100, site_id: Page.current_site.id, layout_id: nil}).compact.sort_by{|e| e[:date]}.first(3)
+    elsif festival_dates.first > now.to_date
       FestivityPerformance.includes(:festivity_event_page).where(pages: {status_id: 100, site_id: current_site.id, layout_id: nil}).compact.sort_by{|e| e[:date]}.first(3)
     else
       FestivityPerformance.includes(:festivity_event_page).where(pages: {status_id: 100, site_id: current_site.id, layout_id: nil}).compact.sort_by{|e| e[:date]}.last(3)

data/lib/trusty-festivity-extension.rb

@@ -1,5 +1,5 @@
 module TrustyFestivityExtension
-  VERSION     = "2.5.9"
+  VERSION     = "2.5.10"
   SUMMARY     = "Festival microsite engine for Trusty CMS"
   DESCRIPTION = "Event management for arts festivals."
   URL         = "http://github.com/pgharts/trusty-festivity-extension"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-festivity-extension
 version: !ruby/object:Gem::Version
-  version: 2.5.9
+  version: 2.5.10
 platform: ruby
 authors:
 - Eric Sipple, Danielle Greaves, Brittany Martin, Patrick FitzGerald
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-07 00:00:00.000000000 Z
+date: 2016-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trusty-cms