startback 0.12.0 → 0.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67ffd7abceaf1b4e048cc8f02f668b682ea81f62fc7de5228a9f0d12abab1df8
-  data.tar.gz: 1eb075bdec30a569726bc3f2a74c1ce427aef8ff0c3cbcee401a61c034e71ca6
+  metadata.gz: 402d175b50a47cda7b683e91613fa0b15405ba0415b1d4b27c765f087717951e
+  data.tar.gz: 6b926b4b805ca0623cd66f37a80802d0eb9a41a44707be1952d8cb4f328314ee
 SHA512:
-  metadata.gz: 8cb4d6f1302a34cab267c836c1e0d81c54267607de7f24d350183ff05a79af7cc216a6f34bc96c0e1204f71cca1de744fde448590e99bd96a1ab45c15c8ceddf
-  data.tar.gz: fecf573e39eb04317d756414349d94092f24a07210629a55347191ef74ec94fcc8079f8a4f38b6c58bf94be5c59fbd79a90a168a4925819ce771269ccae6e3da
+  metadata.gz: 7c5093716de177a26401e82cb90d5b596696b11ff3b5ce390b7deae7eba67f3e939b8fa1c1594fea3ad866e7d05d364fbc6243428b8cf378573ddbe6843052c3
+  data.tar.gz: 24ec0a98d2374cb78130df5358909a4715ee7f7a5e4ec6685a136bc67b03ea8eaff26b0d2f6a52cbd19219145d034a6b95c8147dbe11aa64549a195ff0f81990

data/lib/startback/context/middleware.rb

@@ -18,7 +18,7 @@ module Startback
     #
     #     # Use a user defined context class
     #     Rack::Builder.new do
-    #       use Startback::Context::Middleware, context_class: MyContextClass
+    #       use Startback::Context::Middleware, MyContextClass.new
     #
     #       run ->(env){
     #         ctx = env[Startback::Context::Middleware::RACK_ENV_KEY]
@@ -31,18 +31,14 @@ module Startback
 
       RACK_ENV_KEY = 'SAMBACK_CONTEXT'
 
-      DEFAULT_OPTIONS = {
-        context_class: Context
-      }
-
-      def initialize(app, options = {})
+      def initialize(app, context = Context.new)
         @app = app
-        @options = DEFAULT_OPTIONS.merge(options || {})
+        @context = context
       end
-      attr_reader :options
+      attr_reader :context
 
       def call(env)
-        env[RACK_ENV_KEY] ||= options[:context_class].h({}).tap{|c|
+        env[RACK_ENV_KEY] ||= context.dup.tap{|c|
           c.original_rack_env = env.dup
         }
         @app.call(env)

data/lib/startback/context.rb

@@ -112,6 +112,13 @@ module Startback
       to_h.to_json(*args, &bl)
     end
 
+    def fork(h = nil)
+      dup.tap{|duped|
+        self.class.h_factor!(duped, h) if h
+        yield(duped) if block_given?
+      }
+    end
+
     def dup
       super.tap{|c|
         c.send(:clean_factored!)

data/lib/startback/event/agent.rb

@@ -16,9 +16,12 @@ module Startback
 
       def initialize(engine)
         @engine = engine
+        @context = nil
         install_listeners
       end
       attr_reader :engine
+      attr_accessor :context
+      protected :context=
 
     protected
 
@@ -38,8 +41,9 @@ module Startback
       #
       # See Bus#listen
       def async(exchange, queue)
-        bus.async.listen(exchange, queue) do |event|
-          dup.call(event)
+        bus.async.listen(exchange, queue) do |event_data|
+          event = engine.factor_event(event_data)
+          with_context(event.context).call(event)
         end
       end
 
@@ -47,8 +51,9 @@ module Startback
       #
       # See Bus#listen
       def sync(exchange, queue)
-        bus.listen(exchange, queue) do |event|
-          dup.call(event)
+        bus.listen(exchange, queue) do |event_data|
+          event = engine.factor_event(event_data)
+          with_context(event.context).call(event)
         end
       end
 
@@ -66,6 +71,14 @@ module Startback
         raise NotImplementedError
       end
 
+      def with_context(context)
+        dup.tap{|a| a.send(:context=, context) }
+      end
+
+      def operation_world(op)
+        super(op).merge(context: ctx)
+      end
+
     end # class Agent
   end # class Event
 end # module Starback

data/lib/startback/event/bus/bunny/async.rb

@@ -123,11 +123,8 @@ module Startback
             queue = channel.queue((processor || "main").to_s, queue_options)
             queue.bind(fanout)
             queue.subscribe do |delivery_info, properties, body|
-              event = stop_errors(self, "listen") do
-                factor_event(body)
-              end
-              stop_errors(self, "listen", event.context) do
-                (listener || bl).call(event)
+              stop_errors(self, "listen") do
+                (listener || bl).call(body)
               end
             end
           end

data/lib/startback/event/engine.rb

@@ -36,6 +36,7 @@ module Startback
       def initialize(options = {}, context = Context.new)
         @options = DEFAULT_OPTIONS.merge(options)
         @context = context
+        @context.engine = self
       end
       attr_reader :options, :context
 
@@ -84,6 +85,10 @@ module Startback
           .each { |klass| klass.new(self) }
       end
 
+      def factor_event(event_data)
+        Event.json(event_data, context)
+      end
+
       class Runner
 
         DEFAULT_SERVER_ENGINE_OPTIONS = {

data/lib/startback/event/ext/context.rb

@@ -0,0 +1,5 @@
+module Startback
+  class Context
+    attr_accessor :engine
+  end # class Context
+end # module Startback

data/lib/startback/event/ext/operation.rb

@@ -0,0 +1,13 @@
+module Startback
+  class Operation
+
+    def self.emits(type, &bl)
+      after_call do
+        event_data = instance_exec(&bl)
+        event = type.new(type.to_s, event_data, context)
+        context.engine.bus.emit(event)
+      end
+    end
+
+  end # class Operation
+end # module Startback

data/lib/startback/event.rb

@@ -20,14 +20,13 @@ module Startback
     end
     attr_reader :context, :type, :data
 
-    def self.json(src, world = {})
+    def self.json(src, context)
+      return src if src.is_a?(Event)
+
       parsed = JSON.parse(src)
-      context = if world[:context]
-        world[:context]
-      elsif world[:context_factory]
-        world[:context_factory].call(parsed)
-      end
-      Event.new(parsed['type'], parsed['data'], context)
+      klass = Kernel.const_get(parsed['type'])
+      context = context.fork(parsed['context']) if context
+      klass.new(parsed['type'], parsed['data'], context)
     end
 
     def to_json(*args, &bl)
@@ -41,6 +40,8 @@ module Startback
 
   end # class Event
 end # module Startback
+require_relative 'event/ext/context'
+require_relative 'event/ext/operation'
 require_relative 'event/agent'
 require_relative 'event/bus'
 require_relative 'event/engine'

data/lib/startback/version.rb

@@ -2,7 +2,7 @@ module Startback
   module Version
     MAJOR = 0
     MINOR = 12
-    TINY  = 0
+    TINY  = 3
   end
   VERSION = "#{Version::MAJOR}.#{Version::MINOR}.#{Version::TINY}"
 end

data/spec/spec_helper.rb

@@ -10,3 +10,28 @@ end
 RSpec.configure do |c|
   c.include SpecHelpers
 end
+
+class SubContext < Startback::Context
+  attr_accessor :foo
+  h_factory do |c,h|
+    c.foo = h["foo"]
+  end
+  h_dump do |h|
+    h.merge!("foo" => foo)
+  end
+end
+
+class SubContext
+  attr_accessor :bar
+  h_factory do |c,h|
+    c.bar = h["bar"]
+  end
+  h_dump do |h|
+    h.merge!("bar" => bar)
+  end
+end
+
+class User
+  class Changed < Startback::Event
+  end
+end

data/spec/unit/context/test_dup.rb

@@ -3,12 +3,8 @@ require 'spec_helper'
 module Startback
   describe Context, "dup" do
 
-    class Subcontext < Context
-      attr_accessor :foo
-    end
-
     let(:context) {
-      Subcontext.new.tap{|s| s.foo = "bar" }
+      SubContext.new.tap{|s| s.foo = "bar" }
     }
 
     class ContextRelatedAbstraction
@@ -27,7 +23,7 @@ module Startback
         expect(x).not_to be(context)
       }
       expect(seen).to be(got)
-      expect(got).to be_a(Subcontext)
+      expect(got).to be_a(SubContext)
       expect(got).not_to be(context)
       expect(got.foo).to eql("bar")
     end
@@ -43,4 +39,4 @@ module Startback
     end
 
   end
-end
+end

data/spec/unit/context/test_fork.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+module Startback
+  describe Context, "fork" do
+
+    it 'is a simple dup without args' do
+      context = SubContext.new
+      context.foo = ['hello']
+
+      forked = context.fork
+      puts "Forked: #{forked.inspect}"
+      expect(fork).not_to be(context)
+      expect(forked.foo).to eql(['hello'])
+      expect(forked.foo).to be(context.foo)
+    end
+
+    it 'yields the context if a block is provided' do
+      context = SubContext.new
+
+      seen = false
+      context.fork({ 'foo' => 'hello' }) do |forked|
+        expect(fork).not_to be(context)
+        expect(forked.foo).to eql('hello')
+        seen = true
+      end
+      expect(seen).to eql(true)
+    end
+
+    it 'uses the factory on the hash provided' do
+      context = SubContext.new
+
+      forked = context.fork({ 'foo' => 'hello' })
+      expect(fork).not_to be(context)
+      expect(forked.foo).to eql('hello')
+    end
+
+  end
+end

data/spec/unit/context/test_h_factory.rb

@@ -7,26 +7,6 @@ module Startback
       expect(Context.new.to_json).to eql("{}")
     end
 
-    class SubContext < Context
-      attr_accessor :foo
-      h_factory do |c,h|
-        c.foo = h["foo"]
-      end
-      h_dump do |h|
-        h.merge!("foo" => foo)
-      end
-    end
-
-    class SubContext
-      attr_accessor :bar
-      h_factory do |c,h|
-        c.bar = h["bar"]
-      end
-      h_dump do |h|
-        h.merge!("bar" => bar)
-      end
-    end
-
     it 'allows installing factories' do
       expect(Context.h_factories).to be_empty
       expect(SubContext.h_factories.size).to eql(2)

data/spec/unit/context/test_middleware.rb

@@ -10,18 +10,18 @@ module Startback
       include Rack::Test::Methods
 
       def app
-        opts = middleware_options
+        build_args = self.build_args
         Rack::Builder.new do
-          use Middleware, opts
+          use Middleware, *build_args
           run ->(env){
-            ctx = env[Startback::Context::Middleware::RACK_ENV_KEY] 
+            ctx = env[Startback::Context::Middleware::RACK_ENV_KEY]
             [200, {}, ctx.class.to_s]
           }
         end
       end
 
-      context 'when used without option' do
-        let(:middleware_options){ nil }
+      context 'when used without context' do
+        let(:build_args){ [] }
 
         it 'sets the default context class' do
           get '/'
@@ -31,9 +31,7 @@ module Startback
       end
 
       context 'when specifying the context class' do
-        let(:middleware_options){{
-          context_class: MyContextSubClass
-        }}
+        let(:build_args){ [MyContextSubClass.new] }
 
         it 'sets the default context class' do
           get '/'

data/spec/unit/test_event.rb

@@ -4,7 +4,7 @@ module Startback
   describe Event do
 
     subject{
-      Event.new("user_changed", { "foo" => "bar" })
+      Event.new("User::Changed", { "foo" => "bar" })
     }
 
     it 'presents an ostruct on top of its data' do
@@ -15,7 +15,7 @@ module Startback
 
       JSON_SRC = <<-JSON.gsub(/\s+/, "")
         {
-          "type": "user_changed",
+          "type": "User::Changed",
           "data": {
             "foo": "bar"
           }
@@ -27,10 +27,10 @@ module Startback
       end
 
       it 'has a to_json that dumps the context if any' do
-        evt = Event.new("user_changed", { "foo" => "bar" }, { "baz": "context" })
+        evt = Event.new("User::Changed", { "foo" => "bar" }, { "baz": "context" })
         expect(evt.to_json).to eql(<<-JSON.gsub(/\s+/, ""))
           {
-            "type": "user_changed",
+            "type": "User::Changed",
             "data": {
               "foo": "bar"
             },
@@ -43,26 +43,19 @@ module Startback
 
 
       it 'has a json class method that works as expected' do
-        evt = Event.json(JSON_SRC)
+        evt = Event.json(JSON_SRC, nil)
         expect(evt).to be_a(Event)
-        expect(evt.type).to eql("user_changed")
+        expect(evt.type).to eql("User::Changed")
         expect(evt.data).to eql(subject.data)
       end
 
-      it 'accepts an explicit context in the world' do
-        evt = Event.json(JSON_SRC, context: 12)
-        expect(evt.context).to eql(12)
+      it 'accepts an explicit context as second argument' do
+        c = SubContext.new.tap{|x| x.foo = 'hello' }
+        evt = Event.json(JSON_SRC, c)
+        expect(evt.context).not_to be(c)
+        expect(evt.context).to be_a(SubContext)
+        expect(evt.context.foo).to eql('hello')
       end
-
-      it 'accepts an context factory in the world' do
-        cf = ->(arg) {
-          expect(arg).to eql(JSON.parse(JSON_SRC))
-          12
-        }
-        evt = Event.json(JSON_SRC, context_factory: cf)
-        expect(evt.context).to eql(12)
-      end
-
     end
 
   end

data/spec/unit/web/test_catch_all.rb

@@ -53,7 +53,7 @@ module Startback
 
         def app
           Rack::Builder.new do
-            use Context::Middleware, context_class: MyContextWithErrorHandler
+            use Context::Middleware, MyContextWithErrorHandler.new
             use CatchAll
             run ->(env){ raise AnError, "Hello error" }
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: startback
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.3
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-19 00:00:00.000000000 Z
+date: 2022-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -400,6 +400,8 @@ files:
 - lib/startback/event/bus/memory/async.rb
 - lib/startback/event/bus/memory/sync.rb
 - lib/startback/event/engine.rb
+- lib/startback/event/ext/context.rb
+- lib/startback/event/ext/operation.rb
 - lib/startback/ext.rb
 - lib/startback/ext/date_time.rb
 - lib/startback/ext/time.rb
@@ -434,6 +436,7 @@ files:
 - spec/unit/caching/test_entity_cache.rb
 - spec/unit/context/test_abstraction_factory.rb
 - spec/unit/context/test_dup.rb
+- spec/unit/context/test_fork.rb
 - spec/unit/context/test_h_factory.rb
 - spec/unit/context/test_middleware.rb
 - spec/unit/event/bus/memory/test_async.rb