culpa 0.7.1.1 → 0.7.2.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWJlNzgyODA2NGIwNWUxMzFkMzE0ZTY3ZjI2MGVmN2FiNjM5NjZjNg==
+    ZjY1YjM1ZmM4ZGJiYzBhYmMxMTM4MzMzYmEzMTZjYjg4OGU0YjZmOA==
   data.tar.gz: !binary |-
-    NDc3NmNkZTU4NjlkZWRmZWQwNTFjMWQxYjg5NGIxY2FmY2I4YjUyYg==
+    MTBjYTBhYmY5OGIyYWUyYTgyZWMxNjlhODFhZTRiZDE4YTllYzgyOA==
 SHA512:
   metadata.gz: !binary |-
-    OGQ4ZmRlZDM5ZmZlMGQ0YzI0MTAzNjZiNWYzMzE1YjM3ZmViZTExMzBhZDU5
-    YTRjZDNkNTNmMmNmM2U2ZDZlNmFhNzE4ZjZjNmM1ZjRmODU5ZTA4Yjk5OGUw
-    MDdhMGYyNDQ2ZWRmNWE5ZDBlMTlhMTk5YjE3NjA3YjgxZGFjZDY=
+    OGRjZDI4OTBjYTYxYWNkMTRlZjA2YTFiZTk1NWM3NWU0ZTI0MTRmYzg4NGM5
+    NzUwZmU5ZTExMWJmZTczYjZjOTFjYTU3YWU3Y2U5YjRlZDNhYjE4ZjQxYmEx
+    YmNkOGRjYjA4MTE0MzNhNGY4ZjM2ZDIzNTI3NDczMmM0ZTk4OGM=
   data.tar.gz: !binary |-
-    YTUzNTNkNzA4MWI1NTc3M2E3MWFlMGYxNDYwYWEyMzFkNzE2Yjg1NGVlYjUz
-    Mjc3MTE5MWUwOGQyNWVmZjAxOGUxYjBjNzUxNGJiODBiYzYyNmI5MjhmYjFm
-    MzFhZmQ3ZWE1ZjNiODhlYTU2MmM5YWZjNTQ4NGViMmMwNTFjMTE=
+    Mzg5ZDc5YmFjNjIwN2ZlZmYzZjM1ZDlhNjNjZWJkMjQwNGRkMDI2MTFiZDhl
+    YWM4NTc1MDM4MWIxMDM5OTIxY2JlMmZjYjk2Mjk3MDA3ZGMwZmNiMGMwOGQ2
+    NzEzZGU2NGExMTJhOThiMGVkNjFkZjllMmI1ZDUyZDYxZTgwMzU=

data/lib/action.rb

@@ -56,21 +56,15 @@ class Action
   }
 
   attr_accessor :to_render
+  attr_reader :e, :r, :logger
 
-  def initialize(envelope, request)
+  def initialize(envelope, request, logger)
     @e = envelope
     @r = request
+    @logger = logger
     @to_render = nil
   end
 
-  def e
-    @e
-  end
-
-  def r
-    @r
-  end
-
   def render(options={})
     options[:headers] ||= {}
     if options.has_key? :json
@@ -88,7 +82,7 @@ class Action
              'Content-Disposition' => "#{options[:disposition].to_s || 'attachment'}; filename=#{options[:filename] || 'unknown'}",
          }.merge(options[:headers]),
          status: RETURN_CODES[options[:status]] || 200,
-         object: FileHelpers::Streamer.new(options[:file])
+         object: Culpa::FileStreamer.new(options[:file])
       }
       @to_render[:headers]['Content-Length'] = options[:size] if options.has_key? :size
     elsif options.has_key? :status

data/lib/culpa.rb

@@ -5,9 +5,9 @@ require 'logger'
 
 require 'envelope'
 require 'path_parser'
-require 'file_helpers'
+require 'file_streamer'
 
-CULPA_VERSION='0.7.1.1'
+CULPA_VERSION='0.7.2.1'
 
 ACTIONS_PATH ||= './actions/*.rb'
 MODELS_PATH ||= './models/*.rb'
@@ -41,7 +41,12 @@ module Culpa
     def initialize(options = {})
       @router = YAML.load_file(options[:router] || './config/router.yml')
       @logger = Logger.new(options[:log_output] || STDOUT)
-      @logger.level = ENV['RACK_ENV'] == 'development' ? Logger::DEBUG : Logger::WARN
+      @logger.level = case ENV['RACK_ENV']
+                        when 'development', 'test'
+                          Logger::DEBUG
+                        else
+                          Logger::WARN
+                      end
       @logger.info 'Culpa fully initialized'
     end
 
@@ -52,7 +57,7 @@ module Culpa
           verb: env['REQUEST_METHOD'].downcase.to_sym,
           params: Rack::Utils.parse_nested_query(env['QUERY_STRING'])
       }
-      # Parse body if in JSON
+      # Parse body if in JSON, otherwise pass the rack.input directly
       if env['CONTENT_TYPE'] == 'application/json'
         body = JSON.parse(env['rack.input'].read)
         call_options[:sub_call] = body['sub_call'] if body.has_key? 'sub_call'
@@ -60,7 +65,7 @@ module Culpa
       else
         call_options[:input] = env['rack.input']
       end
-      # Try the known routes
+      # Try the enforced routes
       if !(route_params = PathParser.parse('/:res_name', env['PATH_INFO'])).nil?
         call_options[:res_name] = route_params[:res_name]
         case call_options[:verb]
@@ -90,38 +95,35 @@ module Culpa
         call_options[:sub_call] = route_params[:sub_call]
       else
         @logger.info "Refused request, #{env['PATH_INFO']} didn't match enforced routes"
-        return bad_request
+        return rack_error 400
       end
       # Call the brickchain and return the value to Rack
       @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
+      rack_error 400
     rescue StandardError => error
       @logger.error "Error ecountered while treating request : #{error.message}, aborting...\n#{error.backtrace.join("\n")}"
-      internal_server_error
+      rack_error 500
     end
 
     def call_brickchain(options)
       router_method_name = "#{options[:sub_call]}_#{options[:res_name]}"
       envelope =  Envelope.new
       request = EnvelopeRequest.new(options)
-      bricks = @router[router_method_name]
-      return not_found unless bricks
+      return rack_error(404) unless @router.has_key? router_method_name
       @logger.info "Brickchain determined for #{router_method_name}"
-      bricks.each do |brick|
-        # Iterating over bricks for this request
+      @router[router_method_name].each do |brick|
+        # 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
         elsif brick.is_a?(Hash) && brick.has_key?('async')
           # This brick is a bundle of async bricks, treating it in threads.
-          threads = []
-          brick['async'].each { |async_brick|
-            threads << Thread.new { brick_call(async_brick, envelope, request) }
-          }
-          threads.each { |thread|
+          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
           }
@@ -134,7 +136,7 @@ module Culpa
     # Call a brick and get the instancied class of the brick's parent action
     def brick_call(brick, envelope, request)
       action_class_name, method_name = brick.split('.')
-      action_class = Actions.const_get(action_class_name).new(envelope, request)
+      action_class = Actions.const_get(action_class_name).new(envelope, request, @logger)
       action_class.send method_name
       action_class
     end
@@ -154,21 +156,9 @@ module Culpa
     end
 
     ##
-    # Rack pre-formatted 400 : Bad request
-    def bad_request
-      ['400', {'Content-Type' => 'application/json'}, []]
-    end
-
-    ##
-    # Rack pre-formatted 404 : Not found
-    def not_found
-      ['404', {'Content-Type' => 'application/json'}, []]
-    end
-
-    ##
-    # Rack pre-formatted 404 : Not found
-    def internal_server_error
-      ['500', {'Content-Type' => 'application/json'}, []]
+    # Rack pre-formatted error
+    def rack_error(code)
+      [code.to_s, {'Content-Type' => 'application/json'}, []]
     end
 
   end

data/lib/{file_helpers.rb → file_streamer.rb}

@@ -1,6 +1,6 @@
-module FileHelpers
+module Culpa
 
-  class Streamer
+  class FileStreamer
     def initialize(element)
       @element = element
     end
@@ -11,4 +11,4 @@ module FileHelpers
     end
   end
 
-end
+end

data/lib/rspec_helper.rb

@@ -8,13 +8,14 @@ module CulpaHelpers
     def initialize(opts)
       @action, @method = opts.first
       @action = @action.to_s.split('_').map{|w| w.capitalize}.join
+      @logger = Logger.new STDOUT
       opts.delete(@action)
       @envelope = Envelope.new(opts[:envelope]) if opts.has_key? :envelope
       @request = EnvelopeRequest.new(opts[:request]) if opts.has_key? :request
     end
 
     def call
-      action_class = Actions.const_get(@action).new(@envelope, @request)
+      action_class = Actions.const_get(@action).new(@envelope, @request, @logger)
       action_class.send @method.to_s
       return action_class.to_render
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: culpa
 version: !ruby/object:Gem::Version
-  version: 0.7.1.1
+  version: 0.7.2.1
 platform: ruby
 authors:
 - Jérémy SEBAN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-05 00:00:00.000000000 Z
+date: 2016-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -63,7 +63,7 @@ files:
 - lib/action.rb
 - lib/culpa.rb
 - lib/envelope.rb
-- lib/file_helpers.rb
+- lib/file_streamer.rb
 - lib/path_parser.rb
 - lib/rspec_helper.rb
 - templates/Dockerfile