Merge pull request #57 from ENSL/master

Merge from Master

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

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>

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">

app/views/users/_general.html.erb

@@ -15,6 +15,9 @@
         <%= link_to "Search for Steam Account" %>  
       </div>
     </dd>
+    <dt>Stream</dt>
+    <dd><%= @user.profile.stream.blank? ? "No Stream Provided" : @user.profile.stream %></dd>
+    </dd>
   </dl>
 
   <h4>Contact</h4>

spec/features/users/stream_spec.rb

@@ -0,0 +1,28 @@
+require "spec_helper"
+
+feature "User Stream Information" do
+  let(:password) { "foobar" }
+  let!(:user) { create :user, raw_password: password }
+
+  feature "stream administration" do
+    scenario "user updates their stream" do
+      visit user_path(user)
+      expect(page).to have_content("No Stream Provided")
+      fill_login_form(user, password)
+      click_button submit(:user, :login)
+      visit edit_user_path(user)
+      stream_url = "twitch.tv/gold_n"
+      expect(page).to have_content("Stream")
+      fill_in "user_profile_attributes_stream", with: stream_url
+      click_button "Update Profile"
+      expect(page).to have_content(I18n.t(:users_update))
+      visit user_path(user)
+      expect(page).to have_content(stream_url)
+    end
+  end
+
+  def fill_login_form(user, password)
+    fill_in "login_username", with: user.username
+    fill_in "login_password", with: password
+  end
+end

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|