polyglot 0.2.7 → 0.2.8

data/History.txt

@@ -1,3 +1,8 @@
+== 0.2.8 2009-08-18
+
+* 1 minor fix:
+  * Previous fix for LoadErrors failed for cucumber.
+
 == 0.2.7 2009-08-17
 
 * 1 minor fix:

data/lib/polyglot.rb

@@ -4,8 +4,15 @@ require 'pathname'
 module Polyglot
   @registrations ||= {} # Guard against reloading
   @loaded ||= {}
-  
-  class PolyglotLoadError < LoadError; end
+
+  class NestedLoadError < LoadError
+    def initialize le
+      @le = le
+    end
+    def reraise
+      raise @le
+    end
+  end
 
   def self.register(extension, klass)
     extension = [extension] unless Enumerable === extension
@@ -36,14 +43,18 @@ module Polyglot
     begin
       source_file, loader = Polyglot.find(file, *a[1..-1], &b)
       if (loader)
-        loader.load(source_file)
-        @loaded[file] = true
+        begin
+          loader.load(source_file)
+          @loaded[file] = true
+        rescue LoadError => e
+          raise Polyglot::NestedLoadError.new(e)
+        end
       else
         msg = "Failed to load #{file} using extensions #{(@registrations.keys+["rb"]).sort*", "}"
         if defined?(MissingSourceFile)
           raise MissingSourceFile.new(msg, file)
         else
-          raise PolyglotLoadError.new(msg)
+          raise LoadError.new(msg)
         end
       end
     end
@@ -58,7 +69,9 @@ module Kernel
   rescue LoadError => load_error
     begin
       Polyglot.load(*a, &b)
-    rescue Polyglot::PolyglotLoadError
+    rescue Polyglot::NestedLoadError => e
+      e.reraise
+    rescue LoadError
       # Raise the original exception, possibly a MissingSourceFile with a path
       raise load_error
     end

data/lib/polyglot/version.rb

@@ -2,7 +2,7 @@ module Polyglot #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 7
+    TINY  = 8
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: polyglot
 version: !ruby/object:Gem::Version 
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors: 
 - Clifford Heath
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-17 00:00:00 +10:00
+date: 2009-08-18 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency