culpa 0.4.2 → 0.5.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjUxOGU1NTE3M2U2YmM1NGQ4NzI0MTg2NWU3ZmI3MDAxMzhhNDNiMA==
+    NmIyYjkwNWQxYjk0ODc5MzQ5MWIxOTFmMGUzYTYwNThlZWU3ZGI0Ng==
   data.tar.gz: !binary |-
-    OGQ4YTY4NDM1NWQxYmQxY2FiZjlhM2QyYTdiZGZmMTQ2YjllZmJiMw==
+    NGQzM2I2ZGY0NzE5ODg0OTlkYWU5MjM2MzYxOGViMjdjMGE2YTExZQ==
 SHA512:
   metadata.gz: !binary |-
-    NzI1Njk3ZWYyMDViNGM5NmJhZjViMmZhMmYyNmE2MDdlMWI0YjY4ZTE1YzYy
-    MmE1ZTk0Y2ZjYTNiYzY2OGE4ZTY1OTdmODY3YjVhNjNjZTg0OGVkYmVlNGYy
-    NTBhNTM3Y2JkMzY1YWIwNmVkZDg3ZjBhOWVjOGUxNWRlODQyN2M=
+    MWVlZTE0Y2EyZjgzNzg2YWZmZjBlODdkZTEyZjMwMmFkODA4ZmI1MmNhOGVj
+    MzkxYjA4NzdlMTc0NTk3MTcyMzdlZGYxZDM0YWFhMWQ1YjY0NTYxYTU2NTQ2
+    YWRkYTFiZTkwNGQ2MzIyYWM1Y2JmZGFiOWViY2NlMjkzOGI0Mjc=
   data.tar.gz: !binary |-
-    NjYwOGVhZjEyM2FjZmZjMDU2MjBkZTAyYWJlZGIyMjE1YWEwZjBmMTMwYWI5
-    ZGI2MWZhM2QzNmIwOGI4MTg2ZTNjYWZmZDhiYWE5YWZjZDJhZDJmMjVmZWE0
-    ZjE0MzAxMjFlYTA2NGM4NzQxNzcwMzk0ZDk4OWE4ZmJhNDJhN2Q=
+    YjYyY2QxZGViYWE3ZTI5NTA2MDU0OWVkM2NiMjIwNzY1YTM2NjE1ODU1NWEy
+    MzlmNWQ1ZmMyZDhhNTBjNTJlM2U5MDc5YWIwMWQ4YmUxNzYxNDhhYzYwYTZm
+    YTg5NmVlYWQ1MzMxNjcxNTMwMWI4OGRjYmMzNmExODAwNzAwM2Q=

data/bin/culpa

@@ -20,7 +20,6 @@ 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

@@ -38,14 +38,13 @@ module Culpa
     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_brickchain(options)
       router_method_name = "#{options[:sub_call]}_#{options[:res_name]}"
       envelope =  Envelope.new
       request = EnvelopeRequest.new(options)
-      bricks = generate_brickchain(router_method_name)
+      bricks = @router[router_method_name]
       return not_found unless bricks
       bricks.each do |brick|
         action_class_name, method_name = brick.split('.')
@@ -56,40 +55,6 @@ module Culpa
       raise NoRenderCalled.new
     end
 
-    ##
-    # Building the brick chain for a router method.
-    # Gets before bricks in reverse router and merge it with standard calls.
-    # Keeps the brickchain in cache for later calls.
-    def generate_brickchain(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)
@@ -111,6 +76,7 @@ module Culpa
           verb: env['REQUEST_METHOD'].downcase.to_sym,
           params: Rack::Utils.parse_nested_query(env['QUERY_STRING'])
       }
+      # Parse body if in JSON
       if env['CONTENT_TYPE'] == 'application/json'
         body = JSON.parse(env['rack.input'].read)
         if body.has_key? 'sub_call'
@@ -120,6 +86,7 @@ module Culpa
       else
         call_options[:input] = env['rack.input']
       end
+      # Try the known routes
       if !(route_params = PathParser.parse('/:res_name', env['PATH_INFO'])).nil?
         call_options[:res_name] = route_params[:res_name]
         case call_options[:verb]
@@ -150,6 +117,7 @@ module Culpa
       else
         return bad_request
       end
+      # Call the brickchain and return the value to Rack
       call_brickchain call_options
     end
 

metadata

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