flon 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dcd15fb29f7a61dc56644751c6b3f3f6a6181e148a386e71b2b9d5197048f3dd
-  data.tar.gz: f12632af7ac2b14a6ba79a77fcb8cdc0d6905de5ad47bb59bc73a5d5b39d3089
+  metadata.gz: 9d77f8f763e06566ba8fd67310e4bf2eb7cf25cf1a2927685973c8ab8310a673
+  data.tar.gz: f693eedb16f5dbff5505c00408ff728b4dbf8911294dea690d36139b811027db
 SHA512:
-  metadata.gz: c552c94ec88849cdfb0d6e68b584609154f7ff73f9d486ee95860bca47416f2bb15327a6f97890810c5c8de2cb9a0e75c8503985d000448115e9d2e518e66bd7
-  data.tar.gz: 9051e7d9f471a94b78a3731e2996eee2e61c9d7f10babc144873314a1d4cbc8cd6b2b1d1036ae99da34fd412b56411e0681d2872e91b731b3996fe914628723f
+  metadata.gz: 1ff850c5ec62797dfba5deda611c90aa941110e824bc39bb3cb577fa04594e2f1b7e5210874a9e910b9d5b136d9c7ecb40b23077b800d1b3f39a3b82549a011f
+  data.tar.gz: 179296c86b0de6ebca2629a1977a78159d1e4f261f03d3b397a834a9f41c89c5cb7cd129825aee22285d1d6ccf7421efa8f1909f834a3aac79a7ff8384d6a3b4

data/README.md

@@ -48,12 +48,12 @@ class MyApi
     namespace '/:index' do
       get '/'
       def name_by_index(params)
-        @names[params[:index]]
+        @names[params[:index].to_i]
       end
 
       put '/edit'
       def change_name(params, body)
-        @names[params[:index]] = body
+        @names[params[:index].to_i] = body
       end
     end
   end
@@ -138,12 +138,12 @@ namespace '/users' do
   namespace '/:id' do
     get
     def user_by_id(params) # GET /users/:id
-      @users[params[:id]]
+      @users[params[:id].to_i]
     end
 
     put '/edit'
     def edit_user(params, body) # PUT /users/:id/edit
-      @users[params[:id]] = body
+      @users[params[:id].to_i] = body
     end
   end
 end

data/lib/flon/api.rb

@@ -34,27 +34,57 @@ module Flon
     # @return [Array] a rack-suitable response
     def call(env)
       request = Rack::Request.new(env)
-      response = dispatch(request)
+
+      method = http_method_to_symbol(request.request_method)
+      path   = request.path_info
+
+      response = case (match = @router.match(method, path))
+                 when :bad_path   then Response.new(404, '"404 Not Found"')
+                 when :bad_method then Response.new(405, '"405 Method Not Allowed"')
+                 else dispatch(method, request, match)
+                 end
+
       [response.status, { 'Content-Type' => 'application/json' }, [response.body]]
     end
 
     private
 
-    def dispatch(request)
-      method = http_method_to_symbol(request.request_method)
-      path   = request.path_info
+    def dispatch(method, request, match)
+      params = coalesce_params(request.params, match.params)
+
+      if receives_body?(method)
+        body = normalise_body(request)
+        return Response.new(415, '"415 Unsupported Media Type"') if body == :fail
+      else
+        body = nil
+      end
+
+      call_action(match.action, params, body)
+    end
 
-      match = @router.match(method, path)
-      case match
-      when :bad_path then Response.new(404, '"404 Not Found"')
-      when :bad_method then Response.new(405, '"405 Method Not Allowed"')
-      else call_action(request.params, match, receives_body?(method) ? request.body.read : nil)
+    def coalesce_params(request_params, route_params)
+      request_params.transform_keys(&:to_sym).merge(route_params)
+    end
+
+    def normalise_body(request)
+      body = request.body.read
+      return body if body.empty?
+
+      return :fail unless request.get_header('Content-Type') == 'application/json'
+
+      begin
+        JSON.parse(body)
+      rescue JSON::JSONError
+        :fail
       end
     end
 
-    def call_action(params, match, body)
-      params = params.transform_keys(&:to_sym).merge(match.params)
-      responsify(call_respect_arity(match.action.bind(@api), params, body))
+    def receives_body?(http_method)
+      http_method != :get && http_method != :delete
+    end
+
+    def call_action(action, params, body)
+      responsify(call_respect_arity(action.bind(@api), params, body))
     end
 
     def responsify(result)
@@ -74,10 +104,6 @@ module Flon
       http_method.downcase.to_sym
     end
 
-    def receives_body?(http_method)
-      http_method != :get && http_method != :delete
-    end
-
     def valid_api?(api)
       api.class.respond_to?(:router) && api.class.router.is_a?(Flon::Router)
     end

data/lib/flon/version.rb

@@ -2,5 +2,5 @@
 
 module Flon
   # Flon's version.
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flon
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - unleashy