fakefs-require 0.1.2 → 0.2.0

data/LICENSE

@@ -16,4 +16,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+THE SOFTWARE.

data/README.markdown

@@ -22,6 +22,8 @@ Usage
     
     File.open("foo.rb", "w") {|f| f.write "puts 'hello world!'" }
     require "foo"
+    
+Files loaded by #require will be appended to $".
 
 
 Gems, Standard Lib and Load Path
@@ -56,6 +58,15 @@ Note: This will only work for autoload calls made _after_ ::activate! has been
 called.
 
 
+Kernel#load
+-----------
+
+There is also support for Kernel#load, including loading the file within an
+anonymous module.
+
+    FakeFS::Require.activate! :load => true
+
+
 Limitations
 -----------
 
@@ -76,6 +87,9 @@ There are two known limitations to FakeFS::Require (besides ones to FakeFS).
 2.  If a class/module that calls #autoload defines #const_missing the faked
     autoload won't work. Maybe this is a WONTFIX, I don't know... any ideas?
 
+3.  #require does only work with .rb files. Binary files like .so and .dll will
+    not be loaded.
+
 
 Contributing
 ------------

data/Rakefile

@@ -19,10 +19,14 @@ begin
     gemspec.email       = "lars.gierth@altefeuerwachekoeln.de"
     gemspec.homepage    = "http://github.com/lgierth/fakefs-require"
     gemspec.authors     = ["Lars Gierth"]
-    gemspec.has_rdoc    = false
+    
+    gemspec.has_rdoc     = true
+    gemspec.extra_rdoc_files = ["README.markdown"]
+    gemspec.rdoc_options << "--main" << "README.markdown"
+    
     gemspec.add_dependency "fakefs"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
+end

data/TODO

@@ -0,0 +1,3 @@
+Todos for v0.2.0
+
+* Write code documentation and include it in the gem

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/lib/fakefs/require.rb

@@ -1,149 +1,185 @@
+require "stringio"
+
 module FakeFS
   
-  # TODO write documentation
   module Require
     @active = false
     
+    # Activates faked #require
+    #
+    # = Options
+    # 
+    # * :fallback => true # activates the fallback to Kernel#require
+    # * :autoload => true # activates faked #autoload, #autoload? and #const_missing
+    # * :load => true     # activates faked #load
     def self.activate! opts = {}
-      unless @active
-        Kernel.class_eval do
-          alias_method :fakefs_original_require, :require
-          alias_method :require, :fakefs_require
-        end
-        @active = true
+      return if active?
+      
+      @active = true
+      
+      @opts = {
+        :fallback => false,
+        :autoload => false,
+        :load => false,
+      }.merge opts
+      
+      Kernel.class_eval do
+        alias_method :fakefs_original_require, :require
+        alias_method :require, :fakefs_require
+      end
+      
+      Module.class_eval do
+        alias_method :fakefs_original_autoload, :autoload
+        alias_method :autoload, :fakefs_autoload
         
-        @opts = {
-          :fallback => false,
-          :autoload => false,
-        }
-        @opts.merge!(opts)
-        @identity_map = []
+        alias_method :fakefs_original_autoload?, :autoload?
+        alias_method :autoload?, :fakefs_autoload?
         
-        Module.class_eval do
-          alias_method :fakefs_original_autoload, :autoload
-          alias_method :autoload, :fakefs_autoload
-          
-          alias_method :fakefs_original_autoload?, :autoload?
-          alias_method :autoload?, :fakefs_autoload?
-          
-          alias_method :fakefs_original_const_missing, :const_missing
-          alias_method :const_missing, :fakefs_const_missing
-        end if @opts[:autoload]
-      end
+        alias_method :fakefs_original_const_missing, :const_missing
+        alias_method :const_missing, :fakefs_const_missing
+      end if @opts[:autoload]
+      
+      Kernel.class_eval do
+        alias_method :fakefs_original_load, :load
+        alias_method :load, :fakefs_load
+      end if @opts[:load]
     end
     
+    # Deactivates the faked methods
     def self.deactivate!
-      if @active
-        Kernel.class_eval do
-          alias_method :require, :fakefs_original_require
-        end
-        @active = false
-        
-        Module.class_eval do
-          alias_method :autoload, :fakefs_original_autoload
-          alias_method :autoload?, :fakefs_original_autoload?
-          alias_method :const_missing, :fakefs_original_const_missing
-        end if @opts[:autoload]
+      return unless active?
+      
+      @active = false
+      
+      Kernel.class_eval do
+        alias_method :require, :fakefs_original_require
       end
+      
+      Module.class_eval do
+        alias_method :autoload, :fakefs_original_autoload
+        alias_method :autoload?, :fakefs_original_autoload?
+        alias_method :const_missing, :fakefs_original_const_missing
+      end if @opts[:autoload]
+      
+      Kernel.class_eval do
+        alias_method :load, :fakefs_original_load
+      end if @opts[:load]
+      
+      @opts = nil
     end
     
+    # Returns whether FakeFS::Require is active
     def self.active?
       @active
     end
     
-    def self.clear
-      @identity_map = []
-      @autoloadable = {}
-      @autoloaded = {}
-    end
-    
+    # Returns the options passed to ::activate!
     def self.opts
       @opts
     end
     
-    def self.identity_map
-      @identity_map
-    end
-    
+    # Returns a hash containing autoload data
     def self.autoloadable
       @autoloadable ||= {}
     end
     
-    def self.autoloaded
-      @autoloaded ||= {}
+    # Clears the autoload data hash
+    def self.clear
+      @autoloadable = {}
     end
     
-    # TODO fix identity map behaviour
+    # Resolves the passed filename to a path
+    def self.resolve fn
+      found = nil
+      if fn[0...1] == "/"
+        found = fn if File.exist? fn
+      else
+        $LOAD_PATH.each do |p|
+          path = p + "/" + fn
+          found = path if File.exist? path
+        end
+      end
+      
+      return found
+    end
+    
+    # Faked #require (see Kernel#require)
     def fakefs_require fn
-      fn = fn.to_s unless fn.is_a? String
+      fn = fn.to_s
+      orig_fn = fn.dup
       
-      begin
-        orig_fn = fn.dup
-        fn = fn + ".rb" unless fn[-3..-1] == ".rb"
-        
-        path = nil
-        2.times do
-          if fn.match "^/"
-            path = fn if File.exist? fn
-          else
-            $LOAD_PATH.each do |p|
-              if File.exist? p + "/" + fn
-                path = p + "/" + fn
-                break
-              end
-            end
-          end
-          
-          break if path or orig_fn[-3..-1] == ".rb" or fn[-3..-1] != ".rb"
-          fn = fn[0..-3]
-        end
+      fn = fn + ".rb" unless fn[-3..-1] == ".rb"
+      path = FakeFS::Require.resolve fn
+      
+      if path
+        return false if $".include? fn
         
-        raise LoadError, "no such file to load -- " + orig_fn unless path
-      rescue LoadError => load_error
-        if FakeFS::Require.opts[:fallback]
-          opts = FakeFS::Require.opts
-          begin
-            FakeFS.deactivate!
-            FakeFS::Require.deactivate!
-            return fakefs_original_require orig_fn
-          ensure
-            FakeFS::Require.activate! opts
-            FakeFS.activate!
-          end
+        $" << fn
+        File.open(path, "r") {|f| Object.class_eval f.read, fn, 1 }
+        return true
+      elsif FakeFS::Require.opts[:fallback]
+        opts = FakeFS::Require.opts
+        begin
+          FakeFS.deactivate!
+          FakeFS::Require.deactivate!
+          return fakefs_original_require orig_fn
+        ensure
+          FakeFS::Require.activate! opts
+          FakeFS.activate!
         end
-        raise load_error
       end
       
-      return false if FakeFS::Require.identity_map.include? path
-      
-      FakeFS::Require.identity_map << path
-      File.open path, "r" do |f|
-        Object.class_eval f.read, fn, 1
-      end      
-      return true
+      raise LoadError, "no such file to load -- " + orig_fn
     end
     
     module Autoload
+      # Faked #autoload (see Module#autoload)
       def fakefs_autoload const, file
         Require.autoloadable[self] ||= {}
         Require.autoloadable[self][const] = file
       end
       
+      # Faked #autoload? (see Module#autoload?)
       def fakefs_autoload? const
         hsh = Require.autoloadable[self]
         return hsh[const] if hsh
       end
       
+      # Implementation of #const_missing, catches autoload cases
       def fakefs_const_missing name
-        Require.autoloaded[self] ||= {}
         file = autoload? name
-        if file and !Require.autoloaded[self][name]
-          Require.autoloaded[self][name] = true
+        if file
           require file
           return const_get name if const_defined? name
         end
         parent = (self == Object) ? "" : self.to_s + "::"
-        raise NameError, "uninitialized constant #{parent}" + name.to_s, caller
+        raise NameError, "uninitialized constant #{parent + name.to_s}", caller
+      end
+    end
+    
+    module Load
+      # Faked #load (see Kernel#load)
+      def fakefs_load fn, wrap = false
+        fn = fn.to_s
+        orig_fn = fn.dup
+        
+        fn = fn + ".rb" unless fn[-3..-1] == ".rb"
+        path = FakeFS::Require.resolve fn
+        
+        if path
+          File.open path, "r" do |f|
+            if wrap
+              Module.new.module_eval f.read, fn, 1
+            else
+              Object.class_eval f.read, fn, 1
+            end
+          end
+          return true
+        elsif FakeFS::Require.opts[:fallback]
+          return fakefs_original_load orig_fn, wrap
+        end
+        
+        raise LoadError, "no such file to load -- " + fn
       end
     end
     
@@ -153,6 +189,7 @@ end
 
 module Kernel
   include FakeFS::Require
+  include FakeFS::Require::Load
 end
 
 class Module

data/test/helper.rb

@@ -1,2 +1,4 @@
 require "fakefs/safe"
-require "fakefs/require"
+require "fakefs/require"
+require "mocha"
+require "tmpdir"

data/test/require_test.rb

@@ -5,6 +5,9 @@ class RequireTest < Test::Unit::TestCase
   end
 
   def teardown
+    FakeFS::Require.deactivate!
+    FakeFS::Require.clear
+    
     FakeFS::FileSystem.clear
     FakeFS.deactivate!
   end
@@ -28,62 +31,44 @@ class RequireTest < Test::Unit::TestCase
       require "foo"
     end
     
-    # automatically append .rb
+    # always append .rb if the filename doesn't end with it
     code = <<-EOS
-      module FakeFSTestRequire2
+      module FakeFSTestRequire2_WithDotRb
       end
     EOS
     File.open "fake_fs_test_require2.rb", "w" do |f|
       f.write code
     end
-    require "fake_fs_test_require2"
-    assert ::FakeFSTestRequire2
-    
-    # foo.rb has higher priority than foo
     code = <<-EOS
-      module FakeFSTestRequire3_WithDotRb
+      module FakeFSTestRequire2_WithoutDotRb
       end
     EOS
-    File.open "fake_fs_test_require3.rb", "w" do |f|
+    File.open "fake_fs_test_require2", "w" do |f|
       f.write code
     end
-    code = <<-EOS
-      module FakeFSTestRequire3_WithoutDotRb
-      end
-    EOS
-    File.open "fake_fs_test_require3", "w" do |f|
-      f.write code
-    end
-    require "fake_fs_test_require3"
-    assert ::FakeFSTestRequire3_WithDotRb
+    require "fake_fs_test_require2"
+    assert ::FakeFSTestRequire2_WithDotRb
     
-    # don't require files twice
+    # remember which files have been loaded
     code = <<-EOS
-      module FakeFSTestRequire4
+      module FakeFSTestRequire3
       end
     EOS
-    File.open "fake_fs_test_require4.rb", "w" do |f|
+    File.open "fake_fs_test_require3.rb", "w" do |f|
       f.write code
     end
-    assert require("fake_fs_test_require4")
-    assert !require("fake_fs_test_require4")
-    FakeFS::Require.clear
-    assert require("fake_fs_test_require4")
+    require "fake_fs_test_require3"
+    assert_equal "fake_fs_test_require3.rb", $".last
+    assert !require("fake_fs_test_require3")
     
     # properly deactivate
     FakeFS::Require.deactivate!
     assert_raise LoadError do
       require "bar"
     end
-    
-    FakeFS::Require.clear
   end
   
   def test_fakes_require_with_fallback
-    FakeFS.deactivate!
-    require "tmpdir"
-    FakeFS.activate!
-    
     FakeFS::Require.activate! :fallback => true
     
     # load a file that's in the real (= non-faked) load path
@@ -126,9 +111,6 @@ class RequireTest < Test::Unit::TestCase
     assert_raise LoadError do
       require "rack/mime"
     end
-    
-    FakeFS::Require.deactivate!
-    FakeFS::Require.clear
   end
   
   def test_fakes_autoload
@@ -167,9 +149,46 @@ class RequireTest < Test::Unit::TestCase
     assert_raise NameError do
       FakeFSTestAutoload::Baz
     end
-    
-    FakeFS::Require.deactivate!
-    FakeFS::Require.clear
+  end
+  
+  def test_fakes_load
+    FakeFS::Require.activate! :load => true
+    
+    # loads a file
+    File.open "fake_fs_test_load.rb", "w" do |f|
+      f.write <<-CODE
+        module FakeFSTestLoad
+          @count ||= 0
+          @count += 1
+          def self.count; return @count; end
+        end
+      CODE
+    end
+    load "fake_fs_test_load.rb"
+    assert_equal 1, FakeFSTestLoad.count
+    
+    # loads the file twice
+    load "fake_fs_test_load.rb"
+    assert_equal 2, FakeFSTestLoad.count
+    
+    # doesn't append .rb
+    assert_raise(LoadError) { load "fake_fs_test_load/asd.rb" }
+    
+    # falls back to the original #load
+    fn = "fake_fs_test_load2.rb"
+    FakeFS::Require.opts[:fallback] = true
+    self.expects(:fakefs_original_load).with(fn, false).returns(true)
+    load fn
+    
+    # executes the file within an anonymous module
+    File.open "fake_fs_test_load3.rb", "w" do |f|
+      f.write <<-CODE
+        module FakeFSTestLoad3
+        end
+      CODE
+    end
+    load "fake_fs_test_load3.rb", true
+    assert_raise(NameError) { FakeFSTestLoad3 }
   end
 
-end
+end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: fakefs-require
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Lars Gierth
@@ -9,19 +14,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-30 00:00:00 +02:00
+date: 2010-04-13 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: fakefs
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: 
 email: lars.gierth@altefeuerwachekoeln.de
 executables: []
@@ -29,13 +36,13 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- LICENSE
 - README.markdown
 files: 
 - .gitignore
 - LICENSE
 - README.markdown
 - Rakefile
+- TODO
 - VERSION
 - lib/fakefs/require.rb
 - test/helper.rb
@@ -47,27 +54,31 @@ licenses: []
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
+- --main
+- README.markdown
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: "Faked #require and #autoload for defunkt's FakeFS"
 test_files: 
-- test/helper.rb
 - test/require_test.rb
+- test/helper.rb