easyload 0.1.1 → 0.2.0

data/.gitignore

@@ -1,4 +1,5 @@
 *.gem
+*.rbc
 .bundle
 .yardoc
 Gemfile.lock

data/lib/easyload/helpers.rb

@@ -0,0 +1,14 @@
+# -*- encoding: utf-8 -*-
+module Easyload
+  module Helpers
+    # Looks for a file on the $LOAD_PATH and returns the full path to the first match.
+    def self.find_loadable_file(path)
+      $LOAD_PATH.each do |load_root|
+        full_load_path = File.join(load_root, path)
+        return full_load_path if File.exists? full_load_path
+      end
+      
+      return nil
+    end
+  end
+end

data/lib/easyload/singleton_extensions.rb

@@ -1,5 +1,10 @@
 # -*- encoding: utf-8 -*-
+require 'easyload/helpers'
+require 'monitor'
+
 module Easyload
+  LOAD_LOCK = Monitor.new
+  
   # The singleton methods that are defined for a module that includes {Easyload}.
   module SingletonExtensions
     # The root path that easyload should use when loading a child constant for this module.
@@ -39,34 +44,58 @@ module Easyload
       path_component = self.easyload_path_component_for_sym(sym)
       easyload_path = File.join(@easyload_root, "#{path_component}.rb")
       
-      # Search for the file to include
-      $LOAD_PATH.each do |load_root|
-        full_load_path = File.join(load_root, easyload_path)
-        if File.exists? full_load_path
-          self.module_eval(File.read(full_load_path))
-          
-          # Did we get our target constant?
-          if self.const_defined? sym
-            target_const = self.const_get(sym)
-            class << target_const
-              include SingletonExtensions
-            end
-            
-            target_const.easyload_from(File.join(self.easyload_root, path_component))
-            
-            return self.const_get(sym)
-          
-          # Warn but still break the load process.  We don't want to support ambiguous load
-          # paths.
-          else
-            $stderr.puts "Attempted to easyload #{sym} from '#{full_load_path}', but it doesn't appear to exist in that source file."
-          end
-          
-          break
-        end
+      # Do we have a file to easyload?
+      path_to_easyload = Helpers.find_loadable_file(easyload_path)
+      if path_to_easyload.nil?
+        raise NameError.new("Unknown constant #{self}::#{sym} - tried to easyload it from '#{@easyload_root}/#{path_component}'", sym)
       end
+      file_source = File.read(path_to_easyload)
       
-      raise NameError("Unknown constant #{self}::#{sym} - tried to easyload it from '#{@easyload_root}/#{path_component}'", sym)
+      # Perform the easyload.
+      LOAD_LOCK.synchronize do
+        $parent = self
+        self.module_eval(file_source)
+      end
+      
+      #puts "===="
+      #puts self
+      #puts "===="
+      
+      # Perform the easyload with a manual eval.  module_eval doesn't allow for relative constants
+      # in the easyloaded file, so we need to manually construct the context to evaluate within.
+      #context_type = self.class == Class ? 'class' : 'module'
+      #begin
+      #  ROOT_BINDING.eval("#{context_type} #{self.name}; #{file_source}; end")
+      #rescue
+      #  puts "#{context_type} #{self.name}; #{file_source}; end"
+      #  raise
+      #end
+      
+      #::Kernel.eval("#{context_type} #{self.name}; #{file_source}; end")
+      #puts "----"
+      #easyload_binding = self.module_eval('::Kernel.binding')
+      #easyload_binding.eval(file_source, path_to_easyload)
+      
+      #self.instance_eval do
+      #  ::Kernel.eval(file_source, nil, path_to_easyload)
+      #end
+      
+      #global_eval("#{context_type} #{self.name}; #{file_source}; end")
+      
+      # Did we get our target constant?
+      if not self.const_defined? sym
+        raise LoadError.new("Attempted to easyload #{sym} from '#{path_to_easyload}', but it doesn't appear to exist in that source file.")
+      end
+      
+      # Make sure that we propagate easyload behaviors
+      target_const = self.const_get(sym)
+      class << target_const
+        include SingletonExtensions
+      end
+    
+      target_const.easyload_from(File.join(self.easyload_root, path_component))
+    
+      return self.const_get(sym)
     end
   end
 end

data/lib/easyload/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding: utf-8 -*-
 module Easyload
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

data/spec/naming_spec.rb

@@ -1,10 +1,6 @@
 # -*- encoding: utf-8 -*-
 require 'easyload'
 
-module NamingExamples
-  Easyload
-end
-
 describe 'Easyload file names' do
   it 'should use a single lowercase name for a single word constant' do
     Examples.easyload_path_component_for_sym(:Single).should == 'single'

data/spec/relative_constants/bar.rb

@@ -0,0 +1,4 @@
+# -*- encoding: utf-8 -*-
+class Bar
+  
+end

data/spec/relative_constants/foo.rb

@@ -0,0 +1,4 @@
+# -*- encoding: utf-8 -*-
+module Foo
+  REFERS_TO = $parent::Bar
+end

data/spec/relative_constants_spec.rb

@@ -0,0 +1,12 @@
+# -*- encoding: utf-8 -*-
+require 'easyload'
+
+module RelativeConstants
+  include Easyload
+end
+
+describe 'Easyloaded modules with relatively referenced constants' do
+  it 'should be able to reference relative constants via $parent' do
+    RelativeConstants::Foo::REFERS_TO.should == RelativeConstants::Bar
+  end
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Ian MacLeod
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-22 00:00:00 -08:00
+date: 2011-02-24 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -79,6 +79,7 @@ files:
 - Rakefile
 - easyload.gemspec
 - lib/easyload.rb
+- lib/easyload/helpers.rb
 - lib/easyload/singleton_extensions.rb
 - lib/easyload/version.rb
 - spec/basic_spec.rb
@@ -89,6 +90,9 @@ files:
 - spec/examples/nested/leaf.rb
 - spec/examples/node.rb
 - spec/naming_spec.rb
+- spec/relative_constants/bar.rb
+- spec/relative_constants/foo.rb
+- spec/relative_constants_spec.rb
 has_rdoc: true
 homepage: ""
 licenses: []
@@ -130,3 +134,6 @@ test_files:
 - spec/examples/nested/leaf.rb
 - spec/examples/node.rb
 - spec/naming_spec.rb
+- spec/relative_constants/bar.rb
+- spec/relative_constants/foo.rb
+- spec/relative_constants_spec.rb