include_complete 0.1.0-i386-mingw32 → 0.1.2-i386-mingw32

data/CHANGELOG

@@ -1,3 +1,5 @@
+1/11/2010 version 0.1.2
+* Anonymous module's #to_s now returns "Anon"
 1/11/2010 *NAME CHANGE* TO include_complete, version reset to 0.1.0
 * now called include_complete
 22/10/2010 version 0.2.2

data/ext/include_complete/include_complete_one.c

@@ -1,3 +1,4 @@
+/* include_complete_one.c */
 /* (c) 2010 John Mair (banisterfiend), MIT license */
 /* */
 /* include a module (and its singleton) into an inheritance chain */
@@ -10,11 +11,18 @@ static VALUE
 class_to_s(VALUE self)
 {
   VALUE attached = rb_iv_get(self, "__attached__");
+  VALUE name;
   
   if (attached) 
-    return rb_mod_name(rb_iv_get(attached, "__module__"));
+    name = rb_mod_name(rb_iv_get(attached, "__module__"));
   else
-    return rb_mod_name(rb_iv_get(self, "__module__"));
+    name = rb_mod_name(rb_iv_get(self, "__module__"));
+
+  /* if module does not have a name, return "Anon" */
+  if (NIL_P(name) || RSTRING_LEN(name) == 0)
+    return rb_str_new2("Anon");
+  else
+    return name;
 }
 
 /* totally hacked up version of include_class_new() from class.c; brings in singletons into inheritance chain */
@@ -51,7 +59,7 @@ include_class_new(VALUE module, VALUE super)
   RCLASS_SUPER(klass) = super;
 
   if (TYPE(module) == T_MODULE ||  FL_TEST(module, FL_SINGLETON))
-    rb_iv_set((VALUE)klass, "__module__", module);
+    rb_iv_set(klass, "__module__", module);
     
   /* create IClass for module's singleton  */
   /* if super is 0 then we're including into a module (not a class), so treat as special case */
@@ -149,3 +157,4 @@ void
 Init_include_complete_one() {
   rb_define_method(rb_cModule, "include_complete_one", rb_include_complete_module_one, 1);
 }
+

data/lib/include_complete.rb

@@ -34,7 +34,7 @@ class Module
   #   end
   #   C.hello #=> "hello"
   def include_complete(*mods)
-    mods.each do |mod|
+    mods.reverse.each do |mod|
       include_complete_one mod
     end
     self

data/lib/include_complete/version.rb

@@ -1,3 +1,3 @@
 module IncludeComplete
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 end

data/test/test.rb

@@ -7,256 +7,265 @@ require 'bacon'
 puts "Testing IncludeComplete version #{IncludeComplete::VERSION}..."
 puts "Ruby version #{RUBY_VERSION}"
 
-describe 'Including a module into a class using include_complete' do
-  before do
-    @m = Module.new {
-      def self.class_method
-        :class_method
-      end
-
-      def instance_method
-        :instance_method
-      end
-    }
-
-    @m::CONST = :const
-
-    @c = Class.new
-
-    @c.send(:include_complete, @m)
-  end
-
-  it 'should make class methods accessible to class' do
-    @c.class_method.should.equal :class_method
-  end
-
-  it 'should make instance methods accessible to instances of the class' do
-    obj = @c.new
-    obj.instance_method.should.equal :instance_method
-  end
-
-  it 'should make constants accessible to the class' do
-    lambda { @c::CONST }.should.not.raise NameError
-  end
-end
-
-describe 'Extending a module into a class using extend_complete' do
-  before do
-    @m = Module.new {
-      def self.class_method
-        :class_method
-      end
-
-      def instance_method
-        :instance_method
-      end
-    }
-
-    @m::CONST = :const
-
-    @c = Class.new
-
-    @c.send(:extend_complete, @m)
-  end
-
-  it 'should make instance methods from the module available as class methods on the class' do
-    @c.instance_method.should.equal :instance_method
-  end
-
-  it 'should make class methods from the module available as class methods on the singleton class' do
-    class << @c; self; end.class_method.should.equal :class_method
-  end
-end
-
-    
-describe 'Including a module into a module and then into a class using include_complete' do
+describe IncludeComplete do
+  describe 'Including a module into a class using include_complete' do
     before do
-    @m1 = Module.new {
-      def self.class_method1
-        :class_method1
-      end
+      @m = Module.new {
+        def self.class_method
+          :class_method
+        end
 
-      def instance_method1
-        :instance_method1
-      end
-    }
+        def instance_method
+          :instance_method
+        end
+      }
 
-    @m1::CONST1 = :const1
+      @m::CONST = :const
 
-    @m2 = Module.new {
-      def self.class_method2
-        :class_method2
-      end
+      @c = Class.new
 
-      def instance_method2
-        :instance_method2
-      end
-    }
-    @m2.send(:include_complete, @m1)
+      @c.send(:include_complete, @m)
+    end
 
-    @m2::CONST2 = :const2
+    it 'should make class methods accessible to class' do
+      @c.class_method.should.equal :class_method
+    end
 
-    @c = Class.new
-
-    @c.send(:include_complete, @m2)
-  end
+    it 'should make instance methods accessible to instances of the class' do
+      obj = @c.new
+      obj.instance_method.should.equal :instance_method
+    end
 
-  it 'should make class methods on m1 accessible to m2' do
-    @m2.class_method1.should.equal :class_method1
+    it 'should make constants accessible to the class' do
+      lambda { @c::CONST }.should.not.raise NameError
+    end
   end
 
-  it 'should make constants on m1 and m2 accessible to class' do
-    lambda { @c::CONST1 == :const1 }.should.not.raise NameError
-    lambda { @m2::CONST1 == :const1 }.should.not.raise NameError
-    lambda { @c::CONST2 == :const2 }.should.not.raise NameError
-  end
-
-  it 'should make class methods on modules m1 and m2 accessible to class' do
-    @c.class_method1.should.equal :class_method1
-    @c.class_method2.should.equal :class_method2
-  end
-
-  it 'should make instance methods on modules m1 and m2 accessible to instances of class' do
-    obj = @c.new
-
-    obj.instance_method1.should.equal :instance_method1
-    obj.instance_method2.should.equal :instance_method2
-  end
-
-  it 'should make ancestor chain "look" accurate' do
-    @m1 = Module.new {
-      def self.class_method1
-        :class_method1
-      end
-
-      def instance_method1
-        :instance_method1
-      end
-    }
-
-    Object.const_set(:M1, @m1) 
-
-    @m2 = Module.new {
-      def self.class_method2
-        :class_method2
-      end
-
-      def instance_method2
-        :instance_method2
-      end
-    }
-    Object.const_set(:M2, @m2) 
-
-    @m2.send(:include_complete, @m1)
-
-    @c = Class.new
-
-    @c.send(:include_complete, @m2)
-    
-    @c.ancestors[1].to_s.should.equal M2.name
-    @c.class_method1.should.equal :class_method1
-    @c.class_method2.should.equal :class_method2
-  end
-
-  it 'should work if real_including a module that has another module included using Module#include' do
-    @m1 = Module.new {
-      def self.class_method1
-        :class_method1
-      end
-
-      def instance_method1
-        :instance_method1
-      end
-    }
+  describe 'Extending a module into a class using extend_complete' do
+    before do
+      @m = Module.new {
+        def self.class_method
+          :class_method
+        end
 
-    Object.const_set(:N1, @m1) 
+        def instance_method
+          :instance_method
+        end
+      }
 
-    @m2 = Module.new {
-      def self.class_method2
-        :class_method2
-      end
+      @m::CONST = :const
 
-      def instance_method2
-        :instance_method2
-      end
-    }
-    Object.const_set(:N2, @m2) 
+      @c = Class.new
 
-    @m2.send(:include, @m1)
+      @c.send(:extend_complete, @m)
+    end
 
-    @c = Class.new
+    it 'should make instance methods from the module available as class methods on the class' do
+      @c.instance_method.should.equal :instance_method
+    end
 
-    @c.send(:include_complete, @m2)
-    
-    @c.ancestors[1].to_s.should.equal N2.name
-    @c.ancestors[2].to_s.should.equal N1.name
-    @c.class_method1.should.equal :class_method1
-    @c.class_method2.should.equal :class_method2
+    it 'should make class methods from the module available as class methods on the singleton class' do
+      class << @c; self; end.class_method.should.equal :class_method
+    end
   end
 
-  it 'should work if Module#including a module that has another module included using include_complete' do
-    @m1 = Module.new {
-      def self.class_method1
-        :class_method1
-      end
-
-      def instance_method1
-        :instance_method1
-      end
-    }
-
-    Object.const_set(:K1, @m1) 
-
-    @m2 = Module.new {
-      def self.class_method2
-        :class_method2
-      end
-
-      def instance_method2
-        :instance_method2
-      end
-    }
-    Object.const_set(:K2, @m2) 
-
-    @m2.send(:include_complete, @m1)
-
-    @c = Class.new
-
-    @c.send(:include, @m2)
-    
-    @c.ancestors[1].should.equal K2
-    @c.ancestors[2].should.equal K1
-    @c.new.instance_method1.should.equal :instance_method1
-    @c.new.instance_method2.should.equal :instance_method2
-  end
   
+  describe 'Including a module into a module and then into a class using include_complete' do
+    before do
+      @m1 = Module.new {
+        def self.class_method1
+          :class_method1
+        end
+
+        def instance_method1
+          :instance_method1
+        end
+      }
+
+      @m1::CONST1 = :const1
+
+      @m2 = Module.new {
+        def self.class_method2
+          :class_method2
+        end
+
+        def instance_method2
+          :instance_method2
+        end
+      }
+      @m2.send(:include_complete, @m1)
+
+      @m2::CONST2 = :const2
+
+      @c = Class.new
+
+      @c.send(:include_complete, @m2)
+    end
+
+    it 'should make class methods on m1 accessible to m2' do
+      @m2.class_method1.should.equal :class_method1
+    end
+
+    it 'should make constants on m1 and m2 accessible to class' do
+      lambda { @c::CONST1 == :const1 }.should.not.raise NameError
+      lambda { @m2::CONST1 == :const1 }.should.not.raise NameError
+      lambda { @c::CONST2 == :const2 }.should.not.raise NameError
+    end
+
+    it 'should make class methods on modules m1 and m2 accessible to class' do
+      @c.class_method1.should.equal :class_method1
+      @c.class_method2.should.equal :class_method2
+    end
+
+    it 'should make instance methods on modules m1 and m2 accessible to instances of class' do
+      obj = @c.new
+
+      obj.instance_method1.should.equal :instance_method1
+      obj.instance_method2.should.equal :instance_method2
+    end
+
+    it 'should make ancestor chain "look" accurate' do
+      @m1 = Module.new {
+        def self.class_method1
+          :class_method1
+        end
+
+        def instance_method1
+          :instance_method1
+        end
+      }
+
+      Object.const_set(:M1, @m1) 
+
+      @m2 = Module.new {
+        def self.class_method2
+          :class_method2
+        end
+
+        def instance_method2
+          :instance_method2
+        end
+      }
+      Object.const_set(:M2, @m2) 
+
+      @m2.send(:include_complete, @m1)
+
+      @c = Class.new
+
+      @c.send(:include_complete, @m2)
+      
+      @c.ancestors[1].to_s.should.equal M2.name
+      @c.class_method1.should.equal :class_method1
+      @c.class_method2.should.equal :class_method2
+    end
+
+    it 'should work if real_including a module that has another module included using Module#include' do
+      @m1 = Module.new {
+        def self.class_method1
+          :class_method1
+        end
+
+        def instance_method1
+          :instance_method1
+        end
+      }
+
+      Object.const_set(:N1, @m1) 
+
+      @m2 = Module.new {
+        def self.class_method2
+          :class_method2
+        end
+
+        def instance_method2
+          :instance_method2
+        end
+      }
+      Object.const_set(:N2, @m2) 
+
+      @m2.send(:include, @m1)
+
+      @c = Class.new
+
+      @c.send(:include_complete, @m2)
+      
+      @c.ancestors[1].to_s.should.equal N2.name
+      @c.ancestors[2].to_s.should.equal N1.name
+      @c.class_method1.should.equal :class_method1
+      @c.class_method2.should.equal :class_method2
+    end
+
+    it 'should work if Module#including a module that has another module included using include_complete' do
+      @m1 = Module.new {
+        def self.class_method1
+          :class_method1
+        end
+
+        def instance_method1
+          :instance_method1
+        end
+      }
+
+      Object.const_set(:K1, @m1) 
+
+      @m2 = Module.new {
+        def self.class_method2
+          :class_method2
+        end
+
+        def instance_method2
+          :instance_method2
+        end
+      }
+      Object.const_set(:K2, @m2) 
+
+      @m2.send(:include_complete, @m1)
+
+      @c = Class.new
+
+      @c.send(:include, @m2)
+      
+      @c.ancestors[1].should.equal K2
+      @c.ancestors[2].should.equal K1
+      @c.new.instance_method1.should.equal :instance_method1
+      @c.new.instance_method2.should.equal :instance_method2
+    end
+
+    it 'should show an anonymous module as "Anon" in ancestor chain' do
+      c = Class.new
+      c.include_complete Module.new
+      c.ancestors[1].to_s.should == "Anon"
+    end
+    
 
-  it 'should work with multiple modules passed to include_complete' do
-    @m1 = Module.new {
-      def self.class_method1
-        :class_method1
-      end
-
-      def instance_method1
-        :instance_method1
-      end
-    }
-
-    @m2 = Module.new {
-      def self.class_method2
-        :class_method2
-      end
-
-      def instance_method2
-        :instance_method2
-      end
-    }
-
-    @c = Class.new
-    @c.send(:include_complete, @m2, @m1)
+    it 'should work with multiple modules passed to include_complete' do
+      @m1 = Module.new {
+        def self.class_method1
+          :class_method1
+        end
+
+        def instance_method1
+          :instance_method1
+        end
+      }
+
+      @m2 = Module.new {
+        def self.class_method2
+          :class_method2
+        end
+
+        def instance_method2
+          :instance_method2
+        end
+      }
+
+      @c = Class.new
+      @c.send(:include_complete, @m2, @m1)
+      
+      @c.class_method1.should.equal :class_method1
+      @c.class_method2.should.equal :class_method2
+      @c.ancestors[1..2].map { |v| v.to_s }.should == ["Anon", "Anon"]
+    end
     
-    @c.class_method1.should.equal :class_method1
-    @c.class_method2.should.equal :class_method2
   end
-    
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: include_complete
 version: !ruby/object:Gem::Version 
-  hash: 27
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 2
+  version: 0.1.2
 platform: i386-mingw32
 authors: 
 - John Mair (banisterfiend)
@@ -56,7 +55,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -65,7 +63,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"