Merge pull request rspec#2420 from rspec/export-source-classes-to-rspec-support

Export source classes to rspec-support

Author: yujinakayama

lib/rspec/core/formatters/exception_presenter.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 RSpec::Support.require_rspec_core "formatters/console_codes"
 RSpec::Support.require_rspec_core "formatters/snippet_extractor"
+RSpec::Support.require_rspec_core 'formatters/syntax_highlighter'
 RSpec::Support.require_rspec_support "encoded_string"
 
 module RSpec
@@ -215,7 +216,7 @@ def read_failed_lines
           file_path, line_number = file_and_line_number[1..2]
           max_line_count = RSpec.configuration.max_displayed_failure_line_count
           lines = SnippetExtractor.extract_expression_lines_at(file_path, line_number.to_i, max_line_count)
-          RSpec.world.source_cache.syntax_highlighter.highlight(lines)
+          RSpec.world.syntax_highlighter.highlight(lines)
         rescue SnippetExtractor::NoSuchFileError
           ["Unable to find #{file_path} to read failed line"]
         rescue SnippetExtractor::NoSuchLineError

lib/rspec/core/formatters/html_snippet_extractor.rb

@@ -24,8 +24,8 @@ def self.convert(code)
         @@converter = NullConverter
         begin
           require 'coderay'
-          RSpec::Support.require_rspec_core 'source/syntax_highlighter'
-          RSpec::Core::Source::SyntaxHighlighter.attempt_to_add_rspec_terms_to_coderay_keywords
+          RSpec::Support.require_rspec_core 'formatters/syntax_highlighter'
+          RSpec::Core::Formatters::SyntaxHighlighter.attempt_to_add_rspec_terms_to_coderay_keywords
           @@converter = CoderayConverter
           # rubocop:disable Lint/HandleExceptions
         rescue LoadError

lib/rspec/core/formatters/snippet_extractor.rb

@@ -1,5 +1,3 @@
-RSpec::Support.require_rspec_core "source"
-
 module RSpec
   module Core
     module Formatters
@@ -17,7 +15,7 @@ def self.extract_line_at(file_path, line_number)
 
         def self.source_from_file(path)
           raise NoSuchFileError unless File.exist?(path)
-          RSpec.world.source_cache.source_from_file(path)
+          RSpec.world.source_from_file(path)
         end
 
         if RSpec::Support::RubyFeatures.ripper_supported?

lib/rspec/core/source/syntax_highlighter.rb renamed to lib/rspec/core/formatters/syntax_highlighter.rb

@@ -1,6 +1,6 @@
 module RSpec
   module Core
-    class Source
+    module Formatters
       # @private
       # Provides terminal syntax highlighting of code snippets
       # when coderay is available.

lib/rspec/core/source.rb

@@ -40,6 +40,8 @@ def ordered_example_groups
       def reset
         RSpec::ExampleGroups.remove_all_constants
         example_groups.clear
+        @sources_by_path.clear if defined?(@sources_by_path)
+        @syntax_highlighter = nil
       end
 
       # @private
@@ -128,11 +130,18 @@ def reporter
       end
 
       # @private
-      def source_cache
-        @source_cache ||= begin
-          RSpec::Support.require_rspec_core "source"
-          Source::Cache.new(@configuration)
+      def source_from_file(path)
+        unless defined?(@sources_by_path)
+          RSpec::Support.require_rspec_support 'source'
+          @sources_by_path = {}
         end
+
+        @sources_by_path[path] ||= Support::Source.from_file(path)
+      end
+
+      # @private
+      def syntax_highlighter
+        @syntax_highlighter ||= Formatters::SyntaxHighlighter.new(@configuration)
       end
 
       # @api private

lib/rspec/core/source/location.rb

@@ -247,12 +247,12 @@ module RSpec::Core
           end
 
           it 'uses our syntax highlighter on the code snippet to format it nicely' do
-            syntax_highlighter = instance_double(Source::SyntaxHighlighter)
+            syntax_highlighter = instance_double(Formatters::SyntaxHighlighter)
             allow(syntax_highlighter).to receive(:highlight) do |lines|
               lines.map { |l| "<highlighted>#{l.strip}</highlighted>" }
             end
 
-            allow(RSpec.world.source_cache).to receive_messages(:syntax_highlighter => syntax_highlighter)
+            allow(RSpec.world).to receive_messages(:syntax_highlighter => syntax_highlighter)
 
             formatted = presenter.fully_formatted(1)
             expect(formatted).to include("<highlighted>expect('RSpec').to be_a(Integer)</highlighted>")

lib/rspec/core/source/node.rb

@@ -1,6 +1,6 @@
-require 'rspec/core/source/syntax_highlighter'
+require 'rspec/core/formatters/syntax_highlighter'
 
-class RSpec::Core::Source
+module RSpec::Core::Formatters
   RSpec.describe SyntaxHighlighter do
     let(:config)      { RSpec::Core::Configuration.new.tap { |config| config.color_mode = :on } }
     let(:highlighter) { SyntaxHighlighter.new(config)  }