Removed delayed job and generate matches

Gemfile

@@ -52,7 +52,6 @@ gem 'spring',        group: :development
 		gem 'cancan'
 		gem 'round_robin_tournament'
 		gem 'rb-readline'
-		gem 'delayed_job_active_record'
 		gem 'jquery-datatables-rails', github: 'rweng/jquery-datatables-rails'
 		gem 'jquery-ui-rails'
 

Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: git://github.com/rweng/jquery-datatables-rails.git
-  revision: db17aa0145164095b2b21f83f1ef7ccf91b9ea54
+  revision: 2fed0538ecdeaeb6e36651e36e329b0a595f7fac
   specs:
     jquery-datatables-rails (3.1.1)
       actionpack (>= 3.1)
@@ -58,12 +58,7 @@ GEM
     coffee-script (2.3.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.9.0)
+    coffee-script-source (1.9.1)
-    delayed_job (4.0.6)
-      activesupport (>= 3.0, < 5.0)
-    delayed_job_active_record (4.0.3)
-      activerecord (>= 3.0, < 5.0)
-      delayed_job (>= 3.0, < 4.1)
     devise (3.4.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
@@ -72,12 +67,12 @@ GEM
       thread_safe (~> 0.1)
       warden (~> 1.2.3)
     erubis (2.7.0)
-    execjs (2.3.0)
+    execjs (2.4.0)
-    globalid (0.3.2)
+    globalid (0.3.3)
       activesupport (>= 4.1.0)
     hike (1.2.3)
     i18n (0.7.0)
-    jbuilder (2.2.6)
+    jbuilder (2.2.11)
       activesupport (>= 3.0.0, < 5)
       multi_json (~> 1.2)
     jquery-rails (4.0.3)
@@ -94,8 +89,8 @@ GEM
     mime-types (2.4.3)
     mini_portile (0.6.2)
     minitest (5.5.1)
-    multi_json (1.10.1)
+    multi_json (1.11.0)
-    mysql2 (0.3.17)
+    mysql2 (0.3.18)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     orm_adapter (0.5.0)
@@ -120,7 +115,7 @@ GEM
       activesupport (>= 4.2.0.beta, < 5.0)
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.1)
+    rails-html-sanitizer (1.0.2)
       loofah (~> 2.0)
     rails_12factor (0.0.3)
       rails_serve_static_assets
@@ -147,7 +142,7 @@ GEM
     sdoc (0.4.1)
       json (~> 1.7, >= 1.7.7)
       rdoc (~> 4.0)
-    spring (1.3.1)
+    spring (1.3.3)
     sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -159,13 +154,13 @@ GEM
       sprockets (>= 2.8, < 4.0)
     sqlite3 (1.3.10)
     thor (0.19.1)
-    thread_safe (0.3.4)
+    thread_safe (0.3.5)
     tilt (1.4.1)
     turbolinks (2.5.3)
       coffee-rails
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (2.7.0)
+    uglifier (2.7.1)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     warden (1.2.3)
@@ -178,7 +173,6 @@ DEPENDENCIES
   bootstrap-sass (= 2.3.2.0)
   cancan
   coffee-rails (~> 4.0.0)
-  delayed_job_active_record
   devise
   jbuilder (~> 2.0)
   jquery-datatables-rails!

app/controllers/static_pages_controller.rb

@@ -58,26 +58,4 @@ class StaticPagesController < ApplicationController
 	    end
 	end
 
-	def generate_matches
-		if user_signed_in?
-	    else
-	      redirect_to root_path
-	    end
-		if params[:tournament]
-	      @tournament = Tournament.find(params[:tournament])
-	    end
-	    if @tournament
-	 		@tournament.generateMatches
-	    end
-
-	end
-
-	
-	
-
-
-
-
-
-
 end

app/views/tournaments/show.html.erb

@@ -23,13 +23,6 @@
   <%= @tournament.director_email %>
 </p>
 
-<br>
-<br>
-<% if user_signed_in? %>
-  <%= link_to "New #{@tournament.name} School" , "/schools/new?tournament=#{@tournament.id}" %>
-  <br>
-  BE CAREFUL <%= link_to "Generate Pool Matches" , "/static_pages/generate_matches?tournament=#{@tournament.id}", :class=>"btn" %>
-<% end %>
 <br>
 <br>
 <h3>School Lineups</h3>

config/routes.rb

@@ -24,7 +24,6 @@ Wrestling::Application.routes.draw do
   get 'static_pages/brackets'
   get 'static_pages/weights'
   get 'admin/index'
-  get 'static_pages/generate_matches'
   get 'static_pages/up_matches'
   get 'static_pages/control_match'
   get 'static_pages/results'

db/migrate/20150316131043_remove_delayed_jobs.rb

@@ -0,0 +1,5 @@
+class RemoveDelayedJobs < ActiveRecord::Migration
+  def change
+  	drop_table :delayed_jobs
+  end
+end

db/schema.rb

@@ -11,23 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150209154145) do
+ActiveRecord::Schema.define(version: 20150316131043) do
-
-  create_table "delayed_jobs", force: :cascade do |t|
-    t.integer  "priority",   default: 0, null: false
-    t.integer  "attempts",   default: 0, null: false
-    t.text     "handler",                null: false
-    t.text     "last_error"
-    t.datetime "run_at"
-    t.datetime "locked_at"
-    t.datetime "failed_at"
-    t.string   "locked_by"
-    t.string   "queue"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  add_index "delayed_jobs", ["priority", "run_at"], name: "delayed_jobs_priority"
 
   create_table "matches", force: :cascade do |t|
     t.integer  "r_id"
@@ -35,8 +19,8 @@ ActiveRecord::Schema.define(version: 20150209154145) do
     t.text     "g_stat"
     t.text     "r_stat"
     t.integer  "winner_id"
-    t.string   "win_type",      limit: 255
+    t.string   "win_type"
-    t.string   "score",         limit: 255
+    t.string   "score"
     t.datetime "created_at"
     t.datetime "updated_at"
     t.integer  "tournament_id"
@@ -46,14 +30,14 @@ ActiveRecord::Schema.define(version: 20150209154145) do
   end
 
   create_table "mats", force: :cascade do |t|
-    t.string   "name",          limit: 255
+    t.string   "name"
     t.integer  "tournament_id"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
   create_table "schools", force: :cascade do |t|
-    t.string   "name",          limit: 255
+    t.string   "name"
     t.datetime "created_at"
     t.datetime "updated_at"
     t.integer  "tournament_id"
@@ -61,25 +45,25 @@ ActiveRecord::Schema.define(version: 20150209154145) do
   end
 
   create_table "tournaments", force: :cascade do |t|
-    t.string   "name",           limit: 255
+    t.string   "name"
-    t.string   "address",        limit: 255
+    t.string   "address"
-    t.string   "director",       limit: 255
+    t.string   "director"
-    t.string   "director_email", limit: 255
+    t.string   "director_email"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
   create_table "users", force: :cascade do |t|
-    t.string   "email",                  limit: 255, default: "", null: false
+    t.string   "email",                  default: "", null: false
-    t.string   "encrypted_password",     limit: 255, default: "", null: false
+    t.string   "encrypted_password",     default: "", null: false
-    t.string   "reset_password_token",   limit: 255
+    t.string   "reset_password_token"
     t.datetime "reset_password_sent_at"
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",                      default: 0,  null: false
+    t.integer  "sign_in_count",          default: 0,  null: false
     t.datetime "current_sign_in_at"
     t.datetime "last_sign_in_at"
-    t.string   "current_sign_in_ip",     limit: 255
+    t.string   "current_sign_in_ip"
-    t.string   "last_sign_in_ip",        limit: 255
+    t.string   "last_sign_in_ip"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -95,7 +79,7 @@ ActiveRecord::Schema.define(version: 20150209154145) do
   end
 
   create_table "wrestlers", force: :cascade do |t|
-    t.string   "name",          limit: 255
+    t.string   "name"
     t.integer  "school_id"
     t.integer  "weight_id"
     t.integer  "seed"
@@ -104,7 +88,7 @@ ActiveRecord::Schema.define(version: 20150209154145) do
     t.datetime "updated_at"
     t.integer  "season_win"
     t.integer  "season_loss"
-    t.string   "criteria",      limit: 255
+    t.string   "criteria"
     t.integer  "poolNumber"
     t.boolean  "extra"
   end