techwhizbang-jruby-quartz 0.2 → 1.0

data/README

@@ -2,7 +2,7 @@
 
 == Instructions
 
-Requires the following jars in your application container
+Requires the following jars in your application container and if running with just jruby place these in your $JRUBY_HOME/lib
 
 commons-collections-3.2.x.jar
 commons-logging.jar
@@ -30,13 +30,11 @@ cron expression representing the frequency of the job(s) you want to with it:
 
 class IntegrationScheduler < BaseScheduler
 
-  private
-
-  def initialize
+  def initialize(cron_expression)
     super
+    @cron_expression = cron_expression
     @base_jobs_group = "IntegrationJobs"
     @base_triggers_group = "IntegrationTriggers"
-    @cron_expression = "0 0/1 * * * ?"
   end
 end
 
@@ -57,14 +55,11 @@ Notice the Rails.env /container/, I defined custom environments that only run wh
 inside a Java container so that the schedule! method doesn't get fired off during
 testing. 
 
-****If you don't do this the schedule! method is fired off a Quartz thread pool
-is spun up.****
 
-if RUBY_PLATFORM =~ /java/ && Rails.env =~ /container/
+if RUBY_PLATFORM =~ /java/
 
-  CustomerLoadScheduler.instance.schedule!(Jobs::CustomerLoadJob)
-  LoggerOneScheduler.instance.schedule!(Jobs::LoggerOneJob)
-  LoggerTwoScheduler.instance.schedule!(Jobs::LoggerTwoJob)
+  LoggerOneScheduler.new("0 0/1 * * * ?").schedule!(Jobs::LoggerOneJob)
+  LoggerTwoScheduler.new("0 0/2 * * * ?").schedule!(Jobs::LoggerTwoJob)
 
 end
 
@@ -75,5 +70,5 @@ only with Rails 2.2 or higher because thread safety == 1 runtime
 
 === Other
 
-Problems, comments, and suggestions all welcome. nick@controlaltcreate.com or visit my blog
-http://techwhizbang.com
+Problems, comments, and suggestions all welcome. techwhizbang@gmail.com or visit my blog
+http://techwhizbang.com

data/lib/base_scheduler.rb

@@ -1,5 +1,3 @@
-require 'singleton'
-
 import org.quartz.SchedulerFactory
 import org.quartz.SchedulerException
 import org.quartz.Scheduler
@@ -9,11 +7,19 @@ import org.quartz.SimpleTrigger
 import org.quartz.impl.StdSchedulerFactory
 
 class BaseScheduler
-  include Singleton
   attr_reader :scheduler_factory
 
   attr_accessor :base_jobs_group, :base_triggers_group
   attr_accessor :job_name, :trigger_name, :cron_expression
+  
+  def initialize(cron_expression)
+    @scheduler_factory = initialize_scheduler_factory
+    @base_jobs_group = "BaseJobsGroup"
+    @base_triggers_group = "BaseTriggersGroup"
+    @job_name = "BaseJob"
+    @trigger_name = "BaseTrigger"
+    @cron_expression = cron_expression
+  end
 
   def fire!(job_class, options={})
     raise "Not implemented yet"
@@ -21,7 +27,7 @@ class BaseScheduler
 
   def schedule!(job_class, options={})
     begin
