angelo 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19662f6ad2cd2af07d8468c0db06e79cace30ad6
-  data.tar.gz: e9f0dea09b6fdd129d627893024722dbce7a9836
+  metadata.gz: 55ec6c0b7ba672c2c75bf6c18ea54e465dba68aa
+  data.tar.gz: 60d95a47a93e1509782c9967c0fc42f0e5d0b7e0
 SHA512:
-  metadata.gz: 878aefb22125a90079c96e8647ccb607eb96033ab6f898482c07210561ed5abb4e82c5af9e4fa34aa06306d1f39dd87f683e48a30b81df7d61d85e28dba1d9d3
-  data.tar.gz: a7982735780dd4bd941c4a4a13d42857eaacfc95731c4b8c4aef19a0b36350221e41a1fd606356eb009dc2d43c425f97388327a2c979781b0350ad1bba3f343c
+  metadata.gz: 1bd103e7497922c6bf8489577f3f87d5bcbf046abf4524731b6c9c98c68f3791ca0dee51ed42232bd166d2c99ef9fc40d7f26fa1f8e6d19bbd62d4ffd9dee271
+  data.tar.gz: 3a33ada93accc65b7843d6c910e075932b5f556fede208eea01405d10361f458976199c0cd8086fb3048330f4eda8c4553435773f66a8df12c1cb35ad2785f11

data/lib/angelo/mustermann.rb

@@ -28,6 +28,11 @@ module Angelo
         end
       end
 
+      def socket path, &block
+        path = ::Mustermann.new path
+        routes[:socket][path] = WebsocketResponder.new &block
+      end
+
       def routes
         @routes ||= {}
         ROUTABLE.each do |m|
@@ -44,9 +49,12 @@ module Angelo
 
     class RouteMap < Hash
       def [] route
+        responder = nil
         mustermann = keys.select {|k| k.match(route)}.first
-        responder = fetch mustermann
-        responder.mustermann = mustermann
+        if mustermann
+          responder = fetch mustermann
+          responder.mustermann = mustermann
+        end
         responder
       end
     end

data/lib/angelo/responder/websocket.rb

@@ -17,6 +17,7 @@ module Angelo
     def handle_request
       begin
         if @response_handler
+          Angelo.log @connection, @request, @websocket, :switching_protocols
           @bound_response_handler ||= @response_handler.bind @base
           @bound_response_handler[@websocket]
         else

data/lib/angelo/responder.rb

@@ -1,3 +1,5 @@
+require 'date'
+
 module Angelo
 
   class Responder
@@ -62,7 +64,9 @@ module Angelo
     end
 
     def handle_error _error, report = true
-      @connection.respond :internal_server_error, headers, error_message(_error)
+      err_msg = error_message _error
+      Angelo.log @connection, @request, nil, :internal_server_error, err_msg.size
+      @connection.respond :internal_server_error, headers, err_msg
       @connection.close
       if report
         error "#{_error.class} - #{_error.message}"
@@ -114,6 +118,7 @@ module Angelo
                 raise 'html response requires String' if respond_with? :html
                 @body.to_json if respond_with? :json
               end
+      Angelo.log @connection, @request, nil, :ok, @body.size
       @connection.respond :ok, headers, @body
     rescue => e
       handle_error e, false

data/lib/angelo/server.rb

@@ -13,26 +13,14 @@ module Angelo
     def on_connection connection
       # RubyProf.resume
       connection.each_request do |request|
-        if request.websocket?
-          debug "got websocket request..."
-          route_websocket connection, request
-        else
-          route_request connection, request
-        end
+        meth = request.websocket? ? :socket : request.method.downcase.to_sym
+        route! meth, connection, request
       end
       # RubyProf.pause
     end
 
     private
 
-    def route_request connection, request
-      route! request.method.downcase.to_sym, connection, request
-    end
-
-    def route_websocket connection, request
-      route! :socket, connection, request
-    end
-
     def route! meth, connection, request
       rs = @base.routes[meth][request.path]
       if rs
@@ -41,6 +29,7 @@ module Angelo
         responder.connection = connection
         responder.request = request
       else
+        Angelo.log connection, request, nil, :not_found
         connection.respond :not_found, DEFAULT_RESPONSE_HEADERS, NOT_FOUND
       end
     end

data/lib/angelo/version.rb

@@ -1,3 +1,3 @@
 module Angelo
-  VERSION = '0.0.9'
+  VERSION = '0.1.0'
 end

data/lib/angelo.rb

@@ -32,6 +32,20 @@ module Angelo
 
   NOT_FOUND = 'Not Found'
 
+  LOG_FORMAT = '%s - - "%s %s%s HTTP/%s" %d %s'
+
+  def self.log connection, request, socket, status, body_size = '-'
+    Celluloid::Logger.debug LOG_FORMAT % [
+      socket.nil? ? connection.remote_ip : socket.peeraddr(false)[3],
+      request.method,
+      request.path,
+      request.query_string.nil? ? nil : '?'+request.query_string,
+      request.version,
+      Symbol === status ? HTTP::Response::SYMBOL_TO_STATUS_CODE[status] : status,
+      body_size
+    ]
+  end
+
 end
 
 require 'angelo/version'

data/spec/angelo/mustermann_spec.rb

@@ -49,6 +49,12 @@ if RUBY_VERSION =~ /^2\./
         end
       end
 
+      it '404s correctly for not found routes' do
+        path = '/bad/monkey'
+        get path
+        last_response.status.should eq 404
+      end
+
     end
 
     describe 'tilt/erb integration' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: angelo
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - Kenichi Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-20 00:00:00.000000000 Z
+date: 2014-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reel