paramix 1.1.0 → 2.0.0

data/meta/version

@@ -1 +1 @@
-1.1.0
+2.0.0

data/test/nested/test_nested_both.rb

@@ -6,39 +6,51 @@ class TC_Paramix_Nested_Both < Test::Unit::TestCase
   # -- fixture ------------------------------
 
   module M
-    include Paramix
+    include Paramix::Parametric
 
-    def f
-      mixin_param(M,:p)
+    parameterized do |params|
+      public :f do
+        params[:p]
+      end
     end
   end
 
   module N
-    include Paramix
-    include M[:p=>"mood"]
+    include Paramix::Parametric
+    include M[:p=>"NMp"]
 
-    def g
-      mixin_params(N,:p)
+    parameterized do |params|
+      public :g do
+        params[:p]
+      end
     end
   end
 
   class I
-    include N[:p => "mosh"]
+    include N[:p => "INp"]
   end
 
   class E
-    extend N[:p => "many"]
+    extend N[:p => "ENp"]
   end
 
   # -- tests --------------------------------
 
-  def test_include
-    assert_equal( "mood", I.new.f )
+  def test_include_f
+    assert_equal( "NMp", I.new.f )
   end
 
-  #def test_extend
-  #  assert_equal( "many", E.f )
-  #end
+  def test_include_g
+    assert_equal( "INp", I.new.g )
+  end
+
+  def test_extend_f
+    assert_equal( "NMp", E.f )
+  end
+
+  def test_extend_g
+    assert_equal( "ENp", E.g )
+  end
 
 end
 

data/test/nested/test_nested_bottom.rb

@@ -6,45 +6,49 @@ class TC_Paramix_Nested_Bottom < Test::Unit::TestCase
   # -- fixture ------------------------------
 
   module M
-    include Paramix
+    include Paramix::Parametric
 
-    def f
-      mixin_param(M,:p)
+    parameterized do |params|
+      public :f do
+        params[:p]
+      end
     end
   end
 
   module N
     include M
 
-    def g
-      mixin_param(N,:p)
+    parameterized do |params|
+      public :g do
+        params[:p]
+      end
     end
   end
 
   class I
-    include N[:p => "mosh"]
+    include N[:p => "INp"]
   end
 
   class E
-    extend N[:p => "many"]
+    extend N[:p => "ENp"]
   end
 
   # -- tests --------------------------------
 
   def test_include_f
-    assert_equal( "mosh", I.new.f )
+    assert_equal( "INp", I.new.f )
   end
 
   def test_include_g
-    assert_equal( "mosh", I.new.g )
+    assert_equal( "INp", I.new.g )
   end
 
   def test_extend_f
-    assert_equal( "many", E.f )
+    assert_equal( "ENp", E.f )
   end
 
   def test_extend_g
-    assert_equal( "many", E.g )
+    assert_equal( "ENp", E.g )
   end
 
 end

data/test/nested/test_nested_moot.rb

@@ -0,0 +1,48 @@
+require 'paramix'
+require 'test/unit'
+
+class TC_Paramix_Nested_Simple < Test::Unit::TestCase
+
+  # -- fixture ------------------------------
+
+  module M
+    include Paramix::Parametric
+
+    parameterized do |params|
+      public :f do
+        params[:p]
+      end
+    end
+  end
+
+  module N
+    include Paramix::Parametric
+    include M[:p=>"NMp"]
+  end
+
+  class I ; include N[] ; end
+  class E ; extend  N[] ; end
+
+  class Ix ; include N[:p=>"IxNp"] ; end
+  class Ex ; extend  N[:p=>"ExNp"] ; end
+
+  # -- tests --------------------------------
+
+  def test_include_if
+    assert_equal( "NMp", I.new.f )
+  end
+
+  def test_extend_ef
+    assert_equal( "NMp", E.f )
+  end
+
+  def test_include_ixf
+    assert_equal( "NMp", I.new.f )
+  end
+
+  def test_extend_exf
+    assert_equal( "NMp", E.f )
+  end
+
+end
+

data/test/nested/test_nested_simple.rb

@@ -0,0 +1,41 @@
+require 'paramix'
+require 'test/unit'
+
+class TC_Paramix_Nested_Simple < Test::Unit::TestCase
+
+  # -- fixture ------------------------------
+
+  module M
+    include Paramix::Parametric
+
+    parameterized do |params|
+      public :f do
+        params[:p]
+      end
+    end
+  end
+
+  module N
+    include M[:p=>"NMp"]
+  end
+
+  class I
+    include N
+  end
+
+  class E
+    extend  N
+  end
+
+  # -- tests --------------------------------
+
+  def test_include_if
+    assert_equal( "NMp", I.new.f )
+  end
+
+  def test_extend_ef
+    assert_equal( "NMp", E.f )
+  end
+
+end
+

data/test/nested/test_nested_top.rb

@@ -6,27 +6,32 @@ class TC_Paramix_Nested_Top < Test::Unit::TestCase
   # -- fixture ------------------------------
 
   module M
-    include Paramix
+    include Paramix::Parametric
 
-    def f
-      mixin_param(M,:p)
+    parameterized do |params|
+      public :f do
+        params[:p]
+      end
     end
   end
 
   module N
+    include Paramix::Parametric
     include M[:p=>"mood"]
 
-    def g
-      mixin_param(N,:p)
+    parameterized do |params|
+      public :g do
+        params[:p]
+      end
     end
   end
 
   class I
-    include N
+    include N[]
   end
 
   class E
-    extend N
+    extend N[]
   end
 
   # -- tests --------------------------------
@@ -39,9 +44,13 @@ class TC_Paramix_Nested_Top < Test::Unit::TestCase
     assert_equal( nil, I.new.g ) # TODO: or error ?
   end
 
-  #def test_extend
-  #  assert_equal( "many", E.f )
-  #end
+  def test_extend_f
+    assert_equal( "mood", E.f )
+  end
+
+  def test_extend_g
+    assert_equal( nil, E.g )
+  end
 
 end
 

data/test/test_paramix_callback.rb

@@ -1,24 +1,31 @@
 require 'paramix'
 require 'test/unit'
 
+include Paramix
+
 class TC_Paramix_Callback < Test::Unit::TestCase
 
   # -- fixture ------------------------------
 
   module M
-    include Paramix
+    include Parametric
 
-    def f
-      mixin_param(M,:p)
-    end
+    parameterized do |params|
 
-    #
-    def self.included(base)
-      base.class_eval do
-        attr_accessor mixin_parameters[M][:p]
+      public :f do
+        params[:p]
       end
-      super(base)
+
+      attr_accessor params[:p]
     end
+
+    #
+    #def self.included(base)
+    #  base.class_eval do
+    #    attr_accessor mixin_parameters[M][:p]
+    #  end
+    #  super(base)
+    #end
   end
 
   class C1

data/test/test_paramix_extend.rb

@@ -6,10 +6,14 @@ class TC_Paramix_Extend < Test::Unit::TestCase
   # -- fixture ------------------------------
 
   module M
-    include Paramix
+    include Paramix::Parametric
+
+    parameterized do |params|
+
+      public :f do
+        params[:p]
+      end
 
-    def f
-      mixin_param(M,:p)
     end
   end
 

data/test/test_paramix_include.rb

@@ -6,10 +6,14 @@ class TC_Paramix_Include < Test::Unit::TestCase
   # -- fixture ------------------------------
 
   module M
-    include Paramix
+    include Paramix::Parametric
+
+    parameterized do |params|
+
+      public :f do
+        params[:p]
+      end
 
-    def f
-      mixin_param(M,:p)
     end
   end
 

data/test/test_paramix_namespace.rb

@@ -5,34 +5,34 @@ class TC_Paramix_Namespace < Test::Unit::TestCase
 
   # -- fixture ------------------------------
 
-  module N1
+  module N
     module M
-      include Paramix
-
-      def f
-        mixin_param(M,:p)
+      include Paramix::Parametric
+      parameterized do |params|
+        public :f do
+          params[:p]
+        end
       end
     end
   end
 
-  module N2
+  module Q
     class I
-      include N1::M[:p => "mosh"]
+      include N::M[:p => "mosh"]
     end
-
     class E
-      extend N1::M[:p => "many"]
+      extend N::M[:p => "many"]
     end
   end
 
   # -- tests --------------------------------
 
   def test_class_1
-    assert_equal( "mosh", N2::I.new.f )
+    assert_equal( "mosh", Q::I.new.f )
   end
 
   def test_class_2
-    assert_equal( "many", N2::E.f )
+    assert_equal( "many", Q::E.f )
   end
 
 end

metadata

@@ -3,10 +3,10 @@ name: paramix
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
-  - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  - 0
+  version: 2.0.0
 platform: ruby
 authors: 
 - Thomas Sawyer
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-05 00:00:00 -04:00
+date: 2010-04-06 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -44,15 +44,17 @@ files:
 - meta/version
 - test/nested/test_nested_both.rb
 - test/nested/test_nested_bottom.rb
+- test/nested/test_nested_moot.rb
+- test/nested/test_nested_simple.rb
 - test/nested/test_nested_top.rb
 - test/test_paramix_callback.rb
 - test/test_paramix_extend.rb
 - test/test_paramix_include.rb
-- test/test_paramix_inject.rb
 - test/test_paramix_namespace.rb
+- HISTORY.rdoc
 - LICENSE
 - README.rdoc
-- HISTORY
+- Syckfile
 has_rdoc: true
 homepage: http://rubyworks.github.com/paramix
 licenses: []
@@ -87,9 +89,10 @@ summary: Parametric Mixins
 test_files: 
 - test/nested/test_nested_both.rb
 - test/nested/test_nested_bottom.rb
+- test/nested/test_nested_moot.rb
+- test/nested/test_nested_simple.rb
 - test/nested/test_nested_top.rb
 - test/test_paramix_callback.rb
 - test/test_paramix_extend.rb
 - test/test_paramix_include.rb
-- test/test_paramix_inject.rb
 - test/test_paramix_namespace.rb