From 6fe08003b2d7acf27092e27bca9962e2efd04795 Mon Sep 17 00:00:00 2001
From: Chris Blanchard <cablanchard@gmail.com>
Date: Fri, 18 Sep 2015 13:35:17 +0100
Subject: [PATCH 1/2] Add helper method for new gathers url

---
 app/helpers/application_helper.rb          |  8 ++++++++
 app/views/application/_navigation.html.erb | 22 +++++++++++++++++++---
 app/views/gathers/show.html.erb            |  4 ++++
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 9b9d542..561202d 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -189,4 +189,12 @@ module ApplicationHelper
   def latest_rules
     article_path(Article::RULES)
   end
+
+  def gathers_url
+    if Rails.env.production?
+      "http://gathers.ensl.org"
+    else
+      "http://gathers.staging.ensl.org"
+    end
+  end
 end
diff --git a/app/views/application/_navigation.html.erb b/app/views/application/_navigation.html.erb
index ad687f7..ea46bd0 100644
--- a/app/views/application/_navigation.html.erb
+++ b/app/views/application/_navigation.html.erb
@@ -25,14 +25,19 @@
         </ul>
       </li>
       <li class="dropdown">
-        <%= active_link_to Gather.last, class: 'gathers' do %>
+        <%= link_to gathers_url, class: 'gathers', target: "_blank" do %>
           Gathers 
-          <span class="count"><%= Gather.player_count_for_game('NS2') %>/<%= Gather::FULL %></span>
+          <span class="count" id="gathercount"></span>
         <% end %>
-        
         <ul>
           <li><%= link_to "Introduction", article_url(464) %></li>
           <li><%= link_to "Archives", "/gathers/" %></li>
+          <li>
+            <%= active_link_to Gather.last, class: 'gathers' do %>
+              Fallback
+              <span class="count"><%= Gather.player_count_for_game('NS2') %>/<%= Gather::FULL %></span>
+            <% end %>
+          </li>
         </ul>
       </li>
       <li class="dropdown icon">
@@ -73,3 +78,14 @@
     </ul>
   </div>
 </nav>
+<script>
+$(function () {
+  $.ajax({
+    datatype: "json",
+    url: "<%= gathers_url %>/gathers/current", 
+    success: function (data) {
+      $("#gathercount").html(data.gatherers.length + "/12");
+    }
+  });
+});
+</script>
\ No newline at end of file
diff --git a/app/views/gathers/show.html.erb b/app/views/gathers/show.html.erb
index 930cf74..4403bc6 100644
--- a/app/views/gathers/show.html.erb
+++ b/app/views/gathers/show.html.erb
@@ -143,6 +143,10 @@
     <% end %>
   </div>
 
+  <h4 class="fancy add-top">
+    Gathers have moved to <%= link_to "gathers.ensl.org", gathers_url, target: "_blank" %>. This app is just a fallback in case something goes wrong
+  </h4>
+
   <% if @gather and @gather.status != Gather::STATE_FINISHED %>
     <div id="gather-info">
       <div class="info">

From f28d1e2f84fc850c36162094c61e6f2573de39f9 Mon Sep 17 00:00:00 2001
From: Chris Blanchard <cablanchard@gmail.com>
Date: Fri, 18 Sep 2015 14:42:57 +0100
Subject: [PATCH 2/2] Fix topic spec

---
 spec/models/topic_spec.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb
index 592de27..437c409 100644
--- a/spec/models/topic_spec.rb
+++ b/spec/models/topic_spec.rb
@@ -32,9 +32,8 @@ describe Topic do
     it "returns 5 unique, most recently posted topics" do
       topics = []
       10.times do
-        topic = create :topic
-        topics << topic
-        3.times { create :post, topic: topic }
+        topic = create :topic, first_post: "Foo"
+        topics.push(topic)
       end
       recent_topics = Topic.recent_topics
       topics.last(5).each do |topic|