trinidad 0.7.1 → 0.7.2

data/Rakefile

@@ -14,6 +14,9 @@ begin
     gem.files = FileList['bin/*', 'lib/**/*.rb', 'trinidad-libs/*.jar', 'History.txt', 'LICENSE', 'Rakefile', 'README.rdoc', 'VERSION']      
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
     gem.add_dependency 'rack', '>=1.0'
+
+    gem.add_development_dependency 'rspec'
+    gem.add_development_dependency 'mocha'
   end
 
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.7.1
+0.7.2

data/lib/trinidad/core_ext.rb

@@ -30,18 +30,4 @@ Hash.class_eval do
     end
   end
 
-  def deep_key?(key)
-    exist = false
-
-    keys.each do |k|
-      if self[k].is_a? Hash
-        exist = self[k].deep_key? key
-        break
-      end
-
-      exist = (k == key)
-    end
-    
-    exist
-  end
 end

data/lib/trinidad/rackup_web_app.rb

@@ -3,7 +3,7 @@ module Trinidad
 
     def add_init_params
       super
-      @context.addParameter('rackup', rackup_script) unless @context.findParameter('rackup')
+      add_parameter_unless_exist('rackup', rackup_script)
     end    
 
     def context_listener

data/lib/trinidad/rails_web_app.rb

@@ -3,8 +3,8 @@ module Trinidad
 
     def add_init_params
       super
-      @context.addParameter('rails.env', environment.to_s) unless @context.findParameter('rails.env')
-      @context.addParameter('rails.root', '/') unless @context.findParameter('rails.root')
+      add_parameter_unless_exist('rails.env', environment.to_s)
+      add_parameter_unless_exist('rails.root', '/')
     end
 
     def context_listener

data/lib/trinidad/server.rb

@@ -1,8 +1,8 @@
 module Trinidad
   class Server
-    
+
     attr_reader :tomcat
-    
+
     def default_options
       {
         :environment => 'development',
@@ -15,38 +15,33 @@ module Trinidad
         :jruby_max_runtimes => 5
       }
     end
-    
+
     def initialize(config = {})
       load_config(config)
       load_tomcat_server
       create_web_apps
     end
-    
+
     def load_config(config)
       @config = default_options.deep_merge(config)
       add_default_web_app!(@config)
-
-      configure_ssl!(@config)      
     end
-    
+
     def load_tomcat_server
       @tomcat = Trinidad::Tomcat::Tomcat.new
       @tomcat.setPort(@config[:port].to_i)
       @tomcat.setBaseDir(Dir.pwd)
-      
+
       add_ssl_connector if ssl_enabled?
       add_ajp_connector if ajp_enabled?
     end
-    
+
     def create_web_apps
       @config[:web_apps].each do |name, app|
-        unless app[:context_path]
-          app[:context_path] = name.to_s == 'default' ? '/' : "/#{name.to_s}"
-        end
-        app[:web_app_dir] = Dir.pwd unless app.has_key?(:web_app_dir)
+        app[:context_path] ||= (name.to_s == 'default' ? '/' : "/#{name.to_s}")
+        app[:web_app_dir] ||= Dir.pwd
 
         tomcat_app = @tomcat.addWebapp(app[:context_path].to_s, app[:web_app_dir])
-#        tomcat_app.setDocBase(app[:web_app_dir])        
 
         web_app = WebApp.create(tomcat_app, @config, app)
 
@@ -55,60 +50,60 @@ module Trinidad
         web_app.add_context_loader
         web_app.add_init_params
         web_app.add_web_dir_resources
-      
+
         web_app.add_rack_context_listener
       end
     end
-    
+
     def add_service_connector(options, protocol = nil)
       connector = Trinidad::Tomcat::Connector.new(protocol)
 
       opts = options.dup
-      
-  		connector.scheme = opts.delete(:scheme) if opts[:scheme]
-  		connector.secure = opts.delete(:secure) || false
-  		connector.port = opts.delete(:port).to_i
-  		
-  		options.each do |key, value|
-  		  connector.setProperty(key.to_s, value.to_s)
-		  end
-      
+
+      connector.scheme = opts.delete(:scheme) if opts[:scheme]
+      connector.secure = opts.delete(:secure) || false
+      connector.port = opts.delete(:port).to_i
+
+      options.each do |key, value|
+        connector.setProperty(key.to_s, value.to_s)
+      end
+
       @tomcat.getService().addConnector(connector)
     end
-    
+
     def add_ajp_connector
       add_service_connector(@config[:ajp], 'AJP/1.3')
     end
-    
+
     def add_ssl_connector
-      @config[:web_apps].each do |name, app|
-  		  options = app[:ssl].merge({
-  		    :scheme => 'https', 
-  		    :secure => true,
-  		    :SSLEnabled => 'true',
-  	  	})
-  		  add_service_connector(options)
-  		
-  		  create_default_keystore(app) unless File.exist?(app[:ssl][:keystore])
-      end
+      options = @config[:ssl].merge({
+        :scheme => 'https', 
+        :secure => true,
+        :SSLEnabled => 'true'
+      })
+      options[:keystore] ||= 'ssl/keystore'
+      options[:keystorePass] ||= 'waduswadus'
+
+      add_service_connector(options)
+      create_default_keystore(options) unless File.exist?(options[:keystore])
     end
-    
+
     def ssl_enabled?
-      @config.has_key?(:ssl) || @config[:web_apps].deep_key?(:ssl)
+      @config.has_key?(:ssl)
     end
-    
+
     def ajp_enabled?
       @config.has_key?(:ajp)
     end
-    
+
     def create_default_keystore(config)
       keystore_file = java.io.File.new(config[:ssl][:keystore])
-      
+
       if (!keystore_file.parent_file.exists() &&
               !keystore_file.parent_file.mkdir())
           raise "Unable to create keystore folder: " + keystore_file.parent_file.canonical_path
       end
-      
+
       keytool_args = ["-genkey", 
         "-alias", "localhost", 
         "-dname", "CN=localhost, OU=Trinidad, O=Trinidad, C=ES", 
@@ -118,7 +113,7 @@ module Trinidad
         "-keystore", config[:ssl][:keystore], 
         "-storepass", config[:ssl][:keystorePass],
         "-keypass", config[:ssl][:keystorePass]]
-              
+
       Trinidad::Tomcat::KeyTool.main(keytool_args.to_java(:string))
     end
 
@@ -141,18 +136,5 @@ module Trinidad
       end
     end
 
-    def configure_ssl!(config)
-      if config.has_key?(:ssl) || config[:web_apps].deep_key?(:ssl)
-        if (config.has_key?(:ssl))
-          config[:ssl][:keystore] ||= 'ssl/keystore'
-          config[:ssl][:keystorePass] ||= 'waduswadus'
-        end
-
-        config[:web_apps].each do |name, app|
-          app[:ssl] = config[:ssl] unless app.has_key?(:ssl)
-          app[:ssl][:keystore] = File.join(app[:web_app_dir], app[:ssl][:keystore]) if app.has_key?(:ssl)
-        end
-      end
-    end
   end
 end

data/lib/trinidad/web_app.rb

@@ -41,15 +41,16 @@ module Trinidad
     def add_init_params
       [:jruby_min_runtimes, :jruby_max_runtimes].each do |param|
         param_name = param.to_s.gsub(/_/, '.')
-        @context.addParameter(param_name, @config[param].to_s) unless @context.findParameter(param_name)
+        add_parameter_unless_exist(param_name, @config[param].to_s)
       end
       
-      @context.addParameter('jruby.initial.runtimes', @config[:jruby_min_runtimes].to_s) unless @context.findParameter('jruby.initial.runtimes')
-      @context.addParameter('public.root', File.join('/', public_root)) unless @context.findParameter('public.root')
+      add_parameter_unless_exist('jruby.initial.runtimes', @config[:jruby_min_runtimes].to_s)
+      add_parameter_unless_exist('public.root', File.join('/', public_root))
     end
     
     def add_web_dir_resources
-      @context.setDocBase(File.join(@app[:web_app_dir], public_root)) if File.exist?(File.join(@app[:web_app_dir], public_root))
+      doc_base = File.join(@app[:web_app_dir], public_root)
+      @context.setDocBase(doc_base) if File.exist?(doc_base)
     end
     
     def add_rack_context_listener
@@ -121,5 +122,9 @@ module Trinidad
     def environment
       @app[:environment] || @config[:environment]
     end
+
+    def add_parameter_unless_exist(name, value)
+      @context.addParameter(name, value) unless @context.findParameter(name)
+    end
   end
 end

data/spec/trinidad/server_spec.rb

@@ -1,41 +1,41 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe Trinidad::Server do
-  
+
   it "should have ssl disabled when config param is nil" do
     server = Trinidad::Server.new
     server.ssl_enabled?.should == false
   end
-  
+
   it "should have ajp disabled when config param is nil" do
     server = Trinidad::Server.new
     server.ajp_enabled?.should == false
   end
-  
+
   it "should have ssl enabled when config param is a number" do
     server = Trinidad::Server.new({:ssl => {:port => 8443},
       :web_app_dir => MOCK_WEB_APP_DIR})
-      
+
     server.ssl_enabled?.should == true
   end
-  
+
   it "should have ajp enabled when config param is a number" do
     server = Trinidad::Server.new({:ajp => {:port => 8009}})
-     
+
     server.ajp_enabled?.should == true
   end
-  
+
   it "should have a connector with https scheme" do
     server = Trinidad::Server.new({:ssl => {:port => 8443},
       :web_app_dir => MOCK_WEB_APP_DIR})
-      
+
     server.tomcat.service.findConnectors().should have(1).connectors
     server.tomcat.service.findConnectors()[0].scheme.should == 'https'
   end
-  
+
   it "should have an ajp connector enabled" do
     server = Trinidad::Server.new({:ajp => {:port => 8009}})
