webfx 0.0.5 → 0.0.6

data/lib/webfx.rb

@@ -1,5 +1,75 @@
 require 'json'
 
+class DeferrableBody
+  include EventMachine::Deferrable
+
+  def call(body)
+    body.each do |chunk|
+      @body_callback.call(chunk)
+    end
+  end
+
+  def each &blk
+    @body_callback = blk
+  end  
+end
+
+
+class MyResult
+  attr_reader :env
+   
+  def initialize(env)
+    @env = env
+  end
+end
+
+
+class Context
+
+  def initialize(method, me, env, body)
+    @method = method
+    @me = me
+    @env = env
+    @body = body
+  end 
+ 
+  def respond(response)
+    @env['async.callback'].call [response[0], response[1], @body]
+    @body.call [response[2]]
+    
+    if response[0] < 400
+      @body.succeed
+    else
+      @body.fail
+    end
+  end
+ 
+  def succeed(result)
+    if result.kind_of? MyResult
+      respond result.env 
+      return
+    end
+
+    case @method
+      when 'get', 'post'
+        if result.kind_of? String and  ['{', '['].include? result.slice(0, 1) 
+          json = result
+        else
+          json = result.to_json
+        end
+        respond [200, {'Content-Type' => 'application/json'}, json]
+      else 
+        respond [200, {'Content-Type' => 'application/json'}, {:result => :success}.to_json]
+    end
+  end
+
+  def fail(message)
+    respond [500, {'Content-Type' => 'text/plain'},  message]
+  end
+
+end
+
+
 @@routes = {'get' => [], 'post' => [], 'put' => [], 'delete' => []}
 @@authenticate = false
 
@@ -27,97 +97,82 @@ def authenticate(&fn)
   @@authenticate = fn
 end
 
-class MyResult
-  attr_reader :env
-   
-  def initialize(env)
-    @env = env
-  end
-end
 
-def run_app(env)
-  begin
-    request = Rack::Request.new(env)
-      
-    def static(type, file)
-      [200, { 'Content-Type' => type, 'Cache-Control' => 'public, max-age=86400' }, IO.read(file)]
-    end
+class WebFx
+  AsyncResponse = [-1, {}, []].freeze
+    
+  def call(env)
+
+    EventMachine::next_tick do
+    
+      request = Rack::Request.new(env)
+        
+      def static(type, file, env)
+        begin
+          body = DeferrableBody.new
+          body.call [IO.read(file)]
+          env['async.callback'].call [200, { 'Content-Type' => type, 'Cache-Control' => 'public, max-age=86400' }, body]
+        rescue => e
+          env['async.callback'].call [404, { 'Content-Type' => 'text/plain'}, 'Not found.']
+        end
+      end
 
-    if request.path == '/'
-      return  static('text/html', 'public/index.html')
-    end
+      if request.path == '/'
+        static('text/html', 'public/index.html', env)
+      end
 
-    if request.path.match(/(.*).js/)
-      return  static('text/javascript', "public/#{$1}.js")
-    end
+      if request.path.match(/(.*).js$/)
+        static('text/javascript', "public/#{$1}.js", env)
+      end
 
-    if request.path.match(/(.*).css/)
-      return  static('text/css', "public/#{$1}.css")
-    end
+      if request.path.match(/(.*).css$/)
+        static('text/css', "public/#{$1}.css", env)
+      end
 
-    if request.path.match(/(.*).jpg/)
-      return  static('image/jpg', ".#{$1}.jpg")
-    end
+      if request.path.match(/(.*).jpg$/)
+        static('image/jpg', ".#{$1}.jpg", env)
+      end
 
-    params = request.params
-   
-    if request.post?
-      if not params['file']
-        body = request.body.read
-        params.merge!(JSON.parse(body)) if body != ''
+      params = request.params
+     
+      if request.post?
+        if not params['file']
+          body = request.body.read
+          params.merge!(JSON.parse(body)) if body != ''
+        end
       end
-    end
-         
-    force_method = params['_method']
-    if force_method
-      method = force_method
-      params.delete('_method')  
-    else
-      method = request.request_method
-    end
-    method.downcase!
+           
+      force_method = params['_method']
+      if force_method
+        method = force_method
+        params.delete('_method')  
+      else
+        method = request.request_method
+      end
+      method.downcase!
+                         
+      me = @@authenticate ? @@authenticate.call(params) : nil
+      ctx = Context.new(method, me, env, DeferrableBody.new)
+
+      found = false
       
-    @@routes[method].each do |item|
-      if request.path[1..-1].match(item[:regexp])
-        me = @@authenticate ? @@authenticate.call(params) : nil
-          
-        case $~.length
-          when 1 then result = item[:fn].call(params, me)
-          when 2 then result = item[:fn].call($1, params, me)
-          when 3 then result = item[:fn].call($1, $2, params, me)
-          when 4 then result = item[:fn].call($1, $2, $3, params, me)
-          when 5 then result = item[:fn].call($1, $2, $3, $4, params, me)
-          else result = item[:fn].call($~, params, me)
-        end
-          
-        return result.env if result.kind_of? MyResult
-                    
-        case method
-          when 'get', 'post'
-            if result.kind_of? String and  ['{', '['].include? result.slice(0, 1) 
-              json = result
-            else
-              json = result.to_json
-            end
-            return [200, {'Content-Type' => 'application/json'}, json]
-          else 
-            return [200, {'Content-Type' => 'application/json'}, {:result => :success}.to_json]
+      @@routes[method].each do |item|
+        if request.path[1..-1].match(item[:regexp])
+          found = true
+          case $~.length
+            when 1 then item[:fn].call(params, ctx)
+            when 2 then item[:fn].call($1, params, ctx)
+            when 3 then item[:fn].call($1, $2, params, ctx)
+            when 4 then item[:fn].call($1, $2, $3, params, ctx)
+            when 5 then item[:fn].call($1, $2, $3, $4, params, ctx)
+            else item[:fn].call($~, params, ctx)
+          end                              
         end
       end
-    end
-    [404, {'Content-Type' => 'text/plain'}, 'Not found.']
       
-  rescue => e
-    result = {:message => e.message, :callstack => e.backtrace.join("\n")}
-    [500, {'Content-Type' => 'text/plain' },  e.message]
-  end
-end
-
-
-module WebFx
-  class Application
-    def self.call(env)
-      run_app(env)
+      ctx.respond [404, {'Content-Type' => 'text/plain'}, 'Not found.'] if not found
     end
-  end
+
+    AsyncResponse 
+  end  
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webfx
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: []
 
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-30 00:00:00 -08:00
+date: 2011-01-06 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -62,6 +62,6 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Very minimal RESTful, json, sinatra-inspired framework.
+summary: Async for thin, EventMachine, very minimal, RESTful, json, sinatra-inspired framework.
 test_files: []