trusty-festivity-extension 2.2.5 → 2.2.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODM1ZTdlNDdiNDhlMjBiYzkwNTU4MDc2MjJhMzAyNmY3MTJhOTUzNw==
+    ZjUyYTY5YTdhOTQyYjY4M2ZlMGM3MGFhZmJkYTJmY2Y2YTk3OTZkZQ==
   data.tar.gz: !binary |-
-    MDI0OWQ4ZjU5NWNkNDZiNGE3OGNlZDhiNzQwMDk3MmJlNjI0YmYxZA==
+    YjM2OTY4YWI5NTkyZGU2NTM0NzBkZWE2Yjc0MDk4MDViMGFjNWQ4MQ==
 SHA512:
   metadata.gz: !binary |-
-    YzU4OWUzYWI2MGExYjNlNzQ3NzIxM2JiNmE0YTI1YzE5ZmE2MWM1NjE2NWJj
-    YjBiMDIwM2NmMGM2YWE3ZWIwNGMwYjM0MjM5M2NjYmJhOGY4NTkwYTQzZTc3
-    YTY3ZjgyMmYyZGYxZTYwNDZiNzMyYzJkNWM2MGY0NTFlYzU5Mzk=
+    ZTU3N2U5YWIzM2EwY2VlMTU4ZjA3MzEzZTBkODNiZDkwNDc2MzM1NWI3MjJk
+    YzRjYjhjMjkxNTkxZGFkMWE5ZDlkNzQ3YWU3NGUzYWI3MDkxZjFkMzRhMDJk
+    NzcwMGNmMmY2NmQ2NmM3ZGZhNjJmMjM2N2ViNTJiNGM2Nzk0ZDQ=
   data.tar.gz: !binary |-
-    NTk3NWJlODQxNWJkZGY2NDdiMmRhYWUwNmZhNzdlZmQ3NTgzOWRjYzlhMTI2
-    MGJhMjRjOTZkZDY2OGNkZTYyNTMyMDM0Y2NjMmZlZmM2ODVkMzEwYWM5Nzg0
-    Y2Q3MTY5ZGNmZWFkMTJkMTk3MTkzZDY4MDE2MmE1ODU2ZDlhZWI=
+    M2Y0NDQ0YTNjMTU3ZTA1MTM3ZTRlMzQzYzAzMTFlMTFkMjNlMmZkYmI4YzAy
+    NzQ2ODE1ODVjYjM4ZjY5MTYxZDFjZDM2ZTc1YjEyNGUxODFlYmRjZjNkNjc3
+    NTE0YThjYThkNWEwMjlmNTA5NjczY2ZkMTc3ZjY4M2NmOWQ3MDU=

data/app/controllers/festivity_events_controller.rb

@@ -19,7 +19,7 @@ class FestivityEventsController < ApplicationController
     end
 
 
-    @selected_dates = params[:dates] ? params[:dates].split(",") : []
+    @selected_dates = params[:dates] ? FestivityDatetimeFilterPresenter.parse(params[:dates].split(","), current_site.festivity_filter_type) : []
     @selected_categories = params[:categories] ? params[:categories].split(",") : []
     @selected_sort = order_by
     # If the request is AJAX, only return the event list itself, not the full page

data/app/models/festivity_event_list.rb

@@ -9,7 +9,12 @@ class FestivityEventList
   end
 
   def self.search(criteria, order_by)
+    begin
     where_clause = parse_criteria(criteria)
+    rescue ActiveRecord::RecordNotFound
+      return FestivityEventList.new([])
+    end
+
     # where in event ids
     FestivityEventList.new(
         FestivityEventList::FestivityEventPerformance.
@@ -59,7 +64,7 @@ class FestivityEventList
   # for each date passed in and return the SQL condition
   def self.datetime_criteria(datetimes_string, filter_type)
     date_queries = datetimes_string.split(',').map do |date_string|
-      start_date = DateTime.parse(URI.decode(date_string))
+      start_date = Chronic.parse(date_string)
       end_date = start_date.advance(advance_by(filter_type))
       <<-SQL
         (
@@ -84,7 +89,11 @@ class FestivityEventList
   # - The event ids returned, if any, are added to the where clause for the next query
   # - Any category ids passed are added to the where clause as well.
   def self.parse_criteria(criteria)
-    event_ids = event_ids_for_datetimes(criteria[:dates], criteria[:filter_type]) if criteria[:dates]
+    if criteria[:dates]
+      event_ids = event_ids_for_datetimes(criteria[:dates], criteria[:filter_type])
+      raise ActiveRecord::RecordNotFound unless event_ids.any?
+    end
+
     where_clause = "site_id = #{ Page.current_site.id}"
     where_clause += " AND event_id IN (#{event_ids.join(",")})" if event_ids.present?
     where_clause += " AND #{parse_categories(criteria[:categories].split(","))}" if criteria[:categories]

data/app/presenters/festivity_datetime_filter_presenter.rb

@@ -5,6 +5,10 @@ class FestivityDatetimeFilterPresenter
 
   end
 
+  def self.parse(datetimes, datetime_type)
+    self.new(datetimes.map{|date| Chronic.parse(date)}, datetime_type)
+  end
+
   private
 
   def self.datetime_type_class(datetime_type)

data/app/presenters/festivity_datetime_presenter.rb

@@ -5,6 +5,10 @@ class FestivityDatetimePresenter
     @datetime = datetime
   end
 
+  def ==(other_object)
+    @datetime == other_object.datetime
+  end
+
   def display_as_date
     @datetime.strftime("%a, %B %-d")
   end

data/app/views/festivity_events/_event_filters.html.haml

@@ -24,7 +24,7 @@
           %li
             .checkbox
               %label
-                - checked = @selected_dates.include? datetime
+                - checked = @selected_dates.any? {|selected_date| selected_date == datetime}
                 %input{type: "checkbox", value: datetime.to_s, checked: checked,  data: {filter: "Date", sort: datetime.to_s}}
                   = datetime.display
       - current_site.festivity_active_category_types.each do |type|

data/lib/trusty-festivity-extension.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trusty-festivity-extension
 version: !ruby/object:Gem::Version
-  version: 2.2.5
+  version: 2.2.6
 platform: ruby
 authors:
 - Eric Sipple