startback 0.8.3 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25d875283dd978829a7a55cc1a92bb75ba6e00ea77119e176e1537b326b40793
-  data.tar.gz: 79ec3c424a831f4c596606bc5b5f08a500352b9d776198496ae65d5a02c867f1
+  metadata.gz: ecd3fca505de294b037fbb0f7e15e9e5242823751169a8b745cd5717b9098945
+  data.tar.gz: d0b1546710de2899a9ea246b66a03661f58eea3ec03ba7d4f3c8e95c52d49245
 SHA512:
-  metadata.gz: fd9b8f38650403793f642fad572ce7137b546c312294530a2b962693b855884009339d21e61316f647e85e95d000460b54dd02d6f83f4684bcfda1a44c65f934
-  data.tar.gz: 1cda02569aaccac6cab2c6e612d8ef99c814c5c8a51cf082bb9f589d1ac51f3db7cbca86bb616e0f45fbc78fb34e23678abdc4dc2c0b7f4080b6ac18466dddd8
+  metadata.gz: b0e1bde2cb31f15eeb777da14a9d22062f7dab45028d9de171c9de12526a4571296591eb208c4ebd6c1059730ef671ca76fea98553e7d618272244c2d4f8b7d3
+  data.tar.gz: 47a40ac9677ea5998c8089d6b5ca01b7ef7144810ecdde1163e6286fe41313d8009b723f52c074408aec6c316cacb978a6cfe9179f068ff4fe462e7647b75f8e

data/lib/startback/audit/trailer.rb

@@ -74,13 +74,13 @@ module Startback
 
     protected
 
-      def op_to_trail(op, time, ex = nil)
+      def op_to_trail(op, time = nil, ex = nil)
         log_msg = {
           op_took: time ? time.round(8) : nil,
           op: op_name(op),
           context: op_context(op),
           op_data: op_data(op)
-        }
+        }.compact
         log_msg[:error] = ex if ex
         log_msg
       end
@@ -104,6 +104,8 @@ module Startback
           op.input
         elsif op.respond_to?(:request, false)
           op.request
+        elsif op.is_a?(Operation::MultiOperation)
+          op.ops.map{ |sub_op| op_to_trail(sub_op) }
         end
         sanitize(data)
       end

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

@@ -35,6 +35,8 @@ module Startback
       class Async
         include Support::Robustness
 
+        CHANNEL_KEY = 'Startback::Bus::Bunny::Async::ChannelKey'
+
         DEFAULT_OPTIONS = {
           # (optional) The URL to use for connecting to RabbitMQ.
           url: ENV['STARTBACK_BUS_BUNNY_ASYNC_URL'],
@@ -65,11 +67,15 @@ module Startback
           try_max_times(10) do
             @bunny = ::Bunny.new(conn)
             @bunny.start
-            @channel = @bunny.create_channel
+            channel
             log(:info, {op: "#{self.class.name}#connect", op_data: conn}, options[:context])
           end
         end
-        attr_reader :channel, :options
+        attr_reader :options
+
+        def channel
+          Thread.current[CHANNEL_KEY] ||= @bunny.create_channel
+        end
 
         def emit(event)
           stop_errors(self, "emit", event.context) do

data/lib/startback/errors.rb

@@ -2,8 +2,13 @@ module Startback
   module Errors
 
     class Error < StandardError
-      class << self
+      def initialize(message = nil, causes = nil)
+        super(message)
+        @causes = Array(causes)
+      end
+      attr_reader :causes
 
+      class << self
         def status(code = nil)
           if code.nil?
             @code || (superclass.respond_to?(:status) ? superclass.status : 500)
@@ -22,11 +27,19 @@ module Startback
         msg = super
         return msg unless msg == self.class.name
         parts = self.class.name.split('::').last.gsub(/[A-Z]/){|x|
-          " #{x.downcase}" 
+          " #{x.downcase}"
         }.strip.split(" ")
         parts = parts[0...-1] unless self.class.keep_error
         parts.join(" ").capitalize
       end
+
+      def has_causes?
+        causes && !causes.empty?
+      end
+
+      def cause
+        causes&.first
+      end
     end
 
     class BadRequestError < Error

data/lib/startback/operation/multi_operation.rb

@@ -1,6 +1,6 @@
 module Startback
   class Operation
-    class MultiOperation
+    class MultiOperation < Operation
 
       def initialize(ops = [])
         @ops = ops

data/lib/startback/operation.rb

@@ -29,6 +29,7 @@ module Startback
   #     end
   #
   class Operation
+    extend Support::TransactionPolicy
     include Errors
     include Support::OperationRunner
     include Support::Hooks.new(:call)

data/lib/startback/support/log_formatter.rb

@@ -3,14 +3,28 @@ module Startback
     class LogFormatter
 
       def call(severity, time, progname, msg)
-        if msg[:error] && msg[:error].respond_to?(:message, true)
-          msg[:backtrace] = msg[:error].backtrace[0..25] if severity == "FATAL"
-          msg[:error] = msg[:error].message
-        end
         {
           severity: severity,
-          time: time,
-        }.merge(msg).to_json << "\n"
+          time: time
+        }.merge(msg)
+         .merge(error: error_to_json(msg[:error], severity))
+         .compact
+         .to_json << "\n"
+      end
+
+      def error_to_json(error, severity = nil)
+        return error if error.nil?
+        return error if error.is_a?(String)
+        return error.to_s unless error.is_a?(Exception)
+
+        backtrace = error.backtrace[0..25] if severity == "FATAL"
+        causes = error.causes.map{|c| error_to_json(c) } if error.respond_to?(:causes)
+        causes = nil if causes && causes.empty?
+        {
+          message: error.message,
+          backtrace: backtrace,
+          causes: causes
+        }.compact
       end
 
     end # class LogFormatter

