trinidad 0.7.0 → 0.7.1

data/README.rdoc

@@ -33,7 +33,7 @@ The server can also be configured from a yaml file. If a file is not especified,
 
 You can also specify a default web.xml to config your web application. By default the server tries to load the file <em>config/web.xml</em> but you can modify this path adding the option <em>default_web_xml</em> within your configuration file. 
 
-Other <a href="http://wiki.github.com/calavera/trinidad/advanced-configuration">advanced options</a> can be found in the wiki.
+Other advanced options can be found in the wiki: http://wiki.github.com/calavera/trinidad/advanced-configuration
 
 == Copyright
 

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.7.1

data/lib/trinidad/server.rb

@@ -130,21 +130,14 @@ module Trinidad
     private
 
     def add_default_web_app!(config)
-      if (!config.has_key?(:web_apps))
-        default_app = if (config.has_key?(:rackup))
-          {:rackup => config[:rackup]}
-        else
-          {
-            :context_path => config[:context_path] || '/',
-            :web_app_dir => config[:web_app_dir] || Dir.pwd
-          }
-        end
+      unless (config.has_key?(:web_apps))
+        default_app = {
+          :context_path => config[:context_path] || '/',
+          :web_app_dir => config[:web_app_dir] || Dir.pwd
+        }
+        default_app[:rackup] = config[:rackup] if (config.has_key?(:rackup))
 
-        config.merge!({
-          :web_apps => {
-            :default => default_app
-          }
-        })
+        config[:web_apps] = { :default => default_app }
       end
     end
 

data/spec/spec_helper.rb

@@ -15,4 +15,6 @@ require 'mocha'
 
 Spec::Runner.configure do |config|
   config.mock_with :mocha
-end
+end
+
+MOCK_WEB_APP_DIR = File.join(File.dirname(__FILE__), 'web_app_mock')

data/spec/trinidad/command_line_parser_spec.rb

@@ -23,7 +23,7 @@ describe Trinidad::CommandLineParser do
   end
   
   it "should override the config file when it's especified" do
-    ARGV = "-f #{File.join(File.dirname(__FILE__), '..', 'web_app_mock', 'tomcat.yml')}".split
+    ARGV = "-f #{File.join(MOCK_WEB_APP_DIR, 'tomcat.yml')}".split
     
     options = Trinidad::CommandLineParser.parse
     options[:environment].should == 'production'
@@ -58,7 +58,7 @@ describe Trinidad::CommandLineParser do
   end
   
   it "should merge ajp options from the config file" do
-    ARGV = "--ajp 8099 -f #{File.join(File.dirname(__FILE__), '..', 'web_app_mock', 'tomcat.yml')}".split
+    ARGV = "--ajp 8099 -f #{File.join(MOCK_WEB_APP_DIR, 'tomcat.yml')}".split
     
     options = Trinidad::CommandLineParser.parse
     options[:ajp][:port].should == 8099

data/spec/trinidad/server_spec.rb

@@ -14,7 +14,7 @@ describe Trinidad::Server do
   
   it "should have ssl enabled when config param is a number" do
     server = Trinidad::Server.new({:ssl => {:port => 8443},
-      :web_app_dir => File.join(File.dirname(__FILE__), '..', 'web_app_mock')})
+      :web_app_dir => MOCK_WEB_APP_DIR})
       
     server.ssl_enabled?.should == true
   end
@@ -27,7 +27,7 @@ describe Trinidad::Server do
   
   it "should have a connector with https scheme" do
     server = Trinidad::Server.new({:ssl => {:port => 8443},
-      :web_app_dir => File.join(File.dirname(__FILE__), '..', 'web_app_mock')})
+      :web_app_dir => MOCK_WEB_APP_DIR})
       
     server.tomcat.service.findConnectors().should have(1).connectors
     server.tomcat.service.findConnectors()[0].scheme.should == 'https'
@@ -45,24 +45,46 @@ describe Trinidad::Server do
       :web_apps => {
         :mock1 => {
           :context_path => '/mock1',
-          :web_app_dir => File.join(File.dirname(__FILE__), '..', 'web_app_mock')
+          :web_app_dir => MOCK_WEB_APP_DIR
         },
         :mock2 => {
-          :context_path => '/mock2',
-          :web_app_dir => File.join(File.dirname(__FILE__), '..', 'web_app_mock')
+          :web_app_dir => MOCK_WEB_APP_DIR
+        },
+        :default => {
+          :web_app_dir => MOCK_WEB_APP_DIR
         }
       }
     })
 
