Add longest current streak

Author: bad6e

app/controllers/stats_controller.rb

@@ -1,14 +1,15 @@
 class StatsController < ApplicationController
 
   def index
-    @stats      = Stat.order(commits: :desc)
-    @streaks    = Stat.order(streaks: :desc)
+    @stats           = Stat.order(commits: :desc)
+    @streaks         = Stat.order(streaks: :desc)
+    @current_streaks = Stat.order(current_streaks: :desc)
     @updated_at = Stat.first.when_created
   end
 
   private
 
     def commit_params
-      params.require(:record).permit(:name, :commits, :streaks)
+      params.require(:record).permit(:name, :commits, :streaks, :current_streaks)
     end
 end

app/views/stats/index.html.erb

@@ -59,51 +59,62 @@
     <!-- Page Content -->
     <div class="container">
       <div class="row">
-        <div class="col-lg-12 text-center">
+        <div class="col-md-12 text-center">
           <h1>1507 Git Commit Race</h1>
             <p class="lead">Compete with the best - who will have the most commits when Turing is over?</p>
             <p> Results as of: <%= @updated_at %>
           </div>
         </div>
       </div>
     </div>
+    <br>
 
     <div class="container">
-
-
-        <div class="col-md-6">
-          <h3 id="leaderboard">Commits Leaderboard</h3>
-            <table class="table">
+      <div class="col-md-8">
+        <h3 id="leaderboard">Commits Leaderboard</h3>
+          <table class="table">
+            <tr>
+              <td>Name</td>
+              <td>Commits Since <%= Time.now.month %>/<%= Time.now.day %>/<%= Time.now.year - 1 %></td>
+            </tr>
+            <% @stats.each do |stat| %>
               <tr>
-                <td>Name</td>
-                <td>Commits</td>
+                <td><%= stat.name %></td>
+                <td><%= stat.commits %></td>
               </tr>
-              <% @stats.each do |stat| %>
-                <tr>
-                  <td><%= stat.name %></td>
-                  <td><%= stat.commits %></td>
-                </tr>
-              <% end %>
-            <table>
-        </div>
-
-        <div class="col-md-6">
-          <h3 id="leaderboard">Longest Streak Leaderboard</h3>
-            <table class="table">
+            <% end %>
+          <table>
+      </div>
+       <div class="col-md-8">
+        <h3 id="leaderboard">Longest Current Streak Leaderboard</h3>
+          <table class="table">
+            <tr>
+              <td>Name</td>
+              <td>Longest Current Streak</td>
+            </tr>
+            <% @current_streaks.each do |stat| %>
               <tr>
-                <td>Name</td>
-                <td>Longest One Period Streak of Coding</td>
+                <td><%= stat.name %></td>
+                <td><%= stat.current_streaks %> days</td>
               </tr>
-              <% @streaks.each do |stat| %>
-                <tr>
-                  <td><%= stat.name %></td>
-                  <td><%= stat.streaks %></td>
-                </tr>
-              <% end %>
-            <table>
-        </div>
-
-
+            <% end %>
+          <table>
+      </div>
+      <div class="col-md-8">
+        <h3 id="leaderboard">Longest Streak Leaderboard</h3>
+          <table class="table">
+            <tr>
+              <td>Name</td>
+              <td>Longest Streak</td>
+            </tr>
+            <% @streaks.each do |stat| %>
+              <tr>
+                <td><%= stat.name %></td>
+                <td><%= stat.streaks %> days</td>
+              </tr>
+            <% end %>
+          <table>
+      </div>
     </div>
 
 </body>

db/migrate/20151007235942_add_current_streaks_to_stat.rb

@@ -0,0 +1,5 @@
+class AddCurrentStreaksToStat < ActiveRecord::Migration
+  def change
+    add_column :stats, :current_streaks, :integer
+  end
+end

db/schema.rb

@@ -11,17 +11,18 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20151007231721) do
+ActiveRecord::Schema.define(version: 20151007235942) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
   create_table "stats", force: :cascade do |t|
     t.string   "name"
     t.integer  "commits"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at",      null: false
+    t.datetime "updated_at",      null: false
     t.integer  "streaks"
+    t.integer  "current_streaks"
   end
 
 end

lib/tasks/update_commits.rake

@@ -28,27 +28,32 @@ task :update_commits => :environment do
   end
   puts "Mapped Streaks"
 
+  #Current Streak
+  @current_streaks = @urls.map do |url|
+    Nokogiri::HTML(open(url)).css(".contrib-column").css(".table-column").css(".contrib-number")[2].text.strip.gsub("days","").rstrip
+  end
+  puts "Mapped Current Streaks"
+
   join = @names.zip(@commits)
   final = join.zip(@streaks)
 
   final = final.map do |stat|
     stat.flatten
   end
 
-  final.each do |stat|
-    stat.flatten
-    Stat.create(name: stat[0], commits: stat[1], streaks: stat[2])
-    puts "creating #{stat[0]} with #{stat[1]}commits and a streak of #{stat[2]} days"
-  end
-
-
-
-
-
-
+  real_final = final.zip(@current_streaks)
 
 
+  real_final = real_final.map do |stat|
+    stat.flatten
+  end
 
+  real_final.each do |stat|
+    stat.flatten
+    Stat.create(name: stat[0], commits: stat[1], streaks: stat[2], current_streaks: stat[3])
+    puts "creating #{stat[0]} with #{stat[1]}commits and a l
+          ongest streak of #{stat[2]} days and a current streak of #{stat[3]} days"
+  end
 
   puts "All done Mr. Doucette"
 end