torquebox-configure 2.1.2-java → 2.2.0-java

data/lib/torquebox/configuration/global.rb

@@ -20,6 +20,7 @@ require 'torquebox/configuration'
 
 module TorqueBox
   module Configuration
+    # @api private
     class GlobalConfiguration < TorqueBox::Configuration::Configuration
       def self.load_configuration(file)
         config = new
@@ -62,6 +63,7 @@ module TorqueBox
                                                                 :optional => [
                                                                               :concurrency,
                                                                               { :disabled => [true, false] },
+                                                                              { :durable => [true, false] }, 
                                                                               :default_message_encoding
                                                                              ]
                                                               }),
@@ -108,7 +110,7 @@ module TorqueBox
           
           :topic       => destination_entry,
           :web         => OptionsEntry.with_settings(:validate => {
-                                                       :optional => [:context, :host, :rackup, :static, :'session-timeout' ]
+                                                       :optional => [:context, :host, :rackup, :static, :'session-timeout', :session_timeout]
                                                      })
         }
       end.call

data/lib/torquebox/configuration/validator.rb

@@ -19,6 +19,7 @@ require 'torquebox/configuration'
 
 module TorqueBox
   module Configuration
+    # @api private
     class Validator
       
       def initialize(ruleset, entry, options_to_validate)

data/lib/torquebox/configuration.rb

@@ -34,6 +34,7 @@ module TorqueBox
       FakeConstant.new( name ).to_const
     end
 
+    # @api private
     class Entry < BlankSlate
       def initialize(name, config, entry_map, options = { })
         @name = name
@@ -133,6 +134,7 @@ module TorqueBox
       end
     end
 
+    # @api private
     class OptionsEntry < Entry
       def process_args(args)
         hash = args.first || { }
@@ -141,6 +143,7 @@ module TorqueBox
       end
     end
 
+    # @api private
     class ThingWithOptionsEntry < Entry
       def process_args(args)
         @thing, hash = args
@@ -157,19 +160,22 @@ module TorqueBox
       end
     end
 
+    # @api private
     class ThingsEntry < Entry
       def process_args(args)
         @entry_options = args.map(&:to_s)
         local_config
       end
     end
-    
+
+    # @api private
     class Configuration < Hash
       def initialize
         super { |hash, key| hash[key] = { } }
       end
     end
 
+    # @api private
     class FakeConstant
       def initialize(name)
         @name = name.to_s

data/lib/torquebox-configure.rb

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

data/spec/global_spec.rb

@@ -166,9 +166,9 @@ describe "TorqueBox.configure using the GlobalConfiguration" do
   describe '#web' do
     before(:each) { @method = 'web' }
     it_should_behave_like 'options'
-
+    
     it_should_not_allow_invalid_options { web :foo => :bar }
-    it_should_allow_valid_options { web :context => '', :host => '', :rackup => '', :static => '' }
+    it_should_allow_valid_options { web :context => '', :host => '', :rackup => '', :static => '', :session_timeout => '1s' }
   end
 
   describe '#pool' do
@@ -253,10 +253,10 @@ describe "TorqueBox.configure using the GlobalConfiguration" do
     it_should_behave_like 'a thing with options'
 
     it_should_not_allow_invalid_options { options_for 'a-name', :foo => :bar }
-    it_should_allow_valid_options { options_for 'a-name', :concurrency => 1, :disabled => true }
+    it_should_allow_valid_options { options_for 'a-name', :concurrency => 1, :disabled => true, :durable => true }
 
-    it_should_not_allow_invalid_option_values { options_for 'a-name', :disabled => :bacon }
-    it_should_allow_valid_option_values { options_for 'a-name', :disabled => false }
+    it_should_not_allow_invalid_option_values { options_for 'a-name', :disabled => :bacon, :durable => :bacon }
+    it_should_allow_valid_option_values { options_for 'a-name', :disabled => false, :durable => false }
   end
 
   describe "#service" do
@@ -430,7 +430,7 @@ describe "TorqueBox.configure using the GlobalConfiguration" do
                        :config => { :foo => :bar }
                      } ] ],
         'options_for' => {
-          FakeConstant.new( 'Backgroundable' ) => { :concurrency => 42 },
+          FakeConstant.new( 'Backgroundable' ) => { :concurrency => 42, :durable => false },
           'messaging' => { :default_message_encoding => :biscuit },
           'jobs' => { :concurrency => 55 }
           
@@ -467,7 +467,8 @@ describe "TorqueBox.configure using the GlobalConfiguration" do
                                  :client_id => 'client-id',
                                  :config => { :foo => :bar } } ] ] } },
         'web' => { :context => '/bacon',
-                   :host => ['host1', 'host2'] }
+                   :host => ['host1', 'host2'],
+                   :session_timeout => '42m' }       
       }
 
       @metadata = @config.to_metadata_hash
@@ -504,6 +505,7 @@ describe "TorqueBox.configure using the GlobalConfiguration" do
 
     it "should properly set task options from options_for" do
       @metadata['tasks']['Backgroundable']['concurrency'].should == 42
+      @metadata['tasks']['Backgroundable']['durable'].should == false
     end
 
     it "should properly set pooling" do
@@ -559,7 +561,9 @@ describe "TorqueBox.configure using the GlobalConfiguration" do
       @metadata['web']['host'].to_a.should == ['host1', 'host2']
     end
 
-    
+    it "should properly set session_timeout" do
+      @metadata['web']['session_timeout'].should == '42m'
+    end
   end
   
 end

metadata

@@ -1,87 +1,93 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: torquebox-configure
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 2.1.2
+version: !ruby/object:Gem::Version
+  prerelease:
+  version: 2.2.0
 platform: java
-authors: 
-  - The TorqueBox Team
-autorequire: 
+authors:
+- The TorqueBox Team
+autorequire:
 bindir: bin
 cert_chain: []
-
-date: 2012-09-24 00:00:00 Z
-dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: blankslate
-    prerelease: false
-    requirement: &id001 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 2.1.2.4
-    type: :runtime
-    version_requirements: *id001
-  - !ruby/object:Gem::Dependency 
-    name: rspec
-    prerelease: false
-    requirement: &id002 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 2.7.0
-    type: :development
-    version_requirements: *id002
-description: ""
-email: 
-  - torquebox-dev@torquebox.org
+date: 2012-12-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: blankslate
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.1.2.4
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.1.2.4
+    none: false
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: rspec
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.7.0
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.7.0
+    none: false
+  prerelease: false
+  type: :development
+description: ''
+email:
+- torquebox-dev@torquebox.org
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-  - licenses/lgpl-2.1.txt
-  - lib/torquebox-configure.jar
-  - lib/torquebox-configure.rb
-  - lib/gem_hook.rb
-  - lib/torquebox/configuration.rb
-  - lib/torquebox/configure.rb
-  - lib/torquebox/configuration/validator.rb
-  - lib/torquebox/configuration/global.rb
-  - spec/global_spec.rb
-  - spec/options_macros.rb
-  - spec/validator_spec.rb
+files:
+- licenses/lgpl-2.1.txt
+- lib/torquebox-configure.jar
+- lib/torquebox-configure.rb
+- lib/gem_hook.rb
+- lib/torquebox/configure.rb
+- lib/torquebox/configuration.rb
+- lib/torquebox/configuration/global.rb
+- lib/torquebox/configuration/validator.rb
+- spec/global_spec.rb
+- spec/options_macros.rb
+- spec/validator_spec.rb
 homepage: http://torquebox.org/
-licenses: 
-  - lgpl
-post_install_message: 
+licenses:
+- lgpl
+post_install_message:
 rdoc_options: []
-
-require_paths: 
-  - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: !binary |-
+        MA==
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: !binary |-
+        MA==
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
 requirements: []
-
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 1.8.24
-signing_key: 
+signing_key:
 specification_version: 3
 summary: TorqueBox Configure Gem
-test_files: 
-  - spec/global_spec.rb
-  - spec/validator_spec.rb
+test_files:
+- spec/global_spec.rb
+- spec/validator_spec.rb