acts_as_event_owner 1.1.2 → 1.1.3

data/README.textile

@@ -110,6 +110,15 @@ h3. One-time event
     :start_at => Time.parse("4:00pm")
 </pre>
 
+h3. Every day at 08:00, 13:00, and 18:00
+
+<pre>
+  EventSpecification.create :description => 'walk the dog',
+    :start_at => Time.parse("8:00am"),
+    :repeat => :per_hour,
+    :target => [8,13,18]
+</pre>
+
 h3. Every day
 
 <pre>

data/acts_as_event_owner.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{acts_as_event_owner}
-  s.version = "1.1.2"
+  s.version = "1.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Danny Burkes"]
-  s.date = %q{2010-12-27}
+  s.date = %q{2011-01-18}
   s.description = %q{Simple calendar events for any ActiveRecord model}
   s.email = %q{dburkes@netable.com}
   s.extra_rdoc_files = [

data/lib/acts_as_event_owner/event_specification.rb

@@ -15,17 +15,22 @@ module ActsAsEventOwner
 
     before_validation :set_defaults
     validates_presence_of :description
-    validates_inclusion_of :repeat, :in => [:daily,:weekly,:monthly,:yearly], :allow_nil => true
+    validates_inclusion_of :repeat, :in => [:by_hour,:daily,:weekly,:monthly,:yearly], :allow_nil => true
     validates_inclusion_of :on_the, :in => ON_THE.keys, :allow_nil => true
     validates_numericality_of :frequency, :allow_nil => true
     validates_presence_of :start_at
     validate :validate_recurrence_rules
+    after_validation :set_defaults_after_validation
 
     attr_accessor :generate
     after_create :auto_generate_events
 
     def validate_recurrence_rules
       case self.repeat
+        when :by_hour
+          errors.add(:target, "must be an array") if !self.target.present? || !self.target.is_a?(Array)
+          [:on, :on_the].each {|v| errors.add(v, :present) if self.send(v)}
+
         when :daily
           [:on, :on_the, :target].each {|v| errors.add(v, :present) if self.send(v)}
 
@@ -58,8 +63,15 @@ module ActsAsEventOwner
       return nil if !self.valid? || self.repeat.nil?
 
       components = []
+      repeat = self.repeat
+      frequency = self.frequency
 
       case self.repeat
+        when :by_hour
+          repeat = "DAILY"
+          components << "BYHOUR=#{self.target.join(',')}"
+          frequency = nil
+
         when :daily
 
         when :weekly
@@ -77,8 +89,8 @@ module ActsAsEventOwner
           components << "BYSETPOS=#{ON_THE[self.on_the]};BYDAY=#{byday}" if self.on_the
       end
 
-      components.unshift "INTERVAL=#{self.frequency}" if self.frequency
-      components.unshift "FREQ=#{self.repeat.to_s.upcase}"
+      components.unshift "INTERVAL=#{frequency}" if frequency
+      components.unshift "FREQ=#{repeat.to_s.upcase}"
       components << "UNTIL=#{self.until.strftime("%Y%m%dT%H%M%SZ")}" if self.until
       components.join(';')
     end
@@ -139,6 +151,19 @@ module ActsAsEventOwner
       self.generate = { :from => self.start_at, :to => self.start_at + 30.days } if self.generate.nil?
     end
 
+    def set_defaults_after_validation
+      if self.errors.empty? && self.repeat == :by_hour
+        current_start_hour = self.start_at.hour
+        closest_repeat_hour = self.target.detect {|h| h > current_start_hour}
+        if closest_repeat_hour
+          self.start_at = Time.utc(self.start_at.year, self.start_at.month, self.start_at.day, closest_repeat_hour)
+        else
+          tomorrow = self.start_at + 24.hours
+          self.start_at = Time.utc(tomorrow.year, tomorrow.month, tomorrow.day, self.target.first)
+        end
+      end
+    end
+
     def byday
       self.target.is_a?(Array) ? self.target.join(',').upcase : BYDAYS[self.target]
     end

data/lib/acts_as_event_owner/version.rb

@@ -1,3 +1,3 @@
 module ActsAsEventOwner
-  VERSION = "1.1.2" unless defined? ActsAsEventOwner::VERSION
+  VERSION = "1.1.3" unless defined? ActsAsEventOwner::VERSION
 end

data/spec/acts_as_event_owner/event_specification_spec.rb

@@ -51,6 +51,45 @@ describe ActsAsEventOwner::EventSpecification do
     end
   end
 
+  describe "events recurring multiple times per day" do
+    it "passes validations" do
+      new_event_specification(:repeat => :by_hour, :target => [8, 12, 16]).should be_valid
+    end
+
+    it "defaults start_at to the first occurrence" do
+      now = Time.now
+      Time.stub!(:now).and_return(Time.utc(2011, 1, 15, 8, 23))
+      create_event_specification(:repeat => :by_hour, :target => [8, 12, 16], :generate => false).start_at.utc.should == Time.utc(2011, 1, 15, 12, 00)
+
+      Time.stub!(:now).and_return(Time.utc(2011, 1, 15, 23, 23))
+      create_event_specification(:repeat => :by_hour, :target => [8, 12, 16], :generate => false).start_at.utc.should == Time.utc(2011, 1, 16, 8, 00)
+    end
+
+    it "does not support invalid recurrence specifications" do
+      spec = new_event_specification(:repeat => :by_hour)
+      spec.should_not be_valid
+      spec.errors[:target].should be_present
+
+      spec = new_event_specification(:repeat => :by_hour, :on_the => :first)
+      spec.should_not be_valid
+      spec.errors[:on_the].should be_present
+
+      spec = new_event_specification(:repeat => :by_hour, :on => [1,2])
+      spec.should_not be_valid
+      spec.errors[:on].should be_present
+
+      spec = new_event_specification(:repeat => :by_hour, :target => 8)
+      spec.should_not be_valid
+      spec.errors[:target].should be_present
+    end
+
+    it "generates an RRULE" do
+      # every day at 08:00, 12:00, and 16:00
+      new_event_specification(:repeat => :by_hour, :target => [8,12,16]).to_rrule.should == "FREQ=DAILY;BYHOUR=8,12,16"
+    end
+
+  end
+
   describe "events recurring daily" do
     it "passes validations" do
       new_event_specification(:repeat => :daily).should be_valid

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 2
-  version: 1.1.2
+  - 3
+  version: 1.1.3
 platform: ruby
 authors: 
 - Danny Burkes
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-27 00:00:00 -08:00
+date: 2011-01-18 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency