light-service 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43b8226d18386ca933714af81639598fdff2332d
-  data.tar.gz: e7112eea09148ee8f06412e7e2f61cea18375d05
+  metadata.gz: 65825f46d1fd42f09f7e31d1c6237936c848aa7f
+  data.tar.gz: cc2963f8195cb9e33b1bbb0fad85864d9249e29d
 SHA512:
-  metadata.gz: 6c772140e17955b44a37b923ed4f09a110e5d21da479e2ba44c8a6b0f81b8f647808c722932b56b407bbee781bd57c33981cb36b403f24ee29f746e184410ad1
-  data.tar.gz: 741bf14615577c1d9fe518e5835e3a4a9bde8879810ce9765983db65195afbd5d63e598fe07335bbe47158a9779d9fe23e0f890560dc19bffe5e3bba3ba84784
+  metadata.gz: 5b1cd806096d97fef2f82e8310affaa87102377ce6e318b613f8035ebe542731bcf5331d38e9a54fa748207cc4579da165c55a4a3d95cacd20988200034d52fc
+  data.tar.gz: 5ab53d49c280764ef5cf6e1097ea103059db80d018bef4fc5533baeb80878c010c8c6852d6f9a2ad7abdba612d54e07031894f166ac072078d62e8ded2ef866f

data/README.md

@@ -83,14 +83,14 @@ class LooksUpTaxPercentageAction
   promises :tax_percentage
 
   executed do |context|
-    tax_ranges = TaxRange.for_region(self.order.region)
-    self.tax_percentage = 0
+    tax_ranges = TaxRange.for_region(context.order.region)
+    context.tax_percentage = 0
 
     next context if object_is_nil?(tax_ranges, context, 'The tax ranges were not found')
 
-    self.tax_percentage = tax_ranges.for_total(self.order.total)
+    context.tax_percentage = tax_ranges.for_total(context.order.total)
 
-    next context if object_is_nil?(self.tax_percentage, context, 'The tax percentage was not found')
+    next context if object_is_nil?(context.tax_percentage, context, 'The tax percentage was not found')
   end
 
   def self.object_is_nil?(object, context, message)
@@ -177,7 +177,7 @@ class FooAction
   promises :bar
 
   executed do |context|
-    bar = self.baz + 2
+    bar = context.baz + 2
     context[:bar] = bar
   end
 end
@@ -193,7 +193,7 @@ class FooAction
   promises :bar
 
   executed do |context|
-    self.bar = self.baz + 2
+    context.bar = context.baz + 2
   end
 end
 ```
@@ -257,7 +257,7 @@ Or install it yourself as:
 
 ## Usage
 
-Based on the refactoring example above, just create an organizer object that calls the 
+Based on the refactoring example above, just create an organizer object that calls the
 actions in order and write code for the actions. That's it.
 
 For further examples, please visit the project's [Wiki](https://github.com/adomokos/light-service/wiki).
@@ -273,8 +273,12 @@ 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.3
+* Switching the promises and expects keys accessors from Action to Context
+
 ### 0.3.2
-* Fixing documentation and using separate arguments instead of a hash when setting the context to failure
+* Fixing documentation and using separate arguments instead of a hash when setting the context to failure with error code
+
 ### 0.3.1
 * Adding [error codes](https://github.com/adomokos/light-service#error-codes) to the context
 

data/lib/light-service/action.rb

@@ -21,12 +21,11 @@ module LightService
 
           ContextKeyVerifier.verify_expected_keys_are_in_context(action_context, @_expected_keys)
 
-          define_expectations_readers(context)
-          define_promises_accessors(context)
+          action_context.define_accessor_methods_for_keys(@_expected_keys)
+          action_context.define_accessor_methods_for_keys(@_promised_keys)
 
           yield(action_context)
 
-          set_promises_in_context(action_context)
           ContextKeyVerifier.verify_promised_keys_are_in_context(action_context, @_promised_keys)
         end
       end
@@ -41,33 +40,6 @@ module LightService
         LightService::Context.make(context)
       end
 
-      def define_expectations_readers(context)
-        context.keys.each do |key|
-          define_singleton_method key do
-            context.fetch(key)
-          end
-        end
-      end
-
-      def define_promises_accessors(context)
-        return unless @_promised_keys
-        @_promised_keys.each do |key|
-          instance_variable_set("@#{key}", VALUE_NOT_SET)
-          self.class.send(:attr_accessor, key)
-        end
-      end
-
-      def set_promises_in_context(context)
-        return unless @_promised_keys
-        @_promised_keys.each do |key|
-          value = instance_variable_get("@#{key}")
-          next if value == VALUE_NOT_SET
-          context[key] = value
-        end
-      end
-
-      VALUE_NOT_SET = "___value_was_not_set___"
     end
-
   end
 end

data/lib/light-service/context.rb

@@ -74,5 +74,13 @@ module LightService
     def stop_processing?
       failure? || skip_all?
     end
+
+    def define_accessor_methods_for_keys(keys)
+      return if keys.nil?
+      keys.each do |key|
+        define_singleton_method("#{key}") { self.fetch(key) }
+        define_singleton_method("#{key}=") { |value| self[key] = value }
+      end
+    end
   end
 end

data/lib/light-service/organizer.rb

@@ -17,11 +17,7 @@ module LightService
 
     def reduce(*actions)
       raise "No action(s) were provided" if actions.empty?
-
-      if actions.is_a? Array
-        actions.flatten!
-      end
-
+      actions.flatten!
       actions.reduce(@context) { |context, action| action.execute(context) }
     end
   end

data/lib/light-service/version.rb

@@ -1,3 +1,3 @@
 module LightService
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/spec/acceptance/add_numbers_spec.rb

@@ -18,10 +18,7 @@ class AddsOneAction
   promises :number
 
   executed do |context|
-    number = self.number
-    number += 1
-
-    self.number = number
+    context.number += 1
   end
 end
 
@@ -31,10 +28,7 @@ class AddsTwoAction
   promises :number
 
   executed do |context|
-    number = self.number
-    number += 2
-
-    self.number = number
+    context.number += 2
   end
 end
 
@@ -44,10 +38,7 @@ class AddsThreeAction
   promises :number
 
   executed do |context|
-    number = self.number
-    number += 3
-
-    self.number = number
+    context.number += 3
   end
 end
 

data/spec/action_expected_keys_spec.rb

@@ -8,7 +8,7 @@ module LightService
       promises :milk_tea
 
       executed do |context|
-        context[:milk_tea] = "#{self.tea} - #{milk}"
+        context.milk_tea = "#{context.tea} - #{context.milk}"
       end
     end
 

data/spec/action_expects_and_promises_spec.rb

@@ -45,8 +45,8 @@ module LightService
         expects :baz
 
         executed do |context|
-          # Notice how I use `self.baz` here
-          bar = self.baz + 2
+          # Notice how I use `context.baz` here
+          bar = context.baz + 2
           context[:bar] = bar
         end
       end
@@ -81,8 +81,8 @@ module LightService
         promises :bar
 
         executed do |context|
-          # Notice how I use `self.bar` here
-          self.bar = self.baz + 2
+          # Notice how I use `context.bar` here
+          context.bar = context.baz + 2
         end
       end
       it "puts the value through the accessor into the context" do

data/spec/action_promised_keys_spec.rb

@@ -8,7 +8,7 @@ module LightService
       promises :milk_tea, :something_else
 
       executed do |context|
-        context[:some_tea] = "#{self.tea} - #{self.milk}"
+        context[:some_tea] = "#{context.tea} - #{context.milk}"
       end
     end
 
@@ -28,8 +28,8 @@ module LightService
         promises :milk_tea
 
         executed do |context|
-          self.milk_tea = "#{self.tea} - #{self.milk}"
-          self.milk_tea += " hello"
+          context.milk_tea = "#{context.tea} - #{context.milk}"
+          context.milk_tea += " hello"
         end
       end
       it "sets in the context if it was set with not nil" do
@@ -45,7 +45,7 @@ module LightService
         promises :milk_tea
 
         executed do |context|
-          self.milk_tea = nil
+          context.milk_tea = nil
         end
       end
       it "sets in the context if it was set with nil" do

data/spec/sample/tax/calculates_order_tax_action.rb

@@ -3,6 +3,6 @@ class CalculatesOrderTaxAction
   expects :order, :tax_percentage
 
   executed do |context|
-    order.tax = (order.total * (tax_percentage/100)).round(2)
+    context.order.tax = (context.order.total * (context.tax_percentage/100)).round(2)
   end
 end

data/spec/sample/tax/looks_up_tax_percentage_action.rb

@@ -4,14 +4,14 @@ class LooksUpTaxPercentageAction
   promises :tax_percentage
 
   executed do |context|
-    tax_ranges = TaxRange.for_region(self.order.region)
-    self.tax_percentage = 0
+    tax_ranges = TaxRange.for_region(context.order.region)
+    context.tax_percentage = 0
 
     next context if object_is_nil?(tax_ranges, context, 'The tax ranges were not found')
 
-    self.tax_percentage = tax_ranges.for_total(self.order.total)
+    context.tax_percentage = tax_ranges.for_total(context.order.total)
 
-    next context if object_is_nil?(self.tax_percentage, context, 'The tax percentage was not found')
+    next context if object_is_nil?(context.tax_percentage, context, 'The tax percentage was not found')
   end
 
   def self.object_is_nil?(object, context, message)

data/spec/sample/tax/provides_free_shipping_action.rb

@@ -3,6 +3,7 @@ class ProvidesFreeShippingAction
   expects :order
 
   executed do |context|
+    order = context.order
     if order.total_with_tax > 200
       order.provide_free_shipping!
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: light-service
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Attila Domokos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-22 00:00:00.000000000 Z
+date: 2014-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec