ribbon-plugins 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1203cf7726507ab9760f6ba519ea768fcbf5c19
-  data.tar.gz: 93210e25c99e2d1381c64baff34375e9d41c9f4f
+  metadata.gz: cf4947ad31a06c8efa7a9327d44bee7dfdec5d14
+  data.tar.gz: 9bb844a020b92fb3eb2b9139fdaba188655018b8
 SHA512:
-  metadata.gz: a016c927a8a9061452311957494d201bc6ffb220c68582358b048626171baa0042f38d2841e1f46b37c169aa2f28209a502d4b32ad837ffb95e4556b9971a2ee
-  data.tar.gz: 2eaf238f288063cf187e7c6f0454b4a1ce2dddfb6dec76c2d1def45b0acafd3c65a4978beac6704cb317f6f01ce977d693329bdab89c73f413c8ed4e34aafe83
+  metadata.gz: 1ea53501e2018f3c80b96072654a1a3129ff3f75404b7de9687a37ae9483ef31180d47a40fe8763ccb8ede31cc3c148b308e3323f305e756e107b3b57fa8f0a6
+  data.tar.gz: ad3eec6fedac66772257671af6013e56eee18672aebab3f3496fd32ef734eac3cb43c8b87a43cb68ca17be5559d8bb58c0bf7183e21540fdc3d20eb846f4f2ee

data/lib/ribbon/plugins/around_stack.rb

@@ -24,6 +24,11 @@ class Ribbon::Plugins
 
       outer_most = call_stack.pop
       outer_most.call(call_stack, *args)
+
+      # This shouldn't happen unless the AroundStack isn't functioning properly.
+      raise Errors::Error, "Block passed was not called!" unless inner_most.called?
+
+      inner_most.retval
     end
 
     class AroundWrapper
@@ -49,14 +54,22 @@ class Ribbon::Plugins
 
     class WrappedBlock
       attr_reader :block
+      attr_reader :retval
 
       def initialize(&block)
         @block = block
       end
 
+      def called?
+        !!@_called
+      end
+
       def call(call_stack, *args)
         raise Errors::Error, 'receiving non-empty call stack' unless call_stack.empty?
-        block.call(*args)
+        block.call(*args).tap { |retval|
+          @retval = retval
+          @_called = true
+        }
       end
     end
   end # AroundStack

data/lib/ribbon/plugins/version.rb

@@ -1,5 +1,5 @@
 module Ribbon
   class Plugins
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

data/lib/ribbon/plugins.rb

@@ -39,8 +39,10 @@ module Ribbon
 
     def perform(subject, *args, &block)
       before(subject, *args)
-      around(subject, *args, &block)
+      retval = around(subject, *args, &block)
       after(subject, *args)
+
+      retval
     end
 
     private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ribbon-plugins
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Robert Honer