appengine-rack 0.0.10 → 0.0.11.pre

data/Rakefile

@@ -13,7 +13,7 @@ EOF
 
 spec = Gem::Specification.new do |s|
   s.name = "appengine-rack"
-  s.version = "0.0.10"
+  s.version = "0.0.11.pre"
   s.author = "Ryan Brown"
   s.email = "ribrdb@google.com"
   s.homepage = "http://code.google.com/p/appengine-jruby"

data/lib/appengine-rack.rb

@@ -23,112 +23,20 @@ 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/** bin/**
-                             log/** script/** test/** tmp/**),
-          :merb_excludes => %w(Rakefile autotest/** doc/** bin/**
-                             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
-
     # Split loading requests into 3 parts
     #
     # deferred_dispatcher = AppEngine::Rack::DeferredDispatcher.new(
     #     :require => File.expand_path('../config/environment', __FILE__),
     #     :dispatch => 'ActionController::Dispatcher')
-    # 
-    # map '/admin' do
-    #   use AppEngine::Rack::AdminRequired
-    #   run deferred_dispatcher
-    # end
     #
-    # map '/' do
-    #   use AppEngine::Rack::LoginRequired
-    #   run deferred_dispatcher
-    # end
-
+    # run deferred_dispatcher
     class DeferredDispatcher
       def initialize args
         @args = args
       end
- 
+
       def call env
         if @runtime.nil?
           @runtime = true
@@ -144,7 +52,7 @@ module AppEngine
           @rack_app.call(env)
         end
       end
- 
+
       def redirect_or_error(env)
         if env['REQUEST_METHOD'].eql?('GET')
           redir_url = env['REQUEST_URI'] +
@@ -157,143 +65,8 @@ module AppEngine
         end
       end
     end
-  
-
-    class RackApplication
-      attr_accessor :application, :inbound_services, :precompilation_enabled
-      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 = []
-      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
-        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
-
       # Deprecated, use ENV['RACK_ENV'] instead
       def environment
         if !$servlet_context.nil? and
@@ -303,10 +76,6 @@ module AppEngine
           'production'
         end
       end
-      
-      def make_wildcard(pattern)
-        "#{pattern}/*".squeeze('/')
-      end
     end
   end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: appengine-rack
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
   - 0
   - 0
-  - 10
-  version: 0.0.10
+  - 11
+  - pre
+  version: 0.0.11.pre
 platform: ruby
 authors: 
 - Ryan Brown
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-09 00:00:00 -04:00
+date: 2010-06-09 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -71,7 +72,6 @@ files:
 - LICENSE
 - Rakefile
 - lib/appengine-rack/boot.rb
-- lib/appengine-rack/java.rb
 - lib/appengine-rack.jar
 - lib/appengine-rack.rb
 has_rdoc: true
@@ -92,11 +92,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 

data/lib/appengine-rack/java.rb

@@ -1,94 +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.
-
-require 'appengine-rack'
-
-class JavaServlet
-  def initialize(klass, options={})
-    @klass = klass.to_s
-    @name = (options[:name] || klass).to_s
-    @wildcard = options[:wildcard]
-  end
-  
-  def call(env)
-    raise RuntimeError, "JavaServlet should be dispatched by web.xml"
-  end
-  
-  def append_xml(doc, pattern)
-    servlet = doc.add_element('servlet')
-    servlet.add_element('servlet-name').add_text(@name)
-    servlet.add_element('servlet-class').add_text(@klass)
-    map = doc.add_element('servlet-mapping')
-    map.add_element('servlet-name').add_text(@name)
-    map.add_element('url-pattern').add_text(pattern.to_s)
-    if @wildcard
-      wildcard = doc.add_element('servlet-mapping')
-      wildcard.add_element('servlet-name').add_text(@name)
-      wildcard.add_element('url-pattern').add_text(
-          AppEngine::Rack.make_wildcard(pattern))
-    end
-  end
-end
-
-class JavaServletFilter
-  def self.append_xml(doc, pattern, klass, options={})
-    name = options[:name] || klass
-    filter = doc.add_element('filter')
-    filter.add_element('filter-name').add_text(name.to_s)
-    filter.add_element('filter-class').add_text(klass.to_s)
-    unless pattern == '/' && options[:wildcard]
-      map = doc.add_element('filter-mapping')
-      map.add_element('filter-name').add_text(name.to_s)
-      map.add_element('url-pattern').add_text(pattern.to_s)
-    end
-    if options[:wildcard]
-      wildcard = doc.add_element('filter-mapping')
-      wildcard.add_element('filter-name').add_text(name.to_s)
-      wildcard.add_element('url-pattern').add_text(
-          AppEngine::Rack.make_wildcard(pattern))
-    end
-  end
-  
-  def self.new(app, *args, &block)
-    app
-  end
-end
-
-class JavaContextListener
-  def self.append_xml(doc, pattern, klass)
-    listener = doc.add_element('listener')
-    listener.add_element('listener-class').add_text(klass.to_s)
-  end
-  
-  def self.new(app, *args, &block)
-    app
-  end
-end
-
-class JavaContextParams
-  def self.append_xml(doc, pattern, params)
-    params.each do |name, value|
-      e = doc.add_element('context-param')
-      e.add_element('param-name').add_text(name.to_s)
-      e.add_element('param-value').add_text(value.to_s)
-    end
-  end
-  
-  def self.new(app, *args, &block)
-    app
-  end
-end