data/lib/startback/support/transaction_manager.rb

@@ -0,0 +1,25 @@
+module Startback
+  module Support
+    class TransactionManager
+
+      def initialize(db, method = :transaction)
+        @db = db
+        @method = method
+      end
+
+      def call(runner, op, &then_block)
+        raise ArgumentError, "A block is required" unless then_block
+
+        before = (op.class.transaction_policy == :before_call)
+        if before
+          @db.send(@method) do
+            then_block.call
+          end
+        else
+          then_block.call
+        end
+      end
+
+    end # class TransactionManager
+  end # module Support
+end # module Startback

data/lib/startback/support/transaction_policy.rb

@@ -0,0 +1,33 @@
+module Startback
+  module Support
+    module TransactionPolicy
+
+      # Returns the operation's transaction policy
+      def transaction_policy
+        @transaction_policy || :before_call
+      end
+
+      # Sets the transaction policy to use. Valid values are:
+      # - before_call : the transaction is started by the operation
+      #   runner, right before calling the #call method on operation
+      #   instance
+      # - within_call: the transaction is started by the operation
+      #   itself, as part of its internal logic.
+      def transaction_policy=(policy)
+        unless [:before_call, :within_call].include?(policy)
+          raise ArgumentError, "Unknown policy `#{policy}`"
+        end
+        @transaction_policy = policy
+      end
+
+      def after_commit(&bl)
+        after_call do
+          db.after_commit do
+            instance_exec(&bl)
+          end
+        end
+      end
+
+    end # module TransactionPolicy
+  end # module Support
+end # module Startback

data/lib/startback/support.rb

@@ -19,3 +19,5 @@ require_relative 'support/logger'
 require_relative 'support/robustness'
 require_relative 'support/hooks'
 require_relative 'support/operation_runner'
+require_relative 'support/transaction_policy'
+require_relative 'support/transaction_manager'

data/lib/startback/version.rb

@@ -1,8 +1,8 @@
 module Startback
   module Version
     MAJOR = 0
-    MINOR = 8
-    TINY  = 3
+    MINOR = 10
+    TINY  = 1
   end
   VERSION = "#{Version::MAJOR}.#{Version::MINOR}.#{Version::TINY}"
 end

data/lib/startback/web/shield.rb

@@ -34,10 +34,25 @@ module Startback
       # A bit of logic to choose the best error message for the user
       # according to the error class
       self.body{|ex|
-        ex = ex.root_cause if ex.is_a?(Finitio::TypeError)
-        { code: ex.class.name, description: ex.message }.to_json
+        body_for(ex).to_json
       }
 
