culpa 0.7.4 → 0.8.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NGM3ZDcyZjEwMDFlNjUxODkxNmM1ZmFmNGUzZjE0M2RhMGJlMTFjOQ==
+    ZWUzODlkNWE4YTE1OWMxNmQyMGZmODBlNzliZTkwMmNmN2MxMGI0ZA==
   data.tar.gz: !binary |-
-    OTRmMDY4ZjFjNmZkZjYwMTg4MDQyNmM4ZGM0NWYxZGExYjlmYjc4Yw==
+    NjdlOGQ4YmY4MDZiNTU1ZWNhZDYyMjY2ZTFjMzAwNGQ3NjY2YjhhYQ==
 SHA512:
   metadata.gz: !binary |-
-    ZjZhNGZhODAxNmYwNGIxMjZjMzllMjBhMDY0MTUzMTk2ZDk3NDM5MjBlNmU2
-    MGFiN2EyM2M3ZDFlNThhZTE1ZDQ1ZWUwMTcwNGY1M2EyZDg2ZmNjNmVjYTFh
-    ZTc3NWYxMDFlMWU3OGFhNDY0NDZmMTE5N2I1M2E4OGUxYTMyZGQ=
+    MjIwYWNkZWMxMDJhMTQwNjU5Yjk0NTJjYTNhMTY3ZDQ3NWZmYWQ2NDJjZjZk
+    NTc5ODM1NGFjYTZhYTAzYTdmN2RlZWRmYWZhMTcxZTdjNzA3MGIzNTU2NTYz
+    ZjA3N2FhNTM1ZjJiNDJkOTQzOWQxMDViOTAyYzI2NzA0YmFlMjI=
   data.tar.gz: !binary |-
-    ZGQ3MjAwMTZjODAyOTc1OWIxNDMxYjY4MjVmNmNhMGMyZDgyZDIyNDI5OTBl
-    Mzg5MDM2NTJkNmJlN2ZlYjE4YmRhZmY3NmIxZWM5M2VlNmUwNTA1ZjY0Yjky
-    ZDM0OTUzM2I1NGQyNjBjNDE1ODY5YTA3MDY5MDRkYTk5Mzc3MWI=
+    M2Y3MjdlZDlhODhlNTgxM2MzOTFmODEyNDFjMGU0ZGY0YTRiNDU1MGQ2Yjlh
+    NGZhYTljMDYwYzFjOTY3NmFmYzQ1ZDNiYmU4YjYxYTE0NDlkNzE5NzM0ZWFi
+    YTc0M2E5MDZhMjFmYmYyYzUwMTdmMzc3OTllYmNiMTllYWIzNmU=

data/lib/action.rb

@@ -55,9 +55,15 @@ class Action
       unknown_error: 520
   }
 
-  attr_accessor :to_render
   attr_reader :e, :r, :logger
 
+  class RenderNow < StandardError
+    attr_reader :to_render
+    def initialize(to_render)
+      @to_render = to_render
+    end
+  end
+
   def initialize(envelope, request, logger)
     @e = envelope
     @r = request
@@ -94,6 +100,7 @@ class Action
     else
      raise Culpa::UnknownRenderCall.new
     end
+    raise RenderNow.new(@to_render)
   end
 
 end

data/lib/culpa.rb

@@ -7,7 +7,7 @@ require 'envelope'
 require 'path_parser'
 require 'file_streamer'
 
-CULPA_VERSION='0.7.4'
+CULPA_VERSION='0.8.0'
 
 ACTIONS_PATH ||= './actions/*.rb'
 MODELS_PATH ||= './models/*.rb'
@@ -117,15 +117,15 @@ module Culpa
         # Iterating over the brickchain of this request
         if brick.is_a? String
           # This brick is a sychronous call, processing call directly.
-          action_class = brick_call brick, envelope, request
-          return do_render(action_class.to_render) if action_class.to_render
+          result = brick_call brick, envelope, request
+          return result if result
         elsif brick.is_a?(Hash) && brick.has_key?('async')
           # This brick is a bundle of async bricks, treating it in threads.
           brick['async'].map { |async_brick|
             Thread.new { brick_call(async_brick, envelope, request) }
           }.each { |thread|
-            action_class = thread.value
-            return do_render(action_class.to_render) if action_class.to_render
+            result = thread.value
+            return result if result
           }
         end
       end
@@ -138,7 +138,9 @@ module Culpa
       action_class_name, method_name = brick.split('.')
       action_class = Actions.const_get(action_class_name).new(envelope, request, @logger)
       action_class.send method_name
-      action_class
+      return false
+    rescue Action::RenderNow => renderer
+      return do_render(renderer.to_render)
     end
 
     ##

data/lib/rspec_helper.rb

@@ -17,7 +17,8 @@ module CulpaHelpers
     def call
       action_class = Actions.const_get(@action).new(@envelope, @request, @logger)
       action_class.send @method.to_s
-      return action_class.to_render
+    rescue Action::RenderNow => renderer
+      return renderer.to_render
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: culpa
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.8.0
 platform: ruby
 authors:
 - Jérémy SEBAN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-08 00:00:00.000000000 Z
+date: 2016-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack