diff --git a/lib/sportdb/play.rb b/lib/sportdb/play.rb index df70182..e79a62c 100644 --- a/lib/sportdb/play.rb +++ b/lib/sportdb/play.rb @@ -17,7 +17,8 @@ require 'sportdb/play/models/user' -module SportDb::Play +module SportDb + module Play def self.banner "sportdb-play/#{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]" @@ -30,10 +31,11 @@ def self.root def self.create CreateDb.new.up - WorldDb::Models::Prop.create!( key: 'db.schema.sport.play.version', value: VERSION ) + WorldDb::Model::Prop.create!( key: 'db.schema.sport.play.version', value: VERSION ) end -end # module SportDb::Play + end # module Play +end # module SportDb ## say hello diff --git a/lib/sportdb/play/models/bonus_point.rb b/lib/sportdb/play/models/bonus_point.rb index 7b06773..5bcef38 100644 --- a/lib/sportdb/play/models/bonus_point.rb +++ b/lib/sportdb/play/models/bonus_point.rb @@ -1,16 +1,18 @@ -## NB: just use namespace SportDb::Models (not SportDb::Models::Play) +## NB: just use namespace SportDb::Model (not SportDb::Model::Play) -module SportDb::Models +module SportDb + module Model class BonusPoint < ActiveRecord::Base - + belongs_to :user belongs_to :pool - belongs_to :round, :class_name => 'BonusRound', :foreign_key => 'round_id' - + belongs_to :round, class_name: 'BonusRound', foreign_key: 'round_id' + end # class BonusPoint + end # module Model +end # module SportDb -end # module SportDb::Models diff --git a/lib/sportdb/play/models/bonus_question.rb b/lib/sportdb/play/models/bonus_question.rb index 97abba5..85d4a99 100644 --- a/lib/sportdb/play/models/bonus_question.rb +++ b/lib/sportdb/play/models/bonus_question.rb @@ -1,16 +1,18 @@ -## NB: just use namespace SportDb::Models (not SportDb::Models::Play) +## NB: just use namespace SportDb::Model (not SportDb::Model::Play) -module SportDb::Models +module SportDb + module Model class BonusQuestion < ActiveRecord::Base self.table_name = 'bonus_questions' - has_many :tips, :class_name => 'BonusTip', :foreign_key => 'question_id' + has_many :tips, class_name: 'BonusTip', foreign_key: 'question_id' end # class BonusQuestion + end # module Model +end # module SportDb -end # module SportDb::Models diff --git a/lib/sportdb/play/models/bonus_round.rb b/lib/sportdb/play/models/bonus_round.rb index cf6ba31..9ad1e61 100644 --- a/lib/sportdb/play/models/bonus_round.rb +++ b/lib/sportdb/play/models/bonus_round.rb @@ -1,15 +1,17 @@ -## NB: just use namespace SportDb::Models (not SportDb::Models::Play) +## NB: just use namespace SportDb::Model (not SportDb::Model::Play) -module SportDb::Models +module SportDb + module Model class BonusRound < ActiveRecord::Base self.table_name = 'bonus_rounds' - has_many :questions, :order => 'pos', :class_name => 'BonusQuestion', :foreign_key => 'round_id' + has_many :questions, order: 'pos', class_name: 'BonusQuestion', foreign_key: 'round_id' belongs_to :pool end # class BonusRound -end # module SportDb::Models + end # module Model +end # module SportDb diff --git a/lib/sportdb/play/models/bonus_tip.rb b/lib/sportdb/play/models/bonus_tip.rb index 300a22d..af19f70 100644 --- a/lib/sportdb/play/models/bonus_tip.rb +++ b/lib/sportdb/play/models/bonus_tip.rb @@ -1,7 +1,8 @@ -## NB: just use namespace SportDb::Models (not SportDb::Models::Play) +## NB: just use namespace SportDb::Model (not SportDb::Model::Play) -module SportDb::Models +module SportDb + module Model class BonusTip < ActiveRecord::Base @@ -13,5 +14,6 @@ class BonusTip < ActiveRecord::Base end # class BonusTip -end # module SportDb::Models + end # module Model +end # module SportDb diff --git a/lib/sportdb/play/models/game.rb b/lib/sportdb/play/models/game.rb index 6b82f79..81a2142 100644 --- a/lib/sportdb/play/models/game.rb +++ b/lib/sportdb/play/models/game.rb @@ -1,7 +1,8 @@ -module SportDb::Models +module SportDb + module Model ### NB: extend Game model from sport.db gem @@ -33,17 +34,9 @@ def job_running? ## keep style helpers here? why? why not? - def tip_1_style_class - toto1x2 == '1' ? ' bingo ' : ' ' - end - - def tip_2_style_class - toto1x2 == '2' ? ' bingo ' : ' ' - end - - def tip_x_style_class - toto1x2 == 'X' ? ' bingo ' : ' ' - end + def tip_1_style_class() toto1x2 == '1' ? ' bingo ' : ' '; end + def tip_2_style_class() toto1x2 == '2' ? ' bingo ' : ' '; end + def tip_x_style_class() toto1x2 == 'X' ? ' bingo ' : ' '; end ############ some methods for stats @@ -66,4 +59,5 @@ def tip_1x2_count() tips.complete.count(); end # alias for tip_12x_count // end # class Game -end # module SportDb::Models + end # module Model +end # module SportDb diff --git a/lib/sportdb/play/models/play.rb b/lib/sportdb/play/models/play.rb index 90c95ff..cf5b86a 100644 --- a/lib/sportdb/play/models/play.rb +++ b/lib/sportdb/play/models/play.rb @@ -1,25 +1,22 @@ -## NB: just use namespace SportDb::Models (not SportDb::Models::Play) +## NB: just use namespace SportDb::Model (not SportDb::Model::Play) + +module SportDb + module Model -module SportDb::Models class Play < ActiveRecord::Base - + belongs_to :user belongs_to :pool - - belongs_to :team1, :class_name => 'Team', :foreign_key => 'team1_id' - belongs_to :team2, :class_name => 'Team', :foreign_key => 'team2_id' - belongs_to :team3, :class_name => 'Team', :foreign_key => 'team3_id' - - def job_running! - @job_running = true - end - - def job_done! - @job_running = false - end + belongs_to :team1, class_name: 'Team', foreign_key: 'team1_id' + belongs_to :team2, class_name: 'Team', foreign_key: 'team2_id' + belongs_to :team3, class_name: 'Team', foreign_key: 'team3_id' + + + def job_running!() @job_running = true; end + def job_done!() @job_running = false; end def job_running? (@job_running ||= false) == true @@ -58,4 +55,5 @@ def export? end # class Play -end # module SportDb::Models + end # module Model +end # module SportDb diff --git a/lib/sportdb/play/models/point.rb b/lib/sportdb/play/models/point.rb index 4cf92e3..a8a8cc7 100644 --- a/lib/sportdb/play/models/point.rb +++ b/lib/sportdb/play/models/point.rb @@ -1,8 +1,9 @@ # encoding: utf-8 -## NB: just use namespace SportDb::Models (not SportDb::Models::Play) +## NB: just use namespace SportDb::Model (not SportDb::Model::Play) -module SportDb::Models +module SportDb + module Model class Point < ActiveRecord::Base @@ -51,5 +52,6 @@ def diff_total_pos_str end # class Point + end # module Model +end # module SportDb -end # module SportDb::Models diff --git a/lib/sportdb/play/models/pool.rb b/lib/sportdb/play/models/pool.rb index 1ec817b..a4525a9 100644 --- a/lib/sportdb/play/models/pool.rb +++ b/lib/sportdb/play/models/pool.rb @@ -1,8 +1,9 @@ # encoding: utf-8 -## NB: just use namespace SportDb::Models (not SportDb::Models::Play) +## NB: just use namespace SportDb::Model (not SportDb::Model::Play) -module SportDb::Models +module SportDb + module Model class Pool < ActiveRecord::Base @@ -32,5 +33,6 @@ def team3? # tip for 3rd place? end # class Pool -end # module SportDb::Models + end # module Model +end # module SportDb diff --git a/lib/sportdb/play/models/tip.rb b/lib/sportdb/play/models/tip.rb index a86c67e..32b2006 100644 --- a/lib/sportdb/play/models/tip.rb +++ b/lib/sportdb/play/models/tip.rb @@ -1,9 +1,10 @@ # encoding: utf-8 -## NB: just use namespace SportDb::Models (not SportDb::Models::Play) +## NB: just use namespace SportDb::Model (not SportDb::Model::Play) -module SportDb::Models +module SportDb + module Model class Tip < ActiveRecord::Base @@ -95,53 +96,19 @@ def toto1x2 ### getter/setters for deprecated attribs (score3,4,5,6) - def score3 - score1et - end - - def score4 - score2et - end + def score3() score1et; end + def score4() score2et; end + def score1ot() score1et; end + def score2ot() score2et; end + def score5() score1p; end + def score6() score2p; end - def score1ot - score1et - end - - def score2ot - score2et - end - - def score5 - score1p - end - - def score6 - score2p - end - - def score3=(value) - self.score1et = value - end - - def score4=(value) - self.score2et = value - end - - def score1ot=(value) - self.score1et = value - end - - def score2ot=(value) - self.score2et = value - end - - def score5=(value) - self.score1p = value - end - - def score6=(value) - self.score2p = value - end + def score3=(value) self.score1et = value; end + def score4=(value) self.score2et = value; end + def score1ot=(value) self.score1et = value; end + def score2ot=(value) self.score2et = value; end + def score5=(value) self.score1p = value; end + def score6=(value) self.score2p = value; end @@ -375,4 +342,6 @@ def score2_str() score2.blank? ? '?' : score2.to_s; end end # class Tip -end # module SportDb::Models + end # module Model +end # module SportDb + diff --git a/lib/sportdb/play/models/user.rb b/lib/sportdb/play/models/user.rb index 292ef9c..e48a882 100644 --- a/lib/sportdb/play/models/user.rb +++ b/lib/sportdb/play/models/user.rb @@ -1,9 +1,10 @@ # encoding: utf-8 -## NB: just use namespace SportDb::Models (not SportDb::Models::Play) +## NB: just use namespace SportDb::Model (not SportDb::Model::Play) -module SportDb::Models +module SportDb + module Model class User < ActiveRecord::Base @@ -15,4 +16,5 @@ class User < ActiveRecord::Base end # class User -end # module SportDb::Models + end # module Model +end # module SportDb diff --git a/lib/sportdb/play/schema.rb b/lib/sportdb/play/schema.rb index a668d6c..424b527 100644 --- a/lib/sportdb/play/schema.rb +++ b/lib/sportdb/play/schema.rb @@ -1,4 +1,5 @@ -module SportDb::Play +module SportDb + module Play class CreateDb < ActiveRecord::Migration @@ -8,7 +9,7 @@ def up ## lets add a check? why? why not? change_table :games do |t| - t.boolean :locked, :null => false, :default => false + t.boolean :locked, null: false, default: false end @@ -146,5 +147,6 @@ def down end # class CreateDb + end # module Play +end # module SportDb -end # module SportDb::Play diff --git a/lib/sportdb/play/version.rb b/lib/sportdb/play/version.rb index ee42544..9a9bf8f 100644 --- a/lib/sportdb/play/version.rb +++ b/lib/sportdb/play/version.rb @@ -1,7 +1,7 @@ -module SportDb ; end # forward reference (for hoe require) -module SportDb::Play - VERSION = '0.2.2' +module SportDb + module Play + VERSION = '0.2.3' + end end -