startback 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b7ccc8dd2081ba0dffda6092a2dbb2a345b01e6b7231aee41aa506e85949a4a
-  data.tar.gz: c53f396f235226bbbfd336c872a5e1334708e1dcc6ca62d456d7b969bf7baad2
+  metadata.gz: 3d5d880b8e9dfdeecdd68e78400468a2765dffbcf39866860daef9ac86a8096d
+  data.tar.gz: 6bf01ece248ca741ed4a590ab5458c8f94bda465c315951cfb0797fa49ae4fe9
 SHA512:
-  metadata.gz: c5c4b8ecc4045efd18f206217ddc201c869929e1951e981bf07fae0a9ff710d60d00b444f871bac7096a8ee48f7b05f0d95498f58c3d737be5a5b08e3a626707
-  data.tar.gz: d193c22d134a0f57403433a6e4f0279d74ca17aaf7d99278664a86c5a3d2118d7a926bc7a95957ad2e4bbe90a8fafb82f549a938e73d3996204aa98f0b19c4fc
+  metadata.gz: 7f21d629f5733aea63bdfd21199aae51208d16751e398a373cef0a72cf4fcbceb083046c7f1ec61f9ed4791c2e4621a787229f438622a35a28a9ca2591ec5f90
+  data.tar.gz: c77c9f93fc437a8c803782d226bd6f9c30497f1eb238a6244526262fd5c24e148b322d01d46ed8bd81d907b9851a9789e1774abaec5dccd63fefc8a0da50eeb1

data/lib/startback/event/engine.rb

@@ -1,18 +1,14 @@
 require 'rack'
-require 'webrick'
 require 'startback'
 module Startback
   class Event
     #
     # This class is the starting point of event handling in
     # Startback. It holds a Bus instance to which emitters
-    # and listeners can connect, and the possibility for the
-    # the listening part to start an infinite loop (ServerEngine).
+    # and listeners can connect.
     #
-    # The Engine automatically runs a Webrick small webapp
-    # with a /healthcheck webservice. The class can be extended
-    # and method `on_health_check` overriden to run specific
-    # checks.
+    # The Engine exposes a rack app (.rack_app) with a /healthcheck webservice.
+    # It is supposed to be mounted to a webserver such as puma.
     #
     # This class goes hand in hand with the `startback:engine`
     # docker image. It can be extended by subclasses to override
@@ -22,15 +18,13 @@ module Startback
     #   - on_health_check to check specific health conditions
     #   - create_agents to instantiate all listening agents
     #     (unless auto_create_agents is used)
+    #   - rack_app if you want to customize the API running
     #
     class Engine
       include Support::Robustness
 
       DEFAULT_OPTIONS = {
 
-        # To be passed to ServerEngine
-        server_engine: {}
-
       }
 
       def initialize(options = {}, context = Context.new)
@@ -60,7 +54,7 @@ module Startback
       end
 
       def bus
-        ::Startback::Event::Bus.new
+        @bus ||= ::Startback::Event::Bus.new
       end
 
       def connect
@@ -68,20 +62,12 @@ module Startback
         bus.connect
       end
 
-      def run(options = {})
-        connect
-
-        log(:info, self, "Running agents and server engine!")
-        create_agents
-        Runner.new(self, options[:server_engine] || {}).run
-      end
-
       def create_agents
         return unless parent = self.class.auto_create_agents
 
         ObjectSpace
           .each_object(Class)
-          .select { |klass| klass < parent }
+          .select { |klass| klass <= parent }
           .each { |klass| klass.new(self) }
       end
 
@@ -89,88 +75,20 @@ module Startback
         Event.json(event_data, context)
       end
 
