webfx 0.0.7 → 0.0.8

data/lib/webfx.rb

@@ -1,89 +1,7 @@
+require 'zlib'
+require 'stringio'
 require 'json'
 
-class Request
-  attr_reader :user, :params, :body, :path, :method
-  
-  def initialize(env)
-    request = Rack::Request.new(env)
-    params = request.params  
-           
-    if params['_method']
-      method = params['_method']
-    else
-      method = request.request_method
-    end
-    
-    @user = @@authenticate ? @@authenticate.call(params) : nil
-    @params = params
-    @body = params['file'] ? '' : (request.post? or request.put?) ? request.body.read : ''
-    @path = request.path
-    @method = method.downcase
-  end
-end
-
-
-class Response
-  attr_writer :status, :header
-
-  class DeferrableBody
-    include EM::Deferrable
-
-    def call(body)
-      body.each do |chunk|
-        @body_callback.call(chunk)
-      end
-    end
-
-    def each &blk
-      @body_callback = blk
-    end  
-  end
-  
-  def initialize(env)
-    @env = env
-    @body = DeferrableBody.new
-    @status = nil
-    @header = nil
-  end
-    
-  def fail(message)
-    @status = 500 if @status.nil?
-    @header = {'Content-Type' => 'text/plain'} if @header.nil?
-    @env['async.callback'].call [@status, @header, @body]
-    @body.call [message]
-    @body.fail
-  end
-
-  def succeed(body)
-    @status = 200 if @status.nil?
-    @header = {'Content-Type' => 'application/json'} if @header.nil?
-    @env['async.callback'].call [@status, @header, @body]
-    
-    if @header['Content-Type'] == 'application/json' and 
-      not ((body.kind_of? String) and (['{', '['].include? body.slice(0, 1)))
-      body = body.to_json
-    end
-    
-    @body.call [body]
-    @body.succeed
-  end
-  
-  def deleted
-    @status = 200 if @status.nil?
-    @header = {'Content-Type' => 'text/plain'} if @header.nil?
-    @env['async.callback'].call [@status, @header, @body]
-    @body.succeed
-  end
-  
-  def updated
-    @status = 200 if @status.nil?
-    @header = {'Content-Type' => 'text/plain'} if @header.nil?
-    @env['async.callback'].call [@status, @header, @body]
-    @body.succeed
-  end
-end
-
-
 @@routes = {'get' => [], 'post' => [], 'put' => [], 'delete' => []}
 @@authenticate = false
 
@@ -111,56 +29,115 @@ def authenticate(&fn)
   @@authenticate = fn
 end
 
+class MyResult
+  attr_reader :env
+   
+  def initialize(env)
+    @env = env
+  end
+end
 
-class WebFx
-  AsyncResponse = [-1, {}, []].freeze
-    
-  def call(env)
-    request = Request.new(env)
-    response = Response.new(env)
-    
-    EM::next_tick do
-      found = false
+def gzip(data)
+  s = StringIO.new
+  gz = Zlib::GzipWriter.new(s, 0, nil)
+  gz.write data
+  gz.close
+  s.string
+end
+
+
+def index_html
+  @@index_html ||= gzip(File.read('public/index.html').gsub(/<!--(.|\s)*?-->/, ''))
+end 
+  
+  
+def run_app(env)
+  begin
+    request = Rack::Request.new(env)
       
-      @@routes[request.method].each do |item|
-        if request.path[1..-1].match(item[:regexp])
-          found = true
-          case $~.length
-            when 1 then item[:fn].call(request, response)
-            when 2 then item[:fn].call($1, request, response)
-            when 3 then item[:fn].call($1, $2, request, response)
-            when 4 then item[:fn].call($1, $2, $3, request, response)
-            when 5 then item[:fn].call($1, $2, $3, $4, request, response)
-            else item[:fn].call($~, request, response)
-          end                              
-        end
+    def static(type, file)
+      [200, { 'Content-Type' => type, 'Cache-Control' => 'public, max-age=86400' }, File.read(file)]
+    end
+
+    if request.path == '/'
+      return [200, { 'Content-Type' => 'text/html', 'Content-Encoding' => 'gzip' }, index_html]
+    end
+
+    if request.path.match(/(.*).js$/)
+      return  static('text/javascript', "public/#{$1}.js")
+    end
+
+    if request.path.match(/(.*).css$/)
+      return  static('text/css', "public/#{$1}.css")
+    end
+
+    if request.path.match(/(images\/.*).png$/)
+      return  static('image/png', "public/#{$1}.png")
+    end
+    
+    if request.path.match(/(images\/.*).jpg$/)
+      return  static('image/jpg', "public/#{$1}.jpg")
+    end
+
+    params = request.params
+
+    if request.post?
+      if not params['file']
+        body = request.body.read
+        params.merge!(JSON.parse(body)) if body != ''
       end
+    end
+
+    force_method = params['_method']
+    if force_method
+      method = force_method
+      params.delete('_method')  
+    else
+      method = request.request_method
+    end
+    method.downcase!
       
-      if not found
-        def static(type, file, response)
-          begin
-            response.header = {'Content-Type' => type, 'Cache-Control' => 'public, max-age=86400'}
-            response.succeed(File.read(file))
-          rescue => e
-            response.fail(e.message)
-          end
+    @@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
-
-        if request.path == '/'
-          static('text/html', 'public/index.html', response)
-        elsif request.path.match(/(.*).js$/)
-          static('text/javascript', "public#{$1}.js", response)
-        elsif request.path.match(/(.*).css$/)
-          static('text/css', "public#{$1}.css", response)
-        elsif request.path.match(/(.*).jpg$/)
-          static('image/jpg', ".#{$1}.jpg", response)
-        else
-          response.status = 404
-          response.fail('Not found.')
+          
+        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', 'Content-Encoding' => 'gzip'}, gzip(json)]
+          else 
+            return [200, {'Content-Type' => 'application/json', 'Content-Encoding' => 'gzip'}, gzip({:result => :success}.to_json)]
         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
+
 
-    AsyncResponse 
-  end  
+module WebFx
+  class Application
+    def self.call(env)
+      run_app(env)
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webfx
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: []
 
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-08 00:00:00 -08:00
+date: 2011-02-02 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: Async for thin, EventMachine, heroku, very minimal, RESTful, json, sinatra-inspired framework.
+summary: Minimal, RESTful, json, sinatra-inspired framework.
 test_files: []