RubyGems - trusty-festivity-extension - Versions diffs - 2.5.17 → 2.5.18 - Mend

trusty-festivity-extension 2.5.17 → 2.5.18

Files changed (9) hide show

checksums.yaml +4 -4
data/Gemfile.lock +1 -1
data/config/initializers/pages_controller_decorator.rb +6 -0
data/coverage/index.html +170 -146
data/db/migrate/201610284484312496_add_content_editor_to_users.rb +9 -0
data/lib/trusty-festivity-extension.rb +1 -1
data/spec/dummy/db/schema.rb +19 -16
data/spec/dummy/log/test.log +1094 -0
metadata +3 -1

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: faa05103740a1f5767d4d7c31e3817f97c73ee8b
-  data.tar.gz: a9523943dbddabfad4f2ef74e4297aa5a5f16f0b
+  metadata.gz: 60aa6d4c1a9ce51eec2ee1475d83bbc03d66866a
+  data.tar.gz: dc6251ab513188014f5d951854059ae14259b143
 SHA512:
-  metadata.gz: be20e0891f704776b9e3dea258128df2faac1776f300c768e7cc6517d8f1b095585bc87be3fb21a8b5386b3b187861a7bdcba27b03fd54b2a1b5ed7c8cef0bbb
-  data.tar.gz: e6a17bc999afae2b5197e17f322537da7a7cff928db658197ae7316233fa97f4ec48d3b237cc61c79f60ee86ad58649eb01aaf898f99d5a970b42a7109f53cdd
+  metadata.gz: 326e44ce60d77c228b0b512c4263c9e1be5bd92c3819595c5e28dc845b9646c759e7afd1fb6cd2be0c3d9fb5426ce7f314f14e3d09ca0805442ebcd03791db90
+  data.tar.gz: 167b5f294b8a86eef0520c9191917c6b9a7ad048a572f4ed6414ab64459c5faf9f386fed315c773a1b3a2230debadbc723e282a81ac7447d26f1fd7badc0a057

data/Gemfile.lock CHANGED Viewed

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

data/config/initializers/pages_controller_decorator.rb ADDED Viewed

@@ -0,0 +1,6 @@
+Admin::PagesController.class_eval do
+  only_allow_access_to :index,
+                       :when => [:designer, :admin],
+                       :denied_url => { :controller => '/admin/configuration', :action => 'show' },
+                       :denied_message => 'You must have Admin or Designer privileges to access Content.'
+end

data/coverage/index.html CHANGED Viewed

@@ -14,14 +14,14 @@
       <img src="./assets/0.10.0/loading.gif" alt="loading"/>
     </div>
     <div id="wrapper" style="display:none;">
-      <div class="timestamp">Generated <abbr class="timeago" title="2016-09-06T14:06:06-04:00">2016-09-06T14:06:06-04:00</abbr></div>
+      <div class="timestamp">Generated <abbr class="timeago" title="2016-11-01T14:50:09-04:00">2016-11-01T14:50:09-04:00</abbr></div>
       <ul class="group_tabs"></ul>
       <div id="content">
         <div class="file_list_container" id="AllFiles">
   <h2>
     <span class="group_name">All Files</span>
