light-service 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cce43f62b668f6fa04385c772ca0d006b9e92ca0
-  data.tar.gz: 3d246a1c22bc6dfa9afef1c64d77c1b15b16618b
+  metadata.gz: 55ba3cb29c4ce4e3e59c3129bc8baf4287efe0c2
+  data.tar.gz: ba0a1fc827bee6a92346c886948c024753796880
 SHA512:
-  metadata.gz: 2c00210b56fb1be0cf27ac8c415f421421902088443ed8919d48ee600f22446e8d2b007586b5a4fae553fe39e11092589face9df3950e6e638f5e1a7fa524a81
-  data.tar.gz: 4171398c9f082dae55888485c98e7fe0d335cd0bd527c488b095921055b05659ab1495b33be899b1460839ac41783d902d43121c074276e94c8670481646dae9
+  metadata.gz: 64a014abda6e16cd5d1c4a62ea188b576a8878e46304f90d5768666f5e944869fc84814c250dfc986b7be67eb7c76fd736d74363171445f5401b5457704d36d4
+  data.tar.gz: 77d665f3fcd08eb79c598871fe1c97e6bba9e34b773fe2b083ed8001fa356c383a13fba2195157d187d84110c57fc929f0de81874de07207dfa529b821319ed2

data/README.md

@@ -66,7 +66,7 @@ This is how the organizer and actions interact with eachother:
 
 ```ruby
 class CalculatesTax
-  include LightService::Organizer
+  extend LightService::Organizer
 
   def self.for_order(order)
     with(:order => order).reduce(
@@ -78,7 +78,7 @@ class CalculatesTax
 end
 
 class LooksUpTaxPercentageAction
-  include LightService::Action
+  extend LightService::Action
   expects :order
   promises :tax_percentage
 
@@ -104,7 +104,7 @@ class LooksUpTaxPercentageAction
 end
 
 class CalculatesOrderTaxAction
-  include ::LightService::Action
+  extend ::LightService::Action
   expects :order, :tax_percentage
 
   executed do |context|
@@ -114,7 +114,7 @@ class CalculatesOrderTaxAction
 end
 
 class ProvidesFreeShippingAction
-  include LightService::Action
+  extend LightService::Action
   expects :order
 
   executed do |context|
@@ -154,7 +154,7 @@ action is reduced. If either of them are violated, a custom exception is thrown.
 This is how it's used:
 ```ruby
 class FooAction
-  include LightService::Action
+  extend LightService::Action
   expects :baz
   promises :bar
 
@@ -172,7 +172,7 @@ makes it available to you through a reader. You can refactor the action like thi
 
 ```ruby
 class FooAction
-  include LightService::Action
+  extend LightService::Action
   expects :baz
   promises :bar
 
@@ -188,7 +188,7 @@ you use the accessor with the same name. The code above can be further simplifie
 
 ```ruby
 class FooAction
-  include LightService::Action
+  extend LightService::Action
   expects :baz
   promises :bar
 
@@ -200,6 +200,46 @@ end
 
 Take a look at [this spec](spec/action_expects_and_promises_spec.rb) to see the refactoring in action.
 
+## Key Aliases
+The `aliases` macro sets up pairs of keys and aliases in an Organizer.  Actions can access the context using the aliases.
+
+This allows you to put together existing Actions from different sources and have them work together without having to modify their code.  Aliases will work with or without Action `expects`.
+
+Say for example you have actions `AnAction` and `AnotherAction` that you've used in previous projects.  `AnAction` provides `:my_key` but `AnotherAction` needs to use that value but expects `:key_alias`.  You can use them together in an organizer like so:
+
+```ruby
+class AnOrganizer
+  extend LightService::Organizer
+
+  aliases my_key: :key_alias
+
+  def self.for_order(order)
+    with(:order => order).reduce(
+        AnAction,
+        AnotherAction,
+      )
+  end
+end
+
+class AnAction
+  extend LightService::Action
+  promises :my_key
+
+  executed do |context|
+    context.my_key = "value"
+  end
+end
+
+class AnotherAction
+  extend LightService::Action
+  expects :key_alias
+
+  executed do |context|
+    context.key_alias # => "value"
+  end
+end
+```
+
 ## Logging
 
 Enable LightService's logging to better understand what goes on within the series of actions,
@@ -266,7 +306,7 @@ Normally, when something goes wrong in your actions, you fail the process by set
 
 ```ruby
 class FooAction
-  include LightService::Action
+  extend LightService::Action
 
   executed do |context|
     context.fail!("I don't like what happened here.")
@@ -280,7 +320,7 @@ or in the actions.
 
 ```ruby
 class FooAction
-  include LightService::Action
+  extend LightService::Action
 
   executed do |context|
     unless (service_call.success?)
@@ -305,7 +345,7 @@ the `rolled_back` macro.
 
 ```ruby
 class SaveEntities
-  include LightService::Action
+  extend LightService::Action
   expects :user
 
   executed do |context|
@@ -323,7 +363,7 @@ was triggered.
 
 ```ruby
 class CallExternalApi
-  include LightService::Action
+  extend LightService::Action
 
   executed do |context|
     api_call_result = SomeAPI.save_user(context.user)
@@ -345,7 +385,7 @@ By default LightService provides a mechanism for easily translating your error o
 
 ```ruby
 class FooAction
-  include LightService::Action
+  extend LightService::Action
 
   executed do |context|
     unless service_call.success?
@@ -363,7 +403,7 @@ This also works with nested classes via the ActiveSupport `#underscore` method,
 ```ruby
 module PaymentGateway
   class CaptureFunds
-    include LightService::Action
+    extend LightService::Action
 
     executed do |context|
       if api_service.failed?
@@ -382,7 +422,7 @@ If you need to provide custom variables for interpolation during localization, p
 ```ruby
 module PaymentGateway
   class CaptureFunds
-    include LightService::Action
+    extend LightService::Action
 
     executed do |context|
       if api_service.failed?

data/RELEASES.md

@@ -1,5 +1,9 @@
 A brief list of new features and changes introduced with the specified version.
 
+### 0.6.0
+* Using [extend](https://github.com/adomokos/light-service/pull/64) for using class methods in Actions and Organizers
+* Setting [key aliases](https://github.com/adomokos/light-service/pull/69) for the Context from the Organizer
+
 ### 0.5.2
 * Guarding context keys against the reserved keys the context needs to operate.
 

data/lib/light-service/action.rb

@@ -1,7 +1,12 @@
 module LightService
   module Action
 
+    def self.extended(base_class)
+      base_class.extend Macros
+    end
+
     def self.included(base_class)
+      ActiveSupport::Deprecation.warn "including LightService::Action is deprecated. Please use `extend LightService::Action` instead"
       base_class.extend Macros
     end
 
@@ -32,7 +37,7 @@ module LightService
           # Store the action within the context
           action_context.current_action = self
 
-          Context::KeyVerifier.verify_keys(action_context) do
+          Context::KeyVerifier.verify_keys(action_context, self) do
             action_context.define_accessor_methods_for_keys(all_keys)
 
             yield(action_context)
@@ -64,7 +69,7 @@ module LightService
       def all_keys
         expected_keys + promised_keys
       end
-
     end
+
   end
 end

data/lib/light-service/context.rb

@@ -5,7 +5,7 @@ module LightService
   end
 
   class Context < Hash
-    attr_accessor :outcome, :message, :error_code, :current_action
+    attr_accessor :message, :error_code, :current_action
 
     def initialize(context={}, outcome=Outcomes::SUCCESS, message='', error_code=nil)
       @outcome, @message, @error_code = outcome, message, error_code
@@ -19,8 +19,12 @@ module LightService
         raise ArgumentError, 'Argument must be Hash or LightService::Context'
       end
 
-      return context if context.is_a?(Context)
-      self.new(context)
+      unless context.is_a?(Context)
+        context = self.new(context)
+      end
+
+      context.set_aliases(context.delete(:_aliases)) if context[:_aliases]
+      context
     end
 
     def add_to_context(values)
@@ -39,9 +43,9 @@ module LightService
       @skip_all
     end
 
-    def set_success!(message)
-      warn '`set_success!` is DEPRECATED: please use `succeed!` instead'
-      succeed!(message)
+    def outcome
+      ActiveSupport::Deprecation.warn '`Context#outcome` attribute reader is DEPRECATED and will be removed'
+      @outcome
     end
 
     def succeed!(message=nil, options={})
@@ -49,11 +53,6 @@ module LightService
       @outcome = Outcomes::SUCCESS
     end
 
-    def set_failure!(message)
-      warn '`set_failure!` is DEPRECATED: please use `fail!` instead'
-      fail!(message)
-    end
-
     def fail!(message=nil, options_or_error_code={})
       options_or_error_code ||= {}
 
@@ -92,5 +91,25 @@ module LightService
         define_singleton_method("#{key}=") { |value| self[key] = value }
       end
     end
+
+    def set_aliases(aliases)
+      @aliases = aliases
+
+      aliases.each_pair do |key, key_alias|
+        self[key_alias] = self[key]
+      end
+    end
+
+    def aliases
+      @aliases ||= {}
+    end
+
+    def [](key)
+      super(key) || super(aliases.key(key))
+    end
+
+    def fetch(key, default_or_block = nil)
+      self[key] ||= super(key, default_or_block)
+    end
   end
 end

data/lib/light-service/context/key_verifier.rb

@@ -2,9 +2,9 @@ module LightService; class Context
   class KeyVerifier
     attr_reader :context, :action
 
-    def initialize(context)
+    def initialize(context, action)
       @context = context
-      @action = context.current_action
+      @action = action
     end
 
     def are_all_keys_in_context?(keys)
@@ -40,13 +40,13 @@ module LightService; class Context
       context
     end
 
-    def self.verify_keys(context, &block)
-      ReservedKeysVerifier.new(context).verify
-      ExpectedKeyVerifier.new(context).verify
+    def self.verify_keys(context, action, &block)
+      ReservedKeysVerifier.new(context, action).verify
+      ExpectedKeyVerifier.new(context, action).verify
 
       block.call
 
-      PromisedKeyVerifier.new(context).verify
+      PromisedKeyVerifier.new(context, action).verify
     end
   end
 

data/lib/light-service/organizer.rb

@@ -1,28 +1,31 @@
 module LightService
   module Organizer
+    def self.extended(base_class)
+      base_class.extend ClassMethods
+      base_class.extend Macros
+    end
     def self.included(base_class)
+      ActiveSupport::Deprecation.warn "including LightService::Organizer is deprecated. Please use `extend LightService::Organizer` instead"
       base_class.extend ClassMethods
+      base_class.extend Macros
     end
 
     # In case this module is included
     module ClassMethods
-      def with(data)
+      def with(data={})
+        data.merge!(:_aliases => @aliases) if @aliases
         WithReducerFactory.make(self).with(data)
       end
 
       def reduce(*actions)
-        WithReducerFactory.make(self).with.reduce(actions)
+        with({}).reduce(actions)
       end
     end
 
-    # Provide hooks for extending the class with these methods
-    def with(data = {})
-      WithReducerFactory.make(self).with(data)
-    end
-
-    def reduce(*actions)
-      WithReducerFactory.make(self).with.reduce(actions)
+    module Macros
+      def aliases(key_hash)
+        @aliases = key_hash
+      end
     end
-
   end
 end

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

@@ -11,14 +11,14 @@ module LightService; module Organizer
       raise "No action(s) were provided" if actions.empty?
       actions.flatten!
 
-      actions.reduce(context) do |context, action|
+      actions.reduce(context) do |current_context, action|
         begin
-          result = action.execute(context)
+          result = action.execute(current_context)
         rescue FailWithRollbackError
           result = reduce_rollback(actions)
         ensure
           # For logging
-          yield(context, action) if block_given?
+          yield(current_context, action) if block_given?
         end
 
         result
@@ -45,5 +45,6 @@ module LightService; module Organizer
       # Reverse from the point where the fail was triggered
       actions.take(index_of_current_action + 1)
     end
+
   end
 end; end

data/lib/light-service/version.rb

@@ -1,3 +1,3 @@
 module LightService
-  VERSION = "0.5.2"
+  VERSION = "0.6.0"
 end

data/spec/acceptance/include_warning_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+require 'test_doubles'
+
+describe "Including is discouraged" do
+  context "when including LightService::Organizer" do
+    it "gives warning" do
+      expect(ActiveSupport::Deprecation).to receive(:warn)
+                                        .with("including LightService::Organizer is deprecated. Please use `extend LightService::Organizer` instead")
+
+      class OrganizerIncludingLS
+        include LightService::Organizer
+      end
+    end
+  end
+
+  context "when including LightService::Action" do
+    it "gives warning" do
+      expect(ActiveSupport::Deprecation).to receive(:warn)
+                                        .with("including LightService::Action is deprecated. Please use `extend LightService::Action` instead")
+
+      class ActionIncludingLS
+        include LightService::Action
+      end
+    end
+  end
+end

data/spec/acceptance/message_localization_spec.rb

@@ -14,7 +14,7 @@ class TestsLocalizationAdapter
 end
 
 class TestsLocalizationInvocationOptionsAction
-  include LightService::Action
+  extend LightService::Action
   expects :pass_or_fail, :message_or_key, :i18n_options
 
   executed do |context|

data/spec/acceptance/rollback_spec.rb

@@ -14,7 +14,7 @@ class RollbackOrganizer
 end
 
 class AddsOneWithRollbackAction
-  include LightService::Action
+  extend LightService::Action
   expects :number
   promises :number
 
@@ -32,7 +32,7 @@ class AddsOneWithRollbackAction
 end
 
 class AddsThreeWithRollbackAction
-  include LightService::Action
+  extend LightService::Action
   expects :number
 
   executed do |context|
@@ -59,7 +59,7 @@ class RollbackOrganizerWithNoRollback
 end
 
 class AddsThreeWithNoRollbackAction
-  include LightService::Action
+  extend LightService::Action
   expects :number
 
   executed do |context|
@@ -82,7 +82,7 @@ class RollbackOrganizerWithMiddleRollback
 end
 
 class AddsTwoActionWithRollback
-  include LightService::Action
+  extend LightService::Action
   expects :number
 
   executed do |context|

data/spec/action_expects_and_promises_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe ":expects and :promises macros" do
   describe "actions are backward compatible" do
     class FooAction
-      include LightService::Action
+      extend LightService::Action
 
       executed do |context|
         baz = context.fetch :baz
@@ -21,7 +21,7 @@ describe ":expects and :promises macros" do
 
   context "when expected keys are not in context" do
     class FooNoExpectedKeyAction
-      include LightService::Action
+      extend LightService::Action
       expects :baz
 
       executed do |context|
@@ -40,7 +40,7 @@ describe ":expects and :promises macros" do
 
   describe "expected keys" do
     class FooWithReaderAction
-      include LightService::Action
+      extend LightService::Action
       expects :baz
 
       executed do |context|
@@ -58,7 +58,7 @@ describe ":expects and :promises macros" do
 
   context "when promised keys are not in context" do
     class FooNoPromisedKeyAction
-      include LightService::Action
+      extend LightService::Action
       expects :baz
       promises :bar
 
@@ -75,7 +75,7 @@ describe ":expects and :promises macros" do
 
   describe "promised keys" do
     class FooWithExpectsAndPromisesAction
-      include LightService::Action
+      extend LightService::Action
       expects :baz
       promises :bar
 

data/spec/action_promised_keys_spec.rb

@@ -6,7 +6,7 @@ describe ":promises macro" do
   context "when the promised key is not in the context" do
     it "raises an ArgumentError" do
       class TestDoubles::MakesCappuccinoAction1
-        include LightService::Action
+        extend LightService::Action
         expects :coffee, :milk
         promises :cappuccino
         executed do |context|
@@ -22,7 +22,7 @@ describe ":promises macro" do
 
     it "can fail the context without fulfilling its promise" do
       class TestDoubles::MakesCappuccinoAction2
-        include LightService::Action
+        extend LightService::Action
         expects :coffee, :milk
         promises :cappuccino
         executed do |context|
@@ -42,7 +42,7 @@ describe ":promises macro" do
   context "when the promised key is in the context" do
     it "can be set with an actual value" do
       class TestDoubles::MakesCappuccinoAction3
-        include LightService::Action
+        extend LightService::Action
         expects :coffee, :milk
         promises :cappuccino
         executed do |context|
@@ -61,7 +61,7 @@ describe ":promises macro" do
 
     it "can be set with nil" do
       class TestDoubles::MakesCappuccinoAction4
-        include LightService::Action
+        extend LightService::Action
         expects :coffee, :milk
         promises :cappuccino
         executed do |context|

data/spec/context_spec.rb

@@ -145,4 +145,31 @@ describe LightService::Context do
     expect { context.fail_with_rollback!("roll me back") }.to \
       raise_error(LightService::FailWithRollbackError)
   end
+
+  it "warns about the outcome attribute reader being deprecated" do
+    expect(ActiveSupport::Deprecation).to receive(:warn)
+
+    expect(context.outcome).to eq(::LightService::Outcomes::SUCCESS)
+  end
+
+  context "when aliases are included via .make" do
+    let(:context) do
+      LightService::Context.make(
+        :foo => "foobar",
+        :_aliases => aliases,
+      )
+    end
+    let(:aliases) { { :foo => :bar } }
+
+    it "contains the aliases" do
+      expect(context.aliases).to eq(aliases)
+      expect(context).to include(:foo, :bar)
+    end
+
+    it "returns the correct values for #[] and #fetch" do
+      expect(context[:bar]).to eq context[:foo]
+      expect(context.fetch(:bar)).to eq context[:foo]
+    end
+  end
+
 end

data/spec/organizer_key_aliases_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+require 'test_doubles'
+
+describe "organizer aliases macro" do
+  let(:organizer_with_alias) do
+    Class.new do
+      extend LightService::Organizer
+
+      aliases :promised_key => :expected_key
+
+      def self.do_something(ctx={})
+        with(ctx).reduce([
+          TestDoubles::PromisesPromisedKeyAction,
+          TestDoubles::ExpectsExpectedKeyAction,
+        ])
+      end
+    end
+  end
+
+  context "when aliases is invoked" do
+    it "makes aliases available to the actions" do
+      result = organizer_with_alias.do_something
+      expect(result[:expected_key]).to eq(result[:promised_key])
+      expect(result.expected_key).to eq(result[:promised_key])
+    end
+  end
+end

data/spec/organizer_spec.rb

@@ -58,4 +58,53 @@ describe LightService::Organizer do
         .not_to raise_error
     end
   end
+
+  context "when the organizer is also an action", "and the organizer rescues exceptions of its sub-actions" do
+    let(:organizer) do
+      Class.new do
+        extend LightService::Organizer
+        extend LightService::Action
+
+        executed do |ctx|
+          begin
+            with(ctx).
+              reduce(TestDoubles::MakesTeaPromisingKeyButRaisesException)
+          rescue
+          end
+        end
+      end
+    end
+
+    it "does not raise an error concerning a sub-action's missing keys" do
+      expect { organizer.execute }.not_to raise_error
+    end
+  end
+
+  context "when aliases are declared" do
+    let(:organizer) do
+      Class.new do
+        extend LightService::Organizer
+        aliases :foo => :bar
+
+        def self.do_stuff
+          with.reduce(TestDoubles::AnAction)
+        end
+      end
+    end
+
+    it "merges the aliases into the data" do
+      with_reducer = double(reduce: true)
+
+      allow(described_class::WithReducerFactory).to receive(:make).
+        and_return(with_reducer)
+
+      expect(with_reducer).to \
+        receive(:with).
+        with(hash_including(:_aliases => { :foo => :bar })).
+        and_return(with_reducer)
+
+      organizer.do_stuff
+    end
+  end
+
 end

data/spec/sample/tax/calculates_order_tax_action.rb

@@ -1,5 +1,5 @@
 class CalculatesOrderTaxAction
-  include ::LightService::Action
+  extend ::LightService::Action
   expects :order, :tax_percentage
 
   executed do |context|

data/spec/sample/tax/calculates_tax.rb

@@ -1,5 +1,5 @@
 class CalculatesTax
-  include LightService::Organizer
+  extend LightService::Organizer
 
   def self.for_order(order)
     with(:order => order).reduce(
@@ -9,3 +9,4 @@ class CalculatesTax
     )
   end
 end
+  

data/spec/sample/tax/looks_up_tax_percentage_action.rb

@@ -1,5 +1,5 @@
 class LooksUpTaxPercentageAction
-  include LightService::Action
+  extend LightService::Action
   expects :order
   promises :tax_percentage
 

data/spec/sample/tax/provides_free_shipping_action.rb

@@ -1,5 +1,5 @@
 class ProvidesFreeShippingAction
-  include LightService::Action
+  extend LightService::Action
   expects :order
 
   executed do |context|

data/spec/spec_helper.rb

@@ -5,5 +5,6 @@ require 'light-service'
 require 'ostruct'
 require 'rspec/its'
 require 'active_support/core_ext/string'
+require 'pry'
 
 I18n.enforce_available_locales = true

data/spec/test_doubles.rb

@@ -2,7 +2,7 @@
 
 module TestDoubles
   class AddsTwoActionWithFetch
-    include LightService::Action
+    extend LightService::Action
 
     executed do |context|
       number = context.fetch(:number, 0)
@@ -14,7 +14,7 @@ module TestDoubles
   class AnotherAction; end
 
   class AnOrganizer
-    include LightService::Organizer
+    extend LightService::Organizer
 
     def self.do_something(action_arguments)
       with(action_arguments).reduce([AnAction, AnotherAction])
@@ -30,7 +30,7 @@ module TestDoubles
   end
 
   class MakesTeaWithMilkAction
-    include LightService::Action
+    extend LightService::Action
     expects :tea, :milk
     promises :milk_tea
 
@@ -40,7 +40,7 @@ module TestDoubles
   end
 
   class MultipleExpectsAction
-    include LightService::Action
+    extend LightService::Action
     expects :tea
     expects :milk, :chocolate
     promises :milk_tea
@@ -51,13 +51,13 @@ module TestDoubles
   end
 
   class MakesCappuccinoAction
-    include LightService::Action
+    extend LightService::Action
     expects :coffee, :milk
     promises :cappuccino
   end
 
   class MakesLatteAction
-    include LightService::Action
+    extend LightService::Action
     expects :coffee, :milk
     promises :latte
 
@@ -82,7 +82,7 @@ module TestDoubles
   end
 
   class MultiplePromisesAction
-    include LightService::Action
+    extend LightService::Action
     expects :coffee, :milk
     promises :cappuccino
     promises :latte
@@ -94,7 +94,7 @@ module TestDoubles
   end
 
   class MakesTeaAndCappuccino
-    include LightService::Organizer
+    extend LightService::Organizer
 
     def self.call(tea, milk, coffee)
       with(:tea => tea, :milk => milk, :coffee => coffee)
@@ -104,7 +104,7 @@ module TestDoubles
   end
 
   class MakesCappuccinoAddsTwo
-    include LightService::Organizer
+    extend LightService::Organizer
 
     def self.call(milk, coffee)
       with(:milk => milk, :coffee => coffee)
@@ -114,7 +114,7 @@ module TestDoubles
   end
 
   class MakesCappuccinoAddsTwoAndFails
-    include LightService::Organizer
+    extend LightService::Organizer
 
     def self.call(coffee, this_hot = :very_hot)
       with(:milk => this_hot, :coffee => coffee)
@@ -125,7 +125,7 @@ module TestDoubles
   end
 
   class MakesCappuccinoSkipsAddsTwo
-    include LightService::Organizer
+    extend LightService::Organizer
 
     def self.call(coffee)
       with(:milk => "5%", :coffee => coffee)
@@ -148,7 +148,7 @@ module TestDoubles
   end
 
   class AddsOneAction
-    include LightService::Action
+    extend LightService::Action
     expects :number
     promises :number
 
@@ -158,7 +158,7 @@ module TestDoubles
   end
 
   class AddsTwoAction
-    include LightService::Action
+    extend LightService::Action
     expects :number
 
     executed do |context|
@@ -167,7 +167,7 @@ module TestDoubles
   end
 
   class AddsThreeAction
-    include LightService::Action
+    extend LightService::Action
     expects :number
     promises :product
 
@@ -177,7 +177,7 @@ module TestDoubles
   end
 
   class MakesTeaExpectingReservedKey
-    include LightService::Action
+    extend LightService::Action
     expects :tea, :message
 
     executed do |context|
@@ -186,7 +186,7 @@ module TestDoubles
   end
 
   class MakesTeaExpectingMultipleReservedKeys
-    include LightService::Action
+    extend LightService::Action
     expects :tea, :message, :error_code, :current_action
 
     executed do |context|
@@ -195,7 +195,7 @@ module TestDoubles
   end
 
   class MakesTeaPromisingReservedKey
-    include LightService::Action
+    extend LightService::Action
     expects :tea
     promises :product, :message
 
@@ -205,7 +205,7 @@ module TestDoubles
   end
 
   class MakesTeaPromisingMultipleReservedKeys
-    include LightService::Action
+    extend LightService::Action
     expects :tea
     promises :product, :message, :error_code, :current_action
 
@@ -213,4 +213,41 @@ module TestDoubles
       context.product = context.number + 3
     end
   end
+
+  class MakesTeaPromisingKeyButRaisesException
+    extend LightService::Action
+    promises :product
+
+    executed do |context|
+      context.product = make_product
+    end
+
+    private
+
+    def self.make_product
+      fail "Fail"
+    end
+  end
+
+  class PromisesPromisedKeyAction
+    extend LightService::Action
+
+    promises :promised_key
+
+    executed do |ctx|
+      ctx.promised_key = "promised_key"
+    end
+  end
+
+  class ExpectsExpectedKeyAction
+    extend LightService::Action
+
+    expects :expected_key
+    promises :final_key
+
+    executed do |ctx|
+      ctx.final_key = ctx.expected_key
+    end
+  end
+
 end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: light-service
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Attila Domokos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-06 00:00:00.000000000 Z
+date: 2015-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.1
 - !ruby/object:Gem::Dependency
@@ -87,9 +87,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -111,6 +111,7 @@ files:
 - resources/light-service.png
 - resources/organizer_and_actions.png
 - spec/acceptance/add_numbers_spec.rb
+- spec/acceptance/include_warning_spec.rb
 - spec/acceptance/log_from_organizer_spec.rb
 - spec/acceptance/message_localization_spec.rb
 - spec/acceptance/rollback_spec.rb
@@ -121,6 +122,7 @@ files:
 - spec/context_spec.rb
 - spec/localization_adapter_spec.rb
 - spec/organizer/with_reducer_spec.rb
+- spec/organizer_key_aliases_spec.rb
 - spec/organizer_spec.rb
 - spec/sample/calculates_order_tax_action_spec.rb
 - spec/sample/calculates_tax_spec.rb
@@ -142,22 +144,23 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A service skeleton with an emphasis on simplicity
 test_files:
 - spec/acceptance/add_numbers_spec.rb
+- spec/acceptance/include_warning_spec.rb
 - spec/acceptance/log_from_organizer_spec.rb
 - spec/acceptance/message_localization_spec.rb
 - spec/acceptance/rollback_spec.rb
@@ -168,6 +171,7 @@ test_files:
 - spec/context_spec.rb
 - spec/localization_adapter_spec.rb
 - spec/organizer/with_reducer_spec.rb
+- spec/organizer_key_aliases_spec.rb
 - spec/organizer_spec.rb
 - spec/sample/calculates_order_tax_action_spec.rb
 - spec/sample/calculates_tax_spec.rb