torquebox-configure 2.0.0.cr1-java → 2.0.0-java

data/lib/torquebox/configuration/global.rb

@@ -48,6 +48,7 @@ module TorqueBox
           :injection   => OptionsEntry.with_settings(:validate => {
                                                        :required => [{ :enabled => [true, false] }]
                                                      }),
+          :config => OptionsEntry,
           :job         => ThingWithOptionsEntry.with_settings(:discrete => true,
                                                               :validate => {
                                                                 :required => [:cron],
@@ -194,18 +195,37 @@ module TorqueBox
           end
         end
 
-        hash_to_hashmap( metadata )
+        ruby_to_java( metadata )
+      end
+
+      def ruby_to_java(object)
+        r = object
+        case ( object )
+        when Hash
+          r = hash_to_hashmap(object)
+        when Array
+          r = array_to_arraylist(object)
+        end
+        r
       end
 
       def hash_to_hashmap(hash)
         hashmap = java.util.HashMap.new
         hash.each do |key, value|
-          value = hash_to_hashmap( value ) if value.is_a?( Hash )
+          value = ruby_to_java( value ) 
           hashmap[key.to_s] = value
         end
         hashmap
       end
 
+      def array_to_arraylist(array)
+        arraylist = java.util.ArrayList.new
+        array.each do |value|
+          arraylist.add( ruby_to_java( value ) )
+        end
+        arraylist
+      end
+
       protected
       def unique_name(name, set, suffix = nil)
         name = "#{name}-#{suffix}" if suffix

data/lib/torquebox/configuration.rb

@@ -29,7 +29,7 @@ module TorqueBox
     end
 
     def self.const_missing(name)
-      FakeConstant.new( name )
+      FakeConstant.new( name ).to_const
     end
 
     class Entry < BlankSlate
@@ -79,7 +79,8 @@ module TorqueBox
       end
 
       def self.const_missing(name)
-        FakeConstant.new( name )
+        puts "CONST_MISSING #{name}"
+        FakeConstant.new( name ).to_const
       end
 
       def self.with_settings(options)
@@ -171,6 +172,22 @@ 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 )
+            end
+          end
+        END
+
+        puts "eval #{s}"
+        eval s
+ 
+      end
+
+      def to_const
+        eval @name
       end
 
       def to_s

data/lib/torquebox-configure.rb

@@ -1,6 +1,6 @@
 module TorqueboxConfigure
-  VERSION = '2.0.0.cr1'
-  MAVEN_VERSION = '2.0.0.cr1'
+  VERSION = '2.0.0'
+  MAVEN_VERSION = '2.0.0'
 end
 begin
   require 'java'

data/spec/global_spec.rb

@@ -277,6 +277,19 @@ describe "TorqueBox.configure using the GlobalConfiguration" do
 
       config['<root>']['service'].should == [['AService', { }], ['AService', { }]]
     end
+
+    it "should allow service configuration with a block" do
+      config = TorqueBox.configure do
+        service 'AConfiguredService' do
+          config do
+            food :biscuit
+          end
+        end
+      end
+
+      config['<root>']['service'].should == [["AConfiguredService", {"config"=>{:food=>:biscuit}}]]
+    end
+        
   end
 
   describe '#stomp' do
@@ -332,6 +345,15 @@ describe "TorqueBox.configure using the GlobalConfiguration" do
       config['<root>']['job'].should == [['AJob', { :cron => '1234' }], ['AJob', { :cron => '1234' }]]
     end
 
+    it "should allow jobs in modules" do
+      config = TorqueBox.configure 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 cron to be set in a block" do
       lambda {
         TorqueBox.configure do
@@ -351,6 +373,19 @@ describe "TorqueBox.configure using the GlobalConfiguration" do
       }.should raise_error(TorqueBox::Configuration::ConfigurationError)
     end
 
+    it "should allow job configuration with a block" do
+      config = TorqueBox.configure do
+        job 'AConfiguredJob' do
+          cron '123'
+          config do
+            food :biscuit
+          end
+        end
+      end
+
+      config['<root>']['job'].should == [["AConfiguredJob", {:cron=>"123", "config"=>{:food=>:biscuit}}]]
+    end
+        
   end
 
   describe "#to_metadata_hash" do

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: torquebox-configure
 version: !ruby/object:Gem::Version 
-  prerelease: 6
-  version: 2.0.0.cr1
+  prerelease: 
+  version: 2.0.0
 platform: java
 authors: 
   - The TorqueBox Team
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-02 00:00:00 Z
+date: 2012-03-31 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: blankslate
@@ -48,14 +48,14 @@ files:
   - lib/torquebox-configure.jar
   - lib/torquebox-configure.rb
   - lib/gem_hook.rb
-  - lib/torquebox/configuration.rb
   - lib/torquebox/configure.rb
+  - lib/torquebox/configuration.rb
   - lib/torquebox/configuration/validator.rb
   - lib/torquebox/configuration/global.rb
-  - spec/options_macros.rb
   - spec/validator_spec.rb
   - spec/global_spec.rb
-homepage: http://www.torquebox.org/torquebox-gems-parent/torquebox-configure/
+  - spec/options_macros.rb
+homepage: http://torquebox.org/
 licenses: 
   - lgpl
 post_install_message: 
@@ -72,9 +72,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.3.1
+        version: "0"
 requirements: []
 
 rubyforge_project: