recurring 0.4.5 → 0.5.1

data/lib/schedule.rb

@@ -1,5 +1,6 @@
 module Recurring
-  VERSION = '0.4.5'
+
+  VERSION = '0.5.1'
   
   class << self
     # returns a number starting with 1
@@ -7,6 +8,12 @@ module Recurring
       (((date.day - 1).to_f / 7.0) + 1).floor
     end
 
+    def negative_week_in_month date
+    	end_of_month = (date.month < 12 ? Time.utc(date.year, date.month+1) : Time.utc(date.year + 1)) - 3600
+      
+      (((end_of_month.day - date.day).to_f / 7.0) + 1).floor * -1
+    end
+
     # just a wrapper for strftime
     def week_of_year date
     	date.strftime('%U').to_i
@@ -136,15 +143,27 @@ module Recurring
     # <tt>range = (Time.now..Time.now+24*60*60)</tt>
     #
     # <tt>rs.find_in_range(range)</tt>
-    def find_in_range *range
-      range = range[0] if range.length == 1
-      start = range.first
+    def find_in_range *args
+      if args[0].respond_to?(:first) && args[0].respond_to?(:last)
+	t_start = args[0].first
+	t_end = args[0].last
+      else
+	t_start = args[0]
+	t_end = args[1]
+      end
+      opts = args.last if args.last.respond_to?(:keys)
+      if opts
+	limit = opts[:limit]
+      end
       result = []
+      count = 1
       loop do
-        rnext = find_next start
-        break if rnext > range.last
+        rnext = find_next t_start
+        break if count > limit if limit
+	break if rnext > t_end
         result << rnext
-        start = rnext + 1
+        t_start = rnext + 1
+	count += 1
       end
       result
     end
@@ -284,7 +303,7 @@ module Recurring
       	  return ((Recurring.week_of_year(date) - Recurring.week_of_year(@anchor)) % @frequency) == 0
       	end
       	if @weeks
-      	  @weeks.include?(Recurring.week_in_month(date))
+      	  @weeks.include?(Recurring.week_in_month(date)) || @weeks.include?(Recurring.negative_week_in_month(date))
       	else
       	  true
       	end

data/spec/schedule_spec.rb

@@ -343,6 +343,26 @@ end
 context "A six-monthly schedule with week, weekday, and times params" do
 end
 
+context "A monthly schedule with negative week params and weekday params" do
+
+ setup do
+   @rs = Recurring::Schedule.new :unit => 'months', :weeks => -1,
+:weekdays => :monday
+ end
+
+ specify "should include the beginnings of matching days" do
+   @rs.should_include Time.utc(2006,12,25)
+   @rs.should_include Time.utc(2007,4,30)
+ end
+
+ specify "should not include the matching days in off weeks" do
+   @rs.should_not_include Time.utc(2006,12,18)
+   @rs.should_not_include Time.utc(2006,12,11)
+   @rs.should_not_include Time.utc(2006,12,4)
+ end
+
+end
+
 #WEEKLY
 
 context "A bi-weekly schedule with weekdays and a midnight time" do
@@ -734,8 +754,13 @@ context "Every 45 minutes from an anchor" do
   end
 end
 
-context "A minutely schedule with times params" do
-
+context "A 30 minutely schedule" do
+  setup do
+    @rs = Recurring::Schedule.new :unit => 'minutes', :frequency => 30, :anchor => Time.utc(2006,1,1,1,15)
+  end
+  specify "should match the very next time after the start" do
+    @rs.find_in_range(Time.utc(2006,1,15,2), Time.utc(2006,1,16)).first.should == Time.utc(2006,1,15,2,15)
+  end
 end
 
 context "A 5-minutely schedule with no other params" do
@@ -764,7 +789,17 @@ context "A 5-minutely schedule with no other params" do
   
   specify "should find 7 times in a 30 minute range" do
     should_find_in_range(@rs, 7, Time.utc(2006,12,12,0,45), Time.utc(2006,12,12,1,15))
-    @rs.find_in_range( Time.utc(2006,12,12,0,45), Time.utc(2006,12,12,1,15) ).first.class.should_be Time  
+    @rs.find_in_range( Time.utc(2006,12,12,0,45)..Time.utc(2006,12,12,1,15) ).first.class.should_be Time  
+  end
+
+  specify "should find 3 times in a 30 minute range with a limit of 3" do
+    results = @rs.find_in_range(Time.utc(2006,12,12,0,45), Time.utc(2006,12,12,1,15), :limit => 3)
+    results.length.should == 3
+  end
+
+  specify "should find 3 times in a 30 minute range (with range args) with a limit of 3" do
+    results = @rs.find_in_range(Time.utc(2006,12,12,0,45)..Time.utc(2006,12,12,1,15), :limit => 3)
+    results.length.should == 3
   end
 
   specify "should find in a range given as an object with first and last params" do

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.9.2
 specification_version: 1
 name: recurring
 version: !ruby/object:Gem::Version 
-  version: 0.4.5
-date: 2007-01-24 00:00:00 -08:00
+  version: 0.5.1
+date: 2007-04-25 00:00:00 -07:00
 summary: A scheduling library for recurring events
 require_paths: 
 - lib
@@ -25,6 +25,7 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 signing_key: 
 cert_chain: 
+post_install_message: 
 authors: 
 - Chris Anderson
 files: