culpa 0.7.0 → 0.7.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDI0OTI3ODBhMjhjYjQxODMxODc3ZjJkOTVmM2M1ODhmZDJiZjQ2Mg==
+    MTYyMDA4YTVhMWM0MzE1YzJhYzI2OTI0Y2ZmMjkzYmU5YmYzNzk3NA==
   data.tar.gz: !binary |-
-    OTEzOWU1ZjM3NGJkMDU4M2MwYjJiZDg4NzlhZDZmYzJmNDkyYzE0NA==
+    YjhmYTIxZTQzNTUzYzNmZjBiYTE2NjExZDEwMjk1NjkwOTUwYWM1OA==
 SHA512:
   metadata.gz: !binary |-
-    NGFkOTA3NzIyODFjODI3M2RjYTA2ODUxMTgyMzkwZDUwNGI2NWMyMjVhZTk1
-    ZTJmOGMyODdlZjg1ODQ5YWI4YjBkMjRmZmJjMTRhN2Q2MjQyNTViMWU1YjM5
-    MjgyYWNiZTA4MmIzZDBhMjBkYTE3MjEwNjhjYmQxNTFkYTJlNmU=
+    ODViMGZhZjAwMDJjOTU2ZGJkMDE5ZGUyMmUyMWIzZmI5YWEwNjFkODQzZjY3
+    YTBjNGZlMTQ2ODQ3M2UzY2U4ZjY0MjViMTU0Y2IzYzUzNGJmNzI0ZGE4ODA1
+    N2YzZmI5ZDJlOTE1YTY1ZGZiOGFhZTM5Mzg2NzA0ZWNkZGQ3MmI=
   data.tar.gz: !binary |-
-    YjRlMGVmYjJiZjU1YmM1MDQ1Nzg1MmUxYjIzNjhjNThkMWRiYTZhYjE4MmQy
-    ZjRkYWNjYjE0NGVkMTNkYmIzZGRjYzI0ZmM2YmRiZDU1OWVmMzc3NzJiZGY1
-    OTY1NDRiMzE1MmJiZWFhMjAyZDNjOTY4MjEwNjU2YjQxMzUxY2I=
+    OTRhNjQ3ZjliZjRhNjYxNjMwNTliYmViZmZhZjRmYjkxODA0YmQ5NGM4Zjdl
+    NjgxZWI1ZjU5N2U3YmExNjE4M2ZlNGQ5MzFiYjQ3YjM3ZGM2NTMwOGFjZGJh
+    YzE3ZGYzMTI0NmQxZjJmYTU4MTRkYzI3OTA5YWFhZmM0NjQ3YzE=

data/lib/culpa.rb

@@ -7,7 +7,7 @@ require 'envelope'
 require 'path_parser'
 require 'file_helpers'
 
-CULPA_VERSION='0.7.0'
+CULPA_VERSION='0.7.1'
 
 ACTIONS_PATH ||= './actions/*.rb'
 MODELS_PATH ||= './models/*.rb'
@@ -40,15 +40,14 @@ module Culpa
 
     def initialize(options = {})
       @router = YAML.load_file(options[:router] || './config/router.yml')
-      @logger = Logger.new(STDOUT)
+      @logger = Logger.new(options[:log_output] || STDOUT)
       @logger.level = ENV['RACK_ENV'] == 'development' ? Logger::DEBUG : Logger::WARN
-      @logger.info 'Culpa initialized'
+      @logger.info 'Culpa fully initialized'
     end
 
     ##
     # Rack entrypoint
     def call(env)
-      @logger.debug "Request received : #{env['PATH_INFO']}"
       call_options = {
           verb: env['REQUEST_METHOD'].downcase.to_sym,
           params: Rack::Utils.parse_nested_query(env['QUERY_STRING'])
@@ -56,9 +55,7 @@ module Culpa
       # Parse body if in JSON
       if env['CONTENT_TYPE'] == 'application/json'
         body = JSON.parse(env['rack.input'].read)
-        if body.has_key? 'sub_call'
-          call_options[:sub_call] = body['sub_call']
-        end
+        call_options[:sub_call] = body['sub_call'] if body.has_key? 'sub_call'
         call_options[:input] = body['data']
       else
         call_options[:input] = env['rack.input']
@@ -92,12 +89,17 @@ module Culpa
         call_options[:id] = route_params[:id]
         call_options[:sub_call] = route_params[:sub_call]
       else
-        @logger.debug "Refused request, #{env['PATH_INFO']} didn't match enforced routes"
+        @logger.info "Refused request, #{env['PATH_INFO']} didn't match enforced routes"
         return bad_request
       end
       # Call the brickchain and return the value to Rack
-      @logger.debug "Calling brickchain => subcall: #{call_options[:sub_call]}, action: #{call_options[:res_name]}, id: #{call_options[:id]}"
+      @logger.info "Calling brickchain => subcall: #{call_options[:sub_call]}, action: #{call_options[:res_name]}, id: #{call_options[:id]}"
       call_brickchain call_options
+    rescue UnpredictableSubCallError, JSON::ParserError
+      bad_request
+    rescue StandardError => error
+      @logger.error "Error ecountered while treating request : #{error.message}, aborting...\n#{error.backtrace.join("\n")}"
+      internal_server_error
     end
 
     def call_brickchain(options)
@@ -163,6 +165,12 @@ module Culpa
       ['404', {'Content-Type' => 'application/json'}, []]
     end
 
+    ##
+    # Rack pre-formatted 404 : Not found
+    def internal_server_error
+      ['500', {'Content-Type' => 'application/json'}, []]
+    end
+
   end
 
 end

metadata

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