Merge branch 'master' of github.com:LasVegasRubyGroup/vegastech_app

Gemfile

@@ -12,12 +12,13 @@ gem 'twitter-bootstrap-rails', '2.0.7'
 gem 'therubyracer', :platform => :ruby
 gem 'will_paginate'
 gem 'bootstrap-will_paginate'
-gem "sidekiq", "~> 2.6.5"
+gem "sidekiq", '~> 2.12.3'
 gem 'rest-client'
 gem 'sinatra', require: false
 gem 'slim'
 gem 'capistrano-unicorn', :require => false
 gem 'dotenv-rails', '0.8.0'
+gem 'airbrake'
 
 group :assets do
   gem 'sass-rails',   '~> 3.2.3'

Gemfile.lock

@@ -29,6 +29,10 @@ GEM
       i18n (~> 0.6)
       multi_json (~> 1.0)
     addressable (2.3.2)
+    airbrake (3.1.12)
+      activesupport
+      builder
+      json
     arel (3.0.2)
     bootstrap-will_paginate (0.0.9)
       will_paginate
@@ -48,8 +52,7 @@ GEM
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
       xpath (~> 1.0.0)
-    celluloid (0.12.4)
-      facter (>= 1.6.12)
+    celluloid (0.14.1)
       timers (>= 1.0.0)
     childprocess (0.3.6)
       ffi (~> 1.0, >= 1.0.6)
@@ -62,7 +65,7 @@ GEM
       execjs
     coffee-script-source (1.4.0)
     commonjs (0.2.6)
-    connection_pool (1.0.0)
+    connection_pool (1.1.0)
     daemons (1.1.9)
     database_cleaner (0.9.1)
     diff-lcs (1.1.3)
@@ -73,7 +76,6 @@ GEM
     eventmachine (1.0.0)
     execjs (1.4.0)
       multi_json (~> 1.0)
-    facter (1.6.17)
     factory_girl (4.1.0)
       activesupport (>= 3.0.0)
     factory_girl_rails (4.1.0)
@@ -127,7 +129,7 @@ GEM
       treetop (~> 1.4.8)
     method_source (0.8.1)
     mime-types (1.21)
-    multi_json (1.5.1)
+    multi_json (1.7.6)
     multipart-post (1.1.5)
     mysql2 (0.3.11)
     net-scp (1.1.1)
@@ -184,8 +186,8 @@ GEM
       ffi (>= 0.5.0)
     rdoc (3.12.1)
       json (~> 1.4)
-    redis (3.0.2)
-    redis-namespace (1.2.1)
+    redis (3.0.4)
+    redis-namespace (1.3.0)
       redis (~> 3.0.0)
     rest-client (1.6.7)
       mime-types (>= 1.16)
@@ -218,11 +220,11 @@ GEM
     sextant (0.2.2)
       activesupport (>= 3.2)
       rails (>= 3.2)
-    sidekiq (2.6.5)
-      celluloid (~> 0.12.0)
-      connection_pool (~> 1.0)
-      multi_json (~> 1)
-      redis (~> 3)
+    sidekiq (2.12.3)
+      celluloid (>= 0.14.1)
+      connection_pool (>= 1.0.0)
+      json
+      redis (>= 3.0)
       redis-namespace
     simple_oauth (0.1.9)
     sinatra (1.3.3)
@@ -285,6 +287,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  airbrake
   bootstrap-will_paginate
   capistrano
   capistrano-unicorn
@@ -309,7 +312,7 @@ DEPENDENCIES
   rspec-rails
   sass-rails (~> 3.2.3)
   sextant
-  sidekiq (~> 2.6.5)
+  sidekiq (~> 2.12.3)
   sinatra
   slim
   sqlite3

app/controllers/sessions_controller.rb

@@ -8,13 +8,13 @@ def create
         auth_credentials: auth_hash.credentials.token + ':' + auth_hash.credentials.secret)
     end
     session[:user_id] = user.id
-    redirect_to(root_url, notice: "Successfully signed <3<3<3")
+    redirect_to(root_url, notice: "Successfully signed in! <3<3<3")
 
   end
 
   def destroy
     session[:user_id] = nil
-    redirect_to(root_url, notice: "Signed out Successfully <3<3<3")
+    redirect_to(root_url, notice: "Signed out successfully <3<3<3")
   end
 
   private

app/models/comment.rb

@@ -1,7 +1,7 @@
 class Comment < Post
   belongs_to :story
 
-  after_create :queue_reply_checker
+  # after_create :queue_reply_checker
 
   attr_accessible :post_to_twitter
   attr_accessor :post_to_twitter

app/models/story.rb

@@ -3,7 +3,7 @@ class Story < Post
 
   validates :twitter_id, :uniqueness => true
 
-  after_create :queue_reply_checker
+  # after_create :queue_reply_checker
   after_save :self_love #:promote_tweet
 
   attr_accessible :twitter_id, :twitter_profile_image_url

app/models/vote.rb

@@ -11,7 +11,7 @@ class Vote < ActiveRecord::Base
   attr_accessible :twitter_handle, :value, :twitter_id
   attr_accessor :twitter_id
 
-  after_create :queue_reply_checker
+  # after_create :queue_reply_checker
 
   def story
     post

app/views/stories/_story.html.erb

@@ -31,7 +31,7 @@
         <% end %>
 
         <div class="rank"><%= "#{story.vote_count} points" %></div>
-        <div class="score"><%= "#{story.score.to_f}" %></div>
+        <div class="score"><%#= "#{story.score.to_f}" %></div>
 
       </div>
 

config/deploy.rb

@@ -107,3 +107,6 @@
 after 'deploy:finalize_update', 'deploy:stream:upstart_config'
 after 'deploy:finalize_update', 'deploy:sidekiq:restart'
 after 'deploy:finalize_update', 'deploy:stream:restart'
+
+        require './config/boot'
+        require 'airbrake/capistrano'

config/initializers/airbrake.rb

@@ -0,0 +1,3 @@
+Airbrake.configure do |config|
+  config.api_key = '670411b4d22cbf4d4d501804da5c7711'
+end