trusty-festivity-extension 2.1.1 → 2.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODcyMWZmMTZkNGUyNDhjZWE3YmI0Y2M2MmVhNzZhYzJjYzliZmI1ZA==
+    ZDAxODFiOTU5ZTc5NzMwOGNiNjhlYWFlMmRlZTQ4ZWMzMmFiZTY0YQ==
   data.tar.gz: !binary |-
-    YzZiZmVlODhiNjM0M2ZhZTQyNDIyNTVmMjAwM2ExMDI5NjJjNzQ4ZQ==
+    ODRhMjdkZWZiMzg1Mzk3ZjBiNjBmYWYwNjc3ODJmNWNmYjcxOTkxZg==
 SHA512:
   metadata.gz: !binary |-
-    ZjczYzlhMzMwZDkzNmM0OWYwOGE5NjRkYjdhODc4ODdkYjk0ZWMzZjc1N2Uy
-    ZWU4M2FlZGNhYmQ3NTE4MTdlYmU1NTIwOGVjZjRkNTU3YTQ2NzUyMTA0ZGJm
-    NzJhZTFmZWRjYjJmOGY5MjU3MzAyMTc3ZDI3ODkyYTEzMTFlNDI=
+    YTk1YjNlOTQzY2QzZjIzYzQ4ZTFlNTBiMDAzODliMGMyMzZmNzZlMzUyNTc0
+    NjY5NjdjN2IwOGJkNjkwNGJiODMxNGFlODc4OWJkZTY5ZjY3Y2U0MTI1ZTI1
+    OThjN2VlMzAwYTAyNGZlYTQyM2NmNWVmODYyYjg0YTZkZGJlM2M=
   data.tar.gz: !binary |-
-    Nzk0YzI2MjgxOWEyMWRjZWUxYmViMDg4MjZkMjhhMDdjZWJlYmYzNjJlMDdm
-    OTQwMWQzOWM0MTU1OWVhZDU3MWQ2NTkzMmM4OWQwZmI5MTVmZTI4N2RlYjA1
-    MDg4MDJiMmVjZjY4OThmMjE0OWY2NjYzZjRmYjViOThlYWQxN2Y=
+    YzIyNWRhMWUxYWMwMjkxZWQ2NjYwOTdhZjM2MGIwNDAwZTZiNTAwNTAyNGNl
+    ZmQ2MTEzYjRhYThjYTYyMWVjNjk1YzA2OGZjMmUwZDhlMjk0ODNjNDcwMzlk
+    ZjZhNmI2OWI3M2MyZDEzODMyNGVhNzVjOWIyNDM5NWVmZjQ5ZTY=

data/app/assets/javascripts/admin/sites/site_bindings.js

