culpa 0.2.1 → 0.2.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzFhNDg4ZjgyOGZkYzVhNTFhNTU0ZmNkMThlYjA5OWRiNzY2ZDZkOA==
+    YTNmOTRkMzhlZjlhYTQ5ZmQ0MGNiNjQ0Mjc3MTQyZjhjMDQzNmVlYg==
   data.tar.gz: !binary |-
-    YWJjNTlkOTdmN2JiOTA2NTg3MGU4ZmU1YjNmNWU5NjNkZWM5YjM0Nw==
+    ZWEwODA0NzhiZTdkYjgyOWZkOGJiMmY3NWYzOGFhZGZmMTlhZDg0MA==
 SHA512:
   metadata.gz: !binary |-
-    MTRhYzE3NGM2ZWYxY2MxMDQ4YTNhNTg5NTk4YzliMWUzODdhMDBlNTk4OGY0
-    ZDBjODkwYmE4ZmZmZjlmODZiNjYxN2QwMzIxZDQzNjY4YWI3NjNkMDA4ZjQ1
-    MTczYWE2MjhlODU2NTgzMmU4YTAyY2Y0MzBmNTFhNTJjYThhMmU=
+    NjZkZmJiMzJjZGYyNjkzODYzMmMyZTI2YmY1OWU5MmZiYzBkNDBjOGYwZDE5
+    ZTk0NWQ3MmMzZTVjMGI1OTUwN2QzY2U4YWNhMmJjZTUxOTJhYTY4MDIwMzU5
+    MDdkNjAwODhmNzA5NWQ5NzM3YWYyZTQ5NWEyYTIzMzRhYmU4ZjE=
   data.tar.gz: !binary |-
-    NjU3ODhiOTI4ZDJmNGY4ZDY4N2NlZWU3ZDZhMzMyYjk0YTMwNGI5ZmQxNjNk
-    NTc5ZTFkOGE3ZGY3YjA5MDkxNWJhOGY2NTc4ZDY5NDc5Y2JlYTQ5ZTRhODkw
-    MTM4YzMyMjg3ZDk3YjkwN2IzZDg3NWE2NWM0ZTQ4NDI2ZDI0Mjc=
+    ZmEwZDQ3ODAwNmMyZDg2Njc2NzA1ZjI5ZGNhYzdhNmY0YWVkMmI1NjdhYTRh
+    ZGU5ZWRiNzU5MWY1MjUxZmE5ZmNiMGM4MTU5NzNjMTJmMjI4YTM1YjBjNWZl
+    YjBhNmE4YzNiZDJmYTk1MDhkNTAzMzcxOGFhMzNiYWU5OTE0ODE=

data/bin/culpa

@@ -17,6 +17,7 @@ def create_project(project_path)
   FileUtils.touch "#{project_path}/models/.keep"
   FileUtils.mkdir "#{project_path}/config"
   FileUtils.touch "#{project_path}/config/router.yml"
+  FileUtils.touch "#{project_path}/config/rev_router.yml"
   FileUtils.mkdir "#{project_path}/config/initializers"
   FileUtils.touch "#{project_path}/config/initializers/.keep"
 

data/lib/culpa.rb

@@ -30,17 +30,20 @@ module Culpa
 
   class Application
 
-    def initialize(router = {})
-       @router = router
+    def initialize(options = {})
+      @brick_call_chains_cache = {}
+      @router = YAML.load_file(options[:router] || './config/router.yml')
+      @rev_router = YAML.load_file(options[:rev_router] || './config/rev_router.yml')
     end
 
     def call_action(options)
       router_method_name = "#{options[:sub_call]}_#{options[:res_name]}"
       envelope =  Envelope.new
       request = EnvelopeRequest.new(options)
-      return not_found unless @router.has_key? router_method_name
-      @router[router_method_name].each do |method|
-        action_class_name, method_name = method.split('.')
+      bricks = brick_call_chain(router_method_name)
+      return not_found unless bricks
+      bricks.each do |brick|
+        action_class_name, method_name = brick.split('.')
         action_class = Actions.const_get(action_class_name).new(envelope, request)
         action_class.send method_name
         return do_render action_class.to_render if action_class.to_render
@@ -48,7 +51,42 @@ module Culpa
       raise NoRenderCalled.new
     end
 
-    # Render a json or anything else
+    ##
+    # Building the brick chain for a router method.
+    # Gets before and after bricks in reverse router and merge it with standard calls.
+    # Keeps the brickchain in cache for later calls.
+    def brick_call_chain(router_method_name)
+      unless @brick_call_chains_cache.has_key? router_method_name
+        return unless @router.has_key? router_method_name
+        final_call_chain = []
+        # Search for rev_router matches
+        @rev_router.each do |rev_router_item|
+          if rev_router_item.has_key? 'match_only'
+            rev_router_item['match_only'].each do |matcher|
+              if router_method_name.match(Regexp.new("^#{matcher}$"))
+                final_call_chain.concat rev_router_item['bricks']
+                break
+              end
+            end
+          elsif rev_router_item.has_key? 'all_except'
+            one_match = false
+            rev_router_item['all_except'].each do |matcher|
+              one_match ||= router_method_name.match(Regexp.new("^#{matcher}$"))
+              break if one_match
+            end
+            final_call_chain.concat rev_router_item['bricks'] unless one_match
+          end
+        end
+        # Append router call chain
+        final_call_chain.concat @router[router_method_name]
+        # Save in cache
+        @brick_call_chains_cache[router_method_name] = final_call_chain
+      end
+      @brick_call_chains_cache[router_method_name]
+    end
+
+    ##
+    # Renders a json or anything else
     def do_render(to_render)
       body = case to_render[:format]
                when :json
@@ -61,7 +99,8 @@ module Culpa
       [ to_render[:status], to_render[:headers], body ]
     end
 
-    # Called by rack
+    ##
+    # Rack entrypoint
     def call(env)
       call_options = {
           verb: env['REQUEST_METHOD'].downcase.to_sym
@@ -108,12 +147,14 @@ module Culpa
       call_action call_options
     end
 
-    # 400 : Bad request
+    ##
+    # Rack pre-formatted 400 : Bad request
     def bad_request
       ['400', {'Content-Type' => 'application/json'}, []]
     end
 
-    # 404 : Not found
+    ##
+    # Rack pre-formatted 404 : Not found
     def not_found
       ['404', {'Content-Type' => 'application/json'}, []]
     end

data/templates/Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.3.1
+FROM ruby:2.3-alpine
 MAINTAINER Your Name <your@email.com>
 
 # Create app folder

data/templates/config.ru

@@ -3,4 +3,4 @@ require 'bundler/setup'
 require 'yaml'
 require 'culpa'
 
-run Culpa::Application.new(YAML.load_file('./config/router.yml'))
+run Culpa::Application.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: culpa
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Jérémy SEBAN