torquebox-core 2.0.3-java → 2.1.0-java

data/lib/torquebox-core.rb

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

data/lib/torquebox/injectors.rb

@@ -21,17 +21,22 @@ module TorqueBox
   module Injectors
 
     def self.analyze_and_inject(&block)
-      inject( 'runtime-injection-analyzer' ).analyze_and_inject( block )
+      fetch( 'runtime-injection-analyzer' ).analyze_and_inject( block )
     end
 
-    def __inject__(something)
+    def fetch(something)
       TorqueBox::Registry[something.to_s]
     end
-    alias_method :inject, :__inject__
+    alias_method :inject, :fetch
+    alias_method :__inject__, :fetch
     
     %w{ msc service cdi jndi queue topic }.each do |type|
       define_method("inject_#{type}".to_sym) do |key|
-        __inject__(key)
+        fetch(key)
+      end
+
+      define_method("fetch_#{type}".to_sym) do |key|
+        fetch(key)
       end
     end
 

data/lib/torquebox/logger.rb

@@ -31,13 +31,14 @@ module TorqueBox
         message = progname
         progname = @category
       end
+      message = progname if message.nil?
       super( severity, message, @category, &block )
     end
   end 
 
   begin
     org.jboss.logging::Logger
-  rescue
+  rescue ::NameError
     Logger = FallbackLogger
     return
   end
@@ -57,12 +58,15 @@ module TorqueBox
 
     def method_missing(method, *args, &block)
       delegate = method
+      is_boolean = false
       if method.to_s.end_with?('?')
         delegate = "#{method.to_s.chop}_enabled?".to_sym
+        is_boolean = true
       end
       self.class.class_eval do
         define_method(method) do |*a, &b|
           params = [ a[0] || (b && b.call) ].compact
+          params = [""] if params.empty? && !is_boolean
           @logger.send(delegate, *params)
         end
       end

data/lib/torquebox/service_registry.rb

@@ -15,6 +15,7 @@
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA, or see the FSF site: http://www.fsf.org.
 
+require 'java'
 module TorqueBox
   class ServiceRegistry
 
@@ -25,7 +26,7 @@ module TorqueBox
           lookup name, &block
         end
       end
-      @service_registry
+      registry
     end
 
     # blocks are not allowed on the method named :[]
@@ -34,12 +35,12 @@ module TorqueBox
     end
 
     def self.lookup(name, &block)
-      if @service_registry.nil?
+      if registry.nil?
         self.blocks[name] << block
         nil
       else
         name = TorqueBox::ServiceRegistry.service_name_for( name ) if name.is_a? String
-        entry = @service_registry.getService( name )
+        entry = registry.getService( name )
         return nil unless entry
         if block_given?
           yield entry.getValue()
@@ -57,6 +58,10 @@ module TorqueBox
       Java::org.jboss.msc.service.ServiceName.parse( name )
     end
 
+    def self.registry
+      @service_registry
+    end
+
   end
 
 end

data/spec/injectors_spec.rb

@@ -17,5 +17,17 @@ describe TorqueBox::Injectors do
     inject_topic('this').should == :that
   end
 
+  it "should return the same thing for all fetch types" do
+    TorqueBox::Registry.merge!('this' => :that)
+    TorqueBox::Registry['this'].should == :that
+    fetch('this').should == :that
+    fetch_msc('this').should == :that
+    fetch_service('this').should == :that
+    fetch_cdi(:this).should == :that
+    fetch_jndi('this').should == :that
+    fetch_queue('this').should == :that
+    fetch_topic('this').should == :that
+  end
+
 end
 

data/spec/logger_spec.rb

@@ -34,5 +34,9 @@ describe TorqueBox::Logger do
     logger.error "JC: message too"
   end
 
+  it "should handle nil parameters" do
+    logger = TorqueBox::Logger.new
+    logger.info(nil)
+  end
 end
 

data/spec/service_registry_spec.rb

@@ -29,6 +29,11 @@ describe TorqueBox::ServiceRegistry do
     @foo.should eql("bar")
   end
 
+  it "should make the registry available" do
+    TorqueBox::ServiceRegistry.service_registry = @service_registry
+    TorqueBox::ServiceRegistry.registry.should == @service_registry
+  end
+
   # Mock a JBoss ServiceRegistry backed by a simple member Hash,
   # @registry, that holds the fixtures for the tests.
   before(:each) do
@@ -44,3 +49,4 @@ describe TorqueBox::ServiceRegistry do
   end
   
 end
+

metadata

@@ -2,7 +2,7 @@
 name: torquebox-core
 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: rspec
@@ -37,17 +37,17 @@ files:
   - lib/torquebox-core.jar
   - lib/torquebox-core.rb
   - lib/gem_hook.rb
-  - lib/torquebox/injectors.rb
-  - lib/torquebox/kernel.rb
-  - lib/torquebox/component_manager.rb
+  - lib/torquebox/registry.rb
   - lib/torquebox/core.rb
+  - lib/torquebox/component_manager.rb
+  - lib/torquebox/kernel.rb
   - lib/torquebox/service_registry.rb
   - lib/torquebox/logger.rb
-  - lib/torquebox/registry.rb
-  - spec/service_registry_spec.rb
-  - spec/logger_spec.rb
+  - lib/torquebox/injectors.rb
   - spec/injectors_spec.rb
   - spec/kernel_spec.rb
+  - spec/logger_spec.rb
+  - spec/service_registry_spec.rb
 homepage: http://torquebox.org/
 licenses: 
   - lgpl
@@ -76,7 +76,7 @@ signing_key:
 specification_version: 3
 summary: TorqueBox Core Gem
 test_files: 
-  - spec/service_registry_spec.rb
-  - spec/logger_spec.rb
   - spec/injectors_spec.rb
   - spec/kernel_spec.rb
+  - spec/logger_spec.rb
+  - spec/service_registry_spec.rb