-      
+
     server.tomcat.service.findConnectors().should have(1).connectors
     server.tomcat.service.findConnectors()[0].protocol.should == 'AJP/1.3'
   end
@@ -58,7 +58,7 @@ describe Trinidad::Server do
 
     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()
@@ -70,7 +70,7 @@ describe Trinidad::Server do
 
     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,

data/spec/trinidad/web_app_spec.rb

@@ -34,7 +34,7 @@ describe Trinidad::WebApp do
   it "should load custom jars" do 
     class_loader = org.jruby.util.JRubyClassLoader.new(JRuby.runtime.jruby_class_loader)
     @web_app.add_application_libs(class_loader)
-    
+
     resource = class_loader.find_class('org.ho.yaml.Yaml')
     resource.should_not == nil
   end
@@ -60,10 +60,10 @@ describe Trinidad::WebApp do
     start_context_with_web_xml
     lambda { @web_app.add_init_params }.should_not raise_error
   end
-  
+
   it "should load init params" do
     @web_app.add_init_params
-    
+
     @web_app.context.findParameter('jruby.min.runtimes').should == '2'
     @web_app.context.findParameter('jruby.max.runtimes').should == '6'
   end

metadata

@@ -1,93 +1,113 @@
 --- !ruby/object:Gem::Specification 
 name: trinidad
 version: !ruby/object:Gem::Version 
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors: 
-- David Calavera
+  - David Calavera
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-12-01 00:00:00 +01:00
+date: 2009-12-08 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: 
+  - !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: 
+  - !ruby/object:Gem::Dependency 
+    name: rspec
+    type: :development
+    version_requirement: 
+    version_requirements: !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+      version: 
+  - !ruby/object:Gem::Dependency 
+    name: mocha
+    type: :development
+    version_requirement: 
+    version_requirements: !ruby/object:Gem::Requirement 
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+      version: 
 description: 
 email: calavera@apache.org
 executables: 
-- trinidad
+  - trinidad
 extensions: []
 
 extra_rdoc_files: 
-- LICENSE
-- README.rdoc
+  - LICENSE
+  - README.rdoc
 files: 
-- History.txt
-- LICENSE
-- README.rdoc
-- Rakefile
-- VERSION
-- bin/trinidad
-- lib/trinidad.rb
-- lib/trinidad/command_line_parser.rb
-- lib/trinidad/core_ext.rb
-- lib/trinidad/jars.rb
-- lib/trinidad/rackup_web_app.rb
-- lib/trinidad/rails_web_app.rb
-- lib/trinidad/server.rb
-- lib/trinidad/web_app.rb
-- trinidad-libs/core-3.1.1.jar
-- trinidad-libs/jasper-el.jar
-- trinidad-libs/jasper-jdt.jar
-- trinidad-libs/jasper.jar
-- trinidad-libs/jetty-util-6.1.14.jar
-- trinidad-libs/jruby-rack-0.9.5.jar
-- trinidad-libs/jsp-2.1.jar
-- trinidad-libs/jsp-api-2.1.jar
-- trinidad-libs/servlet-api-2.5-6.1.14.jar
-- trinidad-libs/tomcat-core.jar
-- trinidad-libs/tomcat-dbcp.jar
-- trinidad-libs/tomcat-jasper.jar
+  - History.txt
+  - LICENSE
+  - README.rdoc
+  - Rakefile
+  - VERSION
+  - bin/trinidad
+  - lib/trinidad.rb
+  - lib/trinidad/command_line_parser.rb
+  - lib/trinidad/core_ext.rb
+  - lib/trinidad/jars.rb
+  - lib/trinidad/rackup_web_app.rb
+  - lib/trinidad/rails_web_app.rb
+  - lib/trinidad/server.rb
+  - lib/trinidad/web_app.rb
+  - trinidad-libs/core-3.1.1.jar
+  - trinidad-libs/jasper-el.jar
+  - trinidad-libs/jasper-jdt.jar
+  - trinidad-libs/jasper.jar
+  - trinidad-libs/jetty-util-6.1.14.jar
+  - trinidad-libs/jruby-rack-0.9.5.jar
+  - trinidad-libs/jsp-2.1.jar
+  - trinidad-libs/jsp-api-2.1.jar
+  - trinidad-libs/servlet-api-2.5-6.1.14.jar
+  - 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
+  - --charset=UTF-8
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   version: 
 requirements: []
 
 rubyforge_project: trinidad
-rubygems_version: 1.3.2
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Simple library to run rails applications into an embedded Tomcat
 test_files: 
-- spec/spec_helper.rb
-- spec/trinidad/command_line_parser_spec.rb
-- spec/trinidad/server_spec.rb
-- spec/trinidad/web_app_spec.rb
+  - spec/spec_helper.rb
+  - spec/trinidad/command_line_parser_spec.rb
+  - spec/trinidad/server_spec.rb
+  - spec/trinidad/web_app_spec.rb