appengine-rack 0.0.4 → 0.0.5

data/Rakefile

@@ -10,7 +10,7 @@ EOF
 
 spec = Gem::Specification.new do |s|
   s.name = "appengine-rack"
-  s.version = "0.0.4"
+  s.version = "0.0.5"
   s.author = "Ryan Brown"
   s.email = "ribrdb@google.com"
   s.homepage = "http://code.google.com/p/appengine-jruby"
@@ -20,6 +20,7 @@ spec = Gem::Specification.new do |s|
   
   s.require_path = 'lib'
   s.files = %w(LICENSE Rakefile) + Dir.glob("lib/**/*")
+  s.add_dependency('rack')
 end
 
 task :default => :spec

data/lib/appengine-rack.rb

@@ -15,10 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-begin
-  require 'bundler_gems/environment'
-rescue LoadError
-end
+require 'rack'
 
 begin
   require 'appengine-apis/urlfetch'
@@ -26,15 +23,28 @@ begin
 rescue Exception
 end
 
+class ::Rack::Builder
+
+  def skip_rack_servlet
+    @skip_defaults = true
+  end
+
+  def mime_mapping(mapping)
+    @mime_mapping = mapping
+  end
+
+end
+
 module AppEngine
   module Rack
     ROOT = File.expand_path(File.dirname(__FILE__))
     
     class Resources
       COMMON_EXCLUDES = { 
-          :rails_excludes => %w(README Rakefile db/** doc/**
+          :rails_excludes => %w(README Rakefile db/** doc/** bin/**
                              log/** script/** test/** tmp/**),
-          :merb_excludes => %w(Rakefile autotest/** doc/** gems/** spec/**) }
+          :merb_excludes => %w(Rakefile autotest/** doc/** bin/**
+                             gems/** spec/**) }
 
       def initialize
         @includes = []

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: appengine-rack
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Ryan Brown
@@ -9,10 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-02 00:00:00 -08:00
+date: 2009-12-03 00:00:00 -08:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rack
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: |
   Commom dependencies for configuring an App Engine application via Rack.
 
@@ -27,7 +36,6 @@ files:
 - LICENSE
 - Rakefile
 - lib/appengine-rack.rb
-- lib/appengine-rack.rb.orig
 - lib/appengine-rack/java.rb
 has_rdoc: true
 homepage: http://code.google.com/p/appengine-jruby

data/lib/appengine-rack.rb.orig

@@ -1,259 +0,0 @@
-#!/usr/bin/ruby1.8 -w
-#
-# Copyright:: Copyright 2009 Google Inc.
-# Original Author:: Ryan Brown (mailto:ribrdb@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.
-
-begin
-  require 'bundler_gems/environment'
-rescue LoadError
-end
-
-begin
-  require 'appengine-apis/urlfetch'
-  require 'appengine-apis/tempfile'
-rescue Exception
-end
-
-module AppEngine
-  module Rack
-    ROOT = File.expand_path(File.dirname(__FILE__))
-    
-    class Resources
-      COMMON_EXCLUDES = { 
-          :rails_excludes => %w(README Rakefile db/** doc/**
-                             log/** script/** test/** tmp/**),
-          :merb_excludes => %w(Rakefile autotest/** doc/** gems/** spec/**) }
-
-      def initialize
-        @includes = []
-        @excludes = []
-      end
-    
-      def include(glob, expiration=nil)
-        if glob.is_a? Array
-          glob.each do |g|
-            @includes << [g, expiration]
-          end
-        else
-          @includes << [glob, expiration]
-        end
-      end
-    
-      def exclude(glob)
-        if glob.is_a? Array
-          @excludes += glob
-        elsif glob.is_a? Symbol
-          @excludes += COMMON_EXCLUDES[glob]
-        else
-          @excludes << glob
-        end
-      end
-    
-      def append_to(xml, type)
-        resources = xml.add_element(type) 
-        @includes.each do |path, expiration|
-          element = resources.add_element('include')
-          element.add_attribute('path', path)
-          element.add_attribute('expiration', expiration) if expiration
-        end
-        @excludes.each do |path|
-          resources.add_element('exclude').add_attribute('path', path)
-        end
-      end
-    end
-  
-    class PropertyMap < Hash
-      def append_to(xml)
-        unless empty?
-          sys = xml.add_element('system-properties') 
-          each do |name, value|
-            sys.add_element('property').
-                add_attributes( { "name" => name, "value" => value.to_s } )
-          end
-        end
-      end
-    end
-  
-    class EnvVarMap < Hash
-      def append_to(xml)
-        unless empty?
-          env = xml.add_element('env-variables') 
-          each do |name, value|
-            env.add_element('env-var').
-                add_attributes( { "name" => name, "value" => value.to_s } )
-          end
-        end
-      end    
-    end
-  
-    class RackApplication
-      attr_accessor :application, :precompilation_enabled
-      attr_accessor :inbound_services, :mime_mapping
-      attr_reader :version, :static_files, :resource_files, :public_root
-      attr_reader :system_properties, :environment_variables
-      attr_writer :ssl_enabled, :sessions_enabled
-    
-      def initialize
-        @version = '1'
-        @system_properties = PropertyMap[ 'os.arch' => '',
-            'jruby.jit.threshold'         => 99,
-            'jruby.native.enabled'        => false,
-            'jruby.management.enabled'    => false,
-            'jruby.rack.input.rewindable' => false ]
-        @environment_variables = EnvVarMap.new
-        @static_files = Resources.new
-        @resource_files = Resources.new
-        @public_root = '/public'
-        @inbound_services = []
-        @mime_mapping = {}
-      end
-    
-      alias id application
-    
-      def sessions_enabled?
-        @sessions_enabled
-      end
-    
-      def ssl_enabled?
-        @ssl_enabled
-      end
-      
-      def precompilation_enabled?
-        @precompilation_enabled
-      end
-
-      def public_root=(root)
-        root = "/#{root}".squeeze '/'
-        root = nil if root.eql? '/'
-        @public_root = root
-      end
-    
-      def version=(version)
-        @version = version.to_s
-      end
-    
-      def configure(options={})
-        [:system_properties, :environment_variables].each do |key|
-          self.send(key).merge!(options.delete(key)) if options[key]
-        end
-        options.each { |k,v| self.send("#{k}=", v) }
-      end
-    
-      def to_xml
-        require 'rexml/document'
-
-        xml = REXML::Document.new.add_element('appengine-web-app')
-        xml.add_attribute('xmlns','http://appengine.google.com/ns/1.0')
-        xml.add_element('application').add_text(application)
-        xml.add_element('version').add_text(version)
-        xml.add_element('public-root').add_text(@public_root) if @public_root
-        static_files.append_to(xml, 'static-files')
-        resource_files.append_to(xml, 'resource-files')
-        system_properties.append_to(xml)
-        environment_variables.append_to(xml)
-        if sessions_enabled?
-          xml.add_element('sessions-enabled').add_text('true')
-        end
-        if ssl_enabled?
-          xml.add_element('ssl-enabled').add_text('true')
-        end
-        if precompilation_enabled?
-          xml.add_element('precompilation-enabled').add_text('true')
-        end
-        unless @inbound_services.empty?
-          services = xml.add_element('inbound-services')
-          @inbound_services.each do |service|
-            services.add_element('service').add_text(service.to_s)
-          end
-        end
-        @mime_mapping.each_pair do |key,val|
-          mime = xml.add_element('mime-mapping')
-          mime.add_element('extension').add_text(key.to_s)
-          mime.add_element('mime-type').add_text(val)
-        end
-        return xml
-      end
-    end
-    
-    class SecurityMiddleware
-      def self.append_xml(doc, pattern)
-        security = doc.add_element('security-constraint')
-        collection = security.add_element('web-resource-collection')
-        collection.add_element('url-pattern').add_text(pattern)
-        collection.add_element('url-pattern').add_text(
-            AppEngine::Rack.make_wildcard(pattern))
-        yield security
-      end
-
-      def self.new(app, *args, &block)
-        app
-      end      
-      
-    end
-    
-    class AdminRequired < SecurityMiddleware
-      def self.append_xml(doc, pattern)
-        super(doc, pattern) do |security|
-          auth = security.add_element('auth-constraint')
-          auth.add_element('role-name').add_text('admin')
-        end
-      end
-    end
-  
-    class LoginRequired < SecurityMiddleware
-      def self.append_xml(doc, pattern)
-        super(doc, pattern) do |security|
-          auth = security.add_element('auth-constraint')
-          auth.add_element('role-name').add_text('*')
-        end
-      end
-    end
-
-    class SSLRequired < SecurityMiddleware
-      def self.append_xml(doc, pattern)
-        super(doc, pattern) do |security|
-          udc = security.add_element('user-data-constraint')
-          udc.add_element('transport-guarantee').add_text('CONFIDENTIAL')
-        end
-      end
-    end  
-
-    class << self
-      def app
-        @app ||= RackApplication.new
-      end
-
-      def configure_app(options={})
-        @app = RackApplication.new
-        @app.configure(options)
-      end
-
-      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
-        end
-      end
-      
-      
-      def make_wildcard(pattern)
-        "#{pattern}/*".squeeze('/')
-      end
-    end
-  end
-end