ribbon-plugins 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46af700c614f85fd5bdcba3d978ff0a5d1432b04
-  data.tar.gz: 31dac96000c321fa54cb8959a875dc6d6ae20c0f
+  metadata.gz: 824abb9cd85dbdc1f999f5ec813289e718e9eb91
+  data.tar.gz: c4b52869f401bf9e3384593da9265432e3af40e0
 SHA512:
-  metadata.gz: 9488797076e7bcf2fd6ec6744c4d402ca0f405ab8a3c0e97eae0dc847ac8549ff4dab185f529c16b16cebdc9036296e35a8156df55b5f6a8173cc882f37d005f
-  data.tar.gz: fa203501f477a8326f2169a3138c2f60153f9e92d5dda8bf09ab2a8bf046fd29c0ae0d54eec541186e034a8c6c489c32448a357d85f7c15b65c2602cb602b173
+  metadata.gz: 8311911a1dd18b73c1e24515ae2accdde4010cd94b5046f35f9e017b0c2baa59824591923975a7e78de972a657f986a49fb311f7e3c279ae15632b75cad3fb44
+  data.tar.gz: 2dd783003780802f2493fb31685960fc750ee0fd7a92f5a29821843c32661bfc86495f1458fa4f12d530d96a98dbcb97f7a4fcde13c68895fa3997032718fd65

data/lib/ribbon/plugins/around_stack.rb

@@ -1,20 +1,30 @@
 class Ribbon::Plugins
   class AroundStack
     attr_reader :subject
+    attr_accessor :scope
 
-    def initialize(subject)
+    def initialize(subject, scope=nil)
       @subject = subject.to_sym
+      @scope = scope
       @_stack = []
     end
 
     def push(&block)
       raise Errors::Error, "Must pass block" unless block_given?
 
-      AroundWrapper.new(subject, &block).tap { |wrapper|
+      AroundWrapper.new(self, subject, &block).tap { |wrapper|
         @_stack.push(wrapper)
       }
     end
 
+    def dup
+      AroundStack.new(subject, scope).tap { |stack|
+        @_stack.each { |wrapper|
+          stack.push(&wrapper.block)
+        }
+      }
+    end
+
     def call(*args, &block)
       raise Errors::Error, "Must pass block" unless block_given?
       call_stack = @_stack.dup
@@ -32,13 +42,23 @@ class Ribbon::Plugins
     end
 
     class AroundWrapper
-      attr_reader :subject, :block
+      attr_reader :stack, :subject, :block
 
-      def initialize(subject, &block)
+      def initialize(stack, subject, &block)
+        @stack = stack
         @subject = subject
         @block = block
       end
 
+      def scope
+        stack.scope
+      end
+
+      def method_missing(meth, *args, &block)
+        super unless scope
+        scope.send(meth, *args, &block)
+      end
+
       def call(call_stack, *args)
         wrapped = call_stack.pop
         raise Errors::Error, 'call stack too short' unless wrapped
@@ -48,6 +68,13 @@ class Ribbon::Plugins
           wrapped.call(call_stack, *args)
         }
 
+        singleton_class.instance_exec(subject) { |subject|
+          alias_method subject, "perform_#{subject}"
+
+          # Don't allow these to be overriden
+          attr_reader :stack, :subject, :block
+        }
+
         instance_exec(*args, &block)
       end
     end
@@ -64,6 +91,8 @@ class Ribbon::Plugins
         !!@_called
       end
 
+      ##
+      # Call the wrapped block, ignoring the scope and call_stack arguments.
       def call(call_stack, *args)
         raise Errors::Error, 'receiving non-empty call stack' unless call_stack.empty?
         block.call(*args).tap { |retval|

data/lib/ribbon/plugins/block_stack.rb

@@ -1,15 +1,30 @@
 class Ribbon::Plugins
   class BlockStack
-    def initialize
+    attr_accessor :scope
+
+    def initialize(scope=nil)
+      @scope = scope
       @_stack = []
     end
 
+    def dup
+      BlockStack.new.tap { |stack|
+        @_stack.each { |block| stack.push(&block) }
+      }
+    end
+
     def push(&block)
       @_stack.push(block)
     end
 
     def call(*args)
-      @_stack.reverse_each { |block| block.call(*args) }
+      @_stack.reverse_each { |block|
+        if scope
+          scope.instance_exec(*args, &block)
+        else
+          block.call(*args)
+        end
+      }
     end
   end
 end

data/lib/ribbon/plugins/component_mixin.rb

@@ -39,8 +39,8 @@ module Ribbon
 
       ##
       # Add a plugin.
-      def plugin(plugin)
-        plugins.add(plugin)
+      def plugin(*args, &block)
+        plugins.add(*args, &block)
       end
     end
   end

data/lib/ribbon/plugins/plugin.rb

@@ -53,7 +53,10 @@ class Ribbon::Plugins
 
     private
     def _callbacks(type, subject)
-      self.class._callbacks(type, subject)
+      ((@_callbacks ||= {})[type.to_sym] ||= {})[subject.to_sym] ||=
+        self.class._callbacks(type, subject).dup.tap { |stack|
+          stack.scope = self
+        }
     end
   end # Plugin
 end # Ribbon::Plugins

data/lib/ribbon/plugins/version.rb

@@ -1,5 +1,5 @@
 module Ribbon
   class Plugins
-    VERSION = "0.2.2"
+    VERSION = "0.2.3"
   end
 end

data/lib/ribbon/plugins.rb

@@ -15,9 +15,9 @@ module Ribbon
       @plugin_loader = block
     end
 
-    def add(plugin=nil, &block)
+    def add(plugin=nil, *args, &block)
       plugin = _load(plugin, &block)
-      _add_plugin(plugin.new(self))
+      _add_plugin(plugin.new(self, *args))
     end
 
     def clear
@@ -51,7 +51,7 @@ module Ribbon
     end
 
     def _around_stack
-      @__around_stack ||= AroundStack.new(:block)
+      @__around_stack ||= AroundStack.new(:block, self)
     end
 
     def _add_plugin(plugin)

metadata

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