gregfitz23-chrono_trigger 0.1.3 → 0.1.4

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 3
-:major: 0
 :minor: 1
+:patch: 4
+:major: 0

data/lib/chrono_trigger/trigger.rb

@@ -23,11 +23,11 @@ module ChronoTrigger
     def at(options={})
       validate_hours_or_minutes!(options)
       
-      if hour = options[:hour]
+      if hour = (options[:hour] || options[:hours])
         cron_entry.set_hours(hour)
       end
       
-      if minute = options[:minute]
+      if minute = (options[:minute] || options[:minutes])
         cron_entry.set_minutes(minute)
       end
     end
@@ -36,11 +36,11 @@ module ChronoTrigger
     #Specifying minutes not divisible by 60 result in an exception, use #at instead.
     def every(options={})
       validate_hours_or_minutes!(options)
-      if minutes = options[:minutes]
+      if minutes = (options[:minutes] || options[:minute])
         cron_entry.set_minutes(extract_minutes_for_every(minutes))
       end
       
-      if hours = options[:hours]
+      if hours = (options[:hours] || options[:hour])
         cron_entry.set_hours(extract_hours_for_every(hours))
       end
     end
@@ -55,12 +55,7 @@ module ChronoTrigger
     end
     
     def execute
-      begin
-        @exec_block.call
-      rescue Exception
-        STDERR.puts "Exception #{$!.inspect} caught in Trigger##{self.name}.  Backtrace:"
-        STDERR.puts $!.backtrace
-      end
+      defined?(ActiveRecord) ? execute_with_active_record : execute_without_active_record
     end
   
   
@@ -93,5 +88,34 @@ module ChronoTrigger
       
       (0...base).select {|num| num % time_value == 0}      
     end
+    
+    # When ActiveRecord is defined, attempt to rescue ConnectionNotEstablished errors once,
+    # and reestablish the connection to the database.  If this fails, normal exception logging will take place.
+    # 
+    def execute_with_active_record
+      begin
+        @exec_block.call
+      rescue ActiveRecord::ConnectionNotEstablished
+        ActiveRecord::Base.connection.reconnect!
+        execute_without_active_record
+      rescue Exception
+        log_exception
+      end      
+    end
+    
+    # Execute the execution block and log all exceptions.
+    #
+    def execute_without_active_record
+      begin
+        @exec_block.call
+      rescue Exception
+        log_exception
+      end            
+    end
+    
+    def log_exception
+      STDERR.puts "Exception #{$!.inspect} caught in Trigger##{self.name}.  Backtrace:"
+      STDERR.puts $!.backtrace      
+    end
   end
 end

data/test/test_trigger.rb

@@ -118,11 +118,34 @@ class TestTrigger < Test::Unit::TestCase
       end #for 11 minutes            
     end #on a call to #every      
     
+    context "and a block that will raise an ActiveRecord::ConnectionNotEstablished exception, then return a value" do
+      setup do
+        @value = "hello"
+        
+        @run_once = false
+        @trigger.runs do
+          if @run_once
+            @value
+          else
+            @run_once = true
+            raise ActiveRecord::ConnectionNotEstablished
+          end
+        end
+      end
+
+      should "raise an exception, which is caught, then retry the call method" do
+        require "active_record"
+        ActiveRecord::Base.stubs(:connection).returns(mock({:reconnect! => true}))
+        assert_equal @value, @trigger.execute
+      end
+    end #and a block that will raise an ActiveRecord::ConnectionNotEstablished exception, then return a value
+    
     should "raise an exception on call to #every without minutes or hours" do
       assert_raise ChronoTrigger::ConfigurationException do
         @trigger.every()
       end
     end
+    
   end #A Trigger, @trigger,
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gregfitz23-chrono_trigger
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Greg Fitzgerald
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-04 00:00:00 -07:00
+date: 2009-07-09 00:00:00 -07:00
 default_executable: chrono_trigger
 dependencies: []