light-service 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24c5a758ab50b3cd0ec404ef0b8a426a3e77e42b
-  data.tar.gz: 03ec6d27e900c9685bd141340c2b191df781ab84
+  metadata.gz: 1f6b68783827acc1479c9728d2483dcba8c9c0e7
+  data.tar.gz: 0446e28166fd582394cb74819e855d26241e0393
 SHA512:
-  metadata.gz: ef89eee65b07381b629c9f4b8e5aad0e4e719e370e8aa84c32a23f65824d42c3e9c14424810b8518a244df4769b3f2e4f22a1752f6c498e44e146b803041bff3
-  data.tar.gz: 3476522df0af4775eff555a986d0dffbfed8dad3c0cd77a7a5eb19ca25b39c7109c8da8756a30625d39bf89e10fb7a54fd6212c15955bc544c37e66f2be6293d
+  metadata.gz: 6ac7178a1ea5e9fa7cd22a16de9533c953b504b5a999c26912fbb512e578cd1dcde66fc44d4414b56bf6e0c5be4d679b85b595bdc4e708cc6ac1bbd177a61e94
+  data.tar.gz: 5a881eca505d834cbf1b270215c0134f9b6d831fa37c29ca2737dec6d3fec6de9e224d0683f704e635301d6c9b47eb545e6e165d0c5a6aa69fd8f2b621e34376

data/RELEASES.md

@@ -1,5 +1,8 @@
 A brief list of new features and changes introduced with the specified version.
 
+### 0.10.1
+* [Fixing ContextFactory](https://github.com/adomokos/light-service/pull/141) for orchestrator methods in Organizers.
+
 ### 0.10.0
 * Adding [before_actions and after_actions hooks](https://github.com/adomokos/light-service/pull/144).
 

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,28 @@ module LightService
       end
 
       def for(action)
-        ContextFactoryOrganizer.actions = find_up_to(action)
+        @organizer.before_actions = [
+          lambda do |ctx|
+            if ctx.current_action == action
+              throw(:return_ctx_from_execution, ctx)
+            end
+          end
+        ]
+
         self
       end
 
       def with(ctx)
-        ContextFactoryOrganizer.call(ctx)
+        escaped = catch(:return_ctx_from_execution) do
+          @organizer.call(ctx)
+        end
+
+        escaped
       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.0".freeze
+  VERSION = "0.10.1".freeze
 end

data/spec/acceptance/testing/context_factory_spec.rb

@@ -8,7 +8,7 @@ class AdditionOrganizerContextFactory
     LightService::Testing::ContextFactory
       .make_from(TestDoubles::AdditionOrganizer)
       .for(action)
-      .with(:number => number)
+      .with(number)
   end
 end
 
@@ -26,8 +26,20 @@ RSpec.describe TestDoubles::AddsThreeAction do
       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
 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/test_doubles.rb

@@ -251,6 +251,99 @@ module TestDoubles
     end
   end
 
+  class IterateOrganizer
+    extend LightService::Organizer
+
+    def self.call(ctx)
+      with(ctx).reduce(actions)
+    end
+
+    def self.actions
+      [
+        AddsOneIteratesAction,
+        iterate(:numbers, [
+                  AddsTwoAction,
+                  AddsThreeAction
+                ])
+      ]
+    end
+  end
+
+  class AddsOneIteratesAction
+    extend LightService::Action
+    expects :numbers
+    promises :numbers
+
+    executed do |context|
+      context.numbers = context.numbers.map { |n| n + 1 }
+    end
+  end
+
+  class CallbackOrganizer
+    extend LightService::Organizer
+
+    def self.call(ctx)
+      with(ctx).reduce(actions)
+    end
+
+    def self.actions
+      [
+        AddsOneAction,
+        with_callback(AddTenCallbackAction, [
+                        AddsTwoAction,
+                        AddsThreeAction
+                      ])
+      ]
+    end
+  end
+
+  class AddTenCallbackAction
+    extend LightService::Action
+    expects :number, :callback
+
+    executed do |context|
+      context.number += 10
+      context.number =
+        context.callback.call(context).fetch(:number)
+    end
+  end
+
+  class ReduceUntilOrganizer
+    extend LightService::Organizer
+
+    def self.call(ctx)
+      with(ctx).reduce(actions)
+    end
+
+    def self.actions
+      [
+        AddsOneAction,
+        reduce_until(->(ctx) { ctx.number > 3 }, [
+                       AddsTwoAction,
+                       AddsThreeAction
+                     ])
+      ]
+    end
+  end
+
+  class ReduceIfOrganizer
+    extend LightService::Organizer
+
+    def self.call(ctx)
+      with(ctx).reduce(actions)
+    end
+
+    def self.actions
+      [
+        AddsOneAction,
+        reduce_if(->(ctx) { ctx.number > 1 }, [
+                    AddsTwoAction,
+                    AddsThreeAction
+                  ])
+      ]
+    end
+  end
+
   class MakesTeaExpectingReservedKey
     extend LightService::Action
     expects :tea, :message

data/spec/testing/context_factory/iterate_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+require 'test_doubles'
+
+RSpec.describe 'ContextFactory - used with IterateOrganizer' do
+  let(:organizer) { TestDoubles::IterateOrganizer }
+
+  context 'when called with outside iterate steps' do
+    it 'creates a context up-to the action defined before the iteration' do
+      ctx =
+        LightService::Testing::ContextFactory
+        .make_from(organizer)
+        .for(TestDoubles::AddsOneIteratesAction)
+        .with(:numbers => [1, 2])
+
+      expect(ctx[:numbers]).to eq([1, 2])
+    end
+
+    it 'creates a context up-to iteration with empty context steps' do
+      ctx =
+        LightService::Testing::ContextFactory
+        .make_from(organizer)
+        .for(TestDoubles::AddsTwoAction)
+        .with(:numbers => [1, 2])
+
+      expect(ctx.numbers).to eq([2, 3])
+    end
+
+    it 'creates a context only to the first step of the iteration' do
+      ctx =
+        LightService::Testing::ContextFactory
+        .make_from(organizer)
+        .for(TestDoubles::AddsThreeAction)
+        .with(:numbers => [1, 2])
+
+      expect(ctx.numbers).to eq([2, 3])
+      expect(ctx.number).to eq(4)
+    end
+  end
+end

data/spec/testing/context_factory/reduce_if_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+require 'test_doubles'
+
+RSpec.describe 'ContextFactory - used with ReduceIfOrganizer' do
+  let(:organizer) { TestDoubles::ReduceIfOrganizer }
+
+  context 'when called with a truthy argument action' do
+    it 'executes a context up-to the callback action' do
+      ctx =
+        LightService::Testing::ContextFactory
+        .make_from(organizer)
+        .for(TestDoubles::AddsThreeAction)
+        .with(:number => 1)
+
+      expect(ctx.number).to eq(4)
+    end
+
+    it 'creates a context up-to action with empty context steps' do
+      ctx =
+        LightService::Testing::ContextFactory
+        .make_from(organizer)
+        .for(TestDoubles::AddsTwoAction)
+        .with(:number => 1)
+
+      expect(ctx.number).to eq(2)
+    end
+  end
+
+  context 'when called with a false argument action' do
+    it 'does not execute the steps' do
+      ctx =
+        LightService::Testing::ContextFactory
+        .make_from(organizer)
+        .for(TestDoubles::AddsThreeAction)
+        .with(:number => 0)
+
+      expect(ctx.number).to eq(1)
+    end
+  end
+end

data/spec/testing/context_factory/reduce_until_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+require 'test_doubles'
+
+RSpec.describe 'ContextFactory - used with ReduceUntilOrganizer' do
+  let(:organizer) { TestDoubles::ReduceUntilOrganizer }
+
+  context 'when called with truthy block' do
+    it 'creates a context up-to the action defined before the iteration' do
+      ctx =
+        LightService::Testing::ContextFactory
+        .make_from(organizer)
+        .for(TestDoubles::AddsTwoAction)
+        .with(:number => 1)
+
+      expect(ctx[:number]).to eq(2)
+    end
+
+    it 'creates a context only to the first step of the loop' do
+      ctx =
+        LightService::Testing::ContextFactory
+        .make_from(organizer)
+        .for(TestDoubles::AddsThreeAction)
+        .with(:number => 1)
+
+      expect(ctx.number).to eq(4)
+    end
+  end
+
+  context 'when called with falsey block' do
+    it 'creates a context up-to the first step' do
+      ctx =
+        LightService::Testing::ContextFactory
+        .make_from(organizer)
+        .for(TestDoubles::AddsThreeAction)
+        .with(:number => 7)
+
+      expect(ctx[:number]).to eq(10)
+    end
+  end
+end

data/spec/testing/context_factory/with_callback_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+require 'test_doubles'
+
+RSpec.describe 'ContextFactory - used with CallbackOrganizer' do
+  let(:organizer) { TestDoubles::CallbackOrganizer }
+
+  context 'when called with the callback action' do
+    it 'creates a context up-to the callback action' do
+      ctx =
+        LightService::Testing::ContextFactory
+        .make_from(organizer)
+        .for(TestDoubles::AddTenCallbackAction)
+        .with(:number => 1)
+
+      expect(ctx.number).to eq(2)
+    end
+
+    it 'creates a context up-to callback action with empty context steps' do
+      ctx =
+        LightService::Testing::ContextFactory
+        .make_from(organizer)
+        .for(TestDoubles::AddsTwoAction)
+        .with(:number => 1)
+
+      expect(ctx.number).to eq(12)
+    end
+
+    it 'creates a context up-to the action defined in context steps' do
+      ctx =
+        LightService::Testing::ContextFactory
+        .make_from(organizer)
+        .for(TestDoubles::AddsThreeAction)
+        .with(:number => 1)
+
+      expect(ctx.number).to eq(14)
+    end
+  end
+end

data/spec/testing/context_factory_spec.rb

@@ -2,13 +2,15 @@ require 'spec_helper'
 require 'test_doubles'
 
 describe 'ContextFactory - used with AdditionOrganizer' do
+  let(:organizer) { TestDoubles::AdditionOrganizer }
+
   context 'when called with the first action' do
     it 'does not alter the context' do
       ctx =
         LightService::Testing::ContextFactory
-        .make_from(TestDoubles::AdditionOrganizer)
+        .make_from(organizer)
         .for(TestDoubles::AddsOneAction)
-        .with(:number => 1)
+        .with(1)
 
       expect(ctx[:number]).to eq(1)
     end
@@ -18,9 +20,9 @@ describe 'ContextFactory - used with AdditionOrganizer' do
     it 'adds one to the number provided' do
       ctx =
         LightService::Testing::ContextFactory
-        .make_from(TestDoubles::AdditionOrganizer)
+        .make_from(organizer)
         .for(TestDoubles::AddsTwoAction)
-        .with(:number => 1)
+        .with(1)
 
       expect(ctx.number).to eq(2)
     end
@@ -30,9 +32,9 @@ describe 'ContextFactory - used with AdditionOrganizer' do
     it 'creates a context up-to the action defined' do
       ctx =
         LightService::Testing::ContextFactory
-        .make_from(TestDoubles::AdditionOrganizer)
+        .make_from(organizer)
         .for(TestDoubles::AddsThreeAction)
-        .with(:number => 1)
+        .with(1)
 
       expect(ctx.number).to eq(4)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: light-service
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Attila Domokos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-29 00:00:00.000000000 Z
+date: 2018-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -179,6 +179,10 @@ files:
 - spec/spec_helper.rb
 - spec/support.rb
 - spec/test_doubles.rb
+- spec/testing/context_factory/iterate_spec.rb
+- spec/testing/context_factory/reduce_if_spec.rb
+- spec/testing/context_factory/reduce_until_spec.rb
+- spec/testing/context_factory/with_callback_spec.rb
 - spec/testing/context_factory_spec.rb
 homepage: https://github.com/adomokos/light-service
 licenses:
@@ -252,4 +256,8 @@ test_files:
 - spec/spec_helper.rb
 - spec/support.rb
 - spec/test_doubles.rb
+- spec/testing/context_factory/iterate_spec.rb
+- spec/testing/context_factory/reduce_if_spec.rb
+- spec/testing/context_factory/reduce_until_spec.rb
+- spec/testing/context_factory/with_callback_spec.rb
 - spec/testing/context_factory_spec.rb