light-service 0.10.2 → 0.14.0

data/lib/light-service/organizer/with_reducer_log_decorator.rb

@@ -5,10 +5,13 @@ module LightService
 
       alias logged? logged
 
-      def initialize(organizer, decorated = WithReducer.new)
+      def initialize(organizer, decorated: WithReducer.new, logger:)
         @decorated = decorated
         @organizer = organizer
-        @logger = LightService::Configuration.logger
+
+        decorated.organizer = organizer
+
+        @logger = logger
         @logged = false
       end
 

data/lib/light-service/testing/context_factory.rb

@@ -1,17 +1,6 @@
 module LightService
   module Testing
     class ContextFactory
-      class ContextFactoryOrganizer
-        extend LightService::Organizer
-        class << self
-          attr_accessor :actions
-        end
-
-        def self.call(ctx)
-          with(ctx).reduce(actions)
-        end
-      end
-
       attr_reader :organizer
 
       def self.make_from(organizer)
@@ -19,25 +8,33 @@ module LightService
       end
 
       def for(action)
-        ContextFactoryOrganizer.actions = find_up_to(action)
+        @organizer.append_before_actions(
+          lambda do |ctx|
+            if ctx.current_action == action
+              # The last `:_before_actions` hook is for
+              # ContextFactory, remove it, so it won't
+              # be invoked again
+              ctx[:_before_actions].pop
+
+              throw(:return_ctx_from_execution, ctx)
+            end
+          end
+        )
+
         self
       end
 
-      def with(ctx)
-        ContextFactoryOrganizer.call(ctx)
+      # More than one arguments can be passed to the
+      # Organizer's #call method
+      def with(*args, &block)
+        catch(:return_ctx_from_execution) do
+          @organizer.call(*args, &block)
+        end
       end
 
       def initialize(organizer)
         @organizer = organizer
       end
-
-      def find_up_to(action)
-        original_actions = organizer.actions
-
-        original_actions.take_while do |current_action|
-          current_action != action
-        end
-      end
     end
   end
 end

data/lib/light-service/version.rb

@@ -1,3 +1,3 @@
 module LightService
-  VERSION = "0.10.2".freeze
+  VERSION = "0.14.0".freeze
 end

data/light-service.gemspec

@@ -16,10 +16,11 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = LightService::VERSION
 
-  gem.add_dependency("activesupport", ">= 3.0")
+  gem.add_runtime_dependency("activesupport", ">= 3.0.0")
 
   gem.add_development_dependency("rspec", "~> 3.0")
-  gem.add_development_dependency("simplecov", "~> 0.16.1")
-  gem.add_development_dependency("rubocop", "~> 0.53")
-  gem.add_development_dependency("pry", "~> 0.10")
+  gem.add_development_dependency("simplecov", "~> 0.17")
+  gem.add_development_dependency("rubocop", "~> 0.68.0")
+  gem.add_development_dependency("rubocop-performance", "~> 1.2.0")
+  gem.add_development_dependency("pry", "~> 0.12.2")
 end

data/spec/acceptance/after_actions_spec.rb

@@ -64,4 +64,17 @@ RSpec.describe 'Action after_actions' do
       expect(result.fetch(:number)).to eq(1)
     end
   end
+
+  describe 'after_actions can be appended' do
+    it 'adds to the :_after_actions collection' do
+      TestDoubles::AdditionOrganizer.append_after_actions(
+        lambda do |ctx|
+          ctx.number -= 3 if ctx.current_action == TestDoubles::AddsThreeAction
+        end
+      )
+
+      result = TestDoubles::AdditionOrganizer.call(0)
+      expect(result.fetch(:number)).to eq(3)
+    end
+  end
 end

data/spec/acceptance/custom_log_from_organizer_spec.rb

@@ -0,0 +1,60 @@
+require 'spec_helper'
+
+describe "Log from an organizer with a custom logger" do
+  context "when overriding the global LightService organizer" do
+    let(:global_logger_organizer) do
+      Class.new do
+        extend LightService::Organizer
+
+        def self.call(number)
+          with(:number => number).reduce(actions)
+        end
+
+        def self.actions
+          [
+            TestDoubles::AddsOneAction,
+            TestDoubles::AddsTwoAction,
+            TestDoubles::AddsThreeAction
+          ]
+        end
+      end
+    end
+
+    let(:global_logger_string) { StringIO.new }
+
+    let(:custom_logger_string) { StringIO.new }
+    let(:custom_logger_organizer) do
+      custom_logger = Logger.new(custom_logger_string)
+
+      Class.new do
+        extend LightService::Organizer
+        log_with custom_logger
+
+        def self.call(coffee, this_hot = :very_hot)
+          with(:milk => this_hot, :coffee => coffee)
+            .reduce(TestDoubles::MakesLatteAction,
+                    TestDoubles::AddsTwoActionWithFetch)
+        end
+      end
+    end
+
+    before do
+      @original_global_logger = LightService::Configuration.logger
+      LightService::Configuration.logger = Logger.new(global_logger_string)
+    end
+
+    it "logs in own logger" do
+      global_logger_organizer.call(1)
+      custom_logger_organizer.call(:coffee => "Cappucino")
+
+      expect(custom_logger_string.string).to include("MakesLatteAction")
+      expect(custom_logger_string.string).to_not include("AddsOneAction")
+      expect(global_logger_string.string).to include("AddsOneAction")
+      expect(global_logger_string.string).to_not include("MakesLatteAction")
+    end
+
+    after do
+      LightService::Configuration.logger = @original_global_logger
+    end
+  end
+end

data/spec/acceptance/fail_spec.rb

@@ -1,24 +1,50 @@
 require 'spec_helper'
 
-RSpec.describe "fail! returns immediately from executed block" do
-  class FailAction
-    extend LightService::Action
-    promises :one, :two
-
-    executed do |ctx|
-      ctx.one = 1
-      # Have to set it in Context
-      ctx.two = nil
-
-      ctx.fail_and_return!('Something went wrong')
-      ctx.two = 2
+RSpec.describe "fail_and_return!" do
+  describe "returns immediately from executed block" do
+    class FailAndReturnAction
+      extend LightService::Action
+      promises :one, :two
+
+      executed do |ctx|
+        ctx.one = 1
+        # Have to set it in Context
+        ctx.two = nil
+
+        ctx.fail_and_return!('Something went wrong')
+        ctx.two = 2
+      end
+    end
+
+    it "returns immediately from executed block" do
+      result = FailAndReturnAction.execute
+
+      expect(result).to be_failure
+      expect(result.two).to be_nil
     end
   end
 
-  it "returns immediately from executed block" do
-    result = FailAction.execute
+  describe "accepts error_code option" do
+    class FailAndReturnWithErrorCodeAction
+      extend LightService::Action
+      promises :one, :two
 
-    expect(result).to be_failure
-    expect(result.two).to be_nil
+      executed do |ctx|
+        ctx.one = 1
+        # Have to set it in Context
+        ctx.two = nil
+
+        ctx.fail_and_return!('Something went wrong', :error_code => 401)
+        ctx.two = 2
+      end
+    end
+
+    it "returned context contains the error_code" do
+      result = FailAndReturnWithErrorCodeAction.execute
+
+      expect(result).to be_failure
+      expect(result.error_code).to eq 401
+      expect(result.two).to be_nil
+    end
   end
 end

data/spec/acceptance/organizer/add_aliases_spec.rb

@@ -0,0 +1,28 @@
+require 'spec_helper'
+
+RSpec.describe LightService::Organizer do
+  class TestAddAliases
+    extend LightService::Organizer
+
+    def self.call(context = LightService::Context.make)
+      with(context).reduce(steps)
+    end
+
+    def self.steps
+      [
+        add_to_context(:my_message => 'Hello There'),
+        # This will add the alias `:a_message` which points
+        # to the :my_message key's value
+        add_aliases(:my_message => :a_message),
+        TestDoubles::CapitalizeMessage
+      ]
+    end
+  end
+
+  it 'adds aliases to the context embedded in the series of actions' do
+    result = TestAddAliases.call
+
+    expect(result).to be_success
+    expect(result.final_message).to eq('HELLO THERE')
+  end
+end

data/spec/acceptance/organizer/add_to_context_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+RSpec.describe LightService::Organizer do
+  class TestAddToContext
+    extend LightService::Organizer
+
+    def self.call(context = LightService::Context.make)
+      with(context).reduce(steps)
+    end
+
+    def self.steps
+      [
+        # This will add the `:number` key to the context
+        # with the value of 0, so it's available for
+        # AddsOneAction
+        add_to_context(:number => 0),
+        TestDoubles::AddsOneAction,
+        add_to_context(:something => 'hello')
+      ]
+    end
+  end
+
+  it 'adds items to the context on the fly' do
+    result = TestAddToContext.call
+
+    expect(result).to be_success
+    expect(result.number).to eq(1)
+    expect(result[:something]).to eq('hello')
+  end
+end

data/spec/acceptance/organizer/execute_spec.rb

@@ -14,7 +14,7 @@ RSpec.describe LightService::Organizer do
         TestDoubles::AddsOneAction,
         execute(->(ctx) { ctx.number += 1 }),
         execute(->(ctx) { ctx[:something] = 'hello' }),
-        TestDoubles::AddsOneAction
+        TestDoubles::AddsOne.actions
       ]
     end
   end

data/spec/acceptance/organizer/iterate_spec.rb

@@ -20,6 +20,13 @@ RSpec.describe LightService::Organizer do
     expect(result.number).to eq(5)
   end
 
+  it "knows that it's being iterated from within an organizer" do
+    result = TestDoubles::TestIterate.call(:number => 1,
+                                           :counters => [1, 2, 3, 4])
+
+    expect(result.organized_by).to eq TestDoubles::TestIterate
+  end
+
   it 'will not iterate over a failed context' do
     empty_context.fail!('Something bad happened')
 

data/spec/acceptance/organizer/reduce_if_spec.rb

@@ -48,4 +48,42 @@ RSpec.describe LightService::Organizer do
     result = TestReduceIf.call(empty_context)
     expect(result).to be_success
   end
+
+  it "knows that it's being conditionally reduced from within an organizer" do
+    result = TestReduceIf.call(:number => 2)
+
+    expect(result.organized_by).to eq TestReduceIf
+  end
+
+  it 'skips actions within in its own scope' do
+    org = Class.new do
+      extend LightService::Organizer
+
+      def self.call
+        reduce(actions)
+      end
+
+      def self.actions
+        [
+          reduce_if(
+            ->(c) { !c.nil? },
+            [
+              execute(->(c) { c[:first_reduce_if] = true }),
+              execute(->(c) { c.skip_remaining! }),
+              execute(->(c) { c[:second_reduce_if] = true })
+            ]
+          ),
+          execute(->(c) { c[:last_outside] = true })
+        ]
+      end
+    end
+
+    result = org.call
+
+    aggregate_failures do
+      expect(result[:first_reduce_if]).to be true
+      expect(result[:second_reduce_if]).to be_nil
+      expect(result[:last_outside]).to be true
+    end
+  end
 end

data/spec/acceptance/organizer/reduce_until_spec.rb

@@ -40,4 +40,10 @@ RSpec.describe LightService::Organizer do
     result = TestReduceUntil.call(empty_context)
     expect(result).to be_success
   end
+
+  it "is expected to know its organizer when reducing until a condition" do
+    result = TestReduceUntil.call(:number => 1)
+
+    expect(result.organized_by).to eq TestReduceUntil
+  end
 end

data/spec/acceptance/testing/context_factory_spec.rb

@@ -8,12 +8,12 @@ class AdditionOrganizerContextFactory
     LightService::Testing::ContextFactory
       .make_from(TestDoubles::AdditionOrganizer)
       .for(action)
-      .with(:number => number)
+      .with(number)
   end
 end
 
 RSpec.describe TestDoubles::AddsThreeAction do
-  it "creates a context for the action with ContextFactory wrapper" do
+  it 'creates a context for the action with ContextFactory wrapper' do
     context =
       AdditionOrganizerContextFactory
       .make_for(TestDoubles::AddsThreeAction, 1)
@@ -21,13 +21,34 @@ RSpec.describe TestDoubles::AddsThreeAction do
     expect(context.number).to eq(7)
   end
 
-  it "creates a context for the action using the ContextFactory" do
+  it 'creates a context for the action using the ContextFactory' do
     context =
       LightService::Testing::ContextFactory
       .make_from(TestDoubles::AdditionOrganizer)
       .for(TestDoubles::AddsThreeAction)
-      .with(:number => 4) # Context is a "glorified" hash
+      .with(4) # Context is a "glorified" hash
 
     expect(context.number).to eq(7)
   end
+
+  it "works with multiple arguments passed to Organizer's call method" do
+    context = LightService::Testing::ContextFactory
+              .make_from(TestDoubles::ExtraArgumentAdditionOrganizer)
+              .for(described_class)
+              .with(4, 2)
+
+    expect(context.number).to eq(9)
+  end
+end
+
+RSpec.describe TestDoubles::AddsTwoAction do
+  it 'does not execute a callback entirely from a ContextFactory' do
+    context = LightService::Testing::ContextFactory
+              .make_from(TestDoubles::CallbackOrganizer)
+              .for(described_class)
+              .with(:number => 0)
+
+    # add 1, add 10, then stop before executing first add 2
+    expect(context.number).to eq(11)
+  end
 end

data/spec/action_spec.rb

@@ -68,6 +68,14 @@ describe LightService::Action do
     expect(result.to_hash).to eq(:number => 2)
   end
 
+  context "when called directly" do
+    it "is expected to not be organized" do
+      result = TestDoubles::AddsTwoActionWithFetch.execute(context)
+
+      expect(result.organized_by).to be_nil
+    end
+  end
+
   context "when invoked with hash" do
     it "creates LightService::Context implicitly" do
       ctx = { :some_key => "some value" }