torquebox-configure 2.0.3-java → 2.1.0-java

data/lib/torquebox/configuration/global.rb

@@ -139,12 +139,17 @@ module TorqueBox
               job.merge!( data )
             end
 
-          when 'options_for' # => tasks:, messaging:\n  default_message_encoding:
+          when 'options_for' # => tasks:, messaging:\n default_message_encoding:, jobs:\n concurrency:
             if (messaging_opts = entry_data.delete( 'messaging' )) &&
                 (default_encoding = messaging_opts.delete( :default_message_encoding ))
               metadata['messaging']['default_message_encoding'] = default_encoding.to_s
             end
 
+            if (job_opts = entry_data.delete( 'jobs' )) &&
+                (concurrency = job_opts.delete( :concurrency ))
+              metadata['jobs']['concurrency'] = concurrency.to_java(java.lang.Integer)
+            end
+
             entry_data.each do |name, data|
               data[:concurrency] = 0 if data.delete( :disabled )
               data[:concurrency] &&= data[:concurrency].to_java(java.lang.Integer)

data/lib/torquebox/configuration.rb

@@ -24,7 +24,9 @@ module TorqueBox
     def self.load_configuration(file, config, entry_map)
       Thread.current[:torquebox_config] = config
       Thread.current[:torquebox_config_entry_map] = entry_map
-      eval( File.read( file ) )
+      Dir.chdir( File.dirname( file ) ) do
+        eval( File.read( file ) )
+      end
       config
     end
 
@@ -79,7 +81,6 @@ module TorqueBox
       end
 
       def self.const_missing(name)
-        puts "CONST_MISSING #{name}"
         FakeConstant.new( name ).to_const
       end
 
@@ -172,16 +173,14 @@ module TorqueBox
     class FakeConstant
       def initialize(name)
         @name = name.to_s
-        puts "MODULE #{name}"
         s = <<-END
           module ::#{name}
             def self.const_missing(k)
-              FakeConstant.new( "#{name}::" + k.to_s )
+              FakeConstant.new( "#{name}::" + k.to_s ).to_const
             end
           end
         END
 
-        puts "eval #{s}"
         eval s
  
       end

data/lib/torquebox-configure.rb

@@ -1,6 +1,6 @@
 module TorqueboxConfigure
-  VERSION = '2.0.3'
-  MAVEN_VERSION = '2.0.3'
+  VERSION = '2.1.0'
+  MAVEN_VERSION = '2.1.0'
 end
 begin
   require 'java'

data/spec/global_spec.rb

@@ -350,8 +350,21 @@ describe "TorqueBox.configure using the GlobalConfiguration" do
         job 'One::AJob', :cron => '1234'
         job 'Two::AJob', :cron => '1234'
       end
+      
+      config['<root>']['job'].should == [['One::AJob', { :cron => '1234' }],
+                                         ['Two::AJob', { :cron => '1234' }]]
+    end
+
+    it "should allow jobs as constants" do
+      config = TorqueBox.configure do |cfg|
+        cfg.instance_eval("job JobX, :cron => '1234'")
+        cfg.instance_eval("job Mod1::JobY, :cron => '1234'")
+        cfg.instance_eval("job Mod2::Mod3::JobZ, :cron => '1234'")
+      end
 
-      config['<root>']['job'].should == [['One::AJob', { :cron => '1234' }], ['Two::AJob', { :cron => '1234' }]]
+      config['<root>']['job'].should == [['JobX', { :cron => '1234' }],
+                                         ['Mod1::JobY', { :cron => '1234' }],
+                                         ['Mod2::Mod3::JobZ', { :cron => '1234' }]]
     end
 
     it "should allow cron to be set in a block" do
@@ -414,7 +427,9 @@ describe "TorqueBox.configure using the GlobalConfiguration" do
                      } ] ],
         'options_for' => {
           FakeConstant.new( 'Backgroundable' ) => { :concurrency => 42 },
-          'messaging' => { :default_message_encoding => :biscuit }
+          'messaging' => { :default_message_encoding => :biscuit },
+          'jobs' => { :concurrency => 55 }
+          
         },
         'pool' => {
           'web' => { :type => :shared },
@@ -477,7 +492,11 @@ describe "TorqueBox.configure using the GlobalConfiguration" do
     it "should properly set messaging options from options_for" do
       @metadata['messaging']['default_message_encoding'].should == 'biscuit'
     end
-    
+
+    it "should properly set jobs options from options_for" do
+      @metadata['jobs']['concurrency'].should == 55
+    end
+
     it "should properly set task options from options_for" do
       @metadata['tasks']['Backgroundable']['concurrency'].should == 42
     end

metadata

@@ -2,7 +2,7 @@
 name: torquebox-configure
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.0.3
+  version: 2.1.0
 platform: java
 authors: 
   - The TorqueBox Team
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-04 00:00:00 Z
+date: 2012-07-26 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: blankslate
@@ -50,11 +50,11 @@ files:
   - lib/gem_hook.rb
   - lib/torquebox/configuration.rb
   - lib/torquebox/configure.rb
-  - lib/torquebox/configuration/global.rb
   - lib/torquebox/configuration/validator.rb
+  - lib/torquebox/configuration/global.rb
   - spec/options_macros.rb
-  - spec/validator_spec.rb
   - spec/global_spec.rb
+  - spec/validator_spec.rb
 homepage: http://torquebox.org/
 licenses: 
   - lgpl
@@ -83,5 +83,5 @@ signing_key:
 specification_version: 3
 summary: TorqueBox Configure Gem
 test_files: 
-  - spec/validator_spec.rb
   - spec/global_spec.rb
+  - spec/validator_spec.rb