recurs 0.0.2 → 0.0.3

data/README

@@ -1,5 +1,4 @@
 NOTE: The RiCal library provides a really good implementation of rrule (RecurrenceRules): http://rubydoc.info/gems/ri_cal/0.8.7/RiCal/PropertyValue/RecurrenceRule
-but it doesn't seem to support exrules, rdates, or exdates.
 
 #  Recurs
 Is a small Recurring Event parsing library. It will take symbolized input and output icalendar standard recurring events,

data/lib/recurs.rb

@@ -16,12 +16,17 @@ module Recurs
     #, it ONLY makes the methods available to the MODULE itself
     class << self
       def rrule(repeats=nil, args={})
-        args[:rule] = :r
+        args[:rule] = 'r'
         rule(repeats, args)
       end
 
       def exrule(repeats=nil, args={})
-        args[:rule] = :e
+        args[:rule] = 'e'
+        rule(repeats, args)
+      end
+
+      def nrule(repeats=nil, args={})
+        #args[:rule] = 'e'
         rule(repeats, args)
       end
 
@@ -67,8 +72,7 @@ module Recurs
         r
       end
 
-      protected
-      @@rule = nil
+
 
         # The BYSECOND attr could be eg: 14 or multiple: 14, 45 between 0 and 59 ( i assume )
         # The BYMINUTE attr could be eg: 14 or multiple: 14, 45 between 0 and 59 ( i assume )
@@ -82,7 +86,9 @@ module Recurs
 
 
       def rule(repeats, args = {})
-        args[:rule] == :r ? @@rule = "RRULE" : @@rule = "EXRULE"
+        @@rule = ""
+        @@rule = "RRULE" if (args[:rule] == 'r')
+        @@rule = "EXRULE" if (args[:rule] == 'e')
         @@rule += ":FREQ=#{repeats.to_s.upcase}"
         interval(args)
         args.each { |ar|
@@ -96,6 +102,9 @@ module Recurs
         @@rule
       end
 
+      protected
+
+
       def by_unit(measure, units)
         ms       = {:by_second    => [60, get_num, BY_N_SECONDS],
                     :by_minute    => [60, get_num, BY_N_MINUTES],
@@ -213,6 +222,12 @@ module Recurs
         b.join
       end
 
+      def add_rule(repeats, args = {})
+        arule = Parser.rule(repeats, args)
+        @rrules << arule
+        arule
+      end
+
       def add_rrule(repeats, args = {})
         rrule = Parser.rrule(repeats, args)
         @rrules << rrule

data/lib/recurs/version.rb

@@ -1,3 +1,3 @@
 module Recurs
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/models/instance_spec.rb

@@ -24,6 +24,11 @@ describe Event do
     @event.recurs.should == "RRULE:FREQ=DAILY"
   end
 
+  it "should add a non specific rule" do
+    @event.add_rule(:daily).should == ":FREQ=DAILY"
+    @event.recurs.should == ":FREQ=DAILY"
+  end
+
   it "should add an exrule" do
     @event.add_exrule(:daily).should == "EXRULE:FREQ=DAILY"
     @event.recurs.should == "EXRULE:FREQ=DAILY"

data/spec/models/parser_spec.rb

@@ -24,6 +24,10 @@ describe Recurs::Parser do
     Recurs::Parser.rrule(:daily).should == "RRULE:FREQ=DAILY"
   end
 
+  it "should swicth off rule type" do
+    Recurs::Parser.rule(:daily).should == ":FREQ=DAILY"
+  end
+
  it "should create a daily recurrence with a two day interval" do
    Recurs::Parser.rrule(:daily, :interval => 2).should == "RRULE:FREQ=DAILY;INTERVAL=2"
    Recurs::Parser.rrule(:daily, :repeats_every => 2).should == "RRULE:FREQ=DAILY;INTERVAL=2"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Steve Caney Martin