constructable 0.3.0 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/constructable.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{constructable}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Manuel Korfmann"]

data/lib/constructable/core_ext.rb

@@ -40,9 +40,17 @@ module Constructable
       when Class
         @constructor.redefine_new(self)
       when Module
-        define_singleton_method :included do |base|
-          @constructor.redefine_new(base) if Class === base
+        redefine_new_logic = proc do |base|
+
+          base.instance_variable_set(:@constructor, @constructor)
+          if Class == base.class
+            @constructor.redefine_new(base)
+          elsif Module == base.class
+            base.define_singleton_method :included, &redefine_new_logic
+          end
         end
+
+        define_singleton_method :included, &redefine_new_logic
       end
       return nil
     end

data/test/constructable/test_constructor.rb

@@ -69,6 +69,7 @@ describe 'Constructor' do
           instance.integer = 5
           assert_equal 1, instance.integer
         end
+
       end
 
       describe 'allows to super to the generated method' do
@@ -124,17 +125,38 @@ describe 'Constructor' do
 
   describe 'module support' do
     before do
-      module Foo
+      @foo = Module.new do
         constructable [:foo, readable: true]
       end
     end
 
     it 'allows cosntructing classes after including the module' do
-      class Bar
-        include Foo
-      end
-      bar = Bar.new(foo: 'foo')
+      @bar = Class.new
+      @bar.send :include, @foo
+
+      bar = @bar.new(foo: 'foo')
       assert_equal 'foo', bar.foo
     end
+
+    describe 'shared setup' do
+
+      before do
+        @bar = Module.new
+        @bar.send :include, @foo
+
+        @baz = Class.new
+        @baz.send :include, @bar
+      end
+
+      it 'works for multiple inclusion' do
+        baz = @baz.new(foo: 'foo')
+        assert_equal 'foo', baz.foo
+      end
+
+      it 'always sets the @constructor ivar' do
+        assert_equal @foo.instance_variable_get(:@constructor), @baz.instance_variable_get(:@constructor)
+      end
+
+    end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: constructable
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Manuel Korfmann
@@ -103,7 +103,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 830416941491402705
+      hash: 2398714721687136545
       segments: 
       - 0
       version: "0"