programmable-ventouse 0.0.10 → 0.1.0

data/lib/ventouse/module_declarations.rb

@@ -11,19 +11,23 @@ class Module
   #    end
   #  end
   def declarations &blk
-    raise "There should be only one declarations block" if defined? declarations_block
+    unless @declaration_blocks
+      @declaration_blocks = []
 
-    class << self
-      attr_accessor :declarations_block
-
-      def included(mod)
-        mod.class_eval(&declarations_block) unless declarations_block.nil?
+      def self.included mod
+        case mod
+          when Class
+            @declaration_blocks.each {|b| mod.class_eval &b }
+          when Module
+            @declaration_blocks.each {|b| mod.declarations &b }
+        end
       rescue Exception => ex # When autoloading, you never see real exception unless this rescue
         puts ex.message
         puts ex.backtrace.join("\n")
         raise ex
       end
     end
-    self.declarations_block = blk
+
+    @declaration_blocks << blk
   end
 end

data/test/declarations_test.rb

@@ -0,0 +1,77 @@
+require "test/unit"
+require File.dirname(__FILE__) + "/../lib/ventouse/module_declarations"
+
+module SmokeExt
+  declarations do
+    self.class_var= "ok"
+  end
+end
+
+module SecondExt
+  declarations do
+    self.class_var= "ok2"
+  end
+end
+
+module MultipleDeclarationsModule
+  declarations do
+    self.class_var= "x"
+  end
+
+  declarations do
+    self.class_var+= "x"
+  end
+end
+
+module IncludedModule
+  declarations do
+    self.class_var+= "y"
+  end
+end
+
+module IncludingModule
+  declarations do
+    self.class_var= "x"
+  end
+
+  include IncludedModule
+
+  declarations do
+    self.class_var+= "z"
+  end
+end
+
+class SmokeExpandable
+  def self.class_var= var
+    @@class_var = var
+  end
+  
+  def self.class_var
+    @@class_var if defined? @@class_var
+  end
+end
+
+class DeclarationsTest < Test::Unit::TestCase
+  def test_smoke
+    SmokeExpandable.send :include, SmokeExt
+    assert_equal "ok", SmokeExpandable.class_var
+  end
+
+  def test_second_module
+    SmokeExpandable.send :include, SmokeExt
+    assert_equal "ok", SmokeExpandable.class_var
+
+    SmokeExpandable.send :include, SecondExt
+    assert_equal "ok2", SmokeExpandable.class_var
+  end
+
+  def test_multiple_declarations
+    SmokeExpandable.send :include, MultipleDeclarationsModule
+    assert_equal "xx", SmokeExpandable.class_var
+  end
+
+  def test_module_including
+    SmokeExpandable.send :include, IncludingModule
+    assert_equal "xyz", SmokeExpandable.class_var
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: programmable-ventouse
 version: !ruby/object:Gem::Version 
-  version: 0.0.10
+  version: 0.1.0
 platform: ruby
 authors: 
 - Ilia Ablamonov
@@ -44,6 +44,7 @@ files:
 - lib/ventouse/rescue_ext.rb
 - lib/ventouse/resource_as_root.rb
 - lib/ventouse.rb
+- test/declarations_test.rb
 has_rdoc: true
 homepage: http://github.com/programmable/ventouse
 licenses: 
@@ -74,5 +75,5 @@ rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: Various usefull ruby/rails shit.
-test_files: []
-
+test_files: 
+- test/declarations_test.rb