tailor 1.1.5 → 1.2.0

data/lib/tailor/lexer.rb

@@ -139,20 +139,22 @@ class Tailor
     # @param [String] token The token that the lexer matched.
     def on_embexpr_beg(token)
       log "EMBEXPR_BEG: '#{token}'"
+      current_line = LexedLine.new(super, lineno)
       embexpr_beg_changed
-      notify_embexpr_beg_observers
+      notify_embexpr_beg_observers(current_line, lineno, column)
       super(token)
     end
 
     # Called when the lexer matches the } that closes a #{.  Note that as of
-    # MRI 1.9.3-p125, this never gets called.  Logged as a bug and fixed, but
-    # not yet released: https://bugs.ruby-lang.org/issues/6211.
+    # MRI 1.9.3-p125, this never gets called.  Logged as a bug and fixed in
+    # ruby 2.0.0-p0: https://bugs.ruby-lang.org/issues/6211.
     #
     # @param [String] token The token that the lexer matched.
     def on_embexpr_end(token)
       log "EMBEXPR_END: '#{token}'"
+      current_line = LexedLine.new(super, lineno)
       embexpr_end_changed
-      notify_embexpr_end_observers
+      notify_embexpr_end_observers(current_line, lineno, column)
       super(token)
     end
 

data/lib/tailor/rake_task.rb

@@ -11,6 +11,8 @@ begin
 rescue LoadError
 end
 
+Tailor::Logger.log = false
+
 class Tailor
 
   # This class lets you define Rake tasks to drive tailor.  Specifying options
@@ -29,13 +31,17 @@ class Tailor
   #     end
   #   end
   #
-  # @example Use and override a configuration file
+  # @example Use a configuration file
   #   Tailor::RakeTask.new do |task|
   #     task.config_file = 'hardcore_stylin.rb'
-  #     task.file_set 'lib/**/*.rb' do |style|
-  #       style.indentation_spaces 2, level: :warn
-  #     end
   #   end
+  #
+  # Note that prior to 1.1.4, you could use the #config_file option _and_
+  # specify file_sets or recursive_file_sets; this caused problems (and
+  # confusion), so the combination of these was removed in 1.2.0.  If you use
+  # #config_file, then all file_sets and recursive_file_sets that you specify
+  # in the Rake task will be ignored; only those specified in the given config
+  # file will be used.
   class RakeTask < ::Rake::TaskLib
     include ::Rake::DSL if defined? ::Rake::DSL
 
@@ -54,11 +60,12 @@ class Tailor
 
     # @param [String] name The task name.
     # @param [String] desc Description of the task.
-    def initialize(name = "tailor", desc = "Check style")
+    def initialize(name = 'tailor', desc = 'Check style')
       @name, @desc = name, desc
       @tailor_opts = []
       @file_sets = []
       @recursive_file_sets = []
+      @config_file = nil
 
       yield self if block_given?
 
@@ -91,8 +98,13 @@ class Tailor
           @tailor_opts.concat %W(--config-file=#{config_file})
         end
 
+        cli = Tailor::CLI.new(@tailor_opts)
+        cli.configuration.file_sets
+        create_file_sets_for cli.configuration
+        create_recursive_file_sets_for cli.configuration
+
         begin
-          failure = Tailor::CLI.run(@tailor_opts)
+          failure = cli.execute!
           exit(1) if failure
         rescue Tailor::RuntimeError => ex
           STDERR.puts ex.message
@@ -106,5 +118,31 @@ class Tailor
         end
       end
     end
+
+    # @return [Tailor::Configuration]
+    def create_config
+      configuration = Tailor::Configuration.new([],
+        Tailor::CLI::Options.parse!(@tailor_opts))
+      configuration.load!
+      configuration.formatters(formatters) unless formatters.nil? || formatters.empty?
+
+      configuration
+    end
+
+    # @param [Tailor::Configuration] config
+    def create_recursive_file_sets_for config
+      unless @recursive_file_sets.empty?
+        @recursive_file_sets.each do |fs|
+          config.recursive_file_set(fs[0], fs[1], &fs[2])
+        end
+      end
+    end
+
+    # @param [Tailor::Configuration] config
+    def create_file_sets_for config
+      unless @file_sets.empty?
+        @file_sets.each { |fs| config.file_set(fs[0], fs[1], &fs[2]) }
+      end
+    end
   end
 end

data/lib/tailor/reporter.rb

@@ -12,6 +12,7 @@ class Tailor
     # @param [Array] formats A list of formatters to use for generating reports.
     def initialize(*formats)
       @formatters = []
+      formats = %w[text] if formats.nil? || formats.empty?
 
       formats.flatten.each do |formatter|
         require_relative "formatters/#{formatter}"
@@ -38,10 +39,15 @@ class Tailor
     # Sends the data to each +@formatters+ to generate the reports of problems
     # for all files that were just critiqued.
     #
-    # @param [Hash] all_problems 
-    def summary_report(all_problems)
+    # @param [Hash] all_problems
+    def summary_report(all_problems, opts={})
       @formatters.each do |formatter|
-        formatter.summary_report(all_problems)
+        summary = formatter.summary_report(all_problems)
+        if formatter.respond_to?(:accepts_output_file) &&
+                         formatter.accepts_output_file &&
+                         !opts[:output_file].empty?
+          File.open(opts[:output_file], "w") { |f| f.puts summary }
+        end
       end
     end
   end

data/lib/tailor/rulers/allow_invalid_ruby_ruler.rb

@@ -17,7 +17,7 @@ class Tailor
       # @return [Boolean]
       def invalid_ruby?
         log "Checking for valid Ruby..."
-        result = `ruby -c #{@file_name}`
+        result = `"#{Gem.ruby}" -c "#{@file_name}"`
 
         result.size.zero?
       end
@@ -26,8 +26,8 @@ class Tailor
         if invalid_ruby? && @config == false
           lineno = 0
           column = 0
-          msg = "File contains invalid Ruby; run `ruby -c [your_file.rb]` "
-          msg << "for more details."
+          msg = 'File contains invalid Ruby; run `ruby -c [your_file.rb]` '
+          msg << 'for more details.'
 
           @problems << Problem.new(problem_type, lineno, column, msg,
             @options[:level])

data/lib/tailor/rulers/indentation_spaces_ruler.rb

@@ -55,15 +55,31 @@ class Tailor
         end
       end
 
-      def embexpr_beg_update
+      def embexpr_beg_update(lexed_line, lineno, column)
         @embexpr_nesting << true
+
+        token = Tailor::Lexer::Token.new('{')
+        @manager.update_for_opening_reason(:on_embexpr_beg, token, lineno)
       end
 
-      # Due to a Ripper bug (depending on which Ruby version you have), this may
-      # or may not get triggered.
+      # Due to a Ripper bug that was fixed in ruby 2.0.0-p0, this will not get
+      # triggered if you're using 1.9.x.
       # More info: https://bugs.ruby-lang.org/issues/6211
-      def embexpr_end_update
+      def embexpr_end_update(current_lexed_line, lineno, column)
         @embexpr_nesting.pop
+
+        if @manager.multi_line_braces?(lineno)
+          log "End of multi-line braces!"
+
+          if current_lexed_line.only_embexpr_end?
+            @manager.amount_to_change_this -= 1
+            msg = "lonely embexpr_end.  "
+            msg << "change_this -= 1 -> #{@manager.amount_to_change_this}"
+            log msg
+          end
+        end
+
+        @manager.update_for_closing_reason(:on_embexpr_end, current_lexed_line)
       end
 
       def ignored_nl_update(current_lexed_line, lineno, column)
@@ -166,7 +182,7 @@ class Tailor
         @manager.transition_lines
       end
 
-      # Since Ripper parses the } in a #{} as :on_rbrace instead of
+      # Since Ripper in Ruby 1.9.x parses the } in a #{} as :on_rbrace instead of
       # :on_embexpr_end, this works around that by using +@embexpr_beg to track
       # the state of that event.  As such, this should only be called from
       # #rbrace_update.
@@ -177,11 +193,13 @@ class Tailor
       end
 
       def rbrace_update(current_lexed_line, lineno, column)
-        if in_embexpr?
+        # Is this an rbrace that should've been parsed as an embexpr_end?
+        if in_embexpr? && RUBY_VERSION < '2.0.0'
           msg = "Got :rbrace and @embexpr_beg is true. "
           msg << " Must be at an @embexpr_end."
           log msg
           @embexpr_nesting.pop
+          @manager.update_for_closing_reason(:on_embexpr_end, current_lexed_line)
           return
         end
 

data/lib/tailor/rulers/indentation_spaces_ruler/indentation_manager.rb

@@ -271,8 +271,8 @@ class Tailor
         # reason", such as a +end+, +}+, +]+, +)+.
         #
         # @param [Symbol] event_type The event type that is the closing reason.
-        # @param [Tailor::Token,String] token The token that is the closing
-        #   reason.
+        # @param [Tailor::LexedLine] lexed_line The line that contains the
+        #   closing reason.
         def update_for_closing_reason(event_type, lexed_line)
           remove_continuation_keywords
           remove_appropriate_reason(event_type)

data/lib/tailor/rulers/spaces_before_rbrace_ruler.rb

@@ -13,6 +13,7 @@ class Tailor
         super(config, options)
         add_lexer_observers :embexpr_beg, :lbrace, :rbrace
         @lbrace_nesting = []
+        @embexpr_nesting = []
       end
 
       # @param [LexedLine] lexed_line
@@ -47,8 +48,10 @@ class Tailor
         previous_event.last.size
       end
 
-      def embexpr_beg_update
-        @lbrace_nesting << :embexpr_beg
+      def embexpr_beg_update(lexed_line, lineno, column)
+        if RUBY_VERSION < '2.0.0'
+          @lbrace_nesting << :embexpr_beg
+        end
       end
 
       def lbrace_update(lexed_line, lineno, column)
@@ -71,15 +74,15 @@ class Tailor
         end
       end
 
-      # This has to keep track of '{'s and only follow through with the check
-      # if the '{' was an lbrace because Ripper doesn't scan the '}' of an
-      # embedded expression (embexpr_end) as such.
+      # For Ruby versions < 2.0.0-p0, this has to keep track of '{'s and only
+      # follow through with the check if the '{' was an lbrace because Ripper
+      # doesn't scan the '}' of an embedded expression (embexpr_end) as such.
       #
       # @param [Tailor::LexedLine] lexed_line
       # @param [Fixnum] lineno
       # @param [Fixnum] column
       def rbrace_update(lexed_line, lineno, column)
-        if @lbrace_nesting.last == :embexpr_beg
+        if RUBY_VERSION < '2.0.0' && @lbrace_nesting.last == :embexpr_beg
           @lbrace_nesting.pop
           return
         end

data/lib/tailor/rulers/spaces_in_empty_braces_ruler.rb

@@ -40,7 +40,7 @@ class Tailor
         end
       end
 
-      def embexpr_beg_update
+      def embexpr_beg_update(lexed_line, lineno, column)
         @lbrace_nesting << :embexpr_beg
       end
 

data/lib/tailor/version.rb

@@ -1,3 +1,3 @@
 class Tailor
-  VERSION = '1.1.5'
+  VERSION = '1.2.0'
 end

data/spec/functional/configuration_spec.rb

@@ -240,5 +240,42 @@ end
         config.file_sets[:default].file_list.first.match /lib\/tailor\.rb$/
       end
     end
+
+    context '.tailor defines a yaml formatter' do
+      let(:config_file) do
+        <<-CONFIG
+Tailor.config do |config|
+  config.formatters 'yaml'
+end
+        CONFIG
+      end
+
+      before do
+        File.should_receive(:read).and_return config_file
+      end
+
+      it "sets formatters to 'yaml'" do
+        config.formatters.should == %w(yaml)
+      end
+    end
+
+    context '.tailor defines a more than one formatter' do
+      let(:config_file) do
+        <<-CONFIG
+Tailor.config do |config|
+  config.formatters 'yaml', 'text'
+end
+        CONFIG
+      end
+
+      before do
+        File.should_receive(:read).and_return config_file
+      end
+
+      it "sets formatters to the defined" do
+        config.formatters.should == %w(yaml text)
+      end
+
+    end
   end
 end

data/spec/functional/horizontal_spacing/braces_spec.rb

@@ -3,62 +3,62 @@ require 'tailor/critic'
 require 'tailor/configuration/style'
 
 BRACES = {}
-BRACES[:single_line_hash_0_spaces_before_lbrace] =
+BRACES['single_line_hash_0_spaces_before_lbrace'] =
   %Q{thing ={ :one => 'one' }}
 
-BRACES[:single_line_hash_2_spaces_before_lbrace] =
+BRACES['single_line_hash_2_spaces_before_lbrace'] =
   %Q{thing =  { :one => 'one' }}
 
-BRACES[:single_line_hash_2_spaces_before_rbrace] =
+BRACES['single_line_hash_2_spaces_before_rbrace'] =
   %Q{thing = { :one => 'one'  }}
 
-BRACES[:single_line_hash_2_spaces_after_lbrace] =
+BRACES['single_line_hash_2_spaces_after_lbrace'] =
   %Q{thing = {  :one => 'one' }}
 
-BRACES[:two_line_hash_2_spaces_before_lbrace] = %Q{thing1 =
+BRACES['two_line_hash_2_spaces_before_lbrace'] = %Q{thing1 =
   thing2 =  { :one => 'one' }}
 
-BRACES[:two_line_hash_2_spaces_before_rbrace] = %Q{thing1 =
+BRACES['two_line_hash_2_spaces_before_rbrace'] = %Q{thing1 =
   thing2 = { :one => 'one'  }}
 
-BRACES[:two_line_hash_2_spaces_before_lbrace_lonely_braces] =
+BRACES['two_line_hash_2_spaces_before_lbrace_lonely_braces'] =
   %Q{thing1 =
   thing2 =  {
     :one => 'one'
   }}
 
-BRACES[:space_in_empty_hash_in_string_in_block] =
+BRACES['space_in_empty_hash_in_string_in_block'] =
   %Q{[1].map { |n| { :first => "\#{n}-\#{{ }}" } }}
 
-BRACES[:single_line_block_2_spaces_before_lbrace] =
+BRACES['single_line_block_2_spaces_before_lbrace'] =
   %Q{1..10.times  { |n| puts n }}
 
-BRACES[:single_line_block_in_string_interp_2_spaces_before_lbrace] =
+BRACES['single_line_block_in_string_interp_2_spaces_before_lbrace'] =
   %Q{"I did this \#{1..10.times  { |n| puts n }} times."}
 
-BRACES[:single_line_block_0_spaces_before_lbrace] =
+BRACES['single_line_block_0_spaces_before_lbrace'] =
   %Q{1..10.times{ |n| puts n }}
 
-BRACES[:two_line_braces_block_2_spaces_before_lbrace] =
+BRACES['two_line_braces_block_2_spaces_before_lbrace'] =
   %Q{1..10.times  { |n|
   puts n}}
 
-BRACES[:two_line_braces_block_0_spaces_before_lbrace_trailing_comment] =
+BRACES['two_line_braces_block_0_spaces_before_lbrace_trailing_comment'] =
   %Q{1..10.times{ |n|    # comment
   puts n}}
 
-BRACES[:no_space_after_l_before_r_after_string_interp] =
+BRACES['no_space_after_l_before_r_after_string_interp'] =
   %Q{logger.debug "from \#{current} to \#{new_ver}", {:format => :short}}
 
-BRACES[:no_space_before_consecutive_rbraces] =
+BRACES['no_space_before_consecutive_rbraces'] =
   %Q{thing = { 'id' => "\#{source}", 'attributes' => { 'height' => "\#{height}"}}}
 
 describe "Detection of spacing around braces" do
   before do
     Tailor::Logger.stub(:log)
     FakeFS.activate!
-    File.open(file_name.to_s, 'w') { |f| f.write contents }
-    critic.check_file(file_name.to_s, style.to_hash)
+    File.open(file_name, 'w') { |f| f.write contents }
+    critic.check_file(file_name, style.to_hash)
   end
 
   let(:critic) do
@@ -77,45 +77,45 @@ describe "Detection of spacing around braces" do
 
   context "single-line Hash" do
     context "0 spaces before lbrace" do
-      let(:file_name) { :single_line_hash_0_spaces_before_lbrace }
-      specify { critic.problems[file_name.to_s].size.should be 1 }
-      specify { critic.problems[file_name.to_s].first[:type].should == "spaces_before_lbrace" }
-      specify { critic.problems[file_name.to_s].first[:line].should be 1 }
-      specify { critic.problems[file_name.to_s].first[:column].should be 7 }
-      specify { critic.problems[file_name.to_s].first[:level].should be :error }
+      let!(:file_name) { 'single_line_hash_0_spaces_before_lbrace' }
+      specify { critic.problems[file_name].size.should be 1 }
+      specify { critic.problems[file_name].first[:type].should == "spaces_before_lbrace" }
+      specify { critic.problems[file_name].first[:line].should be 1 }
+      specify { critic.problems[file_name].first[:column].should be 7 }
+      specify { critic.problems[file_name].first[:level].should be :error }
     end
 
     context "2 spaces before lbrace" do
-      let(:file_name) { :single_line_hash_2_spaces_before_lbrace }
-      specify { critic.problems[file_name.to_s].size.should be 1 }
-      specify { critic.problems[file_name.to_s].first[:type].should == "spaces_before_lbrace" }
-      specify { critic.problems[file_name.to_s].first[:line].should be 1 }
-      specify { critic.problems[file_name.to_s].first[:column].should be 9 }
-      specify { critic.problems[file_name.to_s].first[:level].should be :error }
+      let!(:file_name) { 'single_line_hash_2_spaces_before_lbrace' }
+      specify { critic.problems[file_name].size.should be 1 }
+      specify { critic.problems[file_name].first[:type].should == "spaces_before_lbrace" }
+      specify { critic.problems[file_name].first[:line].should be 1 }
+      specify { critic.problems[file_name].first[:column].should be 9 }
+      specify { critic.problems[file_name].first[:level].should be :error }
     end
 
     context "2 spaces after lbrace" do
-      let(:file_name) { :single_line_hash_2_spaces_after_lbrace }
-      specify { critic.problems[file_name.to_s].size.should be 1 }
-      specify { critic.problems[file_name.to_s].first[:type].should == "spaces_after_lbrace" }
-      specify { critic.problems[file_name.to_s].first[:line].should be 1 }
-      specify { critic.problems[file_name.to_s].first[:column].should be 9 }
-      specify { critic.problems[file_name.to_s].first[:level].should be :error }
+      let!(:file_name) { 'single_line_hash_2_spaces_after_lbrace' }
+      specify { critic.problems[file_name].size.should be 1 }
+      specify { critic.problems[file_name].first[:type].should == "spaces_after_lbrace" }
+      specify { critic.problems[file_name].first[:line].should be 1 }
+      specify { critic.problems[file_name].first[:column].should be 9 }
+      specify { critic.problems[file_name].first[:level].should be :error }
     end
 
     context "2 spaces before rbrace" do
-      let(:file_name) { :single_line_hash_2_spaces_before_rbrace }
-      specify { critic.problems[file_name.to_s].size.should be 1 }
-      specify { critic.problems[file_name.to_s].first[:type].should == "spaces_before_rbrace" }
-      specify { critic.problems[file_name.to_s].first[:line].should be 1 }
-      specify { critic.problems[file_name.to_s].first[:column].should be 25 }
-      specify { critic.problems[file_name.to_s].first[:level].should be :error }
+      let!(:file_name) { 'single_line_hash_2_spaces_before_rbrace' }
+      specify { critic.problems[file_name].size.should be 1 }
+      specify { critic.problems[file_name].first[:type].should == "spaces_before_rbrace" }
+      specify { critic.problems[file_name].first[:line].should be 1 }
+      specify { critic.problems[file_name].first[:column].should be 25 }
+      specify { critic.problems[file_name].first[:level].should be :error }
     end
   end
 
   context "two-line Hash" do
     context "2 spaces before lbrace" do
-      let(:file_name) { :two_line_hash_2_spaces_before_lbrace }
+      let!(:file_name) { 'two_line_hash_2_spaces_before_lbrace' }
       specify { critic.problems[file_name.to_s].size.should be 1 }
       specify { critic.problems[file_name.to_s].first[:type].should == "spaces_before_lbrace" }
       specify { critic.problems[file_name.to_s].first[:line].should be 2 }
@@ -124,45 +124,45 @@ describe "Detection of spacing around braces" do
     end
 
     context "2 spaces before rbrace" do
-      let(:file_name) { :two_line_hash_2_spaces_before_rbrace }
-      specify { critic.problems[file_name.to_s].size.should be 1 }
-      specify { critic.problems[file_name.to_s].first[:type].should == "spaces_before_rbrace" }
-      specify { critic.problems[file_name.to_s].first[:line].should be 2 }
-      specify { critic.problems[file_name.to_s].first[:column].should be 28 }
-      specify { critic.problems[file_name.to_s].first[:level].should be :error }
+      let!(:file_name) { 'two_line_hash_2_spaces_before_rbrace' }
+      specify { critic.problems[file_name].size.should be 1 }
+      specify { critic.problems[file_name].first[:type].should == "spaces_before_rbrace" }
+      specify { critic.problems[file_name].first[:line].should be 2 }
+      specify { critic.problems[file_name].first[:column].should be 28 }
+      specify { critic.problems[file_name].first[:level].should be :error }
     end
 
     context "2 spaces before lbrace, lonely braces" do
-      let(:file_name) { :two_line_hash_2_spaces_before_lbrace_lonely_braces }
-      specify { critic.problems[file_name.to_s].size.should be 1 }
-      specify { critic.problems[file_name.to_s].first[:type].should == "spaces_before_lbrace" }
-      specify { critic.problems[file_name.to_s].first[:line].should be 2 }
-      specify { critic.problems[file_name.to_s].first[:column].should be 12 }
-      specify { critic.problems[file_name.to_s].first[:level].should be :error }
+      let!(:file_name) { 'two_line_hash_2_spaces_before_lbrace_lonely_braces' }
+      specify { critic.problems[file_name].size.should be 1 }
+      specify { critic.problems[file_name].first[:type].should == "spaces_before_lbrace" }
+      specify { critic.problems[file_name].first[:line].should be 2 }
+      specify { critic.problems[file_name].first[:column].should be 12 }
+      specify { critic.problems[file_name].first[:level].should be :error }
     end
   end
 
   context "single-line block" do
     context "space in empty Hash" do
-      let(:file_name) { :space_in_empty_hash_in_string_in_block }
-      specify { critic.problems[file_name.to_s].size.should be 1 }
-      specify { critic.problems[file_name.to_s].first[:type].should == "spaces_in_empty_braces" }
-      specify { critic.problems[file_name.to_s].first[:line].should be 1 }
-      specify { critic.problems[file_name.to_s].first[:column].should be 36 }
-      specify { critic.problems[file_name.to_s].first[:level].should be :error }
+      let!(:file_name) { 'space_in_empty_hash_in_string_in_block' }
+      specify { critic.problems[file_name].size.should be 1 }
+      specify { critic.problems[file_name].first[:type].should == "spaces_in_empty_braces" }
+      specify { critic.problems[file_name].first[:line].should be 1 }
+      specify { critic.problems[file_name].first[:column].should be 36 }
+      specify { critic.problems[file_name].first[:level].should be :error }
     end
 
     context "0 spaces before lbrace" do
-      let(:file_name) { :single_line_block_0_spaces_before_lbrace }
-      specify { critic.problems[file_name.to_s].size.should be 1 }
-      specify { critic.problems[file_name.to_s].first[:type].should == "spaces_before_lbrace" }
-      specify { critic.problems[file_name.to_s].first[:line].should be 1 }
-      specify { critic.problems[file_name.to_s].first[:column].should be 11 }
-      specify { critic.problems[file_name.to_s].first[:level].should be :error }
+      let!(:file_name) { 'single_line_block_0_spaces_before_lbrace' }
+      specify { critic.problems[file_name].size.should be 1 }
+      specify { critic.problems[file_name].first[:type].should == "spaces_before_lbrace" }
+      specify { critic.problems[file_name].first[:line].should be 1 }
+      specify { critic.problems[file_name].first[:column].should be 11 }
+      specify { critic.problems[file_name].first[:level].should be :error }
     end
 
     context "2 spaces before lbrace" do
-      let(:file_name) { :single_line_block_2_spaces_before_lbrace }
+      let!(:file_name) { 'single_line_block_2_spaces_before_lbrace' }
       specify { critic.problems[file_name.to_s].size.should be 1 }
       specify { critic.problems[file_name.to_s].first[:type].should == "spaces_before_lbrace" }
       specify { critic.problems[file_name.to_s].first[:line].should be 1 }
@@ -171,68 +171,68 @@ describe "Detection of spacing around braces" do
     end
 
     context "in String interpolation, 2 spaces before lbrace" do
-      let(:file_name) { :single_line_block_in_string_interp_2_spaces_before_lbrace }
-      specify { critic.problems[file_name.to_s].size.should be 1 }
-      specify { critic.problems[file_name.to_s].first[:type].should == "spaces_before_lbrace" }
-      specify { critic.problems[file_name.to_s].first[:line].should be 1 }
-      specify { critic.problems[file_name.to_s].first[:column].should be 27 }
-      specify { critic.problems[file_name.to_s].first[:level].should be :error }
+      let!(:file_name) { 'single_line_block_in_string_interp_2_spaces_before_lbrace' }
+      specify { critic.problems[file_name].size.should be 1 }
+      specify { critic.problems[file_name].first[:type].should == "spaces_before_lbrace" }
+      specify { critic.problems[file_name].first[:line].should be 1 }
+      specify { critic.problems[file_name].first[:column].should be 27 }
+      specify { critic.problems[file_name].first[:level].should be :error }
     end
   end
 
   context "multi-line block" do
     context "2 spaces before lbrace" do
-      let(:file_name) { :two_line_braces_block_2_spaces_before_lbrace }
-      specify { critic.problems[file_name.to_s].size.should be 2 }
-      specify { critic.problems[file_name.to_s].first[:type].should == "spaces_before_lbrace" }
-      specify { critic.problems[file_name.to_s].first[:line].should be 1 }
-      specify { critic.problems[file_name.to_s].first[:column].should be 13 }
-      specify { critic.problems[file_name.to_s].first[:level].should be :error }
-      specify { critic.problems[file_name.to_s].last[:type].should == "spaces_before_rbrace" }
-      specify { critic.problems[file_name.to_s].last[:line].should be 2 }
-      specify { critic.problems[file_name.to_s].last[:column].should be 8 }
-      specify { critic.problems[file_name.to_s].last[:level].should be :error }
+      let!(:file_name) { 'two_line_braces_block_2_spaces_before_lbrace' }
+      specify { critic.problems[file_name].size.should be 2 }
+      specify { critic.problems[file_name].first[:type].should == "spaces_before_lbrace" }
+      specify { critic.problems[file_name].first[:line].should be 1 }
+      specify { critic.problems[file_name].first[:column].should be 13 }
+      specify { critic.problems[file_name].first[:level].should be :error }
+      specify { critic.problems[file_name].last[:type].should == "spaces_before_rbrace" }
+      specify { critic.problems[file_name].last[:line].should be 2 }
+      specify { critic.problems[file_name].last[:column].should be 8 }
+      specify { critic.problems[file_name].last[:level].should be :error }
     end
 
     context "0 spaces before lbrace, with trailing comment" do
-      let(:file_name) { :two_line_braces_block_0_spaces_before_lbrace_trailing_comment }
-      specify { critic.problems[file_name.to_s].size.should be 2 }
-      specify { critic.problems[file_name.to_s].first[:type].should == "spaces_before_lbrace" }
-      specify { critic.problems[file_name.to_s].first[:line].should be 1 }
-      specify { critic.problems[file_name.to_s].first[:column].should be 11 }
-      specify { critic.problems[file_name.to_s].first[:level].should be :error }
-      specify { critic.problems[file_name.to_s].last[:type].should == "spaces_before_rbrace" }
-      specify { critic.problems[file_name.to_s].last[:line].should be 2 }
-      specify { critic.problems[file_name.to_s].last[:column].should be 8 }
-      specify { critic.problems[file_name.to_s].last[:level].should be :error }
+      let!(:file_name) { 'two_line_braces_block_0_spaces_before_lbrace_trailing_comment' }
+      specify { critic.problems[file_name].size.should be 2 }
+      specify { critic.problems[file_name].first[:type].should == "spaces_before_lbrace" }
+      specify { critic.problems[file_name].first[:line].should be 1 }
+      specify { critic.problems[file_name].first[:column].should be 11 }
+      specify { critic.problems[file_name].first[:level].should be :error }
+      specify { critic.problems[file_name].last[:type].should == "spaces_before_rbrace" }
+      specify { critic.problems[file_name].last[:line].should be 2 }
+      specify { critic.problems[file_name].last[:column].should be 8 }
+      specify { critic.problems[file_name].last[:level].should be :error }
     end
   end
 
   context "String interpolation" do
     context "0 spaces after lbrace or before rbrace" do
-      let(:file_name) { :no_space_after_l_before_r_after_string_interp }
-      specify { critic.problems[file_name.to_s].size.should be 2 }
-      specify { critic.problems[file_name.to_s].first[:type].should == "spaces_after_lbrace" }
-      specify { critic.problems[file_name.to_s].first[:line].should be 1 }
-      specify { critic.problems[file_name.to_s].first[:column].should be 47 }
-      specify { critic.problems[file_name.to_s].first[:level].should be :error }
-      specify { critic.problems[file_name.to_s].last[:type].should == "spaces_before_rbrace" }
-      specify { critic.problems[file_name.to_s].last[:line].should be 1 }
-      specify { critic.problems[file_name.to_s].last[:column].should be 64 }
-      specify { critic.problems[file_name.to_s].last[:level].should be :error }
+      let!(:file_name) { 'no_space_after_l_before_r_after_string_interp' }
+      specify { critic.problems[file_name].size.should be 2 }
+      specify { critic.problems[file_name].first[:type].should == "spaces_after_lbrace" }
+      specify { critic.problems[file_name].first[:line].should be 1 }
+      specify { critic.problems[file_name].first[:column].should be 47 }
+      specify { critic.problems[file_name].first[:level].should be :error }
+      specify { critic.problems[file_name].last[:type].should == "spaces_before_rbrace" }
+      specify { critic.problems[file_name].last[:line].should be 1 }
+      specify { critic.problems[file_name].last[:column].should be 64 }
+      specify { critic.problems[file_name].last[:level].should be :error }
     end
 
     context "no space before consecutive rbraces" do
-      let(:file_name) { :no_space_before_consecutive_rbraces }
-      specify { critic.problems[file_name.to_s].size.should be 2 }
-      specify { critic.problems[file_name.to_s].first[:type].should == "spaces_before_rbrace" }
-      specify { critic.problems[file_name.to_s].first[:line].should be 1 }
-      specify { critic.problems[file_name.to_s].first[:column].should be 72 }
-      specify { critic.problems[file_name.to_s].first[:level].should be :error }
-      specify { critic.problems[file_name.to_s].last[:type].should == "spaces_before_rbrace" }
-      specify { critic.problems[file_name.to_s].last[:line].should be 1 }
-      specify { critic.problems[file_name.to_s].last[:column].should be 73 }
-      specify { critic.problems[file_name.to_s].last[:level].should be :error }
+      let(:file_name) { 'no_space_before_consecutive_rbraces' }
+      specify { critic.problems[file_name].size.should be 2 }
+      specify { critic.problems[file_name].first[:type].should == "spaces_before_rbrace" }
+      specify { critic.problems[file_name].first[:line].should be 1 }
+      specify { critic.problems[file_name].first[:column].should be 72 }
+      specify { critic.problems[file_name].first[:level].should be :error }
+      specify { critic.problems[file_name].last[:type].should == "spaces_before_rbrace" }
+      specify { critic.problems[file_name].last[:line].should be 1 }
+      specify { critic.problems[file_name].last[:column].should be 73 }
+      specify { critic.problems[file_name].last[:level].should be :error }
     end
   end
 end