Merge branch 'master' of https://github.com/LukeShu/leaguer

2 files changed, 25 insertions, 23 deletions

diff --git a/app/models/tournament.rb b/app/models/tournament.rb
index 61b4700..2d4d6b6 100644
--- a/app/models/tournament.rb
+++ b/app/models/tournament.rb
@@ -93,4 +93,29 @@ class Tournament < ActiveRecord::Base
 	def sampling
 		@sampling ||= "Sampling::#{self.sampling_method.camelcase}".constantize
 	end
+
+	# YISSSSSS
+	def self.make_methods(dir)
+		@methods ||= {}
+		if @methods[dir].nil? or Rails.env.development?
+			@methods[dir] = Dir.glob("#{Rails.root}/lib/#{dir}/*.rb").map{|filename| File.basename(filename, ".rb").humanize }
+		end
+		return @methods[dir]
+	end
+
+	def self.scoring_methods
+		make_methods "scoring"
+	end
+
+	def self.sampling_methods
+		make_methods "sampling"
+	end
+
+	def self.scheduling_methods
+		make_methods "scheduling"
+	end
+
+	def self.seeding_methods
+		make_methods "seeding"
+	end
 end
diff --git a/app/models/tournament_stage.rb b/app/models/tournament_stage.rb
index 84519b9..9352137 100644
--- a/app/models/tournament_stage.rb
+++ b/app/models/tournament_stage.rb
@@ -25,29 +25,6 @@ class TournamentStage < ActiveRecord::Base
 		return seeding.seed.pair(matches, players)
 	end
 
-	def make_methods(dir)
-		if @methods[dir].nil? or Rails.env.development?
-			@methods[dir] = Dir.glob("#{Rails.root}/lib/#{dir}/*.rb").map{|filename| filename.sub(/.*\/(.*)\.rb/, /\1/)}
-		end
-		return @methods[dir]
-	end
-
-	def scoring_methods
-		make_methods "scoring"
-	end
-
-	def sampling_methods
-		make_methods "sampling"
-	end
-
-	def scheduling_methods
-		make_methods "scheduling"
-	end
-
-	def seeding_methods
-		make_methods "seeding"
-	end
-
 	# Accessors to the configured methods
 
 	def scoring