light-service 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 713a827193e2ac90169a99251cbb9d9745ed4394
-  data.tar.gz: 91400a943609efb9e0a811437b73d30faf1090cb
+  metadata.gz: c74e129f4aa196c42077e14704239de1e3cdafec
+  data.tar.gz: 47f5b3dd133c2ceec5b66ecf513a9dbd78559708
 SHA512:
-  metadata.gz: 4ceecbf3154d271ead7dfb8105dc38100589b0e0158943c3994a1f1649b30b9e5d65725b7d3416311b1975b5a8a5a0a181a2c26e4843689637b88a873d2792a3
-  data.tar.gz: 6f44c67e69cd032a46320d75ab6a7188f3d177e090207abdcbed34a1db984b914367d2ba6a9eeb3aaa881d3f4e9f91a59207323993db8984d7024b754ab387bc
+  metadata.gz: 496f22c177d5b14d0ba7d33fb6b54700e1a150e6a8683d29be30b7ec0304b24fb9daa8adac00f934c6b1f956e94d0330d020014a18450cbf89b98751b184f7f6
+  data.tar.gz: 24f9965dcf22ec98ed9ebb9a3083111cce43f30e438d607ccecf2d7290ee1a61c0a6e400f935ea318708b883c0eefc56bd87c86dcf94bfb6830af7021f6e91bd

data/.rspec

@@ -1,2 +1,3 @@
 --color
 --format progress
+--order rand

data/README.md

@@ -273,12 +273,16 @@ 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.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
+
 ### 0.3.4
 * The method call `with` is [now optional](https://github.com/adomokos/light-service/blob/master/spec/organizer_spec.rb#L18) in case you have nothing to put into the context.
 * Action name is being displayed in the error message when the expected or promised key is not in the context.
 
 ### 0.3.3
-* Switching the promises and expects keys accessors from Action to Context
+* Switching the promises and expects key accessors from Action to Context
 
 ### 0.3.2
 * Fixing documentation and using separate arguments instead of a hash when setting the context to failure with error code

data/lib/light-service/action.rb

@@ -28,14 +28,14 @@ module LightService
           return action_context if action_context.stop_processing?
           action = self
 
-          ContextKeyVerifier.verify_expected_keys_are_in_context(action_context, action)
+          Context::KeyVerifier.verify_expected_keys_are_in_context(action_context, action)
 
           action_context.define_accessor_methods_for_keys(expected_keys)
           action_context.define_accessor_methods_for_keys(promised_keys)
 
           yield(action_context)
 
-          ContextKeyVerifier.verify_promised_keys_are_in_context(action_context, action)
+          Context::KeyVerifier.verify_promised_keys_are_in_context(action_context, action)
         end
       end
 

data/lib/light-service/context.rb

@@ -26,13 +26,6 @@ module LightService
       self.merge! values
     end
 
-    # It's really there for testing and debugging
-    # Deprecated: Please use `to_hash` instead
-    def context_hash
-      warn 'DEPRECATED: Please use `to_hash` instead'
-      self.dup
-    end
-
     def success?
       @outcome == ::LightService::Outcomes::SUCCESS
     end

data/lib/light-service/context_key_verifier.rb

@@ -2,35 +2,39 @@ module LightService
   class ExpectedKeysNotInContextError < StandardError; end
   class PromisedKeysNotInContextError < StandardError; end
 
-  class ContextKeyVerifier
-    class << self
-      def verify_expected_keys_are_in_context(context, action)
-        verify_keys_are_in_context(context, action.expected_keys) do |not_found_keys|
-          fail ExpectedKeysNotInContextError, "expected #{format_keys(not_found_keys)} to be in the context during #{action.to_s}"
+  class Context
+    class KeyVerifier
+      class << self
+        def verify_expected_keys_are_in_context(context, action)
+          verify_keys_are_in_context(context, action.expected_keys) do |not_found_keys|
+            fail ExpectedKeysNotInContextError, "expected #{format_keys(not_found_keys)} to be in the context during #{action}"
+          end
         end
-      end
 
-      def verify_promised_keys_are_in_context(context, action)
-        verify_keys_are_in_context(context, action.promised_keys) do |not_found_keys|
-          fail PromisedKeysNotInContextError, "promised #{format_keys(not_found_keys)} to be in the context during #{action.to_s}"
+        def verify_promised_keys_are_in_context(context, action)
+          return context if context.failure?
+
+          verify_keys_are_in_context(context, action.promised_keys) do |not_found_keys|
+            fail PromisedKeysNotInContextError, "promised #{format_keys(not_found_keys)} to be in the context during #{action}"
+          end
         end
-      end
 
-      private
+        private
 
-      def verify_keys_are_in_context(context, keys)
-        keys ||= context.keys
+        def verify_keys_are_in_context(context, keys)
+          keys ||= context.keys
 
-        not_found_keys = keys - context.keys
-        unless not_found_keys.empty?
-          yield not_found_keys
-        end
+          not_found_keys = keys - context.keys
+          unless not_found_keys.empty?
+            yield not_found_keys
+          end
 
-        context
-      end
+          context
+        end
 
-      def format_keys(keys)
-        keys.map { |k| ":#{k}"}.join(', ')
+        def format_keys(keys)
+          keys.map { |k| ":#{k}"}.join(', ')
+        end
       end
     end
   end

data/lib/light-service/version.rb

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

data/spec/action_promised_keys_spec.rb

@@ -5,52 +5,62 @@ module LightService
     class DummyActionForKeysToPromise
       include LightService::Action
       expects :tea, :milk
-      promises :milk_tea, :something_else
+      promises :milk_tea
 
-      executed do |context|
-        context[:some_tea] = "#{context.tea} - #{context.milk}"
-      end
     end
 
     context "when the promised key is not in the context" do
       it "raises an ArgumentError" do
-        exception_error_text = "promised :milk_tea, :something_else to be in the context during LightService::DummyActionForKeysToPromise"
+        class DummyActionForKeysToPromise
+          executed do |context|
+            context[:some_tea] = "#{context.tea} - #{context.milk}"
+          end
+        end
+
+        exception_error_text = "promised :milk_tea to be in the context during LightService::DummyActionForKeysToPromise"
         expect {
           DummyActionForKeysToPromise.execute(:tea => "black", :milk => "full cream")
         }.to raise_error(PromisedKeysNotInContextError, exception_error_text)
       end
-    end
 
-    context "when the promised key is in the context" do
-      class DummyActionSetsItemInContext
-        include LightService::Action
-        expects :tea, :milk
-        promises :milk_tea
-
-        executed do |context|
-          context.milk_tea = "#{context.tea} - #{context.milk}"
-          context.milk_tea += " hello"
+      it "fails the context without fulfilling its promise" do
+        class DummyActionForKeysToPromise
+          executed do |context|
+            context.fail!("Sorry, something bad has happened.")
+          end
         end
+
+        result_context = DummyActionForKeysToPromise.execute(:tea => "black",
+                                                             :milk => "full cream")
+
+        expect(result_context).to be_failure
+        expect(result_context.keys).not_to include(:milk_tea)
       end
+    end
+
+    context "when the promised key is in the context" do
       it "sets in the context if it was set with not nil" do
-        result_context = DummyActionSetsItemInContext.execute(:tea => "black",
+        class DummyActionForKeysToPromise
+          executed do |context|
+            context.milk_tea = "#{context.tea} - #{context.milk}"
+            context.milk_tea += " hello"
+          end
+        end
+
+        result_context = DummyActionForKeysToPromise.execute(:tea => "black",
                                                               :milk => "full cream")
         expect(result_context).to be_success
         expect(result_context[:milk_tea]).to eq("black - full cream hello")
       end
 
-      class DummyActionNilNotSetInContext
-        include LightService::Action
-        expects :tea, :milk
-        promises :milk_tea
-
-        executed do |context|
-          context.milk_tea = nil
-        end
-      end
       it "sets in the context if it was set with nil" do
-        result_context = DummyActionNilNotSetInContext.execute(:tea => "black",
-                                                              :milk => "full cream")
+        class DummyActionForKeysToPromise
+          executed do |context|
+            context.milk_tea = nil
+          end
+        end
+        result_context = DummyActionForKeysToPromise.execute(:tea => "black",
+                                                             :milk => "full cream")
         expect(result_context).to be_success
         expect(result_context[:milk_tea]).to be_nil
       end

metadata

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