dandy 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47781859a32ae38be5a82a4548ee099ce2c745ea
-  data.tar.gz: b8488633a66da4c980fb3532df442713ae35747c
+  metadata.gz: f5fd46a75db6411e264b87e934aff42dd34b2b7e
+  data.tar.gz: 681b74058c62074c072f59fab34c98ad21ac3e35
 SHA512:
-  metadata.gz: b9ca968a3acd135a2656309c9ca2dd28d4c426b82a7d1b683c502201eeddd2f66772e74e75dfbbb8c1fdd03f50e81323842034e85b59d303da4441bc1a189eb5
-  data.tar.gz: 7e802942e16d29e0de61a6c501bc62be98d5b1588028f2f1692894d2c633d6822de706d9a693c9d54dce750b317ca9b6aae5b5725f2161db87b8f26b00f0377f
+  metadata.gz: a9fc7ea134531646040be3368dcb0745e8bd8d19d4495bd38a0963728f8268c5d46f687f4bc7e0a76c0d55900f80d4ee07dbbbbb211cdce717a7aa809087fb85
+  data.tar.gz: 5a2b123dd6e34b828450a519ebb2cbe2bb98b52aa960bb1933956433fdc60d7db6b3166d2db9004ae60ccd4ddb604184e91f6581de7273c7c9ba7b8be0fdb730

data/lib/dandy/app.rb

@@ -9,9 +9,9 @@ require 'dandy/request'
 require 'dandy/template_registry'
 require 'dandy/view_builder_registry'
 require 'dandy/view_factory'
-require 'dandy/chain_factory'
 require 'dandy/view_builders/json'
 require 'dandy/routing/routing'
+require 'dandy/safe_executor'
 
 module Dandy
   class App
@@ -27,7 +27,7 @@ module Dandy
     end
 
     def call(env)
-      request = Request.new(@route_matcher, @container, @chain_factory, @view_factory)
+      request = Request.new(@route_matcher, @container, @safe_executor)
       request.handle(env)
     end
 
@@ -61,12 +61,12 @@ module Dandy
         template_registry: TemplateRegistry,
         view_builder_registry: ViewBuilderRegistry,
         view_factory: ViewFactory,
-        chain_factory: ChainFactory,
         file_reader: Routing::FileReader,
         syntax_parser: SyntaxParser,
         syntax_error_interpreter: Routing::SyntaxErrorInterpreter,
         routes_builder: Routing::Builder,
-        route_parser: Routing::Parser
+        route_parser: Routing::Parser,
+        safe_executor: SafeExecutor
       }
 
       singletons.keys.each do |name|
@@ -76,11 +76,12 @@ module Dandy
     end
 
     def load_basic_dependencies
-      @chain_factory = @container.resolve(:chain_factory)
+      @dandy_config = @container.resolve(:dandy_config)
       @view_factory = @container.resolve(:view_factory)
       @dependency_loader = @container.resolve(:dependency_loader)
       @view_builder_registry = @container.resolve(:view_builder_registry)
       @route_parser = @container.resolve(:route_parser)
+      @safe_executor = @container.resolve(:safe_executor)
 
       @dependency_loader.load_components
     end

data/lib/dandy/chain.rb

@@ -2,46 +2,23 @@ require 'timeout'
 
 module Dandy
   class Chain
-    def initialize(container, dandy_config, commands, last_command, catch_command = nil)
-      @commands = commands
-      @last_command = last_command
+    def initialize(container, dandy_config)
       @container = container
-      @catch_command = catch_command
       @async_timeout = dandy_config[:action][:async_timeout]
     end
 
-    def execute
-      if @catch_command.nil?
-        run_commands
-      else
-        begin
-          run_commands
-        rescue Exception => error
-          @container
-            .register_instance(error, :dandy_error)
-            .using_lifetime(:scope)
-            .bound_to(:dandy_request)
-
-          action = @container.resolve(@catch_command.name.to_sym)
-          action.call
-        end
-      end
-    end
-
-    private
-
-    def run_commands
+    def run_commands(commands, last_command)
       threads = []
       Thread.abort_on_exception = true
 
       result = nil
