sinatra-symphony 0.3.0 → 0.5.0

data/lib/rack/mapper.rb

@@ -0,0 +1,70 @@
+require 'rack'
+require 'async_rack'
+
+module Rack
+  class Mapper
+    def initialize map
+      @map = remap(map)
+    end
+
+    def remap map
+      map.map     {|path, app| [path, app.respond_to?(:new) ? app_instance(app, path) : app]}
+         .sort_by {|path, app| path.size}.reverse
+         .map     {|path, app| [Regexp.new("^#{path.chomp('/')}(?:/(.*)|$)"), path, app]}
+    end
+
+    def call env
+      rest, path, app = find_mapping(env['PATH_INFO'])
+      app ? dispatch(app, env, rest, path) : not_found(env)
+    end
+
+    def app_instance app, path
+      app.new do |instance|
+        instance.instance_variable_set(:@rack_mapper_path, path)
+      end
+    end
+
+    def dispatch app, env, rest, path
+      app.call(
+        env.merge(
+          'PATH_INFO'    => rest,
+          'SCRIPT_NAME'  => ::File.join(env['SCRIPT_NAME'], path),
+          'REQUEST_PATH' => ::File.join(env['SCRIPT_NAME'], path, rest),
+        )
+      )
+    end
+
+    def not_found env
+      [404, {"Content-Type" => "text/plain", "X-Cascade" => "pass"}, ["no application mounted at #{env['REQUEST_PATH']}"]]
+    end
+
+    def find_mapping path
+      @map.each do |re, location, app|
+        if re.match(path)
+          return ["/#{$1}", location, app]
+        end
+      end
+      return nil
+    end
+
+    class Logger < Rack::CommonLogger
+      def log env, status, header, began_at
+        env_path_info    = env['PATH_INFO']
+        env['PATH_INFO'] = env['REQUEST_PATH'] || ::File.join(env['SCRIPT_NAME'], env['PATH_INFO'])
+        super
+      ensure
+        env['PATH_INFO'] = env_path_info
+      end
+    end # Logger
+
+    class AsyncLogger < AsyncRack::CommonLogger
+      def log env, status, header, began_at
+        env_path_info    = env['PATH_INFO']
+        env['PATH_INFO'] = env['REQUEST_PATH'] || ::File.join(env['SCRIPT_NAME'], env['PATH_INFO'])
+        super
+      ensure
+        env['PATH_INFO'] = env_path_info
+      end
+    end # AsyncLogger
+  end # Mapper
+end # Rack

data/lib/rack/urlmap_logger.rb

@@ -0,0 +1,10 @@
+require 'async_rack'
+
+module Rack
+  class MapperLogger < AsyncRack::CommonLogger
+    def log env, status, header, began_at
+      env['PATH_INFO'] = env['REQUEST_PATH']
+      super
+    end
+  end
+end

data/lib/sinatra/symphony.rb

@@ -9,12 +9,26 @@ module Sinatra
     disable :raise_errors, :show_exceptions
 
     def invoke
-      EM.synchrony do
+      if self.class.symphony[:exclude].include? @request.path_info
         super
-        env['async.callback'].call response.finish
+      else
+        EM.synchrony do
+          super
+          env['async.callback'].call response.finish
+        end
+
+        throw :async
       end
+    end
+
+    def self.synchronous *paths
+      paths.each do |path|
+        symphony[:exclude] << path
+      end
+    end
 
-      throw :async
+    def self.symphony
+      @symphony ||= Hash.new {|h, k| h[k] = []}
     end
   end # Symphony
 end # Sinatra

data/test/helper.rb

@@ -3,6 +3,7 @@ require 'minitest/autorun'
 require 'em-synchrony/em-http'
 require 'sinatra-symphony'
 require 'sinatra/symphony/test'
+require 'rack/mapper'
 
 class MiniTest::Spec
   include Rack::Test::Methods

data/test/test_mapper.rb

@@ -0,0 +1,24 @@
+require 'helper'
+
+describe 'Rack::Mapper' do
+  def app
+    Sinatra::Symphony::Test.new(Rack::Mapper.new('/hello' => @myapp))
+  end
+
+  it 'should run' do
+    mylogs = StringIO.new
+    @myapp = Class.new(Sinatra::Symphony) do
+      use Rack::Mapper::AsyncLogger, mylogs
+      get '/world' do
+        [@rack_mapper_path, '/world']
+      end
+    end
+
+    get '/hello/world'
+    assert_equal 200,            last_response.status
+    assert_equal '/hello/world', last_response.body
+
+    mylogs.rewind
+    assert_match %r{GET /hello/world}, mylogs.read
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-symphony
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,120 +9,120 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-14 00:00:00.000000000 Z
+date: 2012-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sinatra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :runtime
-  prerelease: false
+  name: sinatra
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  prerelease: false
 - !ruby/object:Gem::Dependency
-  name: em-synchrony
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :runtime
-  prerelease: false
+  name: em-synchrony
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  prerelease: false
 - !ruby/object:Gem::Dependency
-  name: async-rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :runtime
-  prerelease: false
+  name: async-rack
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  prerelease: false
 - !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :development
-  prerelease: false
+  name: rake
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  prerelease: false
 - !ruby/object:Gem::Dependency
-  name: thin
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :development
-  prerelease: false
+  name: thin
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  prerelease: false
 - !ruby/object:Gem::Dependency
-  name: rack-test
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :development
-  prerelease: false
+  name: rack-test
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  prerelease: false
 - !ruby/object:Gem::Dependency
-  name: em-http-request
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :development
-  prerelease: false
+  name: em-http-request
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  prerelease: false
 description: em-synchrony glue for sinatra.
 email:
 - deepfryed@gmail.com
@@ -130,11 +130,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- test/test_mapper.rb
 - test/helper.rb
 - test/test_app.rb
 - lib/sinatra/symphony/test.rb
 - lib/sinatra/symphony.rb
 - lib/sinatra-symphony.rb
+- lib/rack/urlmap_logger.rb
+- lib/rack/mapper.rb
 - README.md
 homepage: http://github.com/deepfryed/sinatra-symphony
 licenses: []
@@ -143,17 +146,20 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
+      hash: -2775563060799593485
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+      segments:
+      - 0
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+  none: false
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24