texel-recurrence-rule-parser 0.0.9 → 0.1.0

data/lib/rrule_parser.rb

@@ -12,7 +12,16 @@ class RruleParser
     "TH" => Runt::Thursday,
     "FR" => Runt::Friday,
     "SA" => Runt::Saturday,
-    "SU" => Runt::Sunday
+  }
+  
+  DAY_NAMES = {
+    "SU" => 'Sunday',
+    "MO" => 'Monday',
+    "TU" => 'Tuesday',
+    "WE" => 'Wednesday',
+    "TH" => 'Thursday',
+    "FR" => 'Friday',
+    "SA" => 'Saturday',
   }
   
   ADVERB_MAP = {
@@ -57,6 +66,14 @@ class RruleParser
     self.expressions.inject {|m, v| v & m}
   end
   
+  def frequency
+    self.rules[:frequency]
+  end
+  
+  def interval
+    self.rules[:interval].to_i || 1
+  end
+  
   # Accepts a range of dates and outputs an array of dates matching the temporal expression.
   def dates(range)
     dates = []
@@ -99,15 +116,33 @@ class RruleParser
     # Override rules to_s
     rules.instance_eval do
       def to_s
-        self.map do |key, value|
-          "#{key.to_s.upcase}=#{value.map.join(',')}"
-        end.join(";")
+        # Enforce order: FREQ, INTERVAL, BYDAY
+        ordered = [:freq, :interval, :byday]
+        ordered_values = ordered.map do |key|
+          "#{key.to_s.upcase}=#{self[key].map.join(',')}" if self[key]
+        end
+        
+        unordered_values = self.map do |key, value|
+          "#{key.to_s.upcase}=#{value.map.join(',')}" unless ordered.include?(key)
+        end
+        
+        all_values = (ordered_values + unordered_values).compact.join(';')
       end
     end
     
     rules
   end
   
+  def to_s
+    clauses = [freq_interval_clause, byday_clause, until_clause].compact.join(' ')
+    
+    if clauses.blank?
+      'Never'
+    else
+      "Every #{clauses}"
+    end
+  end
+  
   protected
   
   def parse_rules
@@ -129,15 +164,15 @@ class RruleParser
   end
   
   def parse_frequency_and_interval
-    if self.rules[:freq]
-      frequency = self.rules[:freq]
-      interval  = self.rules[:interval] ? self.rules[:interval].to_i : 1
-      Runt::EveryTE.new(self.event.start, interval, Runt::DPrecision.const_get(ADVERB_MAP[frequency]))
+    if frequency
+      unless frequency == 'DAILY'
+        Runt::EveryTE.new(self.event.start, interval, Runt::DPrecision.const_get(ADVERB_MAP[frequency]))
+      end
     end
   end
   
   def parse_daily
-    return
+    Runt::DayIntervalTE.new(self.event.start, interval)
   end
   
   def parse_weekly
@@ -205,4 +240,48 @@ class RruleParser
       Runt::DIWeek.new(RruleParser::DAYS[day_string])
     end
   end
+  
+  def pluralize(count, word)
+    if count == 1
+      word
+    else
+      "#{count} #{word}s"
+    end
+  end
+  
+  def freq_interval_clause
+    return nil unless rules[:freq] && rules[:interval]
+    
+    pluralize(rules[:interval].to_i, ADVERB_MAP[rules[:freq]].downcase)
+  end
+  
+  def byday_clause
+    return nil unless rules[:byday]
+    
+    days = rules[:byday].map { |abbr| DAY_NAMES[abbr] }
+    
+    output =
+      case days.length
+      when 0
+        return nil
+      when 1
+        days.first
+      when 2
+        days.join(' and ')
+      else
+        last_day    = days.pop
+        other_days  = days.join(', ')
+        [other_days, last_day].join(', and ')
+      end
+      
+    "on #{output}" if output
+  end
+  
+  def until_clause
+    return nil unless rules[:until]
+    
+    time = Time.zone.parse rules[:until]
+    
+    "until #{time.strftime("%B %d, %Y")}"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: texel-recurrence-rule-parser
 version: !ruby/object:Gem::Version 
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors: 
 - Leigh Caplan
@@ -14,6 +14,7 @@ default_executable:
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: texel-runt
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -23,6 +24,7 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: icalendar
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: