texel-recurrence-rule-parser 0.0.6 → 0.0.7

data/lib/rrule_parser.rb

@@ -23,14 +23,15 @@ class RruleParser
   }
   
   attr_accessor :event
-  attr_accessor :rules
+  attr_accessor :rules, :exceptions
   
   def initialize(event)
     @expressions      = []
     @count            = 0
     self.rules        = {}
     self.event        = event
-    self.parse_rules(event)
+    self.parse_rules
+    self.parse_exceptions
     parse_count
   end
   
@@ -63,17 +64,18 @@ class RruleParser
       end
     end
   
-    # TODO put original date back in if recurrence rule doesn't define it.
+    # Put original date back in if recurrence rule doesn't define it.
     start_date = self.event.start.send(:to_date)
     dates << start_date if range.include?(start_date)
-    dates.flatten.uniq
+    
+    dates.flatten.uniq - self.exceptions
   end
   
   protected
   
-  def parse_rules(event)
+  def parse_rules
     self.rules = {}
-    rrules = event.recurrence_rules
+    rrules = self.event.recurrence_rules
     rrules.each do |rule|
       pairs = rule.split(";")
       pairs.each do |pair|
@@ -99,6 +101,12 @@ class RruleParser
     end
   end
   
+  def parse_exceptions
+    self.exceptions = self.event.exception_dates.map do |exception_date|
+      Date.parse(exception_date)
+    end
+  end
+  
   def parse_start
     start_date = Date.civil(self.event.start.year, self.event.start.month, self.event.start.day) - 1
     Runt::AfterTE.new(start_date)

data/spec/lib/rrule_parser_spec.rb

@@ -159,9 +159,24 @@ describe RruleParser do
             create_parser(@event)
           end
 
-          it "should return 31 dates" do
+          it "should return 32 dates" do
             @parser.dates(@range).size.should == 32
           end
+          
+          context "with an exception on 12/5/2008" do
+            before(:each) do
+              @event.exception_dates = ['EXDATE;TZID=US/Pacific:20081205T150000']
+              create_parser(@event)
+            end
+            
+            it "should return 31 dates" do
+              @parser.dates(@range).size.should == 31
+            end
+            
+            it "should not return a date on 12/5/2008" do
+              @parser.dates(@range).should_not include(Date.parse('12/5/2008'))
+            end
+          end
         end
         
         context "recurring every 2 days" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: texel-recurrence-rule-parser
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Leigh Caplan