trinidad 1.0.2 → 1.0.3

data/History.txt

@@ -1,3 +1,7 @@
+== 1.0.3 (2010-12-08)
+
+* fix TRINIDAD-31: fix bug causing trailing slashes errors loading assets
+
 == 1.0.2 (2010-11-11)
 
 * stop using application directory as work directory to prevent TRINIDAD-27 and other issues

data/lib/trinidad.rb

@@ -24,5 +24,5 @@ require 'trinidad/rackup_web_app'
 require 'trinidad/war_web_app'
 
 module Trinidad
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 end

data/lib/trinidad/command_line_parser.rb

@@ -13,7 +13,7 @@ module Trinidad
       @default_options = {
         :port => 3000,
         :environment => 'development',
-        :context_path => '/',
+        :context_path => '',
         :libs_dir => 'lib',
         :classes_dir => 'classes',
         :ssl_port => 8443,

data/lib/trinidad/server.rb

@@ -53,7 +53,7 @@ module Trinidad
     def create_from_web_apps
       if @config[:web_apps]
         @config[:web_apps].each do |name, app_config|
-          app_config[:context_path] ||= (name.to_s == 'default' ? '/' : "/#{name.to_s}")
+          app_config[:context_path] ||= (name.to_s == 'default' ? '' : "/#{name.to_s}")
           app_config[:web_app_dir] ||= Dir.pwd
 
           create_web_app(app_config)
@@ -72,7 +72,7 @@ module Trinidad
           if (File.directory?(path) || path =~ /\.war$/)
             name = File.basename(path)
             app_config = {
-              :context_path => (name == 'default' ? '/' : "/#{name.to_s}"),
+              :context_path => (name == 'default' ? '' : "/#{name.to_s}"),
               :web_app_dir => File.expand_path(path)
             }
 
@@ -190,7 +190,7 @@ module Trinidad
     def add_default_web_app!(config)
       if (!config.has_key?(:web_apps) && !config.has_key?(:apps_base))
         default_app = {
-          :context_path => config[:context_path] || '/',
+          :context_path => config[:context_path],
           :web_app_dir => config[:web_app_dir] || Dir.pwd,
           :log => config[:log]
         }

data/lib/trinidad/web_app.rb

@@ -62,7 +62,7 @@ module Trinidad
       @app_config[:public]  || @config[:public] || 'public'
     end
 
-    %w{context_path web_app_dir libs_dir classes_dir default_web_xml environment
+    %w{context_path web_app_dir libs_dir classes_dir default_web_xml
         jruby_min_runtimes jruby_max_runtimes rackup log}.each do |method_name|
       define_method method_name do
         sym = method_name.to_sym
@@ -80,6 +80,7 @@ module Trinidad
 
     def war?; WebApp.war?(app_config); end
     def work_dir; web_app_dir; end
+    def environment; @app_config[:environment] || @config[:environment] || 'development'; end
 
     protected
     def add_parameter_unless_exist(param_name, param_value)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 1
     - 0
-    - 2
-  version: 1.0.2
+    - 3
+  version: 1.0.3
 platform: ruby
 authors: 
   - David Calavera
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-11 00:00:00 -06:00
+date: 2010-12-08 00:00:00 +01:00
 default_executable: trinidad
 dependencies: 
   - !ruby/object:Gem::Dependency