rrschedule 0.2.4 → 0.2.5

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.2.5

data/lib/rrschedule.rb

@@ -203,10 +203,11 @@ module RRSchedule
         else
           #PS and GT stack empty... we go to the next rule
           if @cur_rule_index < @rules.size-1
+            last_rule=@cur_rule
             @cur_rule_index += 1
             @cur_rule = @rules[@cur_rule_index]            
             #Go to the next date (except if the new rule is for the same weekday)
-            @cur_date = next_game_date(@cur_date+=1,@cur_rule.wday) if @cur_rule.wday != @rules[@cur_rule_index].wday
+            @cur_date = next_game_date(@cur_date+=1,@cur_rule.wday) if last_rule.wday != @cur_rule.wday
           else
             @cur_rule_index = 0
             @cur_rule = @rules[@cur_rule_index]            

data/test/test_rrschedule.rb

@@ -98,22 +98,37 @@ class TestRrschedule < Test::Unit::TestCase
         :exclude_dates => [
           Date.parse("2011/02/02")
         ]
-      ).generate
+      )
     end
 
     should "generate separate round-robins" do
+      @s.generate
       assert_equal 4, @s.flights.size
       4.times { |i| assert @s.round_robin?(i)}
     end
 
     should "have a correct total number of games" do
+      @s.generate    
       assert_equal 112, @s.gamedays.collect{|gd| gd.games.size}.inject{|x,sum| x+sum}
     end
 
     should "not have games for a date that is excluded" do
+      @s.generate    
       assert !@s.gamedays.collect{|gd| gd.date}.include?(Date.parse("2011/02/02"))
       assert @s.gamedays.collect{|gd| gd.date}.include?(Date.parse("2011/02/09"))
     end
+    
+    should "respect rules" do
+      @s.teams << %w(E1 E2 E3 E4 E5 E6 E7 E8)
+      @s.rules << Rule.new(:wday => 4, :gt => "7:00PM", :ps => %w(one two))
+      @s.generate
+      
+      wday = 3
+      @s.gamedays.each do |gd|
+        assert_equal wday, gd.date.wday
+        wday = (wday==3) ? 4 : 3
+      end
+    end
   end
 
   ##### RULES #######

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rrschedule
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 2
-  - 4
-  version: 0.2.4
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - flamontagne
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-18 00:00:00 -05:00
+date: 2011-02-19 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency