monkey-lib 0.5.1 → 0.5.2

data/lib/monkey/backend.rb

@@ -97,9 +97,9 @@ module Monkey
 
     def self.setup!(backend)
       if backend
+        @setup = true
         @backend = detect_backend(backend)
         @backend.setup
-        @setup = true
         @backend
       else
         available_backends.each do |backend|

data/lib/monkey/ext.rb

@@ -1,4 +1,5 @@
 require "pathname"
+require "monkey/engine"
 
 module Monkey
   module Ext
@@ -25,17 +26,29 @@ module Monkey
               __send__(meth, *args, &blk)
             end
           EOS
-          unless klass.is_a? Class
-            # HACK: Don't modify modules while looping through object space.
-            # JRuby does not like that.
-            list = []
-            ObjectSpace.each_object(Class) do |mod|
-              list << mod if mod.ancestors.include? klass and not mod.ancestors.include? self
-            end
-            list.each { |e| e.send :include, klass }
-          end
+          propagate_include
+        end
+        @core_class
+      end
+
+      if Monkey::Engine.jruby? and JRUBY_VERSION < '1.6.0'
+        def each_module(&block)
+          list = []
+          ObjectSpace.each_object(Class) { |c| list << c }
+          list.each(&block)
+        end
+      else
+        def each_module(&block)
+          ObjectSpace.each_object(Module, &block)
+        end
+      end
+
+      def propagate_include
+        return if core_class.is_a? Class
+        each_module do |mod|
+          next unless mod < core_class and not mod < self
+          mod.send(:include, core_class)
         end
-        return @core_class
       end
 
       def included(klass)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: monkey-lib
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 5
-  - 1
-  version: 0.5.1
+  - 2
+  version: 0.5.2
 platform: ruby
 authors: 
 - Konstantin Haase
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-15 00:00:00 +02:00
+date: 2010-07-18 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency