light-service 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c74e129f4aa196c42077e14704239de1e3cdafec
-  data.tar.gz: 47f5b3dd133c2ceec5b66ecf513a9dbd78559708
+  metadata.gz: fc46d59ad8bc4839942dc2977961ce978bae275f
+  data.tar.gz: a2ca45e8cb9987ab44dfe5af7080dd45a943efc7
 SHA512:
-  metadata.gz: 496f22c177d5b14d0ba7d33fb6b54700e1a150e6a8683d29be30b7ec0304b24fb9daa8adac00f934c6b1f956e94d0330d020014a18450cbf89b98751b184f7f6
-  data.tar.gz: 24f9965dcf22ec98ed9ebb9a3083111cce43f30e438d607ccecf2d7290ee1a61c0a6e400f935ea318708b883c0eefc56bd87c86dcf94bfb6830af7021f6e91bd
+  metadata.gz: 061d0554efd265aa95e83cd7197e24aa12207ea3c4119d297bbd036bc9ed15c5be44af52bcb9b00975b3d0a779f039a1008d6efae6d2ceffa562b65ce9f0cbf0
+  data.tar.gz: 66fe3f85032dc702b60edcb69cab36a2c6a6bd088f2f04a92a2554aff016d58889092f49baded959e6b161a3bd0490285ce0cc95de54647218cfb6d642ad7087

data/README.md

@@ -273,6 +273,9 @@ For further examples, please visit the project's [Wiki](https://github.com/adomo
 Huge thanks to the [contributors](https://github.com/adomokos/light-service/graphs/contributors)!
 
 ## Release Notes
+### 0.3.6
+* [Collecting](https://github.com/adomokos/light-service/commit/29817de3ad589441788077368ad1d7e723286def) the `expects` and `promises` keys when they are called multiple times in an action
+
 ### 0.3.5
 * remove previously deprecated method Context#context_hash
 * [Skipping](https://github.com/adomokos/light-service/commit/d2bd05455a7e4f78aa448db1ea1d692f7b8b67d3) the promised keys check in the context when the context is in failure state

data/lib/light-service/action.rb

@@ -7,11 +7,13 @@ module LightService
 
     module Macros
       def expects(*args)
-        @_expected_keys = args
+        @_expected_keys ||= []
+        @_expected_keys.concat(args)
       end
 
       def promises(*args)
-        @_promised_keys = args
+        @_promised_keys ||= []
+        @_promised_keys.concat(args)
       end
 
       def expected_keys

data/lib/light-service/version.rb

@@ -1,3 +1,3 @@
 module LightService
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end

data/spec/action_expected_keys_spec.rb

@@ -11,15 +11,6 @@ module LightService
         context.milk_tea = "#{context.tea} - #{context.milk}"
       end
     end
-    class DummyActionForKeysToPromiseWithError
-      include LightService::Action
-      expects :tea, :milk
-      promises :milk_tea
-
-      executed do |context|
-        context[:some_tea] = "#{context.tea} - #{context.milk}"
-      end
-    end
 
     context "when expected keys are in the context" do
       it "can access the keys as class methods" do
@@ -32,7 +23,7 @@ module LightService
       end
     end
 
-    context "when expected key is not in the context" do
+    context "when an expected key is not in the context" do
       it "raises an error" do
         exception_error_text = "expected :milk to be in the context during LightService::DummyActionForKeysToExpect"
         expect {
@@ -41,13 +32,24 @@ module LightService
       end
     end
 
-    context "when promised key is not in context" do
-      it "raises an error" do
-        exception_error_text = "promised :milk_tea to be in the context during LightService::DummyActionForKeysToPromiseWithError"
-        expect {
-          DummyActionForKeysToPromiseWithError.execute(:tea => "black", :milk => "2%")
-        }.to raise_error(PromisedKeysNotInContextError, exception_error_text)
+    it "can collect expected keys when the `expects` macro is called multiple times" do
+      class DummyActionWithMultipleExpects
+        include LightService::Action
+        expects :tea
+        expects :milk, :chocolate
+        promises :milk_tea
+
+        executed do |context|
+          context.milk_tea = "#{context.tea} - #{context.milk} - with #{context.chocolate}"
+        end
       end
+      resulting_context = DummyActionWithMultipleExpects.execute(
+        :tea => "black",
+        :milk => "full cream",
+        :chocolate => "dark chocolate"
+      )
+      expect(resulting_context[:milk_tea]).to eq("black - full cream - with dark chocolate")
     end
+
   end
 end

data/spec/action_promised_keys_spec.rb

@@ -23,7 +23,7 @@ module LightService
         }.to raise_error(PromisedKeysNotInContextError, exception_error_text)
       end
 
-      it "fails the context without fulfilling its promise" do
+      it "can fail the context without fulfilling its promise" do
         class DummyActionForKeysToPromise
           executed do |context|
             context.fail!("Sorry, something bad has happened.")
@@ -39,7 +39,7 @@ module LightService
     end
 
     context "when the promised key is in the context" do
-      it "sets in the context if it was set with not nil" do
+      it "can be set with an actual value" do
         class DummyActionForKeysToPromise
           executed do |context|
             context.milk_tea = "#{context.tea} - #{context.milk}"
@@ -48,12 +48,12 @@ module LightService
         end
 
         result_context = DummyActionForKeysToPromise.execute(:tea => "black",
-                                                              :milk => "full cream")
+                                                             :milk => "full cream")
         expect(result_context).to be_success
         expect(result_context[:milk_tea]).to eq("black - full cream hello")
       end
 
-      it "sets in the context if it was set with nil" do
+      it "can be set with nil" do
         class DummyActionForKeysToPromise
           executed do |context|
             context.milk_tea = nil
@@ -64,7 +64,25 @@ module LightService
         expect(result_context).to be_success
         expect(result_context[:milk_tea]).to be_nil
       end
+    end
 
+    it "can collect promised keys when the `promised` macro is called multiple times" do
+      class DummyActionWithMultiplePromises
+        include LightService::Action
+        expects :coffee
+        promises :cappuccino
+        promises :latte
+
+        executed do |context|
+          context.cappuccino = "Cappucino needs #{context.coffee} and a little milk"
+          context.latte = "Latte needs #{context.coffee} and a lot of milk"
+        end
+      end
+      resulting_context = DummyActionWithMultiplePromises.execute(:coffee => "espresso")
+
+      expect(resulting_context.cappuccino).to eq("Cappucino needs espresso and a little milk")
+      expect(resulting_context.latte).to eq("Latte needs espresso and a lot of milk")
     end
+
   end
 end

data/spec/action_spec.rb

@@ -18,11 +18,6 @@ module LightService
       end
     end
 
-    class PromisingAction
-      include LightService::Action
-      promises :milk_tea
-    end
-
     let(:context) { ::LightService::Context.make }
 
     context "when the action context has failure" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: light-service
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Attila Domokos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-13 00:00:00.000000000 Z
+date: 2014-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec