Merge branch 'master' of github.com:SegmentFault/node-tiny-http

Conflicts:
	build/request.js

Author: joyqi

build/http.js

@@ -1,6 +1,6 @@
 {
   "name": "node-tiny-http",
-  "version": "1.3.4",
+  "version": "1.3.5",
   "description": "A tiny node.js http framework",
   "main": "build/http.js",
   "scripts": {

build/request.js

@@ -49,7 +49,13 @@ class Http
     # static file method
     assets: (path, dir) ->
         @routerInstance.register 'GET', (path.replace /\/+$/g, '') + '/%path', (done) ->
-            done 'file', dir + '/' + ((@request.get 'path').replace /\.{2,}/g, '')
+            parts = []
+            path = @request.get 'path'
+
+            for val in path.split '/'
+                parts.push val if not val.match /^\.+$/
+
+            done 'file', dir + '/' + (parts.join '/')
         .raw()
 
 

build/response.js

@@ -6,16 +6,13 @@ QueryString = require 'querystring'
 
 class Request
 
-    options = {}
-
     mergeParams = (source, target) ->
         for k, v of target
             source[k] = v
 
 
-    constructor: (@req, opt, cb) ->
+    constructor: (@req, @options, cb) ->
         parts = Url.parse @req.url, yes
-        options = opt
 
         @method = @req.method.toUpperCase()
         @uri = parts.href
@@ -64,18 +61,18 @@ class Request
         defaults = ['x-real-ip', 'x-forwarded-for', 'client-ip']
 
         if not @$ip?
-            if options.ipHeader?
-                @$ip = @header options.ipHeader, @req.socket.remoteAddress
+            if @options.ipHeader?
+                @$ip = @header @options.ipHeader, @req.socket.remoteAddress
             else
+                @$ip = @req.socket.remoteAddress
+
                 for key in defaults
                     val = @header key
 
                     if val?
                         @$ip = val
                         break
 
-                @$ip = @req.socket.remoteAddress
-
         @$ip
 
 

package.json

@@ -18,10 +18,8 @@ patchOriginalResponse = (res) ->
 
 class Response
 
-    options = {}
 
-
-    constructor: (@res, req, opt) ->
+    constructor: (@res, req, @options) ->
 
         @$statusCode = 200
         @$headers =
@@ -31,10 +29,9 @@ class Response
         @$stream = null
         @$content = null
 
-        options = opt
         @responded = no
 
-        if opt.compression
+        if @options.compression
             acceptEncoding = req.headers['accept-encoding']
 
             if acceptEncoding?