@@ -1,4 +1,94 @@
 $(function () {
+    $.extend($.inputmask.defaults.aliases, {
+        festivitydatetime12: {
+            mask: "1/2/y h:s t\\m",
+            placeholder: "mm/dd/yyyy hh:mm xm",
+            alias: "mm/dd/yyyy",
+            hourFormat: "12",
+            regex: {
+                hrspre: new RegExp("[012]"),
+                hrs24: new RegExp("2[0-4]|1[3-9]"),
+                hrs: new RegExp("[01][0-9]|2[0-4]"),
+                ampm: new RegExp("^[a|p|A|P][m|M]"),
+                mspre: new RegExp("[0-5]"),
+                ms: new RegExp("[0-5][0-9]")
+            },
+            timeseparator: ":",
+            definitions: {
+                h: {
+                    validator: function(chrs, maskset, pos, strict, opts) {
+                        if ("24" == opts.hourFormat && 24 == parseInt(chrs, 10)) return maskset.buffer[pos - 1] = "0",
+                            maskset.buffer[pos] = "0", {
+                            refreshFromBuffer: {
+                                start: pos - 1,
+                                end: pos
+                            },
+                            c: "0"
+                        };
+                        var isValid = opts.regex.hrs.test(chrs);
+                        if (!strict && !isValid && (chrs.charAt(1) == opts.timeseparator || -1 != "-.:".indexOf(chrs.charAt(1))) && (isValid = opts.regex.hrs.test("0" + chrs.charAt(0)))) return maskset.buffer[pos - 1] = "0",
+                            maskset.buffer[pos] = chrs.charAt(0), pos++, {
+                            refreshFromBuffer: {
+                                start: pos - 2,
+                                end: pos
+                            },
+                            pos: pos,
+                            c: opts.timeseparator
+                        };
+                        if (isValid && "24" !== opts.hourFormat && opts.regex.hrs24.test(chrs)) {
+                            var tmp = parseInt(chrs, 10);
+                            return 24 == tmp ? (maskset.buffer[pos + 5] = "a", maskset.buffer[pos + 6] = "m") : (maskset.buffer[pos + 5] = "p",
+                                maskset.buffer[pos + 6] = "m"), tmp -= 12, 10 > tmp ? (maskset.buffer[pos] = tmp.toString(),
+                                maskset.buffer[pos - 1] = "0") : (maskset.buffer[pos] = tmp.toString().charAt(1),
+                                maskset.buffer[pos - 1] = tmp.toString().charAt(0)), {
+                                refreshFromBuffer: {
+                                    start: pos - 1,
+                                    end: pos + 6
+                                },
+                                c: maskset.buffer[pos]
+                            };
+                        }
+                        return isValid;
+                    },
+                    cardinality: 2,
+                    prevalidator: [ {
+                        validator: function(chrs, maskset, pos, strict, opts) {
+                            var isValid = opts.regex.hrspre.test(chrs);
+                            return strict || isValid || !(isValid = opts.regex.hrs.test("0" + chrs)) ? isValid : (maskset.buffer[pos] = "0",
+                                pos++, {
+                                pos: pos
+                            });
+                        },
+                        cardinality: 1
+                    } ]
+                },
+                s: {
+                    validator: "[0-5][0-9]",
+                    cardinality: 2,
+                    prevalidator: [ {
+                        validator: function(chrs, maskset, pos, strict, opts) {
+                            var isValid = opts.regex.mspre.test(chrs);
+                            return strict || isValid || !(isValid = opts.regex.ms.test("0" + chrs)) ? isValid : (maskset.buffer[pos] = "0",
+                                pos++, {
+                                pos: pos
+                            });
+                        },
+                        cardinality: 1
+                    } ]
+                },
+                t: {
+                    validator: function(chrs, maskset, pos, strict, opts) {
+                        return opts.regex.ampm.test(chrs + "m");
+                    },
+                    casing: "lower",
+                    cardinality: 1
+                }
+            },
+            insertMode: !1,
+            autoUnmask: !1
+        }
+    });
   Festivity.CategoryTypes.bindEvents();
   Festivity.Categories.bindEvents(null);
+    $(".date_field").inputmask("festivitydatetime12");
 });

data/app/assets/stylesheets/admin/modules/_form_styles.scss

@@ -14,7 +14,7 @@
 .festivity-title {
   margin: 2em 0;
   padding: 1em .5em;
-  background-color: $dark-background;
+  background-color: $light-background;
 }
 
 .festivity-error {

data/app/controllers/admin/festivity_performances_controller.rb

@@ -3,7 +3,7 @@ class Admin::FestivityPerformancesController  < Admin::ResourceController
     event = FestivityEventPage.find(params[:event_page_id])
     performance = event.festivity_performances.new
     if performance.save
-      render partial: 'admin/pages/partials/performance', :locals => { :performance => performance, :locations => FestivityLocationPage.all }
+      render partial: 'admin/pages/partials/performance', :locals => {:performance => performance, :locations => FestivityLocationPage.where(site_id: event.site.id) }
     else
       render status: :bad_request
     end

data/app/controllers/festivity_events_controller.rb

@@ -9,10 +9,12 @@ class FestivityEventsController < ApplicationController
   def index
     order_by = params[:sort] ? params[:sort] : "start_date"
     @title = "#{current_site.festivity_festival_name}: Events"
+    @filter_type = current_site.festivity_filter_type
     @events =  Rails.cache.fetch("#{cache_key}", expires_in: 2.hours) do
       FestivityEventList.search(
           {dates: search_dates.join(","),
-           categories: params[:categories]},
+           categories: params[:categories],
+          filter_type: current_site.festivity_filter_type},
           order_by).events
     end
 
@@ -59,9 +61,9 @@ class FestivityEventsController < ApplicationController
   end
 
   def collect_festival_dates
-    festival_dates = current_site.festival_dates
-    if current_site.date_during_festival?(Date.today)
-      festival_dates = festival_dates.select{ |date| date == Date.today }
+    festival_dates = current_site.festival_datetimes
+    if current_site.date_during_festival?(DateTime.now)
+      festival_dates = festival_dates.select{ |date| date == DateTime.now }
     end
 
     festival_dates.map{ |date| date.to_s }

data/app/models/festivity_event_list.rb

@@ -51,16 +51,16 @@ class FestivityEventList
   private
 
   # Return a list of unique event ids that match the provided dates
-  def self.event_ids_for_dates(dates)
-    FestivityEventList::FestivityEventPerformance.where(date_criteria(dates)).map {|e| e.event_id}.uniq
+  def self.event_ids_for_datetimes(datetimes, filter_type)
+    FestivityEventList::FestivityEventPerformance.where(datetime_criteria(datetimes, filter_type)).map {|e| e.event_id}.uniq
   end
 
   # Create a condition for start and end date between midnight and 11:59pm
   # for each date passed in and return the SQL condition
-  def self.date_criteria(dates_string)
-    date_queries = dates_string.split(',').map do |date_string|
-      start_date = DateTime.parse(date_string)
-      end_date = start_date.advance(hours: 23, minutes: 59)
+  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))
+      end_date = start_date.advance(advance_by(filter_type))
       <<-SQL
         (
           (start_date >= '#{start_date}' AND start_date <= '#{end_date}')
@@ -72,13 +72,19 @@ class FestivityEventList
     date_queries.join(" OR ")
   end
 
+  def self.advance_by(filter_type)
+    advance_by_hash = {minutes: 59}
+    advance_by_hash[:hours] = 23 if filter_type == "date"
+    advance_by_hash
+  end
+
   # The order of querying, depending on what is passed:
   # - If dates are passed, we search both start and end date between midnight and 11:59pm of that date.
   #   That query returns any matching event ids.
   # - 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_dates(criteria[:dates]) if criteria[:dates]
+    event_ids = event_ids_for_datetimes(criteria[:dates], criteria[:filter_type]) if criteria[:dates]
     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/models/festivity_performance.rb

@@ -2,6 +2,7 @@ class FestivityPerformance < ActiveRecord::Base
   validates_presence_of :event_page_id
   belongs_to :festivity_event_page, foreign_key: :event_page_id
   belongs_to :festivity_location_page, foreign_key: :location_page_id
+  default_scope {order :start_date}
 
   attr_accessible :start_date, :end_date, :festivity_location_page, :notes
 
@@ -20,8 +21,7 @@ class FestivityPerformance < ActiveRecord::Base
   private
 
   def parse_date(date)
-    time = Time.strptime("#{date}", '%m/%d/%Y %I:%M %p')
-    Time.zone.local(time.year, time.month, time.day, time.hour, time.min, time.sec)
+    Time.parse(Time.strptime(date, "%m/%d/%Y %l:%M %P").to_s)
   rescue
     nil
   end

data/app/presenters/festivity_date_presenter.rb

@@ -0,0 +1,7 @@
+class FestivityDatePresenter < FestivityDatetimePresenter
+
+  def display
+    display_as_date
+  end
+
+end

data/app/presenters/festivity_datetime_filter_presenter.rb

@@ -0,0 +1,14 @@
+class FestivityDatetimeFilterPresenter
+
+  def self.new(datetimes, datetime_type)
+    datetimes.map { |datetime| datetime_type_class(datetime_type).new(datetime) }
+
+  end
+
+  private
+
+  def self.datetime_type_class(datetime_type)
+   datetime_type == "date" ? FestivityDatePresenter : FestivityTimePresenter
+  end
+
+end

data/app/presenters/festivity_datetime_presenter.rb

@@ -0,0 +1,36 @@
+class FestivityDatetimePresenter
+  attr_reader :datetime
+
+  def initialize(datetime)
+    @datetime = datetime
+  end
+
+  def display_as_date
+    @datetime.strftime("%a, %B %-d")
+  end
+
+  def to_s
+    @datetime.to_s
+  end
+
+  def to_date
+    @datetime.to_date
+  end
+
+  def display_as_time_range
+    "#{display_start_time} - #{display_end_time}"
+  end
+
+  def display_start_time
+    @datetime.strftime(display_time_format)
+  end
+
+  def display_end_time
+    (@datetime + 1.hour).strftime(display_time_format)
+  end
+
+  def display_time_format
+    "%l:%M %P"
+  end
+
+end

data/app/presenters/festivity_time_presenter.rb

@@ -0,0 +1,7 @@
+class FestivityTimePresenter < FestivityDatetimePresenter
+
+  def display
+    display_as_time_range
+  end
+
+end

data/app/presenters/social/feed_presenter.rb

@@ -0,0 +1,9 @@
+module Social
+  class FeedPresenter
+
+    def initializer
+
+    end
+
+  end
+end

data/app/presenters/social/instagram_post_presenter.rb

@@ -0,0 +1,44 @@
+Social::InstagramPostPresenter = ImmutableStruct.new(
+    :user_full_name,
+    :user_id,
+    :user_profile_picture_url,
+    :user_username,
+    :id,
+    :text,
+    :filter,
+    :id,
+    :low_res_image_url,
+    :low_res_image_height,
+    :low_res_image_width,
+    :standard_res_image_url,
+    :standard_res_image_height,
+    :standard_res_image_width,
+    :thumbnail_image_url,
+    :thumbnail_res_image_height,
+    :thumbnail_res_image_width,
+    :url,
+    :created_time
+  ) do
+
+    def self.from_instagram_post(post)
+      self.new(user_profile_picture_url: post.user.profile_picture,
+               user_full_name: post.user.full_name,
+               user_id: post.user.id,
+               user_username: post.user.username,
+               id: post.id,
+               created_time: Time.at(post.created_time.to_i),
+               text: post.caption.text,
+               filter: post.filter,
+               low_res_image_url: post.images.low_resolution.url,
+               low_res_image_height: post.images.low_resolution.height,
+               low_res_image_width: post.images.low_resolution.width,
+               standard_res_image_url: post.images.standard_resolution.url,
+               standard_res_image_height: post.images.standard_resolution.height,
+               standard_res_image_width: post.images.standard_resolution.width,
+               thumbnail_image_url: post.images.thumbnail.url,
+               thumbnail_image_height: post.images.thumbnail.height,
+               thumbnail_image_width: post.images.thumbnail.width,
+               url: post.link)
+
+    end
+  end

data/app/services/instagram_feed_service.rb

@@ -0,0 +1,13 @@
+class InstagramFeedService
+
+  def initialize
+    @client = Instagram.client
+  end
+
+  def get_feed_for_tag(tag)
+    @client.tag_recent_media(tag).map do |post|
+      Social::InstagramPostPresenter.from_instagram_post(post)
+    end
+  end
+
+end

data/app/services/social_feed_service.rb

@@ -0,0 +1,18 @@
+class SocialFeedService
+
+  def initialize
+
+  end
+
+  def get_feed(options)
+
+  end
+
+
+  private
+
+  def query_feeds(options)
+
+  end
+
+end

data/app/views/admin/pages/partials/_performances.html.haml

@@ -1,4 +1,4 @@
-- locations = FestivityLocationPage.all
+- locations = FestivityLocationPage.where(site_id: @page.site.id)
 .festivity-full.festivity-list.festivity-div
   = render partial: 'admin/pages/partials/performances_table', locals: {performances: performances, locations: locations, page_id: page_id}
 .right

data/app/views/admin/sites/_festivity_site_fields.html.haml

@@ -12,12 +12,20 @@
   = self.text_field( :site, :festivity_festival_name, class: "textbox festivity-control")
 %p.festivity-third
   %label{for: "site_festivity_start_date"}
-    Start Date
-  = self.text_field :site, :festivity_start_date, :class=> "textbox date festivity-control", :type=>"date", :value => (@site.festivity_start_date ? I18n.localize(@site.festivity_start_date.to_date, :format =>:default) : nil)
+    Festival Start
+  = self.text_field :site, :festivity_start_date, :class=> "date_field textbox date festivity-control", :value => (@site.festivity_start_date ? format_date(@site.festivity_start_date) : nil)
 %p.festivity-third
   %label{for: "site_festivity_end_date"}
-    End Date
-  = self.text_field :site, :festivity_end_date, :class=> "textbox date festivity-control", :type=>"date", :value => (@site.festivity_end_date ? I18n.localize(@site.festivity_end_date.to_date, :format =>:default) : nil)
+    Festival End
+  = self.text_field :site, :festivity_end_date, :class=> "date_field textbox date festivity-control", :value => (@site.festivity_end_date ? format_date(@site.festivity_end_date) : nil)
+%p.festivity-third
+  %label{for: "site_festivity_end_date"}
+    Festival Filter Type
+  = self.select :site, :festivity_filter_type,  [['Date', 'date'], ['Time', 'time']], :class=> "textbox festivity-control"
+%p.festivity-third
+  %label{for: "site_festivity_end_date"}
+    Buy Tickets Button Text
+  = self.text_field :site, :festivity_buy_ticket_text, :class=> "textbox festivity-control"
 %p.festivity-third
   %label{for: "site_festivity_google_api_key"}
     Google Search API Key

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

@@ -1,3 +1,4 @@
+- current_date = FestivityDatetimePresenter.new current_site.festival_datetimes.first.datetime - 1.day
 .events-filter-bar__wrapper
 
   %p.event-filter-bar__header
@@ -8,17 +9,24 @@
     Done
 
   %form
+    -
     %div#collapse-wrapper{data: {collapse: true}}
       %h3.open
         Dates
       %ul.filter-bar_filters.date-filters
-        - current_site.festival_dates.each do |day|
+        - current_site.festival_datetimes.each do |datetime|
+          - unless current_site.date_filter?
+            - unless current_date.to_date == datetime.to_date
+              - current_date = datetime
+              %li
+                %h4
+                  = current_date.display_as_date
           %li
             .checkbox
               %label
-                - checked = @selected_dates.include? day.to_s
-                %input{type: "checkbox", value: day.to_s, checked: checked,  data: {filter: "Date", sort: day.to_s}}
-                  = day.strftime("%a, %B %-d")
+                - checked = @selected_dates.include? 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|
         %h3
           = type.name

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

@@ -56,7 +56,7 @@
             .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'
+                = link_to  current_site.festivity_buy_ticket_text, "#{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?

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

@@ -18,7 +18,7 @@
       - if @event.can_buy?
         .tickets.sidebar-item
           %a.tickets-button.btn.btn-primary.btn-lg.btn-block{href: "#{@event.buy_url}", target: "_blank"}
-            Buy Tickets
+            = current_site.festivity_buy_ticket_text
       .event-sidebar__location.sidebar-item
         %ul.list-group
           %li.list-group-item.list-group-title

data/app/views/social/_instagram_posts.html.haml

@@ -0,0 +1,4 @@
+.social-posts
+  - posts.each do |post|
+    "BUTTS"
+    = post.text

data/db/migrate/20151018190155_update_site_for_hourly_filters.rb

@@ -0,0 +1,14 @@
+class UpdateSiteForHourlyFilters < ActiveRecord::Migration
+  def up
+    change_column :sites, :festivity_start_date, :datetime
+    change_column :sites, :festivity_end_date, :datetime
+    add_column :sites, :festivity_filter_type, :string
+
+  end
+
+  def down
+    change_column :sites, :festivity_start_date, :date
+    change_column :sites, :festivity_end_date, :date
+    remove_column :sites, :festivity_filter_type, :string
+  end
+end

data/db/migrate/20151105155407_add_buy_ticket_text_to_site.rb

@@ -0,0 +1,5 @@
+class AddBuyTicketTextToSite < ActiveRecord::Migration
+  def change
+    add_column :sites, :festivity_buy_ticket_text, :string, default: "Buy Tickets"
+  end
+end

data/festivity_extension.rb

@@ -19,8 +19,10 @@ class FestivityExtension < TrustyCms::Extension
     Site.send :include, Festivity::Extensions::SiteExtensions
     Page.send :include, Festivity::Extensions::PageExtensions
     Admin::PagesHelper.send :include, Festivity::Extensions::PagesHelperExtensions
+    Admin::SitesHelper.send :include, Festivity::Extensions::PagesHelperExtensions
     Page.send :include, Tags::NavigationTags
     Page.send :include, Tags::HeaderTags
+    Page.send :include, Tags::SocialFeedTags
   end
 
 end

data/lib/festivity/extensions/site_extensions.rb

@@ -11,28 +11,41 @@ module Festivity
 
       module SiteMethods
 
+        def festivity_start_date=(value)
+          super(Time.strptime(value, "%m/%d/%Y %l:%M %P"))
+        end
+
+        def festivity_end_date=(value)
+          super(Time.strptime(value, "%m/%d/%Y %l:%M %P"))
+        end
+
         def festivity_active_category_types
           self.festivity_category_types.where(["inactive = false"])
         end
 
         def date_during_festival?(date)
-          self.festival_dates.include?(date)
+          self.festival_datetimes.include?(date)
         end
 
-        def festival_dates
-          @festival_dates ||= calculate_festival_dates
+        def festival_datetimes
+          @festival_datetimes ||= calculate_festival_datetimes
         end
 
-        def calculate_festival_dates
+        def calculate_festival_datetimes
           dates = [self.festivity_start_date]
+          advance_by = date_filter? ? {days: 1} : {hours: 1}
           until dates.last >= self.festivity_end_date do
-            dates << dates.last.advance(days: 1)
+            dates << dates.last.advance(advance_by)
           end
-          dates
+          FestivityDatetimeFilterPresenter.new(dates, self.festivity_filter_type)
         rescue
           []
         end
 
+        def date_filter?
+          self.festivity_filter_type == "date"
+        end
+
       end
 
     end

data/lib/tags/social_feed_tags.rb

@@ -0,0 +1,16 @@
+module Tags::SocialFeedTags
+  include TrustyCms::Taggable
+
+  desc %{Instagram posts feed
+
+        *Usage:*
+<pre><code><r:instagram_posts tag="culturaltrust">/code></pre>}
+  tag "instagram_posts" do |tag|
+
+    posts = InstagramFeedService.new.get_feed_for_tag(tag.attr['tag'])
+    request.env["action_controller.instance"].render_to_string :partial => "social/instagram_posts",
+                                                               :locals => {:posts => posts}
+
+  end
+
+end

data/lib/trusty-festivity-extension.rb

@@ -1,5 +1,5 @@
 module TrustyFestivityExtension
-  VERSION     = "2.1.1"
+  VERSION     = "2.2.0"
   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

@@ -31,6 +31,9 @@ Gem::Specification.new do |s|
   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 'instagram'                    , '~> 1.1'
+  s.add_dependency 'twitter'                      , '~> 5.15'
+  s.add_dependency 'immutable-struct'             , '~> 2.1'
 
   s.add_dependency 'trusty_google_custom_search'
   s.add_dependency 'fog'                          , "~> 1.26"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-festivity-extension
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Eric Sipple
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-10 00:00:00.000000000 Z
+date: 2015-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trusty-cms
@@ -136,6 +136,48 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.2
+- !ruby/object:Gem::Dependency
+  name: instagram
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: twitter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '5.15'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '5.15'
+- !ruby/object:Gem::Dependency
+  name: immutable-struct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: trusty_google_custom_search
   requirement: !ruby/object:Gem::Requirement
@@ -358,6 +400,14 @@ files:
 - app/models/festivity_market_page.rb
 - app/models/festivity_page_category.rb
 - app/models/festivity_performance.rb
+- app/presenters/festivity_date_presenter.rb
+- app/presenters/festivity_datetime_filter_presenter.rb
+- app/presenters/festivity_datetime_presenter.rb
+- app/presenters/festivity_time_presenter.rb
+- app/presenters/social/feed_presenter.rb
+- app/presenters/social/instagram_post_presenter.rb
+- app/services/instagram_feed_service.rb
+- app/services/social_feed_service.rb
 - app/views/admin/pages/_festivity_base_fields.html.haml
 - app/views/admin/pages/_festivity_featured_image_fields.html.haml
 - app/views/admin/pages/_festivity_includes.html.haml
@@ -392,6 +442,7 @@ files:
 - app/views/search/_pagination_links.html.haml
 - app/views/search/_result_item.html.haml
 - app/views/search/show.html.haml
+- app/views/social/_instagram_posts.html.haml
 - config/initializers/pluralizations.rb
 - config/initializers/radiant_config.rb
 - config/locales/en.yml
@@ -415,6 +466,8 @@ files:
 - db/migrate/20150226131727777_add_location_page_fields.rb
 - db/migrate/20150302135485569_add_performances_table.rb
 - db/migrate/20150324135487799_add_indexes.rb
+- db/migrate/20151018190155_update_site_for_hourly_filters.rb
+- db/migrate/20151105155407_add_buy_ticket_text_to_site.rb
 - festivity_extension.rb
 - lib/festivity/admin/assets_helper.rb
 - lib/festivity/engine.rb
@@ -425,6 +478,7 @@ files:
 - lib/festivity/mixins/not_found.rb
 - lib/tags/header_tags.rb
 - lib/tags/navigation_tags.rb
+- lib/tags/social_feed_tags.rb
 - lib/tasks/active_record_utils.rb
 - lib/tasks/festivity_extension_tasks.rake
 - lib/tasks/setup.rake