dandy 1.0.3 → 2.0.0.pre.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10c1d06be946e67fdc9c9e2dd27e37015aa5c315006f153364f6a729eecadc8c
-  data.tar.gz: eb3055e8a23b44e78661f7ae89896bb96748fb71bb2dbd9122f5f9f6a4271a94
+  metadata.gz: f0a2a55e97bb758be7b7fd22226adc5757a7ad94fc48596448d0b10447e85abe
+  data.tar.gz: 232468091c7e5dca9f15a28b54dedc298003f24a0acc116f85ea79f64f83db09
 SHA512:
-  metadata.gz: 40389e9152244e5949e539d18caa4fd35604286721d327543bc2e20765d078e4888f2da0225bd052f54ec0e817e4cef7b50b5cf1092afdd09e5aed9364da66e3
-  data.tar.gz: d6966b353e974d10a755677b84a1a5943a59cf2335eeec2a396203df118a03161fec03bd7f72b63a83467595d92ab019aac30c1d82412a9b5017e553bd8e43ae
+  metadata.gz: a090b89c227d4acd9b2d4fcd2527a649acd147d60b23aee1ebef93c3eec4659311a1204487e304e04a02a7c2abd489b5800c7c6a0522ba63cbd893ccdac24bdd
+  data.tar.gz: dca5768ae6c078c5f1cc5f529489ac43d856b169b49617dfacab1df649779a60a2f8a36d4eaeff20ff862443124e204d7d0d12e5fd49328a211d2c29140e93f1

data/lib/dandy.rb

@@ -1,5 +1,6 @@
 require 'dandy/version'
 require 'dandy/app'
+require 'dandy/consumer'
 require 'dandy/base/handle_errors'
 
 module Dandy

data/lib/dandy/app.rb

@@ -11,7 +11,8 @@ require 'dandy/view_builder_registry'
 require 'dandy/view_factory'
 require 'dandy/view_builders/json'
 require 'dandy/routing/routing'
-require 'dandy/safe_executor'
+require 'dandy/route_executor'
+require 'dandy/handler_executor'
 
 module Dandy
   class App
@@ -22,12 +23,12 @@ module Dandy
 
       register_dependencies
       load_basic_dependencies
-      parse_routes
+      parse_entrypoints
       add_view_builders
     end
 
     def call(env)
-      request = Request.new(@route_matcher, @container, @safe_executor)
+      request = Request.new(@route_matcher, @container, @route_executor)
       request.handle(env)
     end
 
@@ -37,6 +38,10 @@ module Dandy
       @view_builder_registry.add(view_builder, format)
     end
 
+    def add_consumer(consumer)
+      consumer.connect(@message_handlers, @handler_executor)
+    end
+
     private
 
     def add_view_builders
@@ -65,9 +70,11 @@ module Dandy
         file_reader: Routing::FileReader,
         syntax_parser: SyntaxParser,
         syntax_error_interpreter: Routing::SyntaxErrorInterpreter,
-        routes_builder: Routing::Builder,
-        route_parser: Routing::Parser,
-        safe_executor: SafeExecutor
+        routes_builder: Routing::RoutesBuilder,
+        handlers_builder: Routing::HandlersBuilder,
+        dandy_parser: Routing::Parser,
+        route_executor: RouteExecutor,
+        handler_executor: HandlerExecutor
       }
 
       singletons.keys.each do |name|
@@ -81,14 +88,17 @@ module Dandy
       @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)
+      @dandy_parser = @container.resolve(:dandy_parser)
+      @route_executor = @container.resolve(:route_executor)
+      @handler_executor = @container.resolve(:handler_executor)
 
       @dependency_loader.load_components
     end
 
-    def parse_routes
-      @routes = @route_parser.parse
+    def parse_entrypoints
+      entrypoints = @dandy_parser.parse
+      @routes = entrypoints[:routes]
+      @message_handlers = entrypoints[:message_handlers]
       @route_matcher = Routing::Matcher.new(@routes)
     end
   end

data/lib/dandy/chain.rb

@@ -7,7 +7,7 @@ module Dandy
       @async_timeout = dandy_config[:action][:async_timeout]
     end
 
-    def run_commands(commands, last_command)
+    def run_commands(commands, last_command, scope)
       threads = []
       Thread.abort_on_exception = true
 
@@ -19,17 +19,17 @@ module Dandy
           threads = []
 
           if last_command && (command.name == last_command.name)
-            result = run_command(command)
+            result = run_command(command, scope)
           else
-            run_command(command)
+            run_command(command, scope)
           end
         else
           thread = Thread.new {
             Timeout::timeout(@async_timeout) {
               if last_command && (command.name == last_command.name)
-                result = run_command(command)
+                result = run_command(command, scope)
               else
-                run_command(command)
+                run_command(command, scope)
               end
             }
           }
@@ -47,7 +47,7 @@ module Dandy
 
     private
 
-    def run_command(command)
+    def run_command(command, scope)
       if command.entity?
         entity = @container.resolve(command.entity_name.to_sym)
         method_name = command.entity_method.to_sym
@@ -65,7 +65,7 @@ module Dandy
       @container
         .register_instance(result, command.result_name.to_sym)
         .using_lifetime(:scope)
-        .bound_to(:dandy_request)
+        .bound_to(scope)
 
       result
     end

data/lib/dandy/consumer.rb

@@ -0,0 +1,32 @@
+require 'dandy/message'
+
+module Dandy
+  class Consumer
+    def initialize(container)
+      @container = container
+    end
+
+    def connect(message_handlers, handler_executor)
+      @message_handlers = {}
+      @handler_executor = handler_executor
+
+      message_handlers.each do |handler|
+        @message_handlers[handler.name] = handler
+      end
+
+      subscribe
+    end
+
+    def subscribe
+      raise DandyError, 'Method subscribe is not implemented in your consumer'
+    end
+
+    def handle(message_name, payload)
+      if @message_handlers.key? message_name
+        handler = @message_handlers[message_name]
+        message = Message.new(@container, handler, @handler_executor)
+        message.handle(payload)
+      end
+    end
+  end
+end

data/lib/dandy/generators/templates/dandy.yml

@@ -2,7 +2,7 @@ path:
   dependencies:
     - app/actions
   views: app/views
-  routes: app/app.routes
+  routes: app/app.dandy
 action:
   async_timeout: 10 # in seconds
 db:

data/lib/dandy/handler_executor.rb

@@ -0,0 +1,28 @@
+module Dandy
+  class HandlerExecutor
+    def initialize(container, dandy_config)
+      @container = container
+      @dandy_config = dandy_config
+    end
+
+    def execute(message_handler)
+      chain = Chain.new(@container, @dandy_config)
+
+      begin
+        chain.run_commands(message_handler.commands, message_handler.last_command, :dandy_message)
+      rescue Exception => error
+        handle_error(message_handler, error)
+      end
+    end
+
+    def handle_error(message_handler, error)
+      @container
+        .register_instance(error, :dandy_error)
+        .using_lifetime(:scope)
+        .bound_to(:dandy_message)
+
+      command = @container.resolve(message_handler.catch.name.to_sym)
+      command.call
+    end
+  end
+end

data/lib/dandy/loaders/dependency_loader.rb

@@ -7,14 +7,16 @@ module Dandy
       @dandy_env = dandy_env
     end
 
-    def load_components
+    def load_components(scope = :dandy_request)
       if @dandy_env == 'development'
         # every time reload types in development mode
         @types = @type_loader.load_types
       end
 
       @types.each do |type|
-        @container.register(type[:class], type[:path].to_sym).using_lifetime(:scope).bound_to(:dandy_request)
+        @container.register(type[:class], type[:path].to_sym)
+                  .using_lifetime(:scope)
+                  .bound_to(scope)
       end
     end
   end

data/lib/dandy/message.rb