-      @commands.each_with_index do |command, index|
+      commands.each_with_index do |command, index|
         if command.sequential?
           # all previous parallel commands should be done before the current sequential
           threads.each {|t| t.join}
           threads = []
 
-          if @last_command && (command.name == @last_command.name)
+          if last_command && (command.name == last_command.name)
             result = run_command(command)
           else
             run_command(command)
@@ -49,7 +26,7 @@ module Dandy
         else
           thread = Thread.new {
             Timeout::timeout(@async_timeout) {
-              if @last_command && (command.name == @last_command.name)
+              if last_command && (command.name == last_command.name)
                 result = run_command(command)
               else
                 run_command(command)
@@ -60,7 +37,7 @@ module Dandy
         end
 
         # if it's last item in chain then wait until parallel commands are done
-        if index == @commands.length - 1
+        if index == commands.length - 1
           threads.each {|t| t.join}
         end
       end
@@ -68,6 +45,8 @@ module Dandy
       result
     end
 
+    private
+
     def run_command(command)
       if command.entity?
         entity = @container.resolve(command.entity_name.to_sym)

data/lib/dandy/request.rb

@@ -1,21 +1,19 @@
 require 'json'
+require 'awrence'
+require 'plissken'
 require 'rack/multipart'
 require 'dandy/extensions/hash'
-require 'dandy/chain_factory'
 require 'dandy/view_factory'
-require 'awrence'
-require 'plissken'
-
+require 'dandy/chain'
 
 module Dandy
   class Request
     include Hypo::Scope
 
-    def initialize(route_matcher, container, chain_factory, view_factory)
+    def initialize(route_matcher, container, safe_executor)
       @container = container
       @route_matcher = route_matcher
-      @chain_factory = chain_factory
-      @view_factory = view_factory
+      @safe_executor = safe_executor
     end
 
     def handle(rack_env)
@@ -31,36 +29,26 @@ module Dandy
            .collect {|k, v| [k.split('_').collect(&:capitalize).join('-'), v]}
            .flatten
       ]
-      register_params(headers, :dandy_headers)
+
+      register_context(headers, :dandy_headers)
 
       if match.nil?
         result = [404, {'Content-Type' => headers['Accept']}, []]
       else
+        status = match.route.http_status || default_http_status(match.route.http_verb)
+        register_params(match.params)
+        register_status(status)
+
         query = Rack::Utils.parse_nested_query(rack_env['QUERY_STRING']).to_snake_keys.symbolize_keys
-        register_params(query, :dandy_query)
+        register_context(query, :dandy_query)
 
         data = rack_env['rack.parser.result'] ? rack_env['rack.parser.result'].to_snake_keys.deep_symbolize_keys! : {}
-        register_params(data, :dandy_data)
+        register_context(data, :dandy_data)
 
         multipart = Rack::Multipart.parse_multipart(rack_env) || {}
-        register_params(multipart.values, :dandy_files)
-
-        chain = @chain_factory.create(match)
-        chain_result = chain.execute
+        register_context(multipart.values, :dandy_files)
 
-        if match.route.view
-          body = @view_factory.create(match.route.view, headers['Accept'], {keys_format: headers['Keys-Format'] || 'snake'})
-        else
-          if chain_result.is_a?(String)
-            body = chain_result
-          else # generate JSON when nothing other is requested
-            if headers['Keys-Format'] == 'camel' && chain_result
-              chain_result = chain_result.to_camelback_keys
-            end
-
-            body = JSON.generate(chain_result)
-          end
-        end
+        body = @safe_executor.execute(match.route, headers)
 
         status = @container.resolve(:dandy_status)
         result = [status, {'Content-Type' => headers['Accept']}, [body]]
@@ -80,12 +68,32 @@ module Dandy
         .bound_to(self)
     end
 
-    def register_params(params, name)
+    def register_context(params, name)
       unless params.nil?
         @container.register_instance(params, name)
           .using_lifetime(:scope)
           .bound_to(:dandy_request)
       end
     end
+
+    def register_params(params)
+      params.keys.each do |key|
+        @container
+          .register_instance(params[key], key.to_sym)
+          .using_lifetime(:scope)
+          .bound_to(:dandy_request)
+      end
+    end
+
+    def register_status(status)
+      @container
+        .register_instance(status, :dandy_status)
+        .using_lifetime(:scope)
+        .bound_to(:dandy_request)
+    end
+
+    def default_http_status(http_verb)
+      http_verb == 'POST' ? 201 : 200
+    end
   end
 end

data/lib/dandy/safe_executor.rb

@@ -0,0 +1,41 @@
+module Dandy
+  class SafeExecutor
+    def initialize(container, dandy_config, view_factory)
+      @container = container
+      @dandy_config = dandy_config
+      @view_factory = view_factory
+    end
+
+    def execute(route, headers)
+      chain = Chain.new(@container, @dandy_config)
+
+      begin
+        result = chain.run_commands(route.commands, route.last_command)
+        if route.view
+          result = @view_factory.create(route.view, headers['Accept'], {keys_format: headers['Keys-Format'] || 'snake'})
+        end
+
+        body = result.is_a?(String) ? result : format_response(result, headers)
+      rescue Exception => error
+        @container
+          .register_instance(error, :dandy_error)
+          .using_lifetime(:scope)
+          .bound_to(:dandy_request)
+
+        action = @container.resolve(route.catch.name.to_sym)
+        body = format_response(action.call, headers)
+      end
+
+      body
+    end
+
+    private
+    def format_response(result, headers)
+      if headers['Keys-Format'] == 'camel' && result
+        result = result.to_camelback_keys
+      end
+
+      JSON.generate(result)
+    end
+  end
+end

data/lib/dandy/version.rb

@@ -1,3 +1,3 @@
 module Dandy
-  VERSION = '0.12.0'.freeze
+  VERSION = '0.12.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dandy
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Vladimir Kalinkin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-20 00:00:00.000000000 Z
+date: 2018-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hypo
@@ -230,7 +230,6 @@ files:
 - lib/dandy/app.rb
 - lib/dandy/base/handle_errors.rb
 - lib/dandy/chain.rb
-- lib/dandy/chain_factory.rb
 - lib/dandy/config.rb
 - lib/dandy/errors/dandy_error.rb
 - lib/dandy/errors/syntax_error.rb
@@ -288,6 +287,7 @@ files:
 - lib/dandy/routing/syntax/view.rb
 - lib/dandy/routing/syntax_error_interpreter.rb
 - lib/dandy/routing/syntax_grammar.tt
+- lib/dandy/safe_executor.rb
 - lib/dandy/template_registry.rb
 - lib/dandy/version.rb
 - lib/dandy/view_builder.rb

data/lib/dandy/chain_factory.rb

@@ -1,39 +0,0 @@
-require 'dandy/chain'
-
-module Dandy
-  class ChainFactory
-    def initialize(container, dandy_config)
-      @container = container
-      @dandy_config = dandy_config
-    end
-
-    def create(match)
-      status = match.route.http_status || default_http_status(match.route.http_verb)
-      register_params(match.params)
-      register_status(status)
-      Chain.new(@container, @dandy_config, match.route.commands, match.route.last_command, match.route.catch)
-    end
-
-    private
-
-    def register_params(params)
-      params.keys.each do |key|
-        @container
-          .register_instance(params[key], key.to_sym)
-          .using_lifetime(:scope)
-          .bound_to(:dandy_request)
-      end
-    end
-
-    def register_status(status)
-      @container
-        .register_instance(status, :dandy_status)
-        .using_lifetime(:scope)
-        .bound_to(:dandy_request)
-    end
-
-    def default_http_status(http_verb)
-      http_verb == 'POST' ? 201 : 200
-    end
-  end
-end