-    (<span class="covered_percent"><span class="red">3.62%</span></span>
+    (<span class="covered_percent"><span class="red">3.61%</span></span>
      covered at
      <span class="covered_strength">
        <span class="red">
@@ -32,9 +32,9 @@
   <a name="AllFiles"></a>
   <div>
     <b>58</b> files in total.
-    <b>1465</b> relevant lines.
+    <b>1467</b> relevant lines.
     <span class="green"><b>53</b> lines covered</span> and
-    <span class="red"><b>1412</b> lines missed </span>
+    <span class="red"><b>1414</b> lines missed </span>
   </div>
   <table class="file_list">
     <thead>
@@ -253,10 +253,10 @@
       <tr>
         <td class="strong"><a href="#55991f817555ab5e6e7db7ac2e1eee5fa7943207" class="src_link" title="app/models/festivity_event_list.rb">app/models/festivity_event_list.rb</a></td>
         <td class="red strong">0.0 %</td>
-        <td>137</td>
-        <td>137</td>
+        <td>138</td>
+        <td>138</td>
         <td>0</td>
-        <td>137</td>
+        <td>138</td>
         <td>0.0</td>
       </tr>
@@ -453,10 +453,10 @@
       <tr>
         <td class="strong"><a href="#1fdde1c3474c59d9ab63ea7326ad292d335256f4" class="src_link" title="app/services/instagram_feed_service.rb">app/services/instagram_feed_service.rb</a></td>
         <td class="red strong">0.0 %</td>
-        <td>13</td>
-        <td>13</td>
+        <td>14</td>
+        <td>14</td>
         <td>0</td>
-        <td>13</td>
+        <td>14</td>
         <td>0.0</td>
       </tr>
@@ -503,7 +503,7 @@
       <tr>
         <td class="strong"><a href="#85b87cca8a409f164595fa9b41c52f7bfc3e66f8" class="src_link" title="lib/festivity/engine.rb">lib/festivity/engine.rb</a></td>
         <td class="green strong">100.0 %</td>
-        <td>20</td>
+        <td>22</td>
         <td>5</td>
         <td>5</td>
         <td>0</td>
@@ -796,7 +796,7 @@
           <div class="file_list_container" id="Models">
   <h2>
     <span class="group_name">Models</span>
-    (<span class="covered_percent"><span class="red">9.17%</span></span>
+    (<span class="covered_percent"><span class="red">9.15%</span></span>
      covered at
      <span class="covered_strength">
        <span class="red">
@@ -807,9 +807,9 @@
   <a name="Models"></a>
   <div>
     <b>17</b> files in total.
-    <b>447</b> relevant lines.
+    <b>448</b> relevant lines.
     <span class="green"><b>41</b> lines covered</span> and
-    <span class="red"><b>406</b> lines missed </span>
+    <span class="red"><b>407</b> lines missed </span>
   </div>
   <table class="file_list">
     <thead>
@@ -868,10 +868,10 @@
       <tr>
         <td class="strong"><a href="#55991f817555ab5e6e7db7ac2e1eee5fa7943207" class="src_link" title="app/models/festivity_event_list.rb">app/models/festivity_event_list.rb</a></td>
         <td class="red strong">0.0 %</td>
-        <td>137</td>
-        <td>137</td>
+        <td>138</td>
+        <td>138</td>
         <td>0</td>
-        <td>137</td>
+        <td>138</td>
         <td>0.0</td>
       </tr>
@@ -1196,7 +1196,7 @@
       <tr>
         <td class="strong"><a href="#85b87cca8a409f164595fa9b41c52f7bfc3e66f8" class="src_link" title="lib/festivity/engine.rb">lib/festivity/engine.rb</a></td>
         <td class="green strong">100.0 %</td>
-        <td>20</td>
+        <td>22</td>
         <td>5</td>
         <td>5</td>
         <td>0</td>
@@ -1331,7 +1331,7 @@
           <div class="file_list_container" id="Ungrouped">
   <h2>
     <span class="group_name">Ungrouped</span>
-    (<span class="covered_percent"><span class="red">2.65%</span></span>
+    (<span class="covered_percent"><span class="red">2.64%</span></span>
      covered at
      <span class="covered_strength">
        <span class="red">
@@ -1342,9 +1342,9 @@
   <a name="Ungrouped"></a>
   <div>
     <b>11</b> files in total.
-    <b>226</b> relevant lines.
+    <b>227</b> relevant lines.
     <span class="green"><b>6</b> lines covered</span> and
-    <span class="red"><b>220</b> lines missed </span>
+    <span class="red"><b>221</b> lines missed </span>
   </div>
   <table class="file_list">
     <thead>
@@ -1433,10 +1433,10 @@
       <tr>
         <td class="strong"><a href="#1fdde1c3474c59d9ab63ea7326ad292d335256f4" class="src_link" title="app/services/instagram_feed_service.rb">app/services/instagram_feed_service.rb</a></td>
         <td class="red strong">0.0 %</td>
-        <td>13</td>
-        <td>13</td>
+        <td>14</td>
+        <td>14</td>
         <td>0</td>
-        <td>13</td>
+        <td>14</td>
         <td>0.0</td>
       </tr>
@@ -4502,9 +4502,9 @@
     <h3>app/models/festivity_event_list.rb</h3>
     <h4><span class="red">0.0 %</span> covered</h4>
     <div>
-      <b>137</b> relevant lines.
+      <b>138</b> relevant lines.
       <span class="green"><b>0</b> lines covered</span> and
-      <span class="red"><b>137</b> lines missed.</span>
+      <span class="red"><b>138</b> lines missed.</span>
     </div>
   </div>
@@ -4724,469 +4724,469 @@
         <li class="missed" data-hits="0" data-linenumber="36">
-          <code class="ruby"></code>
+          <code class="ruby">    now = DateTime.now.in_time_zone(&quot;Eastern Time (US &amp; Canada)&quot;)</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="37">
-          <code class="ruby">    if festival_dates.include?(DateTime.now.to_date)</code>
+          <code class="ruby"></code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="38">
-          <code class="ruby">      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)</code>
+          <code class="ruby">    if festival_dates.include?(now.to_date)</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="39">
-          <code class="ruby">    elsif festival_dates.first &gt; DateTime.now.to_date</code>
+          <code class="ruby">      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)</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="40">
-          <code class="ruby">      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)</code>
+          <code class="ruby">    elsif festival_dates.first &gt; now.to_date</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="41">
-          <code class="ruby">    else</code>
+          <code class="ruby">      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)</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="42">
-          <code class="ruby">      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)</code>
+          <code class="ruby">    else</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="43">
-          <code class="ruby">    end</code>
+          <code class="ruby">      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)</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="44">
-          <code class="ruby">  end</code>
+          <code class="ruby">    end</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="45">
-          <code class="ruby"></code>
+          <code class="ruby">  end</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="46">
-          <code class="ruby">  def self.find_by_location(location_id, site)</code>
+          <code class="ruby"></code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="47">
-          <code class="ruby">    begin</code>
+          <code class="ruby">  def self.find_by_location(location_id, site)</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="48">
-          <code class="ruby">      where_clause = parse_criteria(dates: collect_festival_dates(site).join(&quot;,&quot;), filter_type: site.festivity_filter_type)</code>
+          <code class="ruby">    begin</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="49">
-          <code class="ruby">    rescue ActiveRecord::RecordNotFound</code>
+          <code class="ruby">      where_clause = parse_criteria(dates: collect_festival_dates(site).join(&quot;,&quot;), filter_type: site.festivity_filter_type)</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="50">
-          <code class="ruby">      return FestivityEventList.new([])</code>
+          <code class="ruby">    rescue ActiveRecord::RecordNotFound</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="51">
-          <code class="ruby">    end</code>
+          <code class="ruby">      return FestivityEventList.new([])</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="52">
-          <code class="ruby"></code>
+          <code class="ruby">    end</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="53">
-          <code class="ruby">    FestivityEventList.new(</code>
+          <code class="ruby"></code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="54">
-          <code class="ruby">        FestivityEventList::FestivityEventPerformance.</code>
+          <code class="ruby">    FestivityEventList.new(</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="55">
-          <code class="ruby">            includes(:assets).</code>
+          <code class="ruby">        FestivityEventList::FestivityEventPerformance.</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="56">
-          <code class="ruby">            joins(:festivity_categories).</code>
+          <code class="ruby">            includes(:assets).</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="57">
-          <code class="ruby">            where(where_clause).</code>
+          <code class="ruby">            joins(:festivity_categories).</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="58">
-          <code class="ruby">            where(location_id: location_id).</code>
+          <code class="ruby">            where(where_clause).</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="59">
-          <code class="ruby">            group(&quot;performance_id&quot;).</code>
+          <code class="ruby">            where(location_id: location_id).</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="60">
-          <code class="ruby">            order(&quot;featured_item DESC, start_date ASC&quot;).</code>
+          <code class="ruby">            group(&quot;performance_id&quot;).</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="61">
-          <code class="ruby">            preload(:festivity_categories)</code>
+          <code class="ruby">            order(&quot;featured_item DESC, start_date ASC&quot;).</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="62">
-          <code class="ruby">    )</code>
+          <code class="ruby">            preload(:festivity_categories)</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="63">
-          <code class="ruby">  end</code>
+          <code class="ruby">    )</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="64">
-          <code class="ruby"></code>
+          <code class="ruby">  end</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="65">
-          <code class="ruby">  def self.find_related_events(criteria)</code>
+          <code class="ruby"></code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="66">
-          <code class="ruby">    where_clause = parse_criteria(criteria)</code>
+          <code class="ruby">  def self.find_related_events(criteria)</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="67">
-          <code class="ruby">    FestivityEventList.new(</code>
+          <code class="ruby">    where_clause = parse_criteria(criteria)</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="68">
-          <code class="ruby">        FestivityEventList::FestivityEventPerformance.</code>
+          <code class="ruby">    FestivityEventList.new(</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="69">
-          <code class="ruby">            includes(:assets).</code>
+          <code class="ruby">        FestivityEventList::FestivityEventPerformance.</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="70">
-          <code class="ruby">            joins(:festivity_categories).</code>
+          <code class="ruby">            includes(:assets).</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="71">
-          <code class="ruby">            where(where_clause).</code>
+          <code class="ruby">            joins(:festivity_categories).</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="72">
-          <code class="ruby">            where(&quot;event_id != ?&quot;, criteria[:event_id]).</code>
+          <code class="ruby">            where(where_clause).</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="73">
-          <code class="ruby">            group(&quot;performance_id&quot;).</code>
+          <code class="ruby">            where(&quot;event_id != ?&quot;, criteria[:event_id]).</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="74">
-          <code class="ruby">            order(&quot;featured_item DESC, start_date ASC&quot;).</code>
+          <code class="ruby">            group(&quot;performance_id&quot;).</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="75">
-          <code class="ruby">            preload(:festivity_categories)</code>
+          <code class="ruby">            order(&quot;featured_item DESC, start_date ASC&quot;).</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="76">
-          <code class="ruby">    )</code>
+          <code class="ruby">            preload(:festivity_categories)</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="77">
-          <code class="ruby">  end</code>
+          <code class="ruby">    )</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="78">
-          <code class="ruby"></code>
+          <code class="ruby">  end</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="79">
-          <code class="ruby">  def self.collect_festival_dates(site)</code>
+          <code class="ruby"></code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="80">
-          <code class="ruby">    festival_dates = site.festival_datetimes</code>
+          <code class="ruby">  def self.collect_festival_dates(site)</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="81">
-          <code class="ruby">    if site.date_during_festival?(Time.now)</code>
+          <code class="ruby">    festival_dates = site.festival_datetimes</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="82">
-          <code class="ruby">      festival_dates = festival_dates.select{ |date| date.datetime == Time.now }</code>
+          <code class="ruby">    if site.date_during_festival?(Time.now)</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="83">
-          <code class="ruby">    end</code>
+          <code class="ruby">      festival_dates = festival_dates.select{ |date| date.datetime == Time.now }</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="84">
-          <code class="ruby"></code>
+          <code class="ruby">    end</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="85">
-          <code class="ruby">    festival_dates.map{ |date| date.to_s }</code>
+          <code class="ruby"></code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="86">
-          <code class="ruby"></code>
+          <code class="ruby">    festival_dates.map{ |date| date.to_s }</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="87">
-          <code class="ruby">  end</code>
+          <code class="ruby"></code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="88">
-          <code class="ruby"></code>
+          <code class="ruby">  end</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="89">
-          <code class="ruby">  private</code>
+          <code class="ruby"></code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="90">
-          <code class="ruby"></code>
+          <code class="ruby">  private</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="91">
-          <code class="ruby">  # Return a list of unique event ids that match the provided dates</code>
+          <code class="ruby"></code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="92">
-          <code class="ruby">  def self.event_ids_for_datetimes(datetimes, filter_type)</code>
+          <code class="ruby">  # Return a list of unique event ids that match the provided dates</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="93">
-          <code class="ruby">    FestivityEventList::FestivityEventPerformance.where(datetime_criteria(datetimes, filter_type)).map {|e| e.event_id}.uniq</code>
+          <code class="ruby">  def self.event_ids_for_datetimes(datetimes, filter_type)</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="94">
-          <code class="ruby">  end</code>
+          <code class="ruby">    FestivityEventList::FestivityEventPerformance.where(datetime_criteria(datetimes, filter_type)).map {|e| e.event_id}.uniq</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="95">
-          <code class="ruby"></code>
+          <code class="ruby">  end</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="96">
-          <code class="ruby">  # Create a condition for start and end date between midnight and 11:59pm</code>
+          <code class="ruby"></code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="97">
-          <code class="ruby">  # for each date passed in and return the SQL condition</code>
+          <code class="ruby">  # Create a condition for start and end date between midnight and 11:59pm</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="98">
-          <code class="ruby">  def self.datetime_criteria(datetimes_string, filter_type)</code>
+          <code class="ruby">  # for each date passed in and return the SQL condition</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="99">
-          <code class="ruby"></code>
+          <code class="ruby">  def self.datetime_criteria(datetimes_string, filter_type)</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="100">
-          <code class="ruby">    date_queries = datetimes_string.split(&#39;,&#39;).map do |date_string|</code>
+          <code class="ruby"></code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="101">
-          <code class="ruby">      start_date = Chronic.parse(URI.decode(date_string)).utc</code>
+          <code class="ruby">    date_queries = datetimes_string.split(&#39;,&#39;).map do |date_string|</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="102">
-          <code class="ruby">      end_date = start_date.advance(advance_by(filter_type))</code>
+          <code class="ruby">      start_date = Chronic.parse(URI.decode(date_string)).utc</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="103">
-          <code class="ruby">      &lt;&lt;-SQL</code>
+          <code class="ruby">      end_date = start_date.advance(advance_by(filter_type))</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="104">
-          <code class="ruby">        (</code>
+          <code class="ruby">      &lt;&lt;-SQL</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="105">
-          <code class="ruby">          (start_date &gt;= &#39;#{start_date}&#39; AND start_date &lt;= &#39;#{end_date}&#39;)</code>
+          <code class="ruby">        (</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="106">
-          <code class="ruby">          OR</code>
+          <code class="ruby">          (start_date &gt;= &#39;#{start_date}&#39; AND start_date &lt;= &#39;#{end_date}&#39;)</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="107">
-          <code class="ruby">          (end_date &gt;= &#39;#{start_date}&#39; AND end_date &lt;= &#39;#{end_date}&#39;)</code>
+          <code class="ruby">          OR</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="108">
-          <code class="ruby">        )</code>
+          <code class="ruby">          (end_date &gt;= &#39;#{start_date}&#39; AND end_date &lt;= &#39;#{end_date}&#39;)</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="109">
-          <code class="ruby">      SQL</code>
+          <code class="ruby">        )</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="110">
-          <code class="ruby">    end</code>
+          <code class="ruby">      SQL</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="111">
-          <code class="ruby">    date_queries.join(&quot; OR &quot;)</code>
+          <code class="ruby">    end</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="112">
-          <code class="ruby">  end</code>
+          <code class="ruby">    date_queries.join(&quot; OR &quot;)</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="113">
-          <code class="ruby"></code>
+          <code class="ruby">  end</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="114">
@@ -5198,121 +5198,121 @@
         <li class="missed" data-hits="0" data-linenumber="115">
-          <code class="ruby">  # The order of querying, depending on what is passed:</code>
+          <code class="ruby"></code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="116">
-          <code class="ruby">  # - If dates are passed, we search both start and end date between midnight and 11:59pm of that date.</code>
+          <code class="ruby">  # The order of querying, depending on what is passed:</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="117">
-          <code class="ruby">  #   That query returns any matching event ids.</code>
+          <code class="ruby">  # - If dates are passed, we search both start and end date between midnight and 11:59pm of that date.</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="118">
-          <code class="ruby">  # - The event ids returned, if any, are added to the where clause for the next query</code>
+          <code class="ruby">  #   That query returns any matching event ids.</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="119">
-          <code class="ruby">  # - Any category ids passed are added to the where clause as well.</code>
+          <code class="ruby">  # - The event ids returned, if any, are added to the where clause for the next query</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="120">
-          <code class="ruby">  def self.parse_criteria(criteria)</code>
+          <code class="ruby">  # - Any category ids passed are added to the where clause as well.</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="121">
-          <code class="ruby">    if criteria[:dates]</code>
+          <code class="ruby">  def self.parse_criteria(criteria)</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="122">
-          <code class="ruby">      # related events fails if filter_type is nil - this is a fallback for nil filter_type</code>
+          <code class="ruby">    if criteria[:dates]</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="123">
-          <code class="ruby">      site_filter = Site.find_by_id(Page.current_site.id).festivity_filter_type</code>
+          <code class="ruby">      # related events fails if filter_type is nil - this is a fallback for nil filter_type</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="124">
-          <code class="ruby">      filter = criteria[:filter_type] ||= site_filter</code>
+          <code class="ruby">      site_filter = Site.find_by_id(Page.current_site.id).festivity_filter_type</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="125">
-          <code class="ruby">      event_ids = event_ids_for_datetimes(criteria[:dates], filter)</code>
+          <code class="ruby">      filter = criteria[:filter_type] ||= site_filter</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="126">
-          <code class="ruby">      raise ActiveRecord::RecordNotFound unless event_ids.any?</code>
+          <code class="ruby">      event_ids = event_ids_for_datetimes(criteria[:dates], filter)</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="127">
-          <code class="ruby">    end</code>
+          <code class="ruby">      raise ActiveRecord::RecordNotFound unless event_ids.any?</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="128">
-          <code class="ruby"></code>
+          <code class="ruby">    end</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="129">
-          <code class="ruby">    where_clause = &quot;site_id = #{ Page.current_site.id}&quot;</code>
+          <code class="ruby"></code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="130">
-          <code class="ruby">    where_clause += &quot; AND event_id IN (#{event_ids.join(&quot;,&quot;)})&quot; if event_ids.present?</code>
+          <code class="ruby">    where_clause = &quot;site_id = #{ Page.current_site.id}&quot;</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="131">
-          <code class="ruby">    where_clause += &quot; AND #{parse_categories(criteria[:categories].split(&quot;,&quot;))}&quot; if criteria[:categories]</code>
+          <code class="ruby">    where_clause += &quot; AND event_id IN (#{event_ids.join(&quot;,&quot;)})&quot; if event_ids.present?</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="132">
-          <code class="ruby">    where_clause</code>
+          <code class="ruby">    where_clause += &quot; AND #{parse_categories(criteria[:categories].split(&quot;,&quot;))}&quot; if criteria[:categories]</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="133">
-          <code class="ruby">  end</code>
+          <code class="ruby">    where_clause</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="134">
-          <code class="ruby"></code>
+          <code class="ruby">  end</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="135">
@@ -5324,12 +5324,18 @@
         <li class="missed" data-hits="0" data-linenumber="136">
-          <code class="ruby">end</code>
+          <code class="ruby"></code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="137">
+          <code class="ruby">end</code>
+        </li>
+        <li class="missed" data-hits="0" data-linenumber="138">
           <code class="ruby"></code>
         </li>
@@ -8432,9 +8438,9 @@
     <h3>app/services/instagram_feed_service.rb</h3>
     <h4><span class="red">0.0 %</span> covered</h4>
     <div>
-      <b>13</b> relevant lines.
+      <b>14</b> relevant lines.
       <span class="green"><b>0</b> lines covered</span> and
-      <span class="red"><b>13</b> lines missed.</span>
+      <span class="red"><b>14</b> lines missed.</span>
     </div>
   </div>
@@ -8462,7 +8468,7 @@
         <li class="missed" data-hits="0" data-linenumber="4">
-          <code class="ruby">    @client = Instagram.client</code>
+          <code class="ruby">    @client = Instagram.client(:access_token =&gt; ENV[&#39;INSTAGRAM_ACCESS_TOKEN&#39;])</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="5">
@@ -8486,36 +8492,42 @@
         <li class="missed" data-hits="0" data-linenumber="8">
-          <code class="ruby">    @client.tag_recent_media(tag).map do |post|</code>
+          <code class="ruby">    tagged_posts = @client.user_recent_media.select{|post| post[:tags].include?(tag.downcase)}</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="9">
-          <code class="ruby">      Social::InstagramPostPresenter.from_instagram_post(post)</code>
+          <code class="ruby">    tagged_posts.map do |post|</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="10">
-          <code class="ruby">    end</code>
+          <code class="ruby">      Social::InstagramPostPresenter.from_instagram_post(post)</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="11">
-          <code class="ruby">  end</code>
+          <code class="ruby">    end</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="12">
-          <code class="ruby"></code>
+          <code class="ruby">  end</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="13">
+          <code class="ruby"></code>
+        </li>
+        <li class="missed" data-hits="0" data-linenumber="14">
           <code class="ruby">end</code>
         </li>
@@ -9140,78 +9152,90 @@
         <li class="never" data-hits="" data-linenumber="8">
-          <code class="ruby">        skins/crawl/skin.css</code>
+          <code class="ruby">        skins/buzzword/skin.css</code>
         </li>
         <li class="never" data-hits="" data-linenumber="9">
-          <code class="ruby">        skins/first-night/skin.css</code>
+          <code class="ruby">        skins/crawl/skin.css</code>
         </li>
         <li class="never" data-hits="" data-linenumber="10">
-          <code class="ruby">        skins/pghkids/skin.css</code>
+          <code class="ruby">        skins/first-night/skin.css</code>
         </li>
         <li class="never" data-hits="" data-linenumber="11">
-          <code class="ruby">        skins/traf/skin.css</code>
+          <code class="ruby">        skins/pghkids/skin.css</code>
         </li>
         <li class="never" data-hits="" data-linenumber="12">
-          <code class="ruby">        admin/festivity_admin.css</code>
+          <code class="ruby">        skins/traf/skin.css</code>
         </li>
         <li class="never" data-hits="" data-linenumber="13">
-          <code class="ruby">        admin/festivity_admin.js</code>
+          <code class="ruby">        skins/buzzword/skin.css</code>
         </li>
         <li class="never" data-hits="" data-linenumber="14">
-          <code class="ruby">        festivity_app.js</code>
+          <code class="ruby">        admin/festivity_admin.css</code>
         </li>
         <li class="never" data-hits="" data-linenumber="15">
-          <code class="ruby">        grunticon/production/grunticon.loader.js</code>
+          <code class="ruby">        admin/festivity_admin.js</code>
         </li>
         <li class="never" data-hits="" data-linenumber="16">
-          <code class="ruby">        grunticon/production/*.css)</code>
+          <code class="ruby">        festivity_app.js</code>
         </li>
         <li class="never" data-hits="" data-linenumber="17">
-          <code class="ruby">    end</code>
+          <code class="ruby">        grunticon/production/grunticon.loader.js</code>
         </li>
         <li class="never" data-hits="" data-linenumber="18">
-          <code class="ruby">  end</code>
+          <code class="ruby">        grunticon/production/*.css)</code>
         </li>
         <li class="never" data-hits="" data-linenumber="19">
-          <code class="ruby"></code>
+          <code class="ruby">    end</code>
         </li>
         <li class="never" data-hits="" data-linenumber="20">
+          <code class="ruby">  end</code>
+        </li>
+        <li class="never" data-hits="" data-linenumber="21">
+          <code class="ruby"></code>
+        </li>
+        <li class="never" data-hits="" data-linenumber="22">
           <code class="ruby">end</code>
         </li>
@@ -11864,7 +11888,7 @@
         <li class="missed" data-hits="0" data-linenumber="2">
-          <code class="ruby">  VERSION     = &quot;2.5.7&quot;</code>
+          <code class="ruby">  VERSION     = &quot;2.5.18&quot;</code>
         </li>
         <li class="missed" data-hits="0" data-linenumber="3">