fit_api 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d36a694f0222623e6ef2d22990328dafcca101afb9862bb10911bb5dd8758275
-  data.tar.gz: c39d8a2d8179cb27390c647265b78068ca9ebbc84ecb2a4a38629563e3b7d4b2
+  metadata.gz: 0d176cc7557464b1cb5b9756b11feb083c8ec735799d2d89e587d3a271794b86
+  data.tar.gz: 5a0a48d8fbf84fd0abd3e82b004b34f9393a522a2cdec75250d6698840cc8dd7
 SHA512:
-  metadata.gz: c573401548394fde83e25e09e132a1c581a2617e3e62815dd853264de96e56743c22b7fd3d549f6354750b7626b9f851fdeeceb5767892069e05d6fd5e432000
-  data.tar.gz: 2fc7176c773d13da6abd1b51891a92bef7d2873c3f36950a7f9a597099c6eef82e2e58c527e632ee4616140e3899cd45df1486ac03c0e374a1ed00f7d0933de2
+  metadata.gz: c079a3c4f083fd3543878d9e6d9cf030ee28b9f91ce67a94b4ca31a5d70c6128f3de32c09822b109ce4188ff897b6dc6b7298f8aa73205a7d05f56c67253fc36
+  data.tar.gz: ca6de1c94256a2840192be7e3fea05d5575a4d57a747be8026540590ca22448a6d40f5fcee52b713a3d7b0f84873b685521a45e7f388be66c00b83d239276fe5

data/README.md

@@ -88,6 +88,14 @@ delete '/test/:id', to: 'app#test_delete'
 
 ### Resources
 
+You can pass the following options:
+
+```
+only
+except
+controller
+```
+
 **Nested:**
 
 ```ruby
@@ -220,12 +228,14 @@ class AppController < FitApi::Controller
   end
   
   def process_post
-    json params 
+    json resource, 201
   end
 end 
 ```
 
-You have the method `#json` available, which basically sets the response body.
+You have the method `#json` available, which basically sets the response body.  
+
+Default status code: ```200```
 
 ----
 
@@ -321,8 +331,8 @@ headers['Header-Name'] = 'Header Value'
 ### Callbacks
 
 ```ruby
-before_action *actions
-after_action *actions, only: %i(index show)
+before_action *actions, only: %i(index show)
+after_action *actions, except: %i(destroy)
 ```
 
 ## TODO:

data/lib/fit_api/controller.rb

@@ -17,11 +17,12 @@ module FitApi
       end
 
       %i(before after).each do |callback_type|
-        define_method "#{callback_type}_action" do |*methods|
-          only = methods.last.is_a?(Hash) ? methods.last[:only] : nil
-          methods.each do |method|
+        define_method "#{callback_type}_action" do |*callbacks|
+          executable_actions = callbacks.last.is_a?(Hash) ? callbacks.last : {}
+
+          callbacks.each do |method|
             unless method.is_a?(Hash) 
-              actions[callback_type] << { method: method, only: only }
+              actions[callback_type] << { method: method }.merge(executable_actions)
             end
           end
         end
@@ -29,23 +30,22 @@ module FitApi
     end
 
     def set_response_headers
-      headers['Date'] = Rack::Utils.rfc2822(Time.now)
-      headers['Content-Type'] = 'application/json'
+      headers['Date'] ||= Rack::Utils.rfc2822(Time.now)
+      headers['Content-Type'] ||= 'application/json'
 
       headers.each &response.method(:add_header)
     end
 
-    private
-
-    def json(hash, status: 200)
-      self.response = Rack::Response.new(hash.to_json, status)
+    def json(object, status = 200)
+      self.response = Rack::Response.new(JSON.pretty_generate(object), status)
     end
 
     def halt(*args)
-      is_integer = args.first.is_a?(Integer)
-      status = is_integer ? args.first : 400
-      error = is_integer ? (args.count > 1 ? args.last : '') : args.first 
-      json(error, status: status)
+      is_int = args.first.is_a?(Integer)
+      status = is_int ? args.first : 400
+      error  = is_int ? (args.count > 1 ? args.last : '') : args.first
+
+      json(error, status)
       raise Halt
     end
   end

data/lib/fit_api/router/mapper.rb

@@ -59,20 +59,30 @@ module FitApi
       private
 
       def set_resource(type, resource, options, &block)
-        options[:only] ||= %i(index show create update destroy)
         options[:controller] ||= resource
-
         path = get_path(type, resource)
 
         @parent = [ type, resource ]
+        @previous = @controller
         @controller = options[:controller] 
 
         namespace path, options do
-          set_actions type, resource, options[:only]
+          set_actions type, resource, get_actions(options)
           instance_eval &block if block
         end
 
-        @parent, @controller = nil, nil
+        @parent, @previous, @controller = nil, nil, @previous
+      end
+
+      def get_actions(options)
+        actions = %i(index show create update destroy)
+        only    = options[:only]
+        except  = options[:except]
+ 
+        return actions & only   if only
+        return actions - except if except
+
+        actions
       end
 
       def set_actions(type, resource, actions)

data/lib/fit_api/router/params.rb

@@ -5,6 +5,10 @@ module FitApi
         @hash = hash
       end
 
+      def to_h
+        @hash
+      end
+
       def to_json
         @hash.to_json
       end

data/lib/fit_api/router/route.rb

@@ -22,7 +22,11 @@ module FitApi
 
         run! controller
       rescue Halt
+        controller.set_response_headers
         controller.response
+      rescue Exception => ex
+        error = { message: "#{ex.message} (#{ex.class})", backtrace: ex.backtrace }
+        controller.json(ENV['RACK_ENV'] == 'production' ? 'An error has occured' : error, 500)
       end
 
       def match?(path)
@@ -50,18 +54,28 @@ module FitApi
         run_callbacks! controller, :before
         controller.send action
         run_callbacks! controller, :after
-        controller.response
-      ensure
         controller.set_response_headers
+        controller.response
       end
 
       def run_callbacks!(controller, type)
-        controller.class.actions[type].each do |action|
-          if action[:only].nil? || action[:only].include?(@action.to_sym)
-            controller.send action[:method]
+        klass = controller.class
+
+        while klass != Object
+          actions = klass.actions[type].each do |rule|
+            controller.send(rule[:method]) if run?(rule)
           end
+          klass = klass.superclass
         end
       end
+
+      def run?(rule)
+        except, only = rule[:except], rule[:only]
+
+        except && !except.map(&:to_s).include?(action) ||
+          only && only.map(&:to_s).include?(action) ||
+            !only && !except
+      end
     end
 
     class Request < Rack::Request

data/lib/fit_api/router.rb

@@ -12,14 +12,12 @@ module FitApi
         status = is_root ? 200 : 404
         res    = is_root ? 'fit-api is working!' : 'Action not found'
 
-        [ status, { 'Content-Type' => 'application/json'}, [ res.to_json ] ]
+        [ status, { 'Content-Type' => 'application/json' }, [ res.to_json ] ]
       end
     end
 
     def self.find(method, path, find_not_found_action = true)
-      routes = mapper.routes[method.downcase]
-      route = routes.find { |route| route.match? path }
-
+      route = mapper.routes[method.downcase].find { |route| route.match? path }
       return route if route
 
       if find_not_found_action

data/lib/fit_api/version.rb

@@ -1,5 +1,5 @@
 module FitApi
   def self.version
-    '1.1.1'
+    '1.1.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fit_api
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Bernardo Castro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-25 00:00:00.000000000 Z
+date: 2019-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack