monkey-lib 0.4.2 → 0.5.0

data/Rakefile

@@ -59,7 +59,7 @@ end
 
 task :environment do
   $LOAD_PATH.unshift "lib"
-  require "monkey"
+  require "monkey-lib"
 end
 
 desc "run all specs"

data/lib/monkey-lib.rb

@@ -1,2 +1,15 @@
 require "monkey"
-MonkeyLib = Monkey
+
+unless defined? Monkey
+  warn "installing both the monkey and the monkey-lib gem results in conflicts, add a Gemfile, use gemsets or remove monkey gem"
+  $LOADED_FEATURES.delete_if { |l| l =~ /monkey\.rb$/ }
+  if defined? require_relative
+    require_relative "monkey"
+  else
+    $LOAD_PATH.unshift File.expand_path('..', __FILE__)
+    require 'monkey'
+  end
+  fail "Please remove monkey gem (not monkey-lib gem) from your $LOAD_PATH" unless defined? Monkey
+end
+
+MonkeyLib = Monkey

data/lib/monkey/autoloader.rb

@@ -1,4 +1,4 @@
-require "monkey"
+require "monkey-lib"
 
 Module.class_eval do
   alias const_missing_without_detection const_missing

data/lib/monkey/backend.rb

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

data/lib/monkey/backend/active_support.rb

@@ -2,7 +2,7 @@ Monkey::Backend.new :ActiveSupport, :active_support do
   def setup
     load_lib :version
     expects_module "::ActiveSupport::CoreExtensions::String::Inflections" if version < "3"
-    load_libs "core_ext/object" => [:metaclass, :misc], :core_ext => %w[array/extract_options string/inflections module/introspection]
+    load_libs "core_ext/object" => [:singleton_class, :misc], :core_ext => %w[array/extract_options string/inflections module/introspection]
     if version < "3"
       ::Array.send :include, ::ActiveSupport::CoreExtensions::Array::ExtractOptions
       ::Module.send :include, ::ActiveSupport::CoreExtensions::Module
@@ -11,9 +11,6 @@ Monkey::Backend.new :ActiveSupport, :active_support do
       alias to_const_string camelcase
       alias to_const_path underscore
     end
-    ::Object.class_eval do
-      alias singleton_class metaclass unless respond_to? :singleton_class
-    end
   end
 
   def version(default = "0")

data/lib/monkey/ext.rb

@@ -17,7 +17,7 @@ module Monkey
           @core_class = klass
           klass.send :include, self
           self::ClassMethods.extend ClassDsl
-          self::ClassMethods.core_class core_class
+          self::ClassMethods.core_class @core_class
           @core_class.class_eval <<-EOS
             def method_missing(meth, *args, &blk)
               return super if Monkey::Backend.setup?
@@ -26,10 +26,13 @@ module Monkey
             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(Module) do |mod|
-              next unless mod.ancestors.include? klass and not mod.ancestors.include? self
-              mod.send :include, klass
+              list << mod if mod.ancestors.include? klass and not mod.ancestors.include? self
             end
+            list.each { |e| e.send :include, klass }
           end
         end
         return @core_class

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 $LOAD_PATH.unshift File.expand_path(__FILE__.sub("spec/spec_helper.rb", "lib"))
-require "monkey"
+require "monkey-lib"
 
 # I hate that code, but rbx for some reason ignores RUBYOPT.
 begin

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 4
-  - 2
-  version: 0.4.2
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Konstantin Haase
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-31 00:00:00 +02:00
+date: 2010-07-09 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency