Fix a bug in exclude dates for occurs_on?

lib/ice_cube/rule_occurrence.rb

@@ -44,8 +44,8 @@ def succ
       begin
         return nil if @end_time && date > @end_time
         return nil if @rule.until_date && date > @rule.until_date # until check
-        next unless @rule.in_interval?(date, @start_date) 
         return nil if yield(date)
+        next unless @rule.in_interval?(date, @start_date) 
         return RuleOccurrence.new(@rule, @start_date, @end_time, date, @index + 1)
       end while date = @rule.next_suggestion(date)
     end

lib/ice_cube/schedule.rb

@@ -165,15 +165,15 @@ def occurrences_between(begin_time, end_time)
       # adjust to the propert end date
       end_time = @end_time if @end_time && @end_time < end_time
       # collect the occurrences
-      include_dates = SortedSet.new(@rdates)
+      include_dates, exclude_dates = SortedSet.new(@rdates), Set.new(@exdates)
       @rrule_occurrence_heads.each do |rrule_occurrence_head|
         include_dates.merge(rrule_occurrence_head.between(begin_time, end_time))
       end
       @exrule_occurrence_heads.each do |exrule_occurrence_head|
         exclude_dates.merge(exrule_occurrence_head.between(begin_time, end_time))
       end
       # reject all of the ones outside of the range
-      include_dates.reject! { |date| (@exdates && @exdates.include?(date)) || date < begin_time || date > end_time }
+      include_dates.reject! { |date| exclude_dates.include?(date) || date < begin_time || date > end_time }
       include_dates.to_a
     end
 

spec/examples/ice_cube_spec.rb

@@ -685,6 +685,14 @@
     schedule.exdate Time.local(2010, 8, 14)
     schedule.exdates.should == [Time.local(2010, 8, 13), Time.local(2010, 8, 14)]
   end
-
+
+  it 'should be able to have a rule and an exrule' do
+    schedule = IceCube::Schedule.new(Time.local(2010, 8, 27, 10))
+    schedule.rrule IceCube::Rule.daily
+    schedule.exrule IceCube::Rule.daily.day(:friday)
+    schedule.occurs_on?(Date.today).should be(false)
+    schedule.occurs_on?(Date.today + 1).should be(true)
+  end
+
 end
 

spec/examples/sample_spec.rb

@@ -1,5 +1,7 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
+#require 'active_support'
+
 describe IceCube::Schedule, 'occurs_on?' do
 
 end