merb-core 1.0.5 → 1.0.6

data/lib/merb-core/core_ext/kernel.rb

@@ -19,10 +19,10 @@ module Kernel
   #
   # :api: private
   def track_dependency(name, clr, *ver, &blk)
-    options = ver.pop if ver.last.is_a?(Hash)
+    options = ver.last.is_a?(Hash) ? ver.pop : {}
     new_dep = Gem::Dependency.new(name, ver.empty? ? nil : ver)
     new_dep.require_block = blk
-    new_dep.require_as = (options && options[:require_as]) || name
+    new_dep.require_as = options.key?(:require_as) ? options[:require_as] : name
     new_dep.original_caller = clr
     
     deps = Merb::BootLoader::Dependencies.dependencies
@@ -138,6 +138,7 @@ module Kernel
   def load_dependency(name, clr, *ver, &blk)
     begin
       dep = name.is_a?(Gem::Dependency) ? name : track_dependency(name, clr, *ver, &blk)
+      return unless dep.require_as
       Gem.activate(dep)
     rescue Gem::LoadError => e
       e.set_backtrace dep.original_caller

data/lib/merb-core/version.rb

@@ -1,4 +1,4 @@
 module Merb
-  VERSION = '1.0.5' unless defined?(Merb::VERSION)
+  VERSION = '1.0.6' unless defined?(Merb::VERSION)
   DM_VERSION = '0.9.8' unless defined?(Merb::DM_VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-core
 version: !ruby/object:Gem::Version 
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors: 
 - Ezra Zygmuntowicz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-15 00:00:00 -08:00
+date: 2008-12-16 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency