angelo 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55ec6c0b7ba672c2c75bf6c18ea54e465dba68aa
-  data.tar.gz: 60d95a47a93e1509782c9967c0fc42f0e5d0b7e0
+  metadata.gz: c49fed8026c10ee370aea064b5be14c7a38848b1
+  data.tar.gz: b56899e2f4ac2310c414b09bb2838357e223df6c
 SHA512:
-  metadata.gz: 1bd103e7497922c6bf8489577f3f87d5bcbf046abf4524731b6c9c98c68f3791ca0dee51ed42232bd166d2c99ef9fc40d7f26fa1f8e6d19bbd62d4ffd9dee271
-  data.tar.gz: 3a33ada93accc65b7843d6c910e075932b5f556fede208eea01405d10361f458976199c0cd8086fb3048330f4eda8c4553435773f66a8df12c1cb35ad2785f11
+  metadata.gz: bfcc2c164ab9d1908ff4f5c0557c115395d3ab48bd92c530d5040cac4e29c469c4a718cf15206e746d78da12d891bc01555a493b359b481bfed2c85987370a11
+  data.tar.gz: a586ff3c8271e29e7475b1c26a796240a0854e86f3c0449e7f099da02c95e725b0dd298623d9ecd7058bc4465c8061cee468cbf75bf12de32523ad35a64eca91

data/lib/angelo/params_parser.rb

@@ -2,14 +2,19 @@ require 'cgi'
 
 module Angelo
 
+  class FormEncodingError < StandardError; end
+
   module ParamsParser
 
     EMPTY_JSON = '{}'
     SEMICOLON = ';'
+    EQUALS = '='
+    AMPERSAND = '&'
 
     def parse_formencoded str
-      str.split('&').reduce(Responder.symhash) do |p, kv|
-        key, value = kv.split('=').map {|s| CGI.unescape s}
+      raise FormEncodingError unless str.empty? or str.index EQUALS
+      str.split(AMPERSAND).reduce(Responder.symhash) do |p, kv|
+        key, value = kv.split(EQUALS).map {|s| CGI.unescape s}
         p[key] = value
         p
       end
@@ -21,14 +26,18 @@ module Angelo
 
     def parse_post_body
       body = request.body.to_s
+      qs = parse_query_string
       case
       when form_encoded?
         body = parse_formencoded body
+        qs.merge! body
       when json?
         body = EMPTY_JSON if body.empty?
         body = JSON.parse body
+        qs.merge! body
+      else
+        qs
       end
-      parse_query_string.merge! body
     end
 
     def form_encoded?
@@ -40,7 +49,11 @@ module Angelo
     end
 
     def content_type? type
-      request.headers[CONTENT_TYPE_HEADER_KEY].split(SEMICOLON).include? type
+      if request.headers[CONTENT_TYPE_HEADER_KEY]
+        request.headers[CONTENT_TYPE_HEADER_KEY].split(SEMICOLON).include? type
+      else
+        nil
+      end
     end
 
   end

data/lib/angelo/responder.rb

@@ -59,14 +59,18 @@ module Angelo
       else
         raise NotImplementedError
       end
+    rescue JSON::ParserError => jpe
+      handle_error jpe, :bad_request, false
+    rescue FormEncodingError => fee
+      handle_error fee, :bad_request, false
     rescue => e
       handle_error e
     end
 
-    def handle_error _error, report = true
+    def handle_error _error, type = :internal_server_error, report = true
       err_msg = error_message _error
-      Angelo.log @connection, @request, nil, :internal_server_error, err_msg.size
-      @connection.respond :internal_server_error, headers, err_msg
+      Angelo.log @connection, @request, nil, type, err_msg.size
+      @connection.respond type, headers, err_msg
       @connection.close
       if report
         error "#{_error.class} - #{_error.message}"
@@ -121,7 +125,7 @@ module Angelo
       Angelo.log @connection, @request, nil, :ok, @body.size
       @connection.respond :ok, headers, @body
     rescue => e
-      handle_error e, false
+      handle_error e, :internal_server_error, false
     end
 
   end

data/lib/angelo/tilt/erb.rb

@@ -52,7 +52,12 @@ module Angelo
 
       def erb view, opts = {locals: {}}
         locals = Hash === opts[:locals] ? opts[:locals] : {}
-        render = ->{self.class.templates[view].render self, locals}
+        render = case view
+                 when String
+                   ->{ view }
+                 when Symbol
+                   ->{self.class.templates[view].render self, locals}
+                 end
         case opts[:layout]
         when false
           render[]

data/lib/angelo/version.rb

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

data/lib/angelo.rb

@@ -35,8 +35,17 @@ module Angelo
   LOG_FORMAT = '%s - - "%s %s%s HTTP/%s" %d %s'
 
   def self.log connection, request, socket, status, body_size = '-'
+
+    remote_ip = ->{
+      if socket.nil?
+        connection.remote_ip rescue 'unknown'
+      else
+        socket.peeraddr(false)[3]
+      end
+    }
+
     Celluloid::Logger.debug LOG_FORMAT % [
-      socket.nil? ? connection.remote_ip : socket.peeraddr(false)[3],
+      remote_ip[],
       request.method,
       request.path,
       request.query_string.nil? ? nil : '?'+request.query_string,
@@ -44,6 +53,7 @@ module Angelo
       Symbol === status ? HTTP::Response::SYMBOL_TO_STATUS_CODE[status] : status,
       body_size
     ]
+
   end
 
 end

data/spec/angelo/params_spec.rb

@@ -68,4 +68,13 @@ describe Angelo::ParamsParser do
     parser.parse_post_body.should eq post_params
   end
 
+  it 'does not parse POST bodies if no Content-Type' do
+    parser.form_encoded = false
+    parser.json = false
+    parser.query_string = get_params
+    parser.body = nil
+    parser.parse_post_body.should eq params_s
+    parser.parse_query_string.should eq params_s
+  end
+
 end

data/spec/angelo_spec.rb

@@ -37,8 +37,7 @@ describe Angelo::Base do
 
     it 'responds to get requests with json properly' do
       get '/json', obj
-      string_vals = obj.keys.reduce({}){|h,k| h[k] = obj[k].to_s; h}
-      last_response_should_be_json string_vals
+      last_response_should_be_json obj_s
     end
 
     it 'responds to post requests with json properly' do
@@ -277,6 +276,33 @@ describe Angelo::Base do
   end
 
   describe 'params helper' do
+
+    define_app do
+
+      [:get, :post].each do |m|
+        __send__ m, '/json' do
+          content_type :json
+          params
+        end
+      end
+
+    end
+
+    it 'parses formencoded body when content-type is formencoded' do
+      post '/json', obj, {'Content-Type' => Angelo::FORM_TYPE}
+      last_response_should_be_json obj_s
+    end
+
+    it 'does not parse JSON body when content-type is formencoded' do
+      post '/json', obj.to_json, {'Content-Type' => Angelo::FORM_TYPE}
+      last_response.status.should eq 400
+    end
+
+    it 'does not parse body when request content-type not set' do
+      post '/json', obj, {'Content-Type' => ''}
+      last_response_should_be_json({})
+    end
+
   end
 
   describe 'websockets helper' do

metadata

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