@@ -0,0 +1,50 @@
+require 'json'
+require 'awrence'
+require 'plissken'
+require 'rack/multipart'
+require 'dandy/extensions/hash'
+require 'dandy/view_factory'
+require 'dandy/chain'
+
+module Dandy
+  class Message
+    include Hypo::Scope
+
+    def initialize(container, handler, handler_executor)
+      @container = container
+      @handler = handler
+      @handler_executor = handler_executor
+    end
+
+    def handle(data)
+      create_scope
+      register_data(data)
+
+      begin
+        result = @handler_executor.execute(@handler)
+        release
+      rescue Exception => error
+        result = @handler_executor.handle_error(@handler, error)
+      end
+
+      result
+    end
+
+    private
+
+    def create_scope
+      @container
+          .register_instance(self, :dandy_message)
+          .using_lifetime(:scope)
+          .bound_to(self)
+    end
+
+    def register_data(data)
+      unless data.nil?
+        @container.register_instance(data, :dandy_data)
+            .using_lifetime(:scope)
+            .bound_to(:dandy_message)
+      end
+    end
+  end
+end

data/lib/dandy/request.rb

@@ -10,10 +10,10 @@ module Dandy
   class Request
     include Hypo::Scope
 
-    def initialize(route_matcher, container, safe_executor)
+    def initialize(route_matcher, container, route_executor)
       @container = container
       @route_matcher = route_matcher
-      @safe_executor = safe_executor
+      @route_executor = route_executor
     end
 
     def handle(rack_env)
@@ -49,12 +49,11 @@ module Dandy
         multipart = Rack::Multipart.parse_multipart(rack_env) || {}
         register_context(multipart.values, :dandy_files)
 
-        body = @safe_executor.execute(match.route, headers)
-
         begin
+          body = @route_executor.execute(match.route, headers)
           release
         rescue Exception => error
-          body = @safe_executor.handle_error(match.route, headers, error)
+          body = @route_executor.handle_error(match.route, headers, error)
         end
 
         status = @container.resolve(:dandy_status)

data/lib/dandy/{safe_executor.rb → route_executor.rb}

@@ -1,7 +1,7 @@
 require 'dandy/response'
 
 module Dandy
-  class SafeExecutor
+  class RouteExecutor
     def initialize(container, dandy_config, view_factory)
       @container = container
       @dandy_config = dandy_config
@@ -12,7 +12,7 @@ module Dandy
       chain = Chain.new(@container, @dandy_config)
 
       begin
-        result = chain.run_commands(route.commands, route.last_command)
+        result = chain.run_commands(route.commands, route.last_command, :dandy_request)
         if route.view
           result = @view_factory.create(route.view, headers['Accept'], {keys_format: headers['Keys-Format'] || 'snake'})
         end

data/lib/dandy/routing/handlers_builder.rb

@@ -0,0 +1,25 @@
+require 'dandy/routing/message_handler'
+
+module Dandy
+  module Routing
+    class HandlersBuilder
+      def initialize
+        @parsed_items = []
+        @route_params = []
+        @current_parent = nil
+        @prev_route = nil
+      end
+
+      def build(section)
+        section.messages.map do |message|
+          MessageHandler.new({
+            name: message.name,
+            catch: section.catch.command,
+            last_command: message.command_list.last,
+            commands: section.before_commands + message.command_list + section.after_commands
+          })
+        end
+      end
+    end
+  end
+end

data/lib/dandy/routing/message_handler.rb

@@ -0,0 +1,15 @@
+module Dandy
+  module Routing
+    class MessageHandler
+      attr_reader :name, :params, :catch,
+        :commands, :last_command
+
+      def initialize(hash)
+        @name = hash[:name]
+        @commands = hash[:commands]
+        @last_command = hash[:last_command]
+        @catch = hash[:catch]
+      end
+    end
+  end
+end

data/lib/dandy/routing/parser.rb

@@ -1,10 +1,11 @@
 module Dandy
   module Routing
     class Parser
-      def initialize(file_reader, routes_builder,
+      def initialize(file_reader, routes_builder, handlers_builder,
                      syntax_parser, syntax_error_interpreter)
         @file_reader = file_reader
         @routes_builder = routes_builder
+        @handlers_builder = handlers_builder
         @syntax_parser = syntax_parser
         @syntax_error_interpreter = syntax_error_interpreter
       end
@@ -18,7 +19,18 @@ module Dandy
           raise Dandy::SyntaxError, error_message
         end
 
-        @routes_builder.build(tree.parse)
+        dandy = tree.parse
+
+        result = {}
+        if dandy.requests
+          result[:routes] = @routes_builder.build(dandy.requests)
+        end
+
+        if dandy.messages
+          result[:message_handlers] = @handlers_builder.build(dandy.messages)
+        end
+
+        result
       end
     end
   end

data/lib/dandy/routing/{builder.rb → routes_builder.rb}

@@ -2,7 +2,7 @@
 
 module Dandy
   module Routing
-    class Builder
+    class RoutesBuilder
       def initialize
         @parsed_items = []
         @route_params = []
@@ -10,10 +10,10 @@ module Dandy
         @prev_route = nil
       end
 
-      def build(sections)
+      def build(requests)
         result = []
 
-        node = sections.node
+        node = requests.node
         restore_hierarchy(node, nil, node.to_hash)
 
         @route_params.each do |route|
@@ -25,7 +25,7 @@ module Dandy
                 http_verb: action[:http_verb],
                 view: action[:view],
                 http_status: action[:http_status],
-                catch: sections.catch.command,
+                catch: requests.catch.command,
                 last_command: action[:commands].last,
                 commands: restore_callbacks(route, :before) + action[:commands] + restore_callbacks(route, :after)
               })

data/lib/dandy/routing/routing.rb

@@ -1,5 +1,6 @@
 require 'treetop'
-require 'dandy/routing/builder'
+require 'dandy/routing/routes_builder'
+require 'dandy/routing/handlers_builder'
 require 'dandy/routing/parser'
 require 'dandy/routing/matcher'
 require 'dandy/routing/file_reader'

data/lib/dandy/routing/syntax.rb

@@ -20,11 +20,17 @@ require_relative 'syntax/route'
 require_relative 'syntax/respond'
 
 
-require_relative 'syntax/sections'
+require_relative 'syntax/requests'
 require_relative 'syntax/before_section'
 require_relative 'syntax/tree_section'
 require_relative 'syntax/after_section'
 require_relative 'syntax/catch_section'
 
+require_relative 'syntax/message_name'
+require_relative 'syntax/message'
+require_relative 'syntax/messages'
+
+require_relative 'syntax/dandy'
+
 module Syntax
 end

data/lib/dandy/routing/syntax/dandy.rb

@@ -0,0 +1,20 @@
+module Syntax
+  class Dandy < Treetop::Runtime::SyntaxNode
+    attr_reader :requests, :messages
+
+    def parse
+      elements.each do |element|
+        element.elements.each do |nested|
+          if nested.is_a? Requests
+            @requests = nested.parse
+          end
+
+          if nested.is_a? Messages
+            @messages = nested.parse
+          end
+        end
+      end
+      self
+    end
+  end
+end

data/lib/dandy/routing/syntax/message.rb

@@ -0,0 +1,19 @@
+module Syntax
+  class Message < Treetop::Runtime::SyntaxNode
+    attr_accessor :name, :command_list
+
+    def parse
+      elements.each do |element|
+        if element.is_a? MessageName
+          @name = element.parse
+        end
+
+        if element.is_a? Commands
+          @command_list = element.parse
+        end
+      end
+
+      self
+    end
+  end
+end

data/lib/dandy/routing/syntax/message_name.rb

@@ -0,0 +1,7 @@
+module Syntax
+  class MessageName < Treetop::Runtime::SyntaxNode
+    def parse
+      text_value.gsub('"','')
+    end
+  end
+end

data/lib/dandy/routing/syntax/messages.rb

@@ -0,0 +1,35 @@
+module Syntax
+  class Messages < Treetop::Runtime::SyntaxNode
+    attr_reader :messages, :catch, :before_commands, :after_commands
+
+    def parse
+      @messages ||= []
+      @before_commands = []
+      @after_commands = []
+
+      elements.each do |element|
+        if element.elements
+          element.elements.each do |nested|
+            if nested.is_a? Message
+              @messages << nested.parse
+            end
+          end
+        end
+
+        if element.is_a? BeforeSection
+          @before_commands = element.parse.commands
+        end
+
+        if element.is_a? AfterSection
+          @after_commands = element.parse.commands
+        end
+
+        if element.is_a? CatchSection
+          @catch = element.parse
+        end
+      end
+
+      self
+    end
+  end
+end

data/lib/dandy/routing/syntax/{sections.rb → requests.rb}

@@ -1,5 +1,5 @@
 module Syntax
-  class Sections < Treetop::Runtime::SyntaxNode
+  class Requests < Treetop::Runtime::SyntaxNode
     attr_reader :node, :catch
 
     def parse

data/lib/dandy/routing/syntax_grammar.tt

@@ -1,6 +1,22 @@
 grammar Syntax
-  rule sections
-    ':receive' eol node catch <Sections>
+  rule dandy
+    (requests) 0..1 (messages) 0..1 <Dandy>
+  end
+
+  rule requests
+    ':request' eol node catch <Requests>
+  end
+
+  rule messages
+    ':message' eol before after message+ catch <Messages>
+  end
+
+  rule message
+    indent message_name commands eol <Message>
+  end
+
+  rule message_name
+    '"' [a-z0-9_\-.]+ '"' <MessageName>
   end
 
   rule before

data/lib/dandy/version.rb

@@ -1,3 +1,3 @@
 module Dandy
-  VERSION = '1.0.3'
+  VERSION = '2.0.0-alpha'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dandy
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 2.0.0.pre.alpha
 platform: ruby
 authors:
 - Vladimir Kalinkin
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-07 00:00:00.000000000 Z
+date: 2021-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hypo
@@ -231,6 +231,7 @@ files:
 - lib/dandy/base/handle_errors.rb
 - lib/dandy/chain.rb
 - lib/dandy/config.rb
+- lib/dandy/consumer.rb
 - lib/dandy/errors/dandy_error.rb
 - lib/dandy/errors/syntax_error.rb
 - lib/dandy/errors/view_engine_error.rb
@@ -252,17 +253,22 @@ files:
 - lib/dandy/generators/templates/dandy.yml
 - lib/dandy/generators/templates/db/mapping.rb
 - lib/dandy/generators/templates/views/show_welcome.json.jbuilder
+- lib/dandy/handler_executor.rb
 - lib/dandy/loaders/dependency_loader.rb
 - lib/dandy/loaders/template_loader.rb
 - lib/dandy/loaders/type_loader.rb
+- lib/dandy/message.rb
 - lib/dandy/request.rb
 - lib/dandy/response.rb
-- lib/dandy/routing/builder.rb
+- lib/dandy/route_executor.rb
 - lib/dandy/routing/file_reader.rb
+- lib/dandy/routing/handlers_builder.rb
 - lib/dandy/routing/match.rb
 - lib/dandy/routing/matcher.rb
+- lib/dandy/routing/message_handler.rb
 - lib/dandy/routing/parser.rb
 - lib/dandy/routing/route.rb
+- lib/dandy/routing/routes_builder.rb
 - lib/dandy/routing/routing.rb
 - lib/dandy/routing/syntax.rb
 - lib/dandy/routing/syntax/action.rb
@@ -272,6 +278,10 @@ files:
 - lib/dandy/routing/syntax/catch_section.rb
 - lib/dandy/routing/syntax/command.rb
 - lib/dandy/routing/syntax/commands.rb
+- lib/dandy/routing/syntax/dandy.rb
+- lib/dandy/routing/syntax/message.rb
+- lib/dandy/routing/syntax/message_name.rb
+- lib/dandy/routing/syntax/messages.rb
 - lib/dandy/routing/syntax/node.rb
 - lib/dandy/routing/syntax/nodes.rb
 - lib/dandy/routing/syntax/primitives/arrow.rb
@@ -284,14 +294,13 @@ files:
 - lib/dandy/routing/syntax/primitives/parameter.rb
 - lib/dandy/routing/syntax/primitives/path.rb
 - lib/dandy/routing/syntax/primitives/result_name.rb
+- lib/dandy/routing/syntax/requests.rb
 - lib/dandy/routing/syntax/respond.rb
 - lib/dandy/routing/syntax/route.rb
-- lib/dandy/routing/syntax/sections.rb
 - lib/dandy/routing/syntax/tree_section.rb
 - 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
@@ -303,7 +312,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -314,12 +323,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Dandy is a minimalistic web API framework.
 test_files: []