+      def body_for(ex)
+        ex = ex.root_cause if ex.is_a?(Finitio::TypeError)
+        body = { code: ex.class.name, description: ex.message }
+        return body unless ex.is_a?(Startback::Errors::Error)
+        return body unless ex.has_causes?
+
+        body[:causes] = ex.causes
+          .filter{|cause|
+            cause.is_a?(Startback::Errors::Error)
+          }
+          .map{|cause|
+            body_for(cause)
+          }
+        body
+      end
+
     end # class Shield
   end # module Web
 end # module Startback

data/spec/unit/support/operation_runner/test_around_run.rb

@@ -68,7 +68,7 @@ module Startback
       end
 
       context 'the around feature with a class' do
-        class TransactionManager
+        class SomeTransactionManager
           include Singleton
 
           def initialize
@@ -87,7 +87,7 @@ module Startback
 
         class RunnerTest3
           include OperationRunner
-          around_run TransactionManager.instance
+          around_run SomeTransactionManager.instance
 
           def operation_world(op)
             { hello: "world" }
@@ -97,7 +97,7 @@ module Startback
         it 'calls the proc with expected parameters' do
           test = RunnerTest3.new
           got = test.run(op)
-          expect(TransactionManager.instance.called).to eql(true)
+          expect(SomeTransactionManager.instance.called).to eql(true)
           expect(got).to eql({
             seen_hello: "world"
           })
@@ -154,4 +154,3 @@ module Startback
     end # module OperationRunner
   end # module Support
 end # module Startback
-

data/spec/unit/support/test_transaction_manager.rb

@@ -0,0 +1,64 @@
+require 'spec_helper'
+module Startback
+  module Support
+    describe TransactionManager do
+      subject do
+        TransactionManager.new(db).call(nil, op) do
+          op.call
+        end
+      end
+
+      class FakeDatabase
+        def initialize
+          @called = false
+        end
+        attr_reader :called
+
+        def transaction
+          @called = true
+          yield
+        end
+      end
+
+      let(:db) do
+        FakeDatabase.new
+      end
+
+      context 'when called with a default operation' do
+        class OperationNotManagingTransactions < Startback::Operation
+          def call
+            12
+          end
+        end
+
+        let(:op) do
+          OperationNotManagingTransactions.new
+        end
+
+        it 'calls db.transaction' do
+          expect(subject).to eql(12)
+          expect(db.called).to eql(true)
+        end
+      end
+
+      context 'when called with an operation that manages the transactions itself' do
+        class OperationManagingTransactions < Startback::Operation
+          self.transaction_policy = :within_call
+
+          def call
+            12
+          end
+        end
+
+        let(:op) do
+          OperationManagingTransactions.new
+        end
+
+        it 'calls db.transaction' do
+          expect(subject).to eql(12)
+          expect(db.called).to eql(false)
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: startback
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.10.1
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-25 00:00:00.000000000 Z
+date: 2021-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -228,22 +228,22 @@ dependencies:
   name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.3.8
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.3.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.3.8
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.3.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
@@ -380,7 +380,6 @@ extra_rdoc_files: []
 files:
 - README.md
 - Rakefile
-- VERSION
 - lib/startback.rb
 - lib/startback/audit.rb
 - lib/startback/audit/prometheus.rb
@@ -411,6 +410,8 @@ files:
 - lib/startback/support/logger.rb
 - lib/startback/support/operation_runner.rb
 - lib/startback/support/robustness.rb
+- lib/startback/support/transaction_manager.rb
+- lib/startback/support/transaction_policy.rb
 - lib/startback/version.rb
 - lib/startback/web/api.rb
 - lib/startback/web/auto_caching.rb
@@ -438,6 +439,7 @@ files:
 - spec/unit/support/operation_runner/test_around_run.rb
 - spec/unit/support/operation_runner/test_before_after_call.rb
 - spec/unit/support/test_robusteness.rb
+- spec/unit/support/test_transaction_manager.rb
 - spec/unit/test_event.rb
 - spec/unit/test_operation.rb
 - spec/unit/test_support.rb
@@ -470,7 +472,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: Got Your Ruby Back

data/VERSION

@@ -1 +0,0 @@
-0.8.3