nachof-zheng 0.0.2 → 0.0.3

data/bin/zheng

@@ -7,5 +7,9 @@ include Zheng
 if ARGV.size > 0
   Actions::call(*ARGV)
 else
-  Actions::script $stdin
+  if $stdin.tty?
+    Interactive.run
+  else
+    Actions.script $stdin
+  end
 end

data/config/init.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'sequel'
 require 'erb'
+require 'readline'
 
 require 'shellwords' # Needed for parsing the script action
 

data/lib/zheng.rb

@@ -4,3 +4,4 @@ require File.join(File.dirname(__FILE__), 'zheng', 'rating')
 require File.join(File.dirname(__FILE__), 'zheng', 'player')
 require File.join(File.dirname(__FILE__), 'zheng', 'game')
 require File.join(File.dirname(__FILE__), 'zheng', 'actions')
+require File.join(File.dirname(__FILE__), 'zheng', 'interactive')

data/lib/zheng/game.rb

@@ -1,19 +1,21 @@
 module Zheng
   class Game < Sequel::Model
+    before_create :set_ratings
+    before_create :set_date
+
     set_schema do
       primary_key :id
       foreign_key :left_id, :players
       foreign_key :right_id, :players
       text :winner, :null => false
+      float :left_rating_before, :null => false
+      float :right_rating_before, :null => false
+      date :date, :null => false
     end
 
-    include Util
-
     belongs_to :left, :class => :Player
     belongs_to :right, :class => :Player
 
-    sequel_accessor :right_id, :left_id
-
     def winner
       @values[:winner].to_sym
     end
@@ -27,9 +29,28 @@ module Zheng
       return Parameters::Con(player.rating) * (result(which_player) - Parameters::expected(player.rating, opponent.rating))
     end
 
+    def rating_before which_player
+      send("#{which_player.to_s}_rating_before".to_sym)
+    end
+    def rating_after which_player
+      rating_before(which_player) + rating_change_for(which_player)
+    end
+
     def result which_player
       (which_player == winner) ? 1 : 0
     end
+
+  private
+
+    def set_ratings
+      self.left_rating_before = left.rating
+      self.right_rating_before = right.rating
+    end
+
+    def set_date
+      self.date = Date.today if date.nil?
+    end
+
   end
 end
 

data/lib/zheng/player.rb

@@ -3,14 +3,10 @@ module Zheng
     set_schema do
       primary_key :id
       text :name, :null => false, :unique => true
-      integer :rating, :null => false
+      float :rating, :null => false
       boolean :external, :default => false
     end
 
-    include Util
-
-    sequel_accessor :name, :rating
-
     def rank
       Rating.new(rating).rank
     end

data/lib/zheng/util.rb

@@ -1,27 +1,4 @@
 module Zheng
-  module Util
-
-    def self.included(base)
-      base.extend ClassMethods
-    end
-
-    module ClassMethods
-      def sequel_accessor *params
-        params.each do |method|
-          class_eval <<-end_eval
-            def #{method.to_s}
-              @values[:#{method.to_s}]
-            end
-            def #{method.to_s}= v
-              @values[:#{method.to_s}] = v
-            end
-          end_eval
-        end
-      end
-    end
-
-  end
-
   module_function
   # I put it here so I can easily silence it for tests
   def output text

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nachof-zheng
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Nacho Facello
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-09 00:00:00 -08:00
+date: 2009-01-26 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency