carry_out 0.2.10 → 0.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b9327924b9bfe1b3e1bcfcf84d550d9b9128da1
-  data.tar.gz: 5f9be969be455b38060313cf57defaaea7e6b330
+  metadata.gz: 2e53303de468775514b88a1a6dca64055f6bbade
+  data.tar.gz: 60c46b2e3808b67e8fc83b258dafe3edf6e9e9a7
 SHA512:
-  metadata.gz: 8f1cdd23f90dd6b0a540511597d5873b7b15ab9b395ff6c983add20694ee5b99eaa85da1dd54102d3d8bbad09aca8fd17f238da3c05dfb2b81b32e71fd912314
-  data.tar.gz: cb681e5628b28c3e9d0ba7979f8582379354fb4393113e50b5339803035c5509cdde3e6f34361606b2ef4211b4c98b6454adcc37265cd77e0d2d18e8948246fe
+  metadata.gz: 2fd95432afa6c5784027248899e3d1c67950f6bdb5e2803dbc878982109a6d4ddcb6863a40367adcf8e27b4cebf39293e389cafe979f7179c6912c78885e0f04
+  data.tar.gz: bec723de2de174e99c49361051dd9954c357bab055044cee2f9ac109938bb30f350fa141dcbc58b4a0268f852a2ba7eb238d511d0c0ea3972441ab3b555ddcb2

data/README.md

@@ -289,22 +289,23 @@ While a contrived example, the following illustrates the improved readability of
 ```ruby
 plan = CarryOut
   .within_order_transaction
-      .will_order_bagel
-        .flavored('everything')
-        .toasted
-        .topped_with('butter')
-        .and('strawberry cream cheese')
-        .returning_as_bagel
-      .then_order_coffee
-        .with_cream
-        .and_sugar
-      .then_calculate_order_total
-        .for { result_of_bagel }
-        .and { result_of_coffee }
-      .then_swipe_credit_card
-        .returning_as_cc
-      .then_pay
-        .with_credit_card { result_of_cc }
+    .will_order_bagel
+      .flavored('everything')
+      .toasted
+      .topped_with('butter')
+      .and('strawberry cream cheese')
+      .returning_as_bagel
+    .then_order_coffee
+      .with_cream
+      .and_sugar
+      .returning_as_coffee
+    .then_calculate_order_total
+      .for { result_of_bagel }
+      .and { result_of_coffee }
+    .then_swipe_credit_card
+      .returning_as_cc
+    .then_pay
+      .with_credit_card { result_of_cc }
 ```
 
 ## Motivation

data/lib/carry_out/plan.rb

@@ -49,7 +49,7 @@ module CarryOut
     end
 
     def unless(reference = nil, &block)
-      self.if { |refs| !(reference || block).call(refs) }
+      self.if { |refs| !self.instance_exec(refs, &(reference || block)) }
       
       self
     end
@@ -143,8 +143,15 @@ module CarryOut
       end
 
       def guard_node(node, artifacts)
+        context = Context.new(artifacts)
         guards = node_meta(node)[:guards]
-        guards.nil? || guards.map { |guard| guard.call(artifacts) }.all?
+        guards.nil? || guards.map do |guard|
+          if guard.kind_of?(CarryOut::Reference)
+            reference_proc = -> (refs) { guard.call(refs) }
+          end
+
+          context.instance_exec(artifacts, &(reference_proc || guard))
+        end.all?
       end
 
       def key_for_node(node)

data/lib/carry_out/version.rb

@@ -1,3 +1,3 @@
 module CarryOut
-  VERSION = "0.2.10"
+  VERSION = "0.2.11"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carry_out
 version: !ruby/object:Gem::Version
-  version: 0.2.10
+  version: 0.2.11
 platform: ruby
 authors:
 - Ryan Fields