recurrence 0.1.2 → 0.1.3

data/History.txt

@@ -52,3 +52,7 @@
 
 * Refactor, refactor, refactor.
 * Using Recurrence as Rails plugin is now deprecated; install it as a gem instead.
+
+== 0.1.3 2010-09-14
+
+* Moved Recurrence class to SimpleIdeias namespace; see troubleshooting section for instructions.

data/README.markdown

@@ -25,6 +25,7 @@ USAGE:
 	# Daily
 	r = Recurrence.new(:every => :day)
 	r = Recurrence.new(:every => :day, :interval => 9)
+	r = Recurrence.daily(options = {})
 
 	# Weekly
 	r = Recurrence.new(:every => :week, :on => 5)
@@ -32,6 +33,7 @@ USAGE:
 	r = Recurrence.new(:every => :week, :on => [:monday, :friday])
 	r = Recurrence.new(:every => :week, :on => [:monday, :wednesday, :friday])
 	r = Recurrence.new(:every => :week, :on => :friday, :interval => 2)
+	r = Recurrence.weekly(:on => :thursday)
 
 	# Monthly by month day
 	r = Recurrence.new(:every => :month, :on => 15)
@@ -39,6 +41,7 @@ USAGE:
 	r = Recurrence.new(:every => :month, :on => 7, :interval => 2)
 	r = Recurrence.new(:every => :month, :on => 7, :interval => :monthly)
 	r = Recurrence.new(:every => :month, :on => 7, :interval => :bimonthly)
+	r = Recurrence.monthly(:on => 31)
 
 	# Monthly by week day
 	r = Recurrence.new(:every => :month, :on => :first, :weekday => :sunday)
@@ -53,6 +56,7 @@ USAGE:
 	r = Recurrence.new(:every => :year, :on => [10, 31], :interval => 3)
 	r = Recurrence.new(:every => :year, :on => [:jan, 31])
 	r = Recurrence.new(:every => :year, :on => [:january, 31])
+	r = Recurrence.yearly(:on => [:january, 31])
 
 	# Limit recurrence
 	# :starts defaults to Date.today
@@ -80,6 +84,25 @@ USAGE:
 	r.next 	# => Keep the original date object
 	r.next! # => Change the internal date object to the next available date
 
+TROUBLESHOOTING
+---------------
+
+If you're having problems because already have a class/module called Recurrence that is conflicting with this gem, you can require the namespace and inherit from the `SimplesIdeias::Recurrence` class.
+
+	require "recurrence/namespace"
+
+	class RecurrentEvent < SimplesIdeias::Recurrence
+	end
+
+	r = RecurrentEvent.new(:every => :day)
+
+If you're using Rails/Bundler or something like that, remember to override the `:require` option.
+
+	# Gemfile
+	source :rubygems
+
+	gem "recurrence", :require => "recurrence/namespace"
+
 MAINTAINER
 ----------
 

data/Rakefile

@@ -1,5 +1,7 @@
+$LOAD_PATH.unshift File.dirname(__FILE__) + "/lib"
+
 require "rspec/core/rake_task"
-require "lib/recurrence/version"
+require "recurrence"
 
 RSpec::Core::RakeTask.new
 

data/lib/recurrence.rb

@@ -1,141 +1,4 @@
-require "date"
-require "active_support/all"
+require "recurrence/namespace"
 
-class Recurrence
-  autoload :Event, "recurrence/event"
-
-  FREQUENCY = %w(day week month year)
-
-  attr_reader :event
-
-  def self.default_until_date
-    @default_until_date ||= Date.new(2037, 12, 31)
-  end
-
-  def self.default_until_date=(date)
-    @default_until_date = if date.is_a?(String)
-      Date.parse(date)
-    else
-      date
-    end
-  end
-
-  def self.daily(options = {})
-    options[:every] = :day
-    new(options)
-  end
-
-  def self.weekly(options = {})
-    options[:every] = :week
-    new(options)
-  end
-
-  def self.monthly(options = {})
-    options[:every] = :month
-    new(options)
-  end
-
-  def self.yearly(options = {})
-    options[:every] = :year
-    new(options)
-  end
-
-  def initialize(options)
-    raise ArgumentError, ":every option is required" unless options.key?(:every)
-    raise ArgumentError, "invalid :every option"     unless FREQUENCY.include?(options[:every].to_s)
-
-    @options = initialize_dates(options)
-    @options[:interval] ||= 1
-
-    @event = case @options[:every].to_sym
-      when :day
-        Recurrence::Event::Daily.new(@options)
-      when :week
-        Recurrence::Event::Weekly.new(@options)
-      when :month
-        Recurrence::Event::Monthly.new(@options)
-      when :year
-        Recurrence::Event::Yearly.new(@options)
-    end
-  end
-
-  def reset!
-    @event.reset!
-    @events = nil
-  end
-
-  def include?(required_date)
-    required_date = Date.parse(required_date) if required_date.is_a?(String)
-
-    if required_date < @options[:starts] || required_date > @options[:until]
-      false
-    else
-      each do |date|
-        return true if date == required_date
-      end
-    end
-
-    return false
-  end
-
-  def next
-    @event.next
-  end
-
-  def next!
-    @event.next!
-  end
-
-  def events(options={})
-    options[:starts] = Date.parse(options[:starts]) if options[:starts].is_a?(String)
-    options[:until]  = Date.parse(options[:until])  if options[:until].is_a?(String)
-
-    reset! if options[:starts] || options[:until]
-
-    @events ||= begin
-      _events = []
-
-      loop do
-        date = @event.next!
-
-        break if date.nil?
-
-        valid_start = options[:starts].nil? || date >= options[:starts]
-        valid_until = options[:until].nil?  || date <= options[:until]
-        _events << date if valid_start && valid_until
-
-        break if options[:until] && options[:until] <= date
-      end
-
-      _events
-    end
-  end
-
-  def events!(options={})
-    reset!
-    events(options)
-  end
-
-  def each!(&block)
-    reset!
-    each(&block)
-  end
-
-  def each(&block)
-    events.each do |item|
-      yield item
-    end
-  end
-
-  private
-  def initialize_dates(options) #:nodoc:
-    [:starts, :until].each do |name|
-      options[name] = Date.parse(options[name]) if options[name].is_a?(String)
-    end
-
-    options[:starts] ||= Date.today
-    options[:until]  ||= self.class.default_until_date
-
-    options
-  end
+class Recurrence < SimplesIdeias::Recurrence
 end

data/lib/recurrence/event.rb

@@ -1,9 +1,11 @@
-class Recurrence
-  module Event
-    autoload :Base,     "recurrence/event/base"
-    autoload :Daily,    "recurrence/event/daily"
-    autoload :Monthly,  "recurrence/event/monthly"
-    autoload :Weekly,   "recurrence/event/weekly"
-    autoload :Yearly,   "recurrence/event/yearly"
+module SimplesIdeias
+  class Recurrence
+    module Event
+      autoload :Base,     "recurrence/event/base"
+      autoload :Daily,    "recurrence/event/daily"
+      autoload :Monthly,  "recurrence/event/monthly"
+      autoload :Weekly,   "recurrence/event/weekly"
+      autoload :Yearly,   "recurrence/event/yearly"
+    end
   end
 end

data/lib/recurrence/event/base.rb

@@ -1,78 +1,80 @@
-class Recurrence
-  module Event
-    class Base
-      CARDINALS = %w(first second third fourth fifth)
-      DAYS = %w(sunday monday tuesday wednesday thursday friday saturday)
+module SimplesIdeias
+  class Recurrence
+    module Event
+      class Base
+        CARDINALS = %w(first second third fourth fifth)
+        DAYS = %w(sunday monday tuesday wednesday thursday friday saturday)
 
-      attr_accessor :start_date
+        attr_accessor :start_date
 
-      def initialize(options={})
-        every, options = nil, every if every.is_a?(Hash)
+        def initialize(options={})
+          every, options = nil, every if every.is_a?(Hash)
 
-        @options    = options
-        @date       = options[:starts]
-        @finished   = false
+          @options    = options
+          @date       = options[:starts]
+          @finished   = false
 
-        validate
-        raise ArgumentError, "interval should be greater than zero" if @options[:interval] <= 0
+          validate
+          raise ArgumentError, "interval should be greater than zero" if @options[:interval] <= 0
 
-        prepare!
-      end
+          prepare!
+        end
 
-      def next!
-        return nil if finished?
-        return @date = @start_date if @start_date && @date.nil?
+        def next!
+          return nil if finished?
+          return @date = @start_date if @start_date && @date.nil?
 
-        @date = next_in_recurrence
+          @date = next_in_recurrence
 
-        @finished, @date = true, nil if @date > @options[:until]
-        @date
-      end
+          @finished, @date = true, nil if @date > @options[:until]
+          @date
+        end
 
-      def next
-        return nil if finished?
-        @date || @start_date
-      end
+        def next
+          return nil if finished?
+          @date || @start_date
+        end
 
-      def reset!
-        @date = nil
-      end
+        def reset!
+          @date = nil
+        end
 
-      def finished?
-        @finished
-      end
+        def finished?
+          @finished
+        end
 
-      private
-      def initialized?
-        !!@start_date
-      end
+        private
+        def initialized?
+          !!@start_date
+        end
 
-      def prepare!
-        @start_date = next!
-        @date       = nil
-      end
+        def prepare!
+          @start_date = next!
+          @date       = nil
+        end
 
-      def validate
-        # Inject custom validations
-      end
+        def validate
+          # Inject custom validations
+        end
 
-      # Common validation for inherited classes.
-      #
-      def valid_month_day?(day) #:nodoc:
-        raise ArgumentError, "invalid day #{day}" unless (1..31).include?(day)
-      end
+        # Common validation for inherited classes.
+        #
+        def valid_month_day?(day) #:nodoc:
+          raise ArgumentError, "invalid day #{day}" unless (1..31).include?(day)
+        end
 
-      # Check if the given key has a valid weekday (0 upto 6) or a valid weekday
-      # name (defined in the DAYS constant). If a weekday name (String) is given,
-      # convert it to a weekday (Integer).
-      #
-      def valid_weekday_or_weekday_name?(value)
-        if value.kind_of?(Numeric)
-          raise ArgumentError, "invalid day #{value}" unless (0..6).include?(value)
-          value
-        else
-          raise ArgumentError, "invalid weekday #{value}" unless DAYS.include?(value.to_s)
-          DAYS.index(value.to_s)
+        # Check if the given key has a valid weekday (0 upto 6) or a valid weekday
+        # name (defined in the DAYS constant). If a weekday name (String) is given,
+        # convert it to a weekday (Integer).
+        #
+        def valid_weekday_or_weekday_name?(value)
+          if value.kind_of?(Numeric)
+            raise ArgumentError, "invalid day #{value}" unless (0..6).include?(value)
+            value
+          else
+            raise ArgumentError, "invalid weekday #{value}" unless DAYS.include?(value.to_s)
+            DAYS.index(value.to_s)
+          end
         end
       end
     end

data/lib/recurrence/event/daily.rb

@@ -1,11 +1,13 @@
-class Recurrence
-  module Event
-    class Daily < Base
-      protected
-      def next_in_recurrence
-        date  = @date.to_date
-        date += @options[:interval] if initialized?
-        date
+module SimplesIdeias
+  class Recurrence
+    module Event
+      class Daily < Base
+        protected
+        def next_in_recurrence
+          date  = @date.to_date
+          date += @options[:interval] if initialized?
+          date
+        end
       end
     end
   end

data/lib/recurrence/event/monthly.rb

@@ -1,102 +1,104 @@
-class Recurrence
-  module Event
-    class Monthly < Base
-      INTERVALS = {
-        :monthly => 1,
-        :bimonthly => 2,
-        :quarterly => 3,
-        :semesterly => 6
-      }
-
-      protected
-      def validate
-        if @options.key?(:weekday)
-
-          # Allow :on => :last, :weekday => :thursday contruction.
-          if @options[:on].to_s == "last"
-            @options[:on] = 5
-          elsif @options[:on].kind_of?(Numeric)
-            valid_week?(@options[:on])
+module SimplesIdeias
+  class Recurrence
+    module Event
+      class Monthly < Base
+        INTERVALS = {
+          :monthly => 1,
+          :bimonthly => 2,
+          :quarterly => 3,
+          :semesterly => 6
+        }
+
+        protected
+        def validate
+          if @options.key?(:weekday)
+
+            # Allow :on => :last, :weekday => :thursday contruction.
+            if @options[:on].to_s == "last"
+              @options[:on] = 5
+            elsif @options[:on].kind_of?(Numeric)
+              valid_week?(@options[:on])
+            else
+              valid_cardinal?(@options[:on])
+              @options[:on] = CARDINALS.index(@options[:on].to_s) + 1
+            end
+
+            @options[:weekday] = valid_weekday_or_weekday_name?(@options[:weekday])
           else
-            valid_cardinal?(@options[:on])
-            @options[:on] = CARDINALS.index(@options[:on].to_s) + 1
+            valid_month_day?(@options[:on])
           end
 
-          @options[:weekday] = valid_weekday_or_weekday_name?(@options[:weekday])
-        else
-          valid_month_day?(@options[:on])
-        end
-
-        if @options[:interval].is_a?(Symbol)
-          valid_interval?(@options[:interval])
-          @options[:interval] = INTERVALS[@options[:interval]]
+          if @options[:interval].is_a?(Symbol)
+            valid_interval?(@options[:interval])
+            @options[:interval] = INTERVALS[@options[:interval]]
+          end
         end
-      end
-
-      def next_in_recurrence
-        return next_month if self.respond_to?(:next_month)
-        type = @options.key?(:weekday) ? :weekday : :monthday
 
-        class_eval <<-METHOD
-          def next_month
-            if initialized?
-              advance_to_month_by_#{type}(@date)
-            else
-              new_date = advance_to_month_by_#{type}(@date, 0)
-              new_date = advance_to_month_by_#{type}(new_date) if @date > new_date
-              new_date
+        def next_in_recurrence
+          return next_month if self.respond_to?(:next_month)
+          type = @options.key?(:weekday) ? :weekday : :monthday
+
+          class_eval <<-METHOD
+            def next_month
+              if initialized?
+                advance_to_month_by_#{type}(@date)
+              else
+                new_date = advance_to_month_by_#{type}(@date, 0)
+                new_date = advance_to_month_by_#{type}(new_date) if @date > new_date
+                new_date
+              end
             end
-          end
-        METHOD
+          METHOD
 
-        next_month
-      end
+          next_month
+        end
 
-      def advance_to_month_by_monthday(date, interval=@options[:interval])
-        # Have a raw month from 0 to 11 interval
-        raw_month  = date.month + interval - 1
+        def advance_to_month_by_monthday(date, interval=@options[:interval])
+          # Have a raw month from 0 to 11 interval
+          raw_month  = date.month + interval - 1
 
-        next_year  = date.year + raw_month / 12
-        next_month = (raw_month % 12) + 1 # change back to ruby interval
-        next_day   = [ @options[:on], Time.days_in_month(next_month, next_year) ].min
+          next_year  = date.year + raw_month / 12
+          next_month = (raw_month % 12) + 1 # change back to ruby interval
+          next_day   = [ @options[:on], Time.days_in_month(next_month, next_year) ].min
 
-        Date.new(next_year, next_month, next_day)
-      end
+          Date.new(next_year, next_month, next_day)
+        end
 
-      def advance_to_month_by_weekday(date, interval=@options[:interval])
-        raw_month  = date.month + interval - 1
-        next_year  = date.year + raw_month / 12
-        next_month = (raw_month % 12) + 1 # change back to ruby interval
-        date       = Date.new(next_year, next_month, 1)
+        def advance_to_month_by_weekday(date, interval=@options[:interval])
+          raw_month  = date.month + interval - 1
+          next_year  = date.year + raw_month / 12
+          next_month = (raw_month % 12) + 1 # change back to ruby interval
+          date       = Date.new(next_year, next_month, 1)
 
-        weekday, month = @options[:weekday], date.month
+          weekday, month = @options[:weekday], date.month
 
-        # Adjust week day
-        to_add  = weekday - date.wday
-        to_add += 7 if to_add < 0
-        to_add += (@options[:on] - 1) * 7
-        date   += to_add
+          # Adjust week day
+          to_add  = weekday - date.wday
+          to_add += 7 if to_add < 0
+          to_add += (@options[:on] - 1) * 7
+          date   += to_add
 
-        # Go to the previous month if we lost it
-        if date.month != month
-          weeks = (date.day - 1) / 7 + 1
-          date -= weeks * 7
-        end
+          # Go to the previous month if we lost it
+          if date.month != month
+            weeks = (date.day - 1) / 7 + 1
+            date -= weeks * 7
+          end
 
-        date
-      end
+          date
+        end
 
-      private
-      def valid_cardinal?(cardinal) #:nodoc:
-        raise ArgumentError, "invalid cardinal #{cardinal}" unless CARDINALS.include?(cardinal.to_s)
-      end
+        private
+        def valid_cardinal?(cardinal) #:nodoc:
+          raise ArgumentError, "invalid cardinal #{cardinal}" unless CARDINALS.include?(cardinal.to_s)
+        end
 
-      def valid_interval?(interval) #:nodoc:
-        raise ArgumentError, "invalid cardinal #{interval}" unless INTERVALS.key?(interval)
-      end
+        def valid_interval?(interval) #:nodoc:
+          raise ArgumentError, "invalid cardinal #{interval}" unless INTERVALS.key?(interval)
+        end
 
-      def valid_week?(week) #:nodoc:
-        raise ArgumentError, "invalid week #{week}" unless (1..5).include?(week)
+        def valid_week?(week) #:nodoc:
+          raise ArgumentError, "invalid week #{week}" unless (1..5).include?(week)
+        end
       end
     end
   end

data/lib/recurrence/event/weekly.rb

@@ -1,27 +1,29 @@
-class Recurrence
-  module Event
-    class Weekly < Base
-      protected
-      def validate
-        @options[:on] = Array.wrap(@options[:on]).inject([]) do |days, value|
-          days << valid_weekday_or_weekday_name?(value)
+module SimplesIdeias
+  class Recurrence
+    module Event
+      class Weekly < Base
+        protected
+        def validate
+          @options[:on] = Array.wrap(@options[:on]).inject([]) do |days, value|
+            days << valid_weekday_or_weekday_name?(value)
+          end
+
+          @options[:on].sort!
         end
 
-        @options[:on].sort!
-      end
+        def next_in_recurrence
+          return @date if !initialized? && @options[:on].include?(@date.wday)
 
-      def next_in_recurrence
-        return @date if !initialized? && @options[:on].include?(@date.wday)
+          if next_day = @options[:on].find { |day| day > @date.wday }
+            to_add = next_day - @date.wday
+          else
+            to_add = (7 - @date.wday)                # Move to next week
+            to_add += (@options[:interval] - 1) * 7  # Add extra intervals
+            to_add += @options[:on].first            # Go to first required day
+          end
 
-        if next_day = @options[:on].find { |day| day > @date.wday }
-          to_add = next_day - @date.wday
-        else
-          to_add = (7 - @date.wday)                # Move to next week
-          to_add += (@options[:interval] - 1) * 7  # Add extra intervals
-          to_add += @options[:on].first            # Go to first required day
+          @date.to_date + to_add
         end
-
-        @date.to_date + to_add
       end
     end
   end

data/lib/recurrence/event/yearly.rb

@@ -1,58 +1,60 @@
-class Recurrence
-  module Event
-    class Yearly < Base
-      MONTHS = {
-        "jan" => 1, "january" => 1,
-        "feb" => 2, "february" => 2,
-        "mar" => 3, "march" => 3,
-        "apr" => 4, "april" => 4,
-        "may" => 5,
-        "jun" => 6, "june" => 6,
-        "jul" => 7, "july" => 7,
-        "aug" => 8, "august" => 8,
-        "sep" => 9, "september" => 9,
-        "oct" => 10, "october" => 10,
-        "nov" => 11, "november" => 11,
-        "dec" => 12, "december" => 12
-      }
+module SimplesIdeias
+  class Recurrence
+    module Event
+      class Yearly < Base
+        MONTHS = {
+          "jan" => 1, "january" => 1,
+          "feb" => 2, "february" => 2,
+          "mar" => 3, "march" => 3,
+          "apr" => 4, "april" => 4,
+          "may" => 5,
+          "jun" => 6, "june" => 6,
+          "jul" => 7, "july" => 7,
+          "aug" => 8, "august" => 8,
+          "sep" => 9, "september" => 9,
+          "oct" => 10, "october" => 10,
+          "nov" => 11, "november" => 11,
+          "dec" => 12, "december" => 12
+        }
 
-      protected
-      def validate
-        valid_month_day?(@options[:on].last)
+        protected
+        def validate
+          valid_month_day?(@options[:on].last)
 
-        if @options[:on].first.kind_of?(Numeric)
-          valid_month?(@options[:on].first)
-        else
-          valid_month_name?(@options[:on].first)
-          @options[:on] = [ MONTHS[@options[:on].first.to_s], @options.last ]
+          if @options[:on].first.kind_of?(Numeric)
+            valid_month?(@options[:on].first)
+          else
+            valid_month_name?(@options[:on].first)
+            @options[:on] = [ MONTHS[@options[:on].first.to_s], @options.last ]
+          end
         end
-      end
 
-      def next_in_recurrence
-        if initialized?
-          advance_to_year(@date)
-        else
-          new_date = advance_to_year(@date, 0)
-          new_date = advance_to_year(new_date) if @date > new_date
-          new_date
+        def next_in_recurrence
+          if initialized?
+            advance_to_year(@date)
+          else
+            new_date = advance_to_year(@date, 0)
+            new_date = advance_to_year(new_date) if @date > new_date
+            new_date
+          end
         end
-      end
 
-      def advance_to_year(date, interval=@options[:interval])
-        next_year  = date.year + interval
-        next_month = @options[:on].first
-        next_day   = [ @options[:on].last, Time.days_in_month(next_month, next_year) ].min
+        def advance_to_year(date, interval=@options[:interval])
+          next_year  = date.year + interval
+          next_month = @options[:on].first
+          next_day   = [ @options[:on].last, Time.days_in_month(next_month, next_year) ].min
 
-        Date.new(next_year, next_month, next_day)
-      end
+          Date.new(next_year, next_month, next_day)
+        end
 
-      private
-      def valid_month?(month) #:nodoc:
-        raise ArgumentError, "invalid month #{month}" unless (1..12).include?(month)
-      end
+        private
+        def valid_month?(month) #:nodoc:
+          raise ArgumentError, "invalid month #{month}" unless (1..12).include?(month)
+        end
 
-      def valid_month_name?(month) #:nodoc:
-        raise ArgumentError, "invalid month #{month}" unless MONTHS.keys.include?(month.to_s)
+        def valid_month_name?(month) #:nodoc:
+          raise ArgumentError, "invalid month #{month}" unless MONTHS.keys.include?(month.to_s)
+        end
       end
     end
   end

data/lib/recurrence/namespace.rb

@@ -0,0 +1,144 @@
+require "date"
+require "active_support/all"
+
+module SimplesIdeias
+  class Recurrence
+    autoload :Event, "recurrence/event"
+    autoload :Version, "recurrence/version"
+
+    FREQUENCY = %w(day week month year)
+
+    attr_reader :event
+
+    def self.default_until_date
+      @default_until_date ||= Date.new(2037, 12, 31)
+    end
+
+    def self.default_until_date=(date)
+      @default_until_date = if date.is_a?(String)
+        Date.parse(date)
+      else
+        date
+      end
+    end
+
+    def self.daily(options = {})
+      options[:every] = :day
+      new(options)
+    end
+
+    def self.weekly(options = {})
+      options[:every] = :week
+      new(options)
+    end
+
+    def self.monthly(options = {})
+      options[:every] = :month
+      new(options)
+    end
+
+    def self.yearly(options = {})
+      options[:every] = :year
+      new(options)
+    end
+
+    def initialize(options)
+      raise ArgumentError, ":every option is required" unless options.key?(:every)
+      raise ArgumentError, "invalid :every option"     unless FREQUENCY.include?(options[:every].to_s)
+
+      @options = initialize_dates(options)
+      @options[:interval] ||= 1
+
+      @event = case @options[:every].to_sym
+        when :day
+          Recurrence::Event::Daily.new(@options)
+        when :week
+          Recurrence::Event::Weekly.new(@options)
+        when :month
+          Recurrence::Event::Monthly.new(@options)
+        when :year
+          Recurrence::Event::Yearly.new(@options)
+      end
+    end
+
+    def reset!
+      @event.reset!
+      @events = nil
+    end
+
+    def include?(required_date)
+      required_date = Date.parse(required_date) if required_date.is_a?(String)
+
+      if required_date < @options[:starts] || required_date > @options[:until]
+        false
+      else
+        each do |date|
+          return true if date == required_date
+        end
+      end
+
+      return false
+    end
+
+    def next
+      @event.next
+    end
+
+    def next!
+      @event.next!
+    end
+
+    def events(options={})
+      options[:starts] = Date.parse(options[:starts]) if options[:starts].is_a?(String)
+      options[:until]  = Date.parse(options[:until])  if options[:until].is_a?(String)
+
+      reset! if options[:starts] || options[:until]
+
+      @events ||= begin
+        _events = []
+
+        loop do
+          date = @event.next!
+
+          break if date.nil?
+
+          valid_start = options[:starts].nil? || date >= options[:starts]
+          valid_until = options[:until].nil?  || date <= options[:until]
+          _events << date if valid_start && valid_until
+
+          break if options[:until] && options[:until] <= date
+        end
+
+        _events
+      end
+    end
+
+    def events!(options={})
+      reset!
+      events(options)
+    end
+
+    def each!(&block)
+      reset!
+      each(&block)
+    end
+
+    def each(&block)
+      events.each do |item|
+        yield item
+      end
+    end
+
+    private
+    def initialize_dates(options) #:nodoc:
+      [:starts, :until].each do |name|
+        options[name] = Date.parse(options[name]) if options[name].is_a?(String)
+      end
+
+      options[:starts] ||= Date.today
+      options[:until]  ||= self.class.default_until_date
+
+      options
+    end
+  end
+end

data/lib/recurrence/version.rb

@@ -1,8 +1,10 @@
-class Recurrence
-  module Version
-    MAJOR = 0
-    MINOR = 1
-    PATCH = 2
-    STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
+module SimplesIdeias
+  class Recurrence
+    module Version
+      MAJOR = 0
+      MINOR = 1
+      PATCH = 3
+      STRING = "#{MAJOR}.#{MINOR}.#{PATCH}"
+    end
   end
 end

data/recurrence.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{recurrence}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nando Vieira"]
-  s.date = %q{2010-09-09}
+  s.date = %q{2010-09-14}
   s.description = %q{}
   s.email = %q{fnando.vieira@gmail.com}
   s.extra_rdoc_files = [
@@ -28,9 +28,11 @@ Gem::Specification.new do |s|
      "lib/recurrence/event/monthly.rb",
      "lib/recurrence/event/weekly.rb",
      "lib/recurrence/event/yearly.rb",
+     "lib/recurrence/namespace.rb",
      "lib/recurrence/version.rb",
      "recurrence.gemspec",
-     "spec/recurrence_spec.rb"
+     "spec/recurrence_spec.rb",
+     "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/fnando/recurrence}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -38,7 +40,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{A simple library to handle recurring events}
   s.test_files = [
-    "spec/recurrence_spec.rb"
+    "spec/recurrence_spec.rb",
+     "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then

data/spec/recurrence_spec.rb

@@ -1,7 +1,4 @@
-require "recurrence"
-
-Date::DATE_FORMATS[:date] = "%d/%m/%Y"
-Time::DATE_FORMATS[:date] = "%d/%m/%Y"
+require "spec_helper"
 
 describe "recurrence" do
   it "should require :every option" do

data/spec/spec_helper.rb

@@ -0,0 +1,5 @@
+require "rspec"
+require "recurrence"
+
+Date::DATE_FORMATS[:date] = "%d/%m/%Y"
+Time::DATE_FORMATS[:date] = "%d/%m/%Y"

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: recurrence
 version: !ruby/object:Gem::Version 
-  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Nando Vieira
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-09 00:00:00 -03:00
+date: 2010-09-14 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 2
         - 0
@@ -42,7 +40,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -69,9 +66,11 @@ files:
 - lib/recurrence/event/monthly.rb
 - lib/recurrence/event/weekly.rb
 - lib/recurrence/event/yearly.rb
+- lib/recurrence/namespace.rb
 - lib/recurrence/version.rb
 - recurrence.gemspec
 - spec/recurrence_spec.rb
+- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/fnando/recurrence
 licenses: []
@@ -86,7 +85,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -95,7 +93,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -108,3 +105,4 @@ specification_version: 3
 summary: A simple library to handle recurring events
 test_files: 
 - spec/recurrence_spec.rb
+- spec/spec_helper.rb