trusty-festivity-extension 2.1.0 → 2.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGQxN2I5NDA1ZjZlZWUxYzg0MWRlY2JjMmEwN2I1OWI5NDdiYzNhMA==
+    ODcyMWZmMTZkNGUyNDhjZWE3YmI0Y2M2MmVhNzZhYzJjYzliZmI1ZA==
   data.tar.gz: !binary |-
-    ZTYxZjIzZDNjMjdiNDRjM2Q5NDY0YzhlYmEyZjBjNjJmMzIwNDRiOA==
+    YzZiZmVlODhiNjM0M2ZhZTQyNDIyNTVmMjAwM2ExMDI5NjJjNzQ4ZQ==
 SHA512:
   metadata.gz: !binary |-
-    NDMwYzJkZjQ2ZWM2NDYxZjk1MGVlZGJjOGIxM2Q4ZjUxNDczNDcwYWRhODJi
-    ZTgxYmMwNjlkMWE4OWFiMDZiNjI0OGU4NjNmMWMyZDU5Y2NiODA3ZDFlOWFi
-    NmJkYjVkOTM1MzQ0MmZiNjRlNGVlOTQ1YTM5MWU5YjZhY2IzNTQ=
+    ZjczYzlhMzMwZDkzNmM0OWYwOGE5NjRkYjdhODc4ODdkYjk0ZWMzZjc1N2Uy
+    ZWU4M2FlZGNhYmQ3NTE4MTdlYmU1NTIwOGVjZjRkNTU3YTQ2NzUyMTA0ZGJm
+    NzJhZTFmZWRjYjJmOGY5MjU3MzAyMTc3ZDI3ODkyYTEzMTFlNDI=
   data.tar.gz: !binary |-
-    NjA0YzQyOTlmZjVkODc2MjBkZDRiODNjNmQ5OTQ5NmMyOTE3YjU0NjhkMjc1
-    YzkzNzllNjcxYTMwNDUzMzc0NDgxMDBkMTgwNGU3ZWIyNDBkNmM4ZjBiMTRj
-    ZDVhYjcxMTUyZDc5YzAzNDFhZjNkMmJhNDA5MjU5NTJmZjJmOTE=
+    Nzk0YzI2MjgxOWEyMWRjZWUxYmViMDg4MjZkMjhhMDdjZWJlYmYzNjJlMDdm
+    OTQwMWQzOWM0MTU1OWVhZDU3MWQ2NTkzMmM4OWQwZmI5MTVmZTI4N2RlYjA1
+    MDg4MDJiMmVjZjY4OThmMjE0OWY2NjYzZjRmYjViOThlYWQxN2Y=

data/app/controllers/festivity_events_controller.rb

@@ -3,7 +3,8 @@ class FestivityEventsController < ApplicationController
   no_login_required
   trusty_layout 'base'
 
-  #caches_action :show
+  caches_action :index, cache_path: proc { |c| c.params.except(:_).merge(format: request.xhr?)}
+  caches_action :show
 
   def index
     order_by = params[:sort] ? params[:sort] : "start_date"

data/app/models/festivity_event_list.rb

@@ -80,7 +80,7 @@ class FestivityEventList
   def self.parse_criteria(criteria)
     event_ids = event_ids_for_dates(criteria[:dates]) if criteria[:dates]
     where_clause = "site_id = #{ Page.current_site.id}"
-    where_clause += " AND event_id IN (#{event_ids.join(",")})" if event_ids
+    where_clause += " AND event_id IN (#{event_ids.join(",")})" if event_ids.present?
     where_clause += " AND #{parse_categories(criteria[:categories].split(","))}" if criteria[:categories]
     where_clause
   end
@@ -95,4 +95,5 @@ class FestivityEventList
   end
 
 
-end
+end
+

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

@@ -1,62 +1,63 @@
 #event-list-items
-  - @events.each do |event|
-    - cache(event) do
-      .row.event-list-item{class: event.id, data:{ genre: event.categories.first.id, date: event.performances.first.start_date, location: event.locations.first.id} }
-        %hr
-        .event-list-item__photo.col-xs-12.col-sm-4
-          .photo
-            = link_to event_path(event.id) do
-              %img.img-responsive{ src: "#{event.image}"}
-            - if event.featured_item
-              .event_list-item__photo-featured-item
-                Featured Event!
-        .event-list-item__info.col-xs-12.col-sm-8
-          = link_to event_path(event.id) do
-            %h2
-              = event.title
-          %h3
-            %span.strong
-              = event.header
-            %span.light
-              = event.sub_header
+  - cache(@events) do
+    - @events.each do |event|
+      - cache(event) do
+        .row.event-list-item{class: event.id, data:{ genre: event.categories.first.id, date: event.performances.first.start_date, location: event.locations.first.id} }
           %hr
-          %p
-            - if event.locations.count == 1
-              - event_location = event.locations.first
-              =link_to location_path(id: event_location.slug) do
-                = event_location.title
-              @
-              =link_to area_path(id: event_location.area_slug) do
-                = event_location.area_title
-            - else
-              Multiple Locations
-          - if event.performances.count > 1
+          .event-list-item__photo.col-xs-12.col-sm-4
+            .photo
+              = link_to event_path(event.id) do
+                %img.img-responsive{ src: "#{event.image}"}
+              - if event.featured_item
+                .event_list-item__photo-featured-item
+                  Featured Event!
+          .event-list-item__info.col-xs-12.col-sm-8
+            = link_to event_path(event.id) do
+              %h2
+                = event.title
+            %h3
+              %span.strong
+                = event.header
+              %span.light
+                = event.sub_header
+            %hr
             %p
-              Multiple dates and times 
-              %button.btn.btn-sm.btn-default.btn-popover{type: "button", data: {content: date_time_popover(event.performances), html: "true",  placement:"top", toggle: "popover"}, title:"All Dates and Times"}
-                Show all
-          - else
-            - event.performances.each do |perf|
+              - if event.locations.count == 1
+                - event_location = event.locations.first
+                =link_to location_path(id: event_location.slug) do
+                  = event_location.title
+                @
+                =link_to area_path(id: event_location.area_slug) do
+                  = event_location.area_title
+              - else
+                Multiple Locations
+            - if event.performances.count > 1
               %p
-                = perf.start_date.strftime("%A, %B %d")
-                = ", "
-                = perf.start_date.strftime("%I:%M%p").downcase
-                = " - "
-                = perf.end_date.strftime('%I:%M%p').downcase
-          %hr
-          %p
-          .event-list-item__info_short_description
-            -# category = event.categories.first
-            -# %a.strong(href='#')
-                    = category.name
-            %span
-              = event.short_description.html_safe
-          %p
-          .event-list-item__button-group
-            = link_to  "Details", event_path(event.id), class: 'btn event-list-item__btn'
-            - unless event.buy_url.blank?
-              = link_to  "Tickets", "#{event.buy_url}", class: 'btn event-list-item__btn', target: '_blank'
-            -#%button.btn.event-list-item__btn{href: "", data: {toggle:"modal", target:"#share-modal"}, type: "button"}
-              Share
-            - unless event.locations.first.directions_url.blank?
-              = link_to  "Directions", "#{event.locations.first.directions_url}", class: 'btn event-list-item__btn', target: '_blank'
+                Multiple dates and times 
+                %button.btn.btn-sm.btn-default.btn-popover{type: "button", data: {content: date_time_popover(event.performances), html: "true",  placement:"top", toggle: "popover"}, title:"All Dates and Times"}
+                  Show all
+            - else
+              - event.performances.each do |perf|
+                %p
+                  = perf.start_date.strftime("%A, %B %d")
+                  = ", "
+                  = perf.start_date.strftime("%I:%M%p").downcase
+                  = " - "
+                  = perf.end_date.strftime('%I:%M%p').downcase
+            %hr
+            %p
+            .event-list-item__info_short_description
+              -# category = event.categories.first
+              -# %a.strong(href='#')
+                      = category.name
+              %span
+                = event.short_description.html_safe
+            %p
+            .event-list-item__button-group
+              = link_to  "Details", event_path(event.id), class: 'btn event-list-item__btn'
+              - unless event.buy_url.blank?
+                = link_to  "Tickets", "#{event.buy_url}", class: 'btn event-list-item__btn', target: '_blank'
+              -#%button.btn.event-list-item__btn{href: "", data: {toggle:"modal", target:"#share-modal"}, type: "button"}
+                Share
+              - unless event.locations.first.directions_url.blank?
+                = link_to  "Directions", "#{event.locations.first.directions_url}", class: 'btn event-list-item__btn', target: '_blank'

data/festivity_extension.rb

@@ -8,6 +8,7 @@ class FestivityExtension < TrustyCms::Extension
 
   def activate
     require 'fog'
+    require 'actionpack/action_caching'
     admin.page.edit.add(:form, "festivity_includes", :before => 'edit_page_parts')
     admin.page.edit.add(:form, "festivity_featured_image_fields", :after => 'edit_page_parts')
     admin.page.edit.add(:form, "festivity_base_fields", :after => 'edit_page_parts')

data/lib/trusty-festivity-extension.rb

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

data/trusty-festivity-extension.gemspec

@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
   s.add_dependency "trusty-layouts-extension"     , "~> 2.0"
   s.add_dependency "trusty-rad-social-extension"  , "~> 2.0"
   s.add_dependency "trusty-multi-site-extension"  , "~> 2.0"
+  s.add_dependency 'actionpack-action_caching'    , '~> 1.1.1'
   s.add_dependency 'dalli-elasticache'            ,'~> 0.1.2'
 
   s.add_dependency 'trusty_google_custom_search'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-festivity-extension
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Eric Sipple
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-03 00:00:00.000000000 Z
+date: 2015-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trusty-cms
@@ -108,6 +108,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: actionpack-action_caching
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: dalli-elasticache
   requirement: !ruby/object:Gem::Requirement