appengine-rack 0.0.7 → 0.0.8

data/Rakefile

@@ -3,6 +3,9 @@ require 'rake/gempackagetask'
 require 'rubygems/specification'
 require 'date'
 require 'spec/rake/spectask'
+require 'fileutils'
+
+BOOT_JAR = "appengine-rack.jar"
 
 SUMMARY = <<EOF
 Commom dependencies for configuring an App Engine application via Rack.
@@ -10,7 +13,7 @@ EOF
 
 spec = Gem::Specification.new do |s|
   s.name = "appengine-rack"
-  s.version = "0.0.7"
+  s.version = "0.0.8"
   s.author = "Ryan Brown"
   s.email = "ribrdb@google.com"
   s.homepage = "http://code.google.com/p/appengine-jruby"
@@ -28,6 +31,11 @@ end
 task :default => :spec
 
 Rake::GemPackageTask.new(spec) do |pkg|
+  chdir 'src'
+  system "jar -cf ../lib/#{BOOT_JAR} com/google/appengine/jruby/*.class"
+  chdir '../lib'
+  system "jar -uf #{BOOT_JAR} appengine-rack/boot.rb"
+  chdir '..'
   pkg.gem_spec = spec
 end
 

data/lib/appengine-rack/boot.rb

@@ -0,0 +1,62 @@
+#!/usr/bin/ruby1.8 -w
+#
+# Copyright:: Copyright 2010 Google Inc.
+# Original Author:: John Woodell (mailto:woodie@google.com)
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'jruby/rack/booter'
+
+# try to require the bundled environment
+begin
+  require 'bundler_gems/environment'
+rescue LoadError
+  # continue
+end
+
+module JRuby
+  module Rack
+    class AppEngineLayout < WebInfLayout
+      def app_uri
+        @app_uri ||= '/'
+      end
+
+      def gem_path
+        "bundler_gems/jruby/1.8"
+      end
+
+      def public_uri
+        @public_uri ||= begin
+          path = @rack_context.getInitParameter('public.root') || '/public'
+          path = "/#{path}" unless path =~ %r{^/}
+          path.chomp("/")
+        end
+      end
+
+      def change_working_directory
+        if @rack_context.server_info.include?('Development')
+          ENV['RACK_ENV'] = 'development'
+        else
+          ENV['RACK_ENV'] = 'production'
+        end
+        super
+      end
+    end
+
+    class Booter
+      def default_layout_class
+        AppEngineLayout
+      end
+    end
+  end
+end

data/lib/appengine-rack.rb

@@ -294,17 +294,16 @@ module AppEngine
         @app.configure(options)
       end
 
+      # Deprecated, use ENV['RACK_ENV'] instead
       def environment
-        if $servlet_context
-          if $servlet_context.server_info =~ %r{^Google App Engine Development/}
-            "development"
-          elsif $servlet_context.server_info =~ %r{^Google App Engine/}
-            "production"
-          end
+        if !$servlet_context.nil? and
+            $servlet_context.server_info.include? 'Development'
+          'development'
+        else
+          'production'
         end
       end
       
-      
       def make_wildcard(pattern)
         "#{pattern}/*".squeeze('/')
       end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Ryan Brown
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-07 00:00:00 -07:00
+date: 2010-05-04 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -56,7 +56,9 @@ extra_rdoc_files: []
 files: 
 - LICENSE
 - Rakefile
+- lib/appengine-rack/boot.rb
 - lib/appengine-rack/java.rb
+- lib/appengine-rack.jar
 - lib/appengine-rack.rb
 has_rdoc: true
 homepage: http://code.google.com/p/appengine-jruby