-      class Runner
-
-        DEFAULT_SERVER_ENGINE_OPTIONS = {
-          daemonize: false,
-          worker_type: 'process',
-          workers: 1
-        }
-
-        def initialize(engine, options = {})
-          raise ArgumentError if engine.nil?
-
-          @engine = engine
-          @options = DEFAULT_SERVER_ENGINE_OPTIONS.merge(options)
-          require 'serverengine'
-        end
-        attr_reader :engine, :options
-
-        def run(options = {})
-          health = self.class.build_health_check(engine)
-          worker = self.class.build_worker(engine, health)
-          se = ServerEngine.create(nil, worker, options)
-          se.run
-          se
-        end
-
-        class << self
-          def run(*args, &bl)
-            new.run(*args, &bl)
-          end
+      def rack_app
+        engine = self
+        Rack::Builder.new do
+          use Startback::Web::CatchAll
 
-          def build_health_check(engine)
-            Rack::Builder.new do
-              map '/health-check' do
-                health = Startback::Web::HealthCheck.new {
-                  engine.on_health_check
-                }
-                run(health)
-              end
-            end
+          map '/health-check' do
+            health = Startback::Web::HealthCheck.new {
+              engine.on_health_check
+            }
+            run(health)
           end
+        end
+      end
 
-          def build_worker(engine, health)
-            Module.new do
-              include Support::Env
-
-              def initialize
-                @stop_flag = ServerEngine::BlockingFlag.new
-              end
-
-              define_method(:health) do
-                health
-              end
-
-              define_method(:engine) do
-                engine
-              end
-
-              def run
-                ran = false
-                until @stop_flag.set?
-                  if ran
-                    engine.send(:log, :warn, engine, "Restarting internal loop")
-                  else
-                    engine.send(:log, :info, engine, "Starting internal loop")
-                  end
-                  Rack::Handler::WEBrick.run(health, {
-                    :Port => env('STARTBACK_ENGINE_PORT', '3000').to_i,
-                    :Host => env('STARTBACK_ENGINE_LISTEN', '0.0.0.0')
-                  })
-                  ran = true
-                end
-              end
-
-              def stop
-                engine.send(:log, :info, engine, "Stopping internal loop")
-                @stop_flag.set!
-                Rack::Handler::WEBrick.shutdown
-              end
-            end
-          end
-        end # class << self
-      end # class Runner
     end # class Engine
   end # class Event
 end # module Startback

data/lib/startback/version.rb

@@ -1,7 +1,7 @@
 module Startback
   module Version
     MAJOR = 0
-    MINOR = 13
+    MINOR = 14
     TINY  = 0
   end
   VERSION = "#{Version::MAJOR}.#{Version::MINOR}.#{Version::TINY}"

data/tasks/test.rake

@@ -9,29 +9,6 @@ namespace :test do
     t.rspec_opts = %{-Ilib -Ispec --color --backtrace --format progress --format RspecJunitFormatter --out spec/rspec-unit.xml}
   end
 
-  desc "Run the tests in the examples folder"
-  task :example do
-    Bundler.with_original_env do
-      system("cd example && bundle exec rake")
-      abort("Example tests failed") unless $?.exitstatus == 0
-    end
-  end
-
-  contribs = (Path.dir.parent/"contrib").glob("*").map do |sub|
-    next unless sub.directory?
-    name = sub.basename.to_sym
-
-    desc "Run tests for #{sub}"
-    task name do
-      Bundler.with_original_env do
-        system("cd #{sub} && bundle exec rake")
-        abort("#{sub} tests failed") unless $?.exitstatus == 0
-      end
-    end
-
-    name
-  end
-
-  task :all => [:unit, :example] + contribs
+  task :all => [:unit]
 end
 task :test => :'test:all'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: startback
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-31 00:00:00.000000000 Z
+date: 2022-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -470,7 +470,7 @@ files:
 - spec/unit/web/test_healthcheck.rb
 - spec/unit/web/test_magic_assets.rb
 - tasks/test.rake
-homepage: http://www.enspirit.be
+homepage: https://www.enspirit.be
 licenses:
 - MIT
 metadata: {}
@@ -489,7 +489,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Got Your Ruby Back