polyglot 0.2.6 → 0.2.7

data/History.txt

@@ -1,3 +1,9 @@
+== 0.2.7 2009-08-17
+
+* 1 minor fix:
+  * Fix Polyglot catching LoadErrors not raised in Polyglot.find and re-raising the 
+  wrong message.
+
 == 0.2.6 2009-06-21
 
 * 1 significant fix:

data/lib/polyglot/version.rb

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

data/lib/polyglot.rb

@@ -4,6 +4,8 @@ require 'pathname'
 module Polyglot
   @registrations ||= {} # Guard against reloading
   @loaded ||= {}
+  
+  class PolyglotLoadError < LoadError; end
 
   def self.register(extension, klass)
     extension = [extension] unless Enumerable === extension
@@ -41,7 +43,7 @@ module Polyglot
         if defined?(MissingSourceFile)
           raise MissingSourceFile.new(msg, file)
         else
-          raise LoadError.new(msg)
+          raise PolyglotLoadError.new(msg)
         end
       end
     end
@@ -56,7 +58,7 @@ module Kernel
   rescue LoadError => load_error
     begin
       Polyglot.load(*a, &b)
-    rescue LoadError
+    rescue Polyglot::PolyglotLoadError
       # Raise the original exception, possibly a MissingSourceFile with a path
       raise load_error
     end

data/test/test_polyglot.rb

@@ -2,21 +2,43 @@ require File.dirname(__FILE__) + '/test_helper.rb'
 
 class TestPolyglot < Test::Unit::TestCase
   TEST_FILE = 'test_file.stub'
+  TEST_REQUIRES_FILE = 'test_requires_file.eval'
   class StubLoader
     def self.load(*args); end
   end
+  class EvalLoader
+    def self.load(file)
+      File.open(file) do |source_file|
+        source = source_file.read
+        eval source
+      end
+    end
+  end
 
   def setup
     Polyglot.register('stub', StubLoader)
     File.open(TEST_FILE, 'w') { |f| f.puts "Test data" }
+    Polyglot.register('eval', EvalLoader)
+    File.open(TEST_REQUIRES_FILE, 'w') { |f| f.puts "require 'nonexistent_file'" }
   end
 
   def teardown
     File.delete(TEST_FILE)
+    File.delete(TEST_REQUIRES_FILE)
   end
   
   def test_load_by_absolute_path
     full_path = File.expand_path(TEST_FILE.sub(/.stub$/, ''))
     assert_nothing_raised { require full_path }
   end
+  
+  def test_load_error
+    exception = assert_raise(LoadError) { require "nonexistent_file" }
+    assert_match(/nonexistent_file/, exception.message)
+  end
+  
+  def test_load_error_inside_poly_file
+    exception = assert_raise(LoadError) { require TEST_REQUIRES_FILE.sub(/.eval$/, '') }
+    assert_match(/nonexistent_file/, exception.message)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: polyglot
 version: !ruby/object:Gem::Version 
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors: 
 - Clifford Heath
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-21 00:00:00 +10:00
+date: 2009-08-17 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.0
+        version: 2.3.2
     version: 
 description: Allows custom language loaders for specified file extensions to be hooked into require
 email: cjheath@rubyforge.org
@@ -66,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: polyglot
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Allows custom language loaders for specified file extensions to be hooked into require