-    server.tomcat.host.findChildren().should have(2).web_apps
-    server.tomcat.host.findChildren().each do |child|
-      puts child.getPath()
+    context_loaded = server.tomcat.host.findChildren()
+    context_loaded.should have(3).web_apps
+    
+    expected = ['/mock1', '/mock2', '/']
+    context_loaded.each do |context|
+      expected.delete(context.getPath()).should == context.getPath()
     end
   end
 
   it "loads the default application from the current directory if :web_apps is not present" do
-    server = Trinidad::Server.new({:web_app_dir => File.join(File.dirname(__FILE__), '..', 'web_app_mock')})
+    server = Trinidad::Server.new({:web_app_dir => MOCK_WEB_APP_DIR})
+
+    default_context_should_be_loaded(server.tomcat.host.findChildren())
+  end
+  
+  it "loads the default application from the current directory using the rackup file if :web_apps is not present" do
+    server = Trinidad::Server.new({
+      :web_app_dir => MOCK_WEB_APP_DIR,
+      :rackup => 'config.ru'
+    })
+
+    context = default_context_should_be_loaded(server.tomcat.host.findChildren())
+    context.findParameter('rackup').gsub(/\s+/, ' ').should == "require 'rubygems' require 'sinatra'"
+  end
 
-    server.tomcat.host.findChildren().should have(1).web_apps
+  def default_context_should_be_loaded(children)
+    children.should have(1).web_apps
+    children[0].getDocBase().should == MOCK_WEB_APP_DIR
+    children[0].getPath().should == '/'
+    children[0]
   end
 end

data/spec/trinidad/web_app_spec.rb

@@ -5,7 +5,7 @@ describe Trinidad::WebApp do
     @tomcat = Trinidad::Tomcat::Tomcat.new
     @tomcat_web_app = @tomcat.addWebapp('/', File.dirname(__FILE__) + '/../../')
     @app = {
-      :web_app_dir => File.join(File.dirname(__FILE__), '..', 'web_app_mock'),
+      :web_app_dir => MOCK_WEB_APP_DIR,
       :context_path => '/'
     }
     @config = {

metadata

@@ -1,32 +1,36 @@
 --- !ruby/object:Gem::Specification 
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - '>='
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-email: calavera@apache.org
-cert_chain: []
-
-summary: Simple library to run rails applications into an embedded Tomcat
-post_install_message: 
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
-homepage: http://calavera.github.com/trinidad
-signing_key: 
 name: trinidad
-rdoc_options: 
-- --charset=UTF-8
-rubyforge_project: trinidad
+version: !ruby/object:Gem::Version 
+  version: 0.7.1
+platform: ruby
+authors: 
+- David Calavera
 autorequire: 
-licenses: []
+bindir: bin
+cert_chain: []
 
+date: 2009-12-01 00:00:00 +01:00
+default_executable: trinidad
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rack
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "1.0"
+    version: 
+description: 
+email: calavera@apache.org
 executables: 
 - trinidad
-description: 
-specification_version: 3
-default_executable: trinidad
+extensions: []
+
+extra_rdoc_files: 
+- LICENSE
+- README.rdoc
 files: 
 - History.txt
 - LICENSE
@@ -54,40 +58,36 @@ files:
 - trinidad-libs/tomcat-core.jar
 - trinidad-libs/tomcat-dbcp.jar
 - trinidad-libs/tomcat-jasper.jar
+has_rdoc: true
+homepage: http://calavera.github.com/trinidad
+licenses: []
+
+post_install_message: 
+rdoc_options: 
+- --charset=UTF-8
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version 
       version: "0"
   version: 
-extensions: []
-
-rubygems_version: 1.3.5
 requirements: []
 
-authors: 
-- David Calavera
-date: 2009-11-30 23:00:00 +00:00
-platform: ruby
+rubyforge_project: trinidad
+rubygems_version: 1.3.2
+signing_key: 
+specification_version: 3
+summary: Simple library to run rails applications into an embedded Tomcat
 test_files: 
 - spec/spec_helper.rb
-- spec/trinidad/server_spec.rb
 - spec/trinidad/command_line_parser_spec.rb
+- spec/trinidad/server_spec.rb
 - spec/trinidad/web_app_spec.rb
-version: !ruby/object:Gem::Version 
-  version: 0.7.0
-require_paths: 
-- lib
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - '>='
-      - !ruby/object:Gem::Version 
-        version: "1.0"
-    version: 
-  type: :runtime
-  version_requirement: 
-  name: rack
-bindir: bin
-has_rdoc: true