fnando-recurrence 0.0.6 → 0.0.7

data/History.txt

@@ -33,4 +33,9 @@
 	* Code refactoring
 	* Added next and next! methods
 	* Added more specs
-	* Yearly interval now accepts symbols: jan-dec and january-december
+	* Yearly interval now accepts symbols: jan-dec and january-december
+
+== 0.0.7 2009-01-06
+
+* 1 major enhancement:
+	* The events method now accepts :starts and :until dates

data/README.markdown

@@ -6,7 +6,7 @@ Recurrence
 DESCRIPTION:
 ------------
 
-A simples library that handles recurring events.
+A simple library to handle recurring events.
 
 
 INSTALLATION:
@@ -17,6 +17,12 @@ run the command
 
 	sudo gem install fnando-recurrence --source=http://gems.github.com
 
+Sometimes Github just won't build the gem. You can then do the following
+
+	git clone git://github.com/fnando/recurrence.git
+	cd recurrence
+	rake gem:install
+
 If you prefer it as a plugin, just run the command
 
 	script/plugin install git://github.com/fnando/recurrence.git
@@ -61,6 +67,9 @@ USAGE:
 	# Getting an array with all events
 	r.events.each {|date| puts date.to_s }  # => Memoized array
 	r.events!.each {|date| puts date.to_s } # => reset items cache and re-execute it
+	r.events(:starts => '2009-01-01').each {|date| puts date.to_s }
+	r.events(:until => '2009-01-10').each {|date| puts date.to_s }
+	r.events(:starts => '2009-01-05', :until => '2009-01-10').each {|date| puts date.to_s }
 	
 	# Iterating events
 	r.each { |date| puts date.to_s } # => Use items method

data/Rakefile

@@ -5,8 +5,8 @@ PKG_FILES = %w(init.rb Rakefile recurrence.gemspec History.txt License.txt READM
 
 spec = Gem::Specification.new do |s|
   s.name = "recurrence"
-  s.version = "0.0.6"
-  s.summary = "A simples library that handles recurring events"
+  s.version = "0.0.7"
+  s.summary = "A simple library to handle recurring events"
   s.authors = ["Nando Vieira"]
   s.email = ["fnando.vieira@gmail.com"]
   s.homepage = "http://github.com/fnando/recurrence"
@@ -22,7 +22,7 @@ namespace :gem do
   # Thanks to the Merb project for this code.
   desc "Update Github Gemspec"
   task :update_gemspec do
-    skip_fields = %w(new_platform original_platform specification_version loaded required_ruby_version rubygems_version platform )
+    skip_fields = %w(new_platform original_platform specification_version loaded required_ruby_version rubygems_version platform)
     
     result = "# WARNING : RAKE AUTO-GENERATED FILE. DO NOT MANUALLY EDIT!\n"
     result << "# RUN : 'rake gem:update_gemspec'\n\n"
@@ -61,6 +61,7 @@ namespace :gem do
   
   desc "Build gem"
   task :build => [:update_gemspec] do
+    system "rm *.gem"
     system "gem build #{spec.instance_variable_get('@name')}.gemspec"
   end
   

data/lib/recurrence/base.rb

@@ -86,7 +86,12 @@ class Recurrence
     @event.next!
   end
   
-  def events
+  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 = []
       
@@ -94,16 +99,25 @@ class Recurrence
         date = @event.next!
 
         break if date.nil?
-        _events << date
+
+        if options[:starts] && options[:until] && date >= options[:starts] && date <= options[:until]
+          _events << date
+        elsif options[:starts] && options[:until].nil? && date >= options[:starts]
+          _events << date
+        elsif options[:until] && options[:starts].nil? && date <= options[:until]
+          _events << date
+        elsif options[:starts].nil? && options[:until].nil?
+          _events << date
+        end
       end
       
       _events
     end
   end
   
-  def events!
+  def events!(options={})
     reset!
-    events
+    events(options)
   end
   
   def each!(&block)

data/recurrence.gemspec

@@ -17,10 +17,10 @@ Gem::Specification.new do |s|
  "lib/recurrence/event.rb",
  "lib/recurrence.rb"]
   s.email = ["fnando.vieira@gmail.com"]
-  s.version = "0.0.6"
+  s.version = "0.0.7"
   s.homepage = "http://github.com/fnando/recurrence"
   s.name = "recurrence"
-  s.summary = "A simples library that handles recurring events"
+  s.summary = "A simple library to handle recurring events"
   s.add_dependency "rubigen", ">= 0"
   s.add_dependency "activesupport", ">= 2.1.1"
   s.bindir = "bin"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fnando-recurrence
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Nando Vieira
@@ -75,6 +75,6 @@ rubyforge_project:
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: A simples library that handles recurring events
+summary: A simple library to handle recurring events
 test_files: []