trinidad 1.3.2 → 1.3.3

data/History.txt

@@ -1,3 +1,7 @@
+== Trinidad 1.3.3 (2012-02-16)
+
+* Fix issues loading the default configuration file from the rack handler
+
 == Trinidad 1.3.2 (2012-01-13)
 
 * Fix #29: Rack::Handler.register not found error

data/lib/rack/handler/trinidad.rb

@@ -1,5 +1,3 @@
-require 'trinidad'
-
 require 'rack/handler'
 require 'rack/handler/servlet'
 
@@ -7,19 +5,9 @@ module Rack
   module Handler
     class Trinidad < Rack::Handler::Servlet
       def self.run(app, options={})
-        # some libs use :Port, :port and :Host, :host, unify this
-        opts = {}
-        options.each {|k, v| opts[k.to_s.downcase.to_sym] = v}
-
-        threads = (opts[:threads] || '1:1').split(':')
-        opts[:app] = app
-        opts[:port] ||= 3000
-        opts[:address] = opts[:host] || 'localhost'
-        opts[:jruby_min_runtimes], opts[:jruby_max_runtimes] = threads[0].to_i, threads[1].to_i
+        opts = parse_options(options)
 
-        context = org.jruby.rack.embed.Context.new('Trinidad')
-        dispatcher = org.jruby.rack.embed.Dispatcher.new(context, self.new(app))
-        servlet = org.jruby.rack.embed.Servlet.new(dispatcher, context)
+        servlet = create_servlet(app)
 
         opts[:servlet] = {:instance => servlet, :name => 'RackServlet'}
 
@@ -34,6 +22,28 @@ module Rack
           "Threads=MIN:MAX" => "min:max threads to use (default 1:1, threadsafe)",
         }
       end
+
+      def self.parse_options(options = {})
+        # some libs use :Port, :port and :Host, :host, unify this
+        opts = {}
+        options.each {|k, v| opts[k.to_s.downcase.to_sym] = v}
+
+        # this is rack's configuration file but also the trinidad's configuration.
+        # Removing it we allow to load trinidad's default configuration.
+        opts.delete(:config)
+
+        threads = (opts[:threads] || '1:1').split(':')
+        opts[:port] ||= 3000
+        opts[:address] ||= opts[:host] || 'localhost'
+        opts[:jruby_min_runtimes], opts[:jruby_max_runtimes] = threads[0].to_i, threads[1].to_i
+        opts
+      end
+
+      def self.create_servlet(app)
+        context = org.jruby.rack.embed.Context.new('Trinidad')
+        dispatcher = org.jruby.rack.embed.Dispatcher.new(context, self.new(app))
+        org.jruby.rack.embed.Servlet.new(dispatcher, context)
+      end
     end
 
     register :trinidad, Trinidad

data/lib/trinidad.rb

@@ -21,5 +21,5 @@ require 'trinidad/war_web_app'
 require 'rack/handler/trinidad'
 
 module Trinidad
-  VERSION = '1.3.2'
+  VERSION = '1.3.3'
 end

metadata

@@ -2,7 +2,7 @@
 name: trinidad
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors: 
   - David Calavera
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-13 00:00:00 Z
+date: 2012-02-16 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: trinidad_jars
@@ -52,7 +52,7 @@ dependencies:
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            version: 2.5.0
+            version: "2.7"
     requirement: *id004
     prerelease: false
     type: :development
@@ -135,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: trinidad
-rubygems_version: 1.8.9
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 2
 summary: Simple library to run rails applications into an embedded Tomcat