trinidad 1.3.0 → 1.3.1

data/History.txt

@@ -1,13 +1,17 @@
+== Trinidad 1.3.1 (2012-01-06)
+
+* Fix Rack handler configuration issues
+
+== Trinidad_jars 1.0.2 (2011-12-31)
+
+* Bump Tomcat's version to 7.0.23
+
 == Trinidad 1.3.0 (2011-12-30)
 
 * Support for virtual hosts
 * Ruby configuration DSL
 * Rack handler
 
-== Trinidad_jars 1.0.2 (2011-09-10)
-
-* Bump Tomcat's version to 7.0.21
-
 == Trinidad 1.2.3 (2011-07-13)
 
 * fix JRuby class loader generation with hot deploy

data/README.md

@@ -12,13 +12,62 @@ Trinidad allows you to run a rails or rackup applications within an embedded Apa
 $ jruby -S gem install trinidad
 ```
 
-## Usage
+## Quick Start
 
 ```
 $ cd myapp
 $ jruby -S trinidad
 ```
 
+### Advanced Rackup setup
+
+**Sinatra**
+
+You can run your Sinatra application with Trinidad from the command line like this:
+
+```
+$ ruby app.rb -s Trinidad
+```
+
+Or tou can configure your application to always use it:
+
+```ruby
+require 'sinatra'
+require 'trinidad'
+
+configure do
+  set :server, :trinidad
+end
+```
+
+If you use Bundler, make sure you add Trinidad to your Gemfile:
+
+```
+gem 'trinidad'
+```
+
+**Rails**
+
+If you already have Trinidad in your Gemfile you can start the server with the rails command:
+
+```
+$ rails s trinidad
+```
+
+**Rackup**
+
+You can pass the server name as an option to `rackup`:
+
+```
+$ rackup -s trinidad
+```
+
+Or you can set Trinidad by default in your `config.ru` file:
+
+```
+#\ -s trinidad
+```
+
 ## Configuration
 
 Trinidad allows you to configure some parameters when the server is started from the command line, the following is a list of the currently supported options:

data/lib/rack/handler/trinidad.rb

@@ -8,26 +8,35 @@ module Rack
   module Handler
     class Trinidad < Rack::Handler::Servlet
       def self.run(app, options={})
-        opts = options.dup
-
         # some libs use :Port, :port and :Host, :host, unify this
-        opts.each {|k,v| opts[k.to_s.downcase.to_sym] = v}
+        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[:servlet] = {:instance => servlet, :name => 'RackServlet'}
-        opts[:jruby_max_runtimes] ||= 1
+        opts[:jruby_min_runtimes], opts[:jruby_max_runtimes] = threads[0].to_i, threads[1].to_i
 
         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)
 
+        opts[:servlet] = {:instance => servlet, :name => 'RackServlet'}
+
         ::Trinidad::CommandLineParser.new.load_configuration(opts)
         ::Trinidad::Server.new.start
       end
+
+      def self.valid_options
+        {
+          "Host=HOST"       => "Hostname to listen on (default: localhost)",
+          "Port=PORT"       => "Port to listen on (default: 8080)",
+          "Threads=MIN:MAX" => "min:max threads to use (default 1:1, threadsafe)",
+        }
+      end
     end
+
+    register :trinidad, Trinidad
   end
 end
-
-Rack::Handler.register 'trinidad', 'Rack::Handler::Trinidad'

data/lib/trinidad/configuration.rb

@@ -41,7 +41,7 @@ module Trinidad
     end
 
     def []=(name, value)
-      send :"#{name}=", value
+      send :"#{name}=", value if respond_to?(:"#{name}=")
     end
 
     def has_key?(name)

data/lib/trinidad.rb

@@ -24,5 +24,5 @@ require 'trinidad/war_web_app'
 require 'rack/handler/trinidad'
 
 module Trinidad
-  VERSION = '1.3.0'
+  VERSION = '1.3.1'
 end

metadata

@@ -2,7 +2,7 @@
 name: trinidad
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors: 
   - David Calavera
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-30 00:00:00 Z
+date: 2012-01-06 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: trinidad_jars