-      scheduler = self.scheduler_factory.get_scheduler
+      scheduler = scheduler_factory.get_scheduler
       scheduler.set_job_factory(job_factory.new)
       detail = job_detail.new(self.job_name,
                               self.base_jobs_group,
@@ -62,18 +68,6 @@ class BaseScheduler
     CronTrigger
   end
 
-  private
-
-  def initialize
-    super
-    @scheduler_factory = initialize_scheduler_factory
-    @base_jobs_group = "BaseJobsGroup"
-    @base_triggers_group = "BaseTriggersGroup"
-    @job_name = "BaseJob"
-    @trigger_name = "BaseTrigger"
-    @cron_expression = "0 0/1 * * * ?"
-  end
-
   class SchedulerError < StandardError; end
 
 end

data/lib/jruby-quartz.rb

@@ -4,5 +4,5 @@ require File.expand_path(File.dirname(__FILE__) + '/jobs/base_job_detail')
 require File.expand_path(File.dirname(__FILE__) + '/jobs/base_job_factory')
 
 module JrubyQuartz
-  VERSION = '0.2'
+  VERSION = '1.0'
 end

data/test/integration/jruby_quartz_integration_test.rb

@@ -2,13 +2,13 @@ require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 
 class IntegrationScheduler < BaseScheduler
 
-  private
-
-  def initialize
+  def initialize(cron_expression)
     super
+    @job_name = "IntegrationJob"
+    @trigger_name = "IntegrationTrigger"
     @base_jobs_group = "IntegrationJobs"
     @base_triggers_group = "IntegrationTriggers"
-    @cron_expression = "0 0/1 * * * ?"
+    @cron_expression = cron_expression
   end
 end
 
@@ -23,6 +23,8 @@ end
 class JrubyQuartzIntegrationTest < Test::Unit::TestCase
 
   def test_scheduler_implementation
+    integration_scheduler = IntegrationScheduler.new "0 0/1 * * * ?"
+
     #must stub the scheduler and scheduler factory to avoid invokation of real Quartz thread pool, etc.
     scheduler = mock('scheduler')
     scheduler_factory = mock('scheduler factory', :get_scheduler => scheduler)
@@ -30,7 +32,7 @@ class JrubyQuartzIntegrationTest < Test::Unit::TestCase
     scheduler.expects(:schedule_job)
     scheduler.expects(:set_job_factory)
     
-    IntegrationScheduler.instance.expects(:scheduler_factory).returns(scheduler_factory)
-    IntegrationScheduler.instance.schedule!(IntegrationJob)
+    integration_scheduler.expects(:scheduler_factory).returns(scheduler_factory)
+    integration_scheduler.schedule!(IntegrationJob)
   end
 end

data/test/unit/base_scheduler_test.rb

@@ -2,42 +2,49 @@ require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 
 class BaseSchedulerTest < Test::Unit::TestCase
 
-  def test_singleton_initialization
-    assert_raise(NoMethodError) { BaseScheduler.new }
-    assert_not_nil(BaseScheduler.instance)
-  end
+#  def test_singleton_initialization
+#    assert_raise(NoMethodError) { BaseScheduler.new }
+#    assert_not_nil(BaseScheduler.instance)
+#  end
   
   def test_scheduler_instance_variables
-    assert_equal BaseScheduler.instance.base_jobs_group, "BaseJobsGroup"
-    assert_equal BaseScheduler.instance.job_name, "BaseJob"
-    assert_equal BaseScheduler.instance.base_triggers_group, "BaseTriggersGroup"
-    assert_equal BaseScheduler.instance.trigger_name, "BaseTrigger"
-    assert_equal BaseScheduler.instance.cron_expression, "0 0/1 * * * ?"
+    scheduler = BaseScheduler.new "0 0/1 * * * ?"
+    assert_equal scheduler.base_jobs_group, "BaseJobsGroup"
+    assert_equal scheduler.job_name, "BaseJob"
+    assert_equal scheduler.base_triggers_group, "BaseTriggersGroup"
+    assert_equal scheduler.trigger_name, "BaseTrigger"
+    assert_equal scheduler.cron_expression, "0 0/1 * * * ?"
   end
 
   def test_trigger_class
-    assert_kind_of(org.quartz.SimpleTrigger, BaseScheduler.instance.send(:trigger).new)
+    scheduler = BaseScheduler.new stub
+    assert_kind_of(org.quartz.SimpleTrigger, scheduler.send(:trigger).new)
   end
 
   def test_job_factory_class
-    assert_kind_of(Jobs::BaseJobFactory, BaseScheduler.instance.send(:job_factory).new)
+    scheduler = BaseScheduler.new stub
+    assert_kind_of(Jobs::BaseJobFactory, scheduler.send(:job_factory).new)
   end
 
   def test_job_detail_class
-    assert_kind_of(Jobs::BaseJobDetail, BaseScheduler.instance.send(:job_detail).new("JobName",
+    scheduler = BaseScheduler.new stub
+    assert_kind_of(Jobs::BaseJobDetail, scheduler.send(:job_detail).new("JobName",
                                                                                      'JobGroup',
                                                                                      'JobClass'))
   end
 
   def test_scheduler_factory_class
-    assert_kind_of(StdSchedulerFactory, BaseScheduler.instance.send(:initialize_scheduler_factory))
+    scheduler = BaseScheduler.new stub
+    assert_kind_of(StdSchedulerFactory, scheduler.send(:initialize_scheduler_factory))
   end
 
   def test_cron_trigger_class
-    assert_kind_of(CronTrigger, BaseScheduler.instance.send(:cron_trigger).new)
+    scheduler = BaseScheduler.new stub
+    assert_kind_of(CronTrigger, scheduler.send(:cron_trigger).new)
   end
 
   def test_schedule_method
+    base_scheduler = BaseScheduler.new stub
     base_job = mock("base job")
     scheduler = mock('scheduler')
     job_factory = mock('job factory')
@@ -45,6 +52,8 @@ class BaseSchedulerTest < Test::Unit::TestCase
     cron_trigger = mock('cron trigger')
     scheduler_factory = mock('scheduler factory', :get_scheduler => scheduler)
 
+    base_scheduler.expects(:scheduler_factory).returns(scheduler_factory)
+    
     job_factory.expects(:new).returns(job_factory)
     base_job.expects(:new).returns(base_job)
     job_detail.expects(:new).returns(job_detail)
@@ -52,11 +61,10 @@ class BaseSchedulerTest < Test::Unit::TestCase
     
     scheduler.expects(:set_job_factory).with(job_factory)
     scheduler.expects(:schedule_job).with(job_detail, cron_trigger)
-    BaseScheduler.instance.expects(:scheduler_factory).returns(scheduler_factory)
     
-    BaseScheduler.instance.stubs(:job_detail).returns(job_detail)
-    BaseScheduler.instance.stubs(:job_factory).returns(job_factory)
-    BaseScheduler.instance.stubs(:cron_trigger).returns(cron_trigger)
-    BaseScheduler.instance.schedule!(base_job)
+    base_scheduler.stubs(:job_detail).returns(job_detail)
+    base_scheduler.stubs(:job_factory).returns(job_factory)
+    base_scheduler.stubs(:cron_trigger).returns(cron_trigger)
+    base_scheduler.schedule!(base_job)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: techwhizbang-jruby-quartz
 version: !ruby/object:Gem::Version 
-  version: "0.2"
+  version: "1.0"
 platform: ruby
 authors: 
 - Nick Zalabak
@@ -39,6 +39,7 @@ files:
 - Rakefile
 has_rdoc: true
 homepage: http://techwhizbang.com
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --title
@@ -63,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: A JRuby implementation of the Quartz scheduling framework that makes it easy to integrate into Ruby and Rails based projects.