deas 0.15.0 → 0.16.0

data/lib/deas/plugin.rb

@@ -0,0 +1,38 @@
+module Deas
+  module Plugin
+
+    # use the Plugin mixin to define your own custom plugins you want to mixin
+    # on your Deas view handlers.  Define included hooks using `plugin_included`.
+    # this allows you to define multiple hooks separately and ensures the hooks
+    # will only be called once - even if your plugin is mixed in multiple times.
+
+    def self.included(receiver)
+      receiver.class_eval do
+        extend ClassMethods
+
+        # install an included hook that first checks if this plugin has
+        # already been installed on the reciever.  If it has not been,
+        # class eval each callback on the receiver.
+
+        def self.included(plugin_receiver)
+          return if self.deas_plugin_receivers.include?(plugin_receiver)
+
+          self.deas_plugin_receivers.push(plugin_receiver)
+          self.deas_plugin_included_hooks.each do |hook|
+            plugin_receiver.class_eval(&hook)
+          end
+        end
+
+      end
+    end
+
+    module ClassMethods
+
+      def deas_plugin_receivers; @plugin_receivers ||= []; end
+      def deas_plugin_included_hooks; @plugin_included_hooks ||= []; end
+      def plugin_included(&hook); self.deas_plugin_included_hooks << hook; end
+
+    end
+
+  end
+end

data/lib/deas/version.rb

@@ -1,3 +1,3 @@
 module Deas
-  VERSION = "0.15.0"
+  VERSION = "0.16.0"
 end

data/lib/deas/view_handler.rb

@@ -73,8 +73,7 @@ module Deas
     module ClassMethods
 
       def layout(*args)
-        @layouts = args unless args.empty?
-        @layouts
+        (@layouts ||= []).tap{ |l| l.push(*args) }
       end
       alias :layouts :layout
 

data/test/unit/plugin_tests.rb

@@ -0,0 +1,95 @@
+require 'assert'
+require 'deas/plugin'
+
+module Deas::Plugin
+
+  class BaseTests < Assert::Context
+    TestPlugin = Module.new do
+      include Deas::Plugin
+
+      plugin_included{ inc_hook1 }
+      plugin_included{ inc_hook2 }
+    end
+
+    desc "Deas::Plugin"
+    setup do
+      @receiver = Class.new do
+        def self.inc_hook1;   @hook1_count ||= 0; @hook1_count += 1; end
+        def self.hook1_count; @hook1_count ||= 0; end
+        def self.inc_hook2;   @hook2_count ||= 0; @hook2_count += 1; end
+        def self.hook2_count; @hook2_count ||= 0; end
+      end
+
+      @hook1 = proc{ 1 }
+      @hook2 = proc{ 2 }
+
+      @plugin = Module.new{ include Deas::Plugin }
+    end
+    subject{ @plugin }
+
+    should have_imeths :deas_plugin_included_hooks, :deas_plugin_receivers
+    should have_imeths :plugin_included
+
+    should "have no plugin_included_hooks by default" do
+      assert_empty subject.deas_plugin_included_hooks
+    end
+
+    should "have no plugin_receivers by default" do
+      assert_empty subject.deas_plugin_receivers
+    end
+
+    should "append hooks with #plugin_included" do
+      subject.plugin_included(&@hook1)
+      subject.plugin_included(&@hook2)
+
+      assert_equal @hook1, subject.deas_plugin_included_hooks.first
+      assert_equal @hook2, subject.deas_plugin_included_hooks.last
+    end
+
+    should "call the plugin included hooks when mixed in" do
+      assert_equal 0, @receiver.hook1_count
+      assert_equal 0, @receiver.hook2_count
+
+      @receiver.send(:include, BaseTests::TestPlugin)
+
+      assert_equal 1, @receiver.hook1_count
+      assert_equal 1, @receiver.hook2_count
+    end
+
+    should "call hooks once when mixed in multiple times" do
+      @receiver.send(:include, BaseTests::TestPlugin)
+
+      assert_equal 1, @receiver.hook1_count
+      assert_equal 1, @receiver.hook2_count
+
+      @receiver.send(:include, BaseTests::TestPlugin)
+
+      assert_equal 1, @receiver.hook1_count
+      assert_equal 1, @receiver.hook2_count
+    end
+
+    should "call hooks once when mixed in by a 3rd party" do
+      third_party = Module.new do
+        def self.included(receiver)
+          receiver.send(:include, BaseTests::TestPlugin)
+        end
+      end
+      @receiver.send(:include, third_party)
+
+      assert_equal 1, @receiver.hook1_count
+      assert_equal 1, @receiver.hook2_count
+
+      @receiver.send(:include, BaseTests::TestPlugin)
+
+      assert_equal 1, @receiver.hook1_count
+      assert_equal 1, @receiver.hook2_count
+
+      @receiver.send(:include, third_party)
+
+      assert_equal 1, @receiver.hook1_count
+      assert_equal 1, @receiver.hook2_count
+    end
+
+  end
+
+end

data/test/unit/view_handler_tests.rb

@@ -37,10 +37,10 @@ module Deas::ViewHandler
       handler_class = Class.new{ include Deas::ViewHandler }
 
       handler_class.layout 'layouts/app'
-      assert_equal [ 'layouts/app' ], handler_class.layouts
+      assert_equal ['layouts/app'], handler_class.layouts
 
       handler_class.layouts 'layouts/web', 'layouts/search'
-      assert_equal [ 'layouts/web', 'layouts/search' ], handler_class.layouts
+      assert_equal ['layouts/app', 'layouts/web', 'layouts/search'], handler_class.layouts
     end
 
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: deas
 version: !ruby/object:Gem::Version 
-  hash: 35
+  hash: 95
   prerelease: 
   segments: 
   - 0
-  - 15
+  - 16
   - 0
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-05-29 00:00:00 Z
+date: 2013-06-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ns-options
@@ -148,6 +148,7 @@ files:
 - lib/deas/error_handler.rb
 - lib/deas/exceptions.rb
 - lib/deas/logging.rb
+- lib/deas/plugin.rb
 - lib/deas/rack_request_fix.rb
 - lib/deas/redirect_handler.rb
 - lib/deas/route.rb
@@ -184,6 +185,7 @@ files:
 - test/unit/error_handler_tests.rb
 - test/unit/exceptions_tests.rb
 - test/unit/logging_tests.rb
+- test/unit/plugin_tests.rb
 - test/unit/redirect_handler_tests.rb
 - test/unit/route_tests.rb
 - test/unit/runner_tests.rb
@@ -251,6 +253,7 @@ test_files:
 - test/unit/error_handler_tests.rb
 - test/unit/exceptions_tests.rb
 - test/unit/logging_tests.rb
+- test/unit/plugin_tests.rb
 - test/unit/redirect_handler_tests.rb
 - test/unit/route_tests.rb
 - test/unit/runner_tests.rb