say_when 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 659f1d92ff0ba2e4ca3c162ab36255868cfa4f1e
-  data.tar.gz: fd29bc29fbf787899ce18dcf91b165a684c205cc
+  metadata.gz: e5dcba46949e37d272cf9ac9a12c72daaddbe556
+  data.tar.gz: db38e13b52b95c3c804970314390a19e4a324ab4
 SHA512:
-  metadata.gz: 1a7c57379229dc78237034625d3cbbb75089c35aef118976b0b2252e7d58a8a214c98f7018aa5584c868c8d74d34dbe46c9003c725d7a34502a67d2668d3e5f2
-  data.tar.gz: c31787d123c46fd1892291ed1d5f96d2859f8c76d7e7f18588d440c98b5fc55425243390348c7a614386177cefd43efe92658f163f6daf646856a63e35258cdc
+  metadata.gz: 8bae2cfdcbdce0cb620911871e0f7185d8860f266b2cfd84310ff56b2ad29e7f04efe6ccc0d404b34d3333f3b85ff8924bc29b0c2c632d6c98c43ea8948749e7
+  data.tar.gz: 6cc782023a88170ddd9313b30c6118de4df3584b67fddf8d671adab17a9cba4299d9d65bca58982946b762c4753bcefb00172153cc0452c5898fb06a56505db3

data/lib/generators/say_when/migration/migration_generator.rb

@@ -14,8 +14,12 @@ module SayWhen
 
     argument :name, type: :string, default: 'random_name'
 
+    def prefix
+      SayWhen.options[:table_prefix] || ''
+    end
+
     def manifest
-      migration_template 'migration.rb', 'db/migrate/create_say_when_tables.rb'
+      migration_template('migration.rb', 'db/migrate/create_say_when_tables.rb')
     end
   end
 end

data/lib/generators/say_when/migration/templates/migration.rb

@@ -4,7 +4,7 @@ class CreateSayWhenTables < ActiveRecord::Migration
 
   def self.up
 
-    create_table :say_when_jobs, :force => true do |t|
+    create_table :<%= prefix %>say_when_jobs, :force => true do |t|
       t.string    :group
       t.string    :name
 
@@ -29,10 +29,10 @@ class CreateSayWhenTables < ActiveRecord::Migration
       t.timestamps null: false
     end
 
-    add_index :say_when_jobs, [:next_fire_at, :status]
-    add_index :say_when_jobs, [:scheduled_type, :scheduled_id]
+    add_index :<%= prefix %>say_when_jobs, [:next_fire_at, :status]
+    add_index :<%= prefix %>say_when_jobs, [:scheduled_type, :scheduled_id]
 
-    create_table :say_when_job_executions, :force => true do |t|
+    create_table :<%= prefix %>say_when_job_executions, :force => true do |t|
       t.integer  :job_id
       t.string   :status
       t.text     :result
@@ -40,12 +40,12 @@ class CreateSayWhenTables < ActiveRecord::Migration
       t.datetime :end_at
     end
 
-    add_index :say_when_job_executions, :job_id
-    add_index :say_when_job_executions, [:status, :start_at, :end_at]
+    add_index :<%= prefix %>say_when_job_executions, :job_id
+    add_index :<%= prefix %>say_when_job_executions, [:status, :start_at, :end_at]
   end
 
   def self.down
-    drop_table :say_when_job_executions
-    drop_table :say_when_jobs
+    drop_table :<%= prefix %>say_when_job_executions
+    drop_table :<%= prefix %>say_when_jobs
   end
 end

data/lib/say_when/configuration.rb

@@ -10,6 +10,8 @@ module SayWhen
         defaults[:tick_length] = (ENV['SAY_WHEN_TICK_LENGTH'] || '5').to_i
         defaults[:queue] = ENV['SAY_WHEN_QUEUE'] || 'default'
         defaults[:reset_acquired_length] = (ENV['SAY_WHEN_RESET_ACQUIRED_LENGTH'] || '3600').to_i
+        defaults[:store_executions] = false
+        defaults[:table_prefix] = ''
       end
     end
   end

data/lib/say_when/storage/active_record_strategy.rb

@@ -35,14 +35,14 @@ module SayWhen
       end
 
       class JobExecution < ActiveRecord::Base
-        self.table_name = 'say_when_job_executions'
+        self.table_name = "#{SayWhen.options[:table_prefix]}say_when_job_executions"
         belongs_to :job, class_name: 'SayWhen::Storage::ActiveRecordStrategy::Job'
       end
 
       class Job < ActiveRecord::Base
         include SayWhen::Storage::BaseJob
 
-        self.table_name = 'say_when_jobs'
+        self.table_name = "#{SayWhen.options[:table_prefix]}say_when_jobs"
 
         serialize :trigger_options
         serialize :data
@@ -132,11 +132,25 @@ module SayWhen
         # default impl with some error handling and result recording
         def execute
           result = nil
+          if SayWhen.options[:store_executions]
+            result = execute_with_stored_result
+          else
+            begin
+              result = self.execute_job(data)
+              SayWhen.logger.info("complete - job: #{self.inspect}, result: #{result}")
+            rescue Object => ex
+              result = "#{ex.class.name}: #{ex.message}\n\t#{ex.backtrace.join("\n\t")}"
+              SayWhen.logger.error("error - job: #{self.inspect}, exception: #{result}")
+            end
+          end
+          result
+        end
+
+        def execute_with_stored_result
           execution = JobExecution.create(job: self, status: STATE_EXECUTING, start_at: Time.now)
 
           begin
-            result = self.execute_job(data)
-            execution.result = result
+            execution.result = self.execute_job(data)
             execution.status = 'complete'
           rescue Object => ex
             execution.result = "#{ex.class.name}: #{ex.message}\n\t#{ex.backtrace.join("\n\t")}"
@@ -145,7 +159,8 @@ module SayWhen
 
           execution.end_at = Time.now
           execution.save!
-          result
+
+          execution.result
         end
       end
 

data/lib/say_when/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module SayWhen
-  VERSION = '2.0.2'
+  VERSION = '2.1.0'
 end

data/test/db/schema.rb

@@ -2,7 +2,7 @@
 
 ActiveRecord::Schema.define(:version => 0) do
 
-  create_table :say_when_jobs, :force => true do |t|
+  create_table :test_say_when_jobs, :force => true do |t|
 
     t.string    :status
 
@@ -23,7 +23,7 @@ ActiveRecord::Schema.define(:version => 0) do
     t.timestamps null: false
   end
 
-  create_table :say_when_job_executions, :force => true do |t|
+  create_table :test_say_when_job_executions, :force => true do |t|
     t.integer  :job_id
     t.string   :status
     t.text     :result
@@ -31,8 +31,8 @@ ActiveRecord::Schema.define(:version => 0) do
     t.datetime :end_at
   end
 
-  add_index :say_when_jobs, :status
-  add_index :say_when_jobs, :next_fire_at
+  add_index :test_say_when_jobs, :status
+  add_index :test_say_when_jobs, :next_fire_at
 
 
-end
+end

data/test/minitest_helper.rb

@@ -31,6 +31,7 @@ Celluloid.boot
 SayWhen.configure do |options|
   options[:storage_strategy]   = :memory
   options[:processor_strategy] = :test
+  options[:table_prefix] = 'test_'
 end
 
 SayWhen.logger = Logger.new('/dev/null')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: say_when
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Andrew Kuklewicz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-10 00:00:00.000000000 Z
+date: 2018-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport