texel-recurrence-rule-parser 0.0.7 → 0.0.8

data/lib/rrule_parser.rb

@@ -24,22 +24,29 @@ class RruleParser
   
   attr_accessor :event
   attr_accessor :rules, :exceptions
-  
+    
   def initialize(event)
+    self.event = event
+    self.setup
+  end
+  
+  def setup
     @expressions      = []
     @count            = 0
     self.rules        = {}
-    self.event        = event
     self.parse_rules
     self.parse_exceptions
     parse_count
+    self
   end
   
+  alias :reload :setup
+  
   # Parse rules, output temporal expressions
   def expressions        
     @expressions = []
     @expressions << parse_frequency_and_interval
-    @expressions << send(:"parse_#{self.rules[:freq].downcase}")
+    @expressions << send(:"parse_#{self.rules[:freq].downcase}") if self.rules[:freq]
     @expressions << parse_start
     @expressions << parse_until
     @expressions.compact!
@@ -71,39 +78,52 @@ class RruleParser
     dates.flatten.uniq - self.exceptions
   end
   
-  protected
-  
-  def parse_rules
-    self.rules = {}
-    rrules = self.event.recurrence_rules
+  def self.parse_rules(rrules)
+    rules = {}
+    
     rrules.each do |rule|
       pairs = rule.split(";")
       pairs.each do |pair|
         array = pair.split('=')
-        self.rules[array[0].downcase.to_sym] = array[1]
+        rules[array[0].downcase.to_sym] = array[1]
       end
     end
-    
+
     # Parse comma separated lists.
-    self.rules.each do |key, rule|
+    rules.each do |key, rule|
       if rule =~ /,/
         rules[key] = rule.split(',')
       end
     end
-    
+
     # Override rules to_s
-    self.rules.instance_eval do
+    rules.instance_eval do
       def to_s
         self.map do |key, value|
           "#{key.to_s.upcase}=#{value.map.join(',')}"
         end.join(";")
       end
     end
+    
+    rules
+  end
+  
+  protected
+  
+  def parse_rules
+    self.rules = RruleParser.parse_rules(self.event.recurrence_rules)
   end
   
   def parse_exceptions
-    self.exceptions = self.event.exception_dates.map do |exception_date|
-      Date.parse(exception_date)
+    # Exception dates are a bit of a misnomer. They should be stored
+    # as Times instead. Right now we are going to assume all exdates
+    # are stored as UTC. We can support time zone conversion later.
+    self.exceptions = self.event.exception_dates.map do |exception_time|
+      if exception_time.is_a?(Time)
+        exception_time
+      else
+        Time.parse(exception_time)
+      end
     end
   end
   

data/spec/lib/rrule_parser_spec.rb

@@ -162,21 +162,6 @@ describe RruleParser 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.7
+  version: 0.0.8
 platform: ruby
 authors: 
 - Leigh Caplan