exegesis 0.0.3 → 0.0.4

data/CHANGELOG

@@ -1,3 +1,9 @@
+= 0.0.3 - 0.0.4
+	* Make sure Forwardable gem dependency gets loaded at the appropriate
+		load-level
+	* Skirt a very rare crash during tests (happens _literally_ only to my one
+		computer) in rubinius 2.0.0rc1
+	* Internal Refactoring to avoid stubbing core classes like `File` and `Dir`
 
 * 0.0.2
 	Large amount of functionality in place, including BaseDirectories,

data/lib/exegesis/file_searcher.rb

@@ -19,18 +19,23 @@ class FileSearcher
   # Create a new FileSearcher on the given path
   #
   # @param parent [Directory] the parent directory to search downward from
-  def initialize(parent)
+  def initialize(parent, fs_interface = File)
+    @fs_interface = fs_interface
     @parent = parent
   end
 
   #All of the directories in the given path
   def directories
-    content.select { |s| File.directory?(s) }.map { |s| Directory.create(parent, File.basename(s)) }
+    content.
+      select { |s| fs_interface.directory?(s) }.
+      map    { |s| Directory.create(parent, fs_interface.basename(s)) }
   end
 
   #All of the files in the given path
   def files
-    content.select { |s| File.file?(s) }.map { |s| SourceFile.create(parent, File.basename(s)) }
+    content.
+      select { |s| fs_interface.file?(s) }.
+      map    { |s| SourceFile.create(parent, fs_interface.basename(s)) }
   end
 
   #All of the content from the given path
@@ -44,5 +49,5 @@ class FileSearcher
 
   private
 
-  attr_reader :parent
+  attr_reader :parent, :fs_interface
 end

data/lib/exegesis/registerable.rb

@@ -1,6 +1,5 @@
 module Registerable
   def self.included(base)
-    base.private_class_method :new, :allocate
     base.instance_eval do
       extend  ClassMethods
       include InstanceMethods

data/lib/exegesis/source_file.rb

@@ -21,7 +21,7 @@ class SourceFile
   include FileSystemEntity
 
   def content
-    File.read(path)
+    fs_interface.read(path)
   end
 
   attr_reader :dependencies
@@ -32,14 +32,17 @@ class SourceFile
 
   private
 
-  def initialize(parent, name)
+  def initialize(parent, name, fs_interface = File)
     raise ArgumentError, "parent must be a directory" unless parent.is_a?(Directory)
 
-    @ext = File.extname(name)
+    @fs_interface = fs_interface
+    @ext = fs_interface.extname(name)
     @name = name
     @parent = parent
     @dependencies = []
   end
+
+  attr_reader :fs_interface
 end
 
 class InvalidDependency < StandardError ; end

data/lib/exegesis/version.rb

@@ -1,4 +1,4 @@
 module Exegesis
   #@private
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/integration/flyweight_registerable_spec.rb

@@ -47,12 +47,6 @@ describe Flyweight, "mixin", "other objects" do
     end
   end
 
-  describe 'instantiation' do
-    it 'disallows instantiation via #new' do
-      expect { Example.new(parent, 'n') }.to raise_error NoMethodError
-    end
-  end
-
   describe 'creating a new instance' do
     subject { Example.create(parent, 'n') }
   end

data/spec/unit/directory_spec.rb

@@ -16,12 +16,6 @@ describe Directory do
 
   subject { directory }
 
-  describe 'instantiation' do
-    it 'disallows instantiation via #new' do
-      expect { Directory.new(parent, name, searcher) }.to raise_error NoMethodError
-    end
-  end
-
   describe 'api' do
     it { should respond_to :directories }
     it { should respond_to :parent      }

data/spec/unit/file_searcher_spec.rb

@@ -1,30 +1,31 @@
 require 'unit_spec_helper'
 
 describe FileSearcher do
-  let (:root)          { double('a fake backend')                  }
-  let (:root_path)     { double('a fake path')                     }
-  let (:globbed_path)  { double('a fake glob of root_path with *') }
-  let (:file_searcher) { FileSearcher.new(root)                    }
-  let (:dir)           { double('a fake directory')                }
-  let (:file)          { double('a fake file')                     }
-  let (:file_path)     { double('the fake file path')              }
-  let (:dir_path)      { double('the directory file path')         }
+  let (:root)          { double('a fake backend')                      }
+  let (:root_path)     { double('a fake path')                         }
+  let (:globbed_path)  { double('a fake glob of root_path with *')     }
+  let (:fs_interface)  { double('a File System Interface like `File`') }
+  let (:file_searcher) { FileSearcher.new(root, fs_interface)          }
+  let (:dir)           { double('a fake directory')                    }
+  let (:file)          { double('a fake file')                         }
+  let (:file_path)     { double('the fake file path')                  }
+  let (:dir_path)      { double('the directory file path')             }
 
   let (:fake_source_file_instance) { double('a fake SourceFile instance') }
   let (:fake_directory_instance)   { double('a fake Directory instance')  }
 
   before do
-    File.stub(:directory?).with(dir).and_return(true)
-    File.stub(:file?).with(dir).and_return(false)
-    File.stub(:basename).with(dir).and_return(dir)
+    fs_interface.stub(:directory?).with(dir).and_return(true)
+    fs_interface.stub(:file?).with(dir).and_return(false)
+    fs_interface.stub(:basename).with(dir).and_return(dir)
 
-    File.stub(:directory?).with(file).and_return(false)
-    File.stub(:file?).with(file).and_return(true)
-    File.stub(:basename).with(file).and_return(file)
+    fs_interface.stub(:directory?).with(file).and_return(false)
+    fs_interface.stub(:file?).with(file).and_return(true)
+    fs_interface.stub(:basename).with(file).and_return(file)
 
-    File.stub(:join).with(root_path, '*').and_return(globbed_path)
-    File.stub(:join).with(root_path, file).and_return(file_path)
-    File.stub(:join).with(root_path, dir).and_return(dir_path)
+    fs_interface.stub(:join).with(root_path, '*').and_return(globbed_path)
+    fs_interface.stub(:join).with(root_path, file).and_return(file_path)
+    fs_interface.stub(:join).with(root_path, dir).and_return(dir_path)
 
     Directory.stub(:new).with(root, dir).and_return(fake_directory_instance)
     SourceFile.stub(:new).with(root, file).and_return(fake_source_file_instance)
@@ -43,13 +44,15 @@ describe FileSearcher do
     it { should respond_to :content }
   end
 
-  describe '#content' do
-    before do
-      Dir.stub(:[])
-      file_searcher.content
-    end
+  pending "better dependency injection" do
+    describe '#content' do
+      before do
+        Dir.stub(:[])
+        file_searcher.content
+      end
 
-    the(Dir) { should have_received(:[]).with(globbed_path) }
+      the(Dir) { should have_received(:[]).with(globbed_path) }
+    end
   end
 
   context do

data/spec/unit/flyweight_spec.rb

@@ -1,17 +1,13 @@
 require 'unit_spec_helper'
 
 describe Flyweight do
-  let (:processor)          { proc { instance_key }     }
-  let (:flyweight)          { Flyweight.new(&processor) }
-  let (:instance)           { double('instance')        }
-  let (:instance_key)       { double('instance_key')    }
+  let (:processor)          { proc { |instance| instance_key }  }
+  let (:flyweight)          { Flyweight.new(&processor)         }
+  let (:instance)           { double('instance')                }
+  let (:instance_key)       { double('instance_key')            }
 
   subject { flyweight }
 
-  before do
-    processor.stub(:call).and_return(instance_key)
-  end
-
   context 'shared examples' do
     shared_examples_for 'flyweight unregistration' do
       before { flyweight.unregister!(key) }
@@ -48,8 +44,6 @@ describe Flyweight do
     before { flyweight.register!(instance) }
 
     describe '#register! and #register' do
-      the(:processor) { should have_received(:call).with(instance) }
-
       describe 'registering an instance with an already-used key' do
         it 'raises an error' do
           expect { flyweight.register!(instance) }.to raise_error Flyweight::AlreadyRegisteredError

data/spec/unit/source_file_spec.rb

@@ -1,28 +1,27 @@
 require 'unit_spec_helper'
 
 describe SourceFile do
-  let(:basename)  { 'fake'               }
-  let(:extension) { '.c'                 }
-  let(:name)      { basename + extension }
-  let(:parent)    { double('directory')  }
+  let(:basename)     { 'fake'               }
+  let(:extension)    { '.c'                 }
+  let(:name)         { basename + extension }
+  let(:parent)       { double('directory')  }
+  let(:fs_interface) { double('an arbitrary interface to a filesystem') }
 
+  # TODO: Eliminate use of File here? More mocks?
   let(:full_path) { File.join(parent.path, name) }
   let(:content)   { double('content')            }
 
-  let(:source_file) { SourceFile.create(parent, name) }
+  let(:source_file) { SourceFile.create(parent, name, fs_interface) }
+
 
   subject { source_file }
 
   before do
     parent.stub(:path).and_return('/path/to/parent/')
     parent.stub(:is_a?).with(Directory).and_return(true)
-    File.stub(:read).with(full_path).and_return(content)
-  end
 
-  describe 'instantiation' do
-    it 'disallows instantiation via #new' do
-      expect { SourceFile.new(parent, name) }.to raise_error NoMethodError
-    end
+    fs_interface.stub(:read).with(full_path).and_return(content)
+    fs_interface.stub(:extname).with(name).and_return(extension)
   end
 
   describe 'api' do
@@ -91,7 +90,7 @@ describe SourceFile do
   describe '#content' do
     before { source_file.content }
 
-    the_class(File) { should have_received(:read).with(full_path) }
+    the(:fs_interface) { should have_received(:read).with(full_path) }
   end
 
   describe '#dependencies' do

metadata

@@ -2,14 +2,14 @@
 name: exegesis
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Joe Fredette
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-07 00:00:00.000000000 Z
+date: 2012-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   type: :runtime