transpec 1.5.1 → 1.6.0

data/lib/transpec/converter.rb

@@ -5,18 +5,8 @@ require 'transpec/configuration'
 require 'transpec/report'
 require 'transpec/rspec_version'
 require 'transpec/syntax'
-require 'transpec/syntax/be_boolean'
-require 'transpec/syntax/be_close'
-require 'transpec/syntax/double'
-require 'transpec/syntax/example'
-require 'transpec/syntax/expect'
-require 'transpec/syntax/its'
-require 'transpec/syntax/method_stub'
-require 'transpec/syntax/oneliner_should'
-require 'transpec/syntax/raise_error'
-require 'transpec/syntax/rspec_configure'
-require 'transpec/syntax/should'
-require 'transpec/syntax/should_receive'
+
+Transpec::Syntax.require_all
 
 module Transpec
   class Converter < BaseRewriter
@@ -86,7 +76,7 @@ module Transpec
         else
           oneliner_should.convert_have_items_to_standard_should!
         end
-      elsif @configuration.convert_oneliner? && @rspec_version.one_liner_is_expected_available?
+      elsif @configuration.convert_oneliner? && @rspec_version.oneliner_is_expected_available?
         oneliner_should.expectize!(negative_form, parenthesize)
       end
     end
@@ -159,6 +149,11 @@ module Transpec
       example.convert! if @configuration.convert_deprecated_method?
     end
 
+    def process_matcher_definition(matcher_definition)
+      return unless @rspec_version.non_should_matcher_protocol_available?
+      matcher_definition.convert_deprecated_method! if @configuration.convert_deprecated_method?
+    end
+
     def process_rspec_configure(rspec_configure)
       if need_to_modify_expectation_syntax_configuration?(rspec_configure)
         rspec_configure.modify_expectation_syntaxes!(:expect)

data/lib/transpec/dynamic_analyzer.rb

@@ -13,7 +13,6 @@ require 'English'
 
 module Transpec
   class DynamicAnalyzer
-    EVAL_TARGET_TYPES = [:object, :context]
     ANALYSIS_METHOD = 'transpec_analysis'
     HELPER_FILE = 'transpec_analysis_helper.rb'
     RESULT_FILE = 'transpec_analysis_result.json'

data/lib/transpec/dynamic_analyzer/rewriter.rb

@@ -1,13 +1,19 @@
 # coding: utf-8
 
 require 'transpec/base_rewriter'
+require 'transpec/dynamic_analyzer'
+require 'transpec/syntax'
 require 'transpec/util'
 
+Transpec::Syntax.require_all
+
 module Transpec
   class DynamicAnalyzer
     class Rewriter < BaseRewriter
       include Util
 
+      EVAL_TARGET_TYPES = [:object, :context]
+
       def process(ast, source_rewriter)
         # TODO: Currently multitheading is not considered...
         clear_requests!
@@ -75,7 +81,6 @@ module Transpec
           '), self, %s, __FILE__, %d, %d)',
           hash_literal(analysis_codes), source_range.begin_pos, source_range.end_pos
         )
-        rear = "\n" + indentation_of_line(source_range.end) + rear if contain_here_document?(node)
 
         [front, rear]
       end

data/lib/transpec/rspec_dsl.rb

@@ -1,20 +1,31 @@
 # coding: utf-8
 
+# Aliases by Capybara:
+# https://github.com/jnicklas/capybara/blob/2.2.0/lib/capybara/rspec/features.rb
+
 module Transpec
   module RSpecDSL
     EXAMPLE_GROUP_METHODS = [
       :describe, :context,
-      :shared_examples, :shared_context, :share_examples_for, :shared_examples_for
+      :shared_examples, :shared_context, :share_examples_for, :shared_examples_for,
+      :feature # Capybara
     ].freeze
 
     EXAMPLE_METHODS = [
       :example, :it, :specify,
       :focus, :focused, :fit,
-      :pending, :xexample, :xit, :xspecify
+      :pending, :xexample, :xit, :xspecify,
+      :scenario, :xscenario # Capybara
     ].freeze
 
-    HOOK_METHODS = [:before, :after, :around].freeze
+    HOOK_METHODS = [
+      :before, :after, :around,
+      :background # Capybara
+    ].freeze
 
-    HELPER_METHODS = [:subject, :subject!, :let, :let!].freeze
+    HELPER_METHODS = [
+      :subject, :subject!, :let, :let!,
+      :given, :given! # Capybara
+    ].freeze
   end
 end

data/lib/transpec/rspec_version.rb

@@ -41,10 +41,11 @@ module Transpec
       @gem_version.to_s
     end
 
-    define_feature :be_truthy,             '2.99.0.beta1'
-    define_feature :yielded_example,       '2.99.0.beta1'
-    define_feature :one_liner_is_expected, '2.99.0.beta2', except: '3.0.0.beta1'
-    define_feature :receive_messages,      '3.0.0.beta1'
-    define_feature :receive_message_chain, '3.0.0.beta2'
+    define_feature :be_truthy,                   '2.99.0.beta1'
+    define_feature :yielded_example,             '2.99.0.beta1'
+    define_feature :oneliner_is_expected,        '2.99.0.beta2', except: '3.0.0.beta1'
+    define_feature :receive_messages,            '3.0.0.beta1'
+    define_feature :receive_message_chain,       '3.0.0.beta2'
+    define_feature :non_should_matcher_protocol, '3.0.0.beta2'
   end
 end

data/lib/transpec/static_context_inspector.rb

@@ -8,6 +8,7 @@ module Transpec
     include RSpecDSL, Util
 
     SCOPE_TYPES = [:module, :class, :sclass, :def, :defs, :block].freeze
+    TWISTED_SCOPE_TYPES = (SCOPE_TYPES - [:def, :defs]).freeze
 
     NON_MONKEY_PATCH_EXPECTATION_AVAILABLE_CONTEXT = [
       [:example_group, :example],
@@ -41,12 +42,16 @@ module Transpec
 
     def scopes
       @scopes ||= begin
-        scopes = @node.each_ancestor_node.reverse_each.map { |node| scope_type(node) }
+        scopes = valid_ancestor_nodes.reverse_each.map { |node| scope_type(node) }
         scopes.compact!
         scopes.extend(ArrayExtension)
       end
     end
 
+    def inside_of_example_group?
+      scopes.include?(:example_group)
+    end
+
     def non_monkey_patch_expectation_available?
       return @expectation_available if instance_variable_defined?(:@expectation_available)
       @expectation_available = match_scopes(NON_MONKEY_PATCH_EXPECTATION_AVAILABLE_CONTEXT)
@@ -64,6 +69,25 @@ module Transpec
 
     private
 
+    def valid_ancestor_nodes
+      valid_nodes = []
+
+      self_and_ancestor_nodes = [@node] + @node.ancestor_nodes
+
+      self_and_ancestor_nodes.each_cons(2) do |child, parent|
+        valid_nodes << parent unless belong_to_direct_outer_scope?(child)
+      end
+
+      valid_nodes
+    end
+
+    def belong_to_direct_outer_scope?(node)
+      return false unless TWISTED_SCOPE_TYPES.include?(node.parent_node.type)
+      scope_node = node.parent_node
+      return true if node.equal?(scope_node.children[0])
+      scope_node.type == :class && node.equal?(scope_node.children[1])
+    end
+
     def scope_type(node)
       return nil unless SCOPE_TYPES.include?(node.type)
 

data/lib/transpec/syntax.rb

@@ -13,6 +13,13 @@ module Transpec
         all_syntaxes << subclass
       end
 
+      def require_all
+        pattern = File.join(File.dirname(__FILE__), 'syntax', '*.rb')
+        Dir.glob(pattern) do |path|
+          require path
+        end
+      end
+
       def all_syntaxes
         @subclasses ||= []
       end

data/lib/transpec/syntax/matcher_definition.rb

@@ -0,0 +1,30 @@
+# coding: utf-8
+
+require 'transpec/syntax'
+require 'transpec/syntax/mixin/send'
+
+module Transpec
+  class Syntax
+    class MatcherDefinition < Syntax
+      include Mixin::Send
+
+      CONVERSION_CORRESPONDENCE = {
+                      match_for_should: :match,
+                  match_for_should_not: :match_when_negated,
+            failure_message_for_should: :failure_message,
+        failure_message_for_should_not: :failure_message_when_negated
+      }
+
+      def self.target_method?(receiver_node, method_name)
+        receiver_node.nil? && CONVERSION_CORRESPONDENCE.keys.include?(method_name)
+      end
+
+      def convert_deprecated_method!
+        replacement_method_name = CONVERSION_CORRESPONDENCE[method_name].to_s
+        replace(selector_range, replacement_method_name)
+
+        @report.records << Record.new("#{method_name} { }", "#{replacement_method_name} { }")
+      end
+    end
+  end
+end

data/lib/transpec/syntax/mixin/send.rb

@@ -20,7 +20,7 @@ module Transpec
           end
 
           def target_method?(receiver_node, method_name)
-            NotImplementedError
+            fail NotImplementedError
           end
 
           def check_target_node_dynamically(node, runtime_data)

data/lib/transpec/util.rb

@@ -47,13 +47,11 @@ module Transpec
 
     def here_document?(node)
       return false unless [:str, :dstr].include?(node.type)
-      map = node.loc
-      return false if !map.respond_to?(:begin) || map.begin.nil?
-      map.begin.source.start_with?('<<')
+      node.loc.respond_to?(:heredoc_end)
     end
 
     def contain_here_document?(node)
-      here_document?(node) || node.each_descendent_node.any? { |n| here_document?(n) }
+      node.each_node.any? { |n| here_document?(n) }
     end
 
     def in_explicit_parentheses?(node)

data/lib/transpec/version.rb

@@ -4,8 +4,8 @@ module Transpec
   # http://semver.org/
   module Version
     MAJOR = 1
-    MINOR = 5
-    PATCH = 1
+    MINOR = 6
+    PATCH = 0
 
     def self.to_s
       [MAJOR, MINOR, PATCH].join('.')

data/spec/transpec/converter_spec.rb

@@ -223,8 +223,8 @@ module Transpec
       end
 
       shared_examples 'invokes OnelinerShould#expectize! if available' do
-        context 'when RSpecVersion#one_liner_is_expected_available? returns true' do
-          before { rspec_version.stub(:one_liner_is_expected_available?).and_return(true) }
+        context 'when RSpecVersion#oneliner_is_expected_available? returns true' do
+          before { rspec_version.stub(:oneliner_is_expected_available?).and_return(true) }
 
           it 'invokes OnelinerShould#expectize!' do
             should_object.should_receive(:expectize!)
@@ -232,8 +232,8 @@ module Transpec
           end
         end
 
-        context 'when RSpecVersion#one_liner_is_expected_available? returns false' do
-          before { rspec_version.stub(:one_liner_is_expected_available?).and_return(false) }
+        context 'when RSpecVersion#oneliner_is_expected_available? returns false' do
+          before { rspec_version.stub(:oneliner_is_expected_available?).and_return(false) }
           include_examples 'does nothing'
         end
       end
@@ -655,7 +655,7 @@ module Transpec
       context 'when Configuration#convert_deprecated_method? is false' do
         before { configuration.convert_deprecated_method = false }
 
-        it 'does not invoke Double#convert_to_double!' do
+        it 'does nothing' do
           double_object.should_not_receive(:convert_to_double!)
           converter.process_double(double_object)
         end
@@ -668,7 +668,7 @@ module Transpec
       context 'when RSpecVersion#be_truthy_available? returns true' do
         before { rspec_version.stub(:be_truthy_available?).and_return(true) }
 
-        context 'when Configuration#convert_deprecated_method? is true' do
+        context 'and Configuration#convert_deprecated_method? is true' do
           before { configuration.convert_deprecated_method = true }
 
           context 'and Configuration#boolean_matcher_type is :conditional' do
@@ -703,7 +703,7 @@ module Transpec
           end
         end
 
-        context 'when Configuration#convert_deprecated_method? is false' do
+        context 'and Configuration#convert_deprecated_method? is false' do
           before { configuration.convert_deprecated_method = false }
 
           it 'does nothing' do
@@ -740,7 +740,7 @@ module Transpec
       context 'when Configuration#convert_deprecated_method? is false' do
         before { configuration.convert_deprecated_method = false }
 
-        it 'does not invoke BeClose#convert_to_be_within!' do
+        it 'does nothing' do
           be_close_object.should_not_receive(:convert_to_be_within!)
           converter.process_be_close(be_close_object)
         end
@@ -762,7 +762,7 @@ module Transpec
       context 'when Configuration#convert_deprecated_method? is false' do
         before { configuration.convert_deprecated_method = false }
 
-        it 'does not invoke BeClose#convert_to_be_within!' do
+        it 'does nothing' do
           raise_error_object.should_not_receive(:remove_error_specification_with_negative_expectation!)
           converter.process_raise_error(raise_error_object)
         end
@@ -784,7 +784,7 @@ module Transpec
       context 'when Configuration#convert_its? is false' do
         before { configuration.convert_its = false }
 
-        it 'does not invoke Its#convert_to_describe_subject_it!' do
+        it 'does nothing' do
           its_object.should_not_receive(:convert_to_describe_subject_it!)
           converter.process_its(its_object)
         end
@@ -797,7 +797,7 @@ module Transpec
       context 'when RSpecVersion#yielded_example_available? returns true' do
         before { rspec_version.stub(:yielded_example_available?).and_return(true) }
 
-        context 'when Configuration#convert_deprecated_method? is true' do
+        context 'and Configuration#convert_deprecated_method? is true' do
           before { configuration.convert_deprecated_method = true }
 
           it 'invokes Example#convert!' do
@@ -806,10 +806,10 @@ module Transpec
           end
         end
 
-        context 'when Configuration#convert_deprecated_method? is false' do
+        context 'and Configuration#convert_deprecated_method? is false' do
           before { configuration.convert_deprecated_method = false }
 
-          it 'does not invoke Its#convert_to_describe_subject_it!' do
+          it 'does nothing' do
             example_object.should_not_receive(:convert!)
             converter.process_example(example_object)
           end
@@ -819,7 +819,7 @@ module Transpec
       context 'when RSpecVersion#yielded_example_available? returns false' do
         before { rspec_version.stub(:yielded_example_available?).and_return(false) }
 
-        context 'when Configuration#convert_deprecated_method? is true' do
+        context 'and Configuration#convert_deprecated_method? is true' do
           before { configuration.convert_deprecated_method = true }
 
           it 'does nothing' do
@@ -830,6 +830,45 @@ module Transpec
       end
     end
 
+    describe '#process_matcher_definition' do
+      let(:matcher_definition) { double('matcher_definition').as_null_object }
+
+      context 'when RSpecVersion#non_should_matcher_protocol_available? returns true' do
+        before { rspec_version.stub(:non_should_matcher_protocol_available?).and_return(true) }
+
+        context 'and Configuration#convert_deprecated_method? is true' do
+          before { configuration.convert_deprecated_method = true }
+
+          it 'invokes MatcherDefinition#convert_deprecated_method!' do
+            matcher_definition.should_receive(:convert_deprecated_method!)
+            converter.process_matcher_definition(matcher_definition)
+          end
+        end
+
+        context 'and Configuration#convert_deprecated_method? is false' do
+          before { configuration.convert_deprecated_method = false }
+
+          it 'does nothing' do
+            matcher_definition.should_not_receive(:convert_deprecated_method!)
+            converter.process_matcher_definition(matcher_definition)
+          end
+        end
+      end
+
+      context 'when RSpecVersion#non_should_matcher_protocol_available? returns false' do
+        before { rspec_version.stub(:non_should_matcher_protocol_available?).and_return(false) }
+
+        context 'and Configuration#convert_deprecated_method? is true' do
+          before { configuration.convert_deprecated_method = true }
+
+          it 'does nothing' do
+            matcher_definition.should_not_receive(:convert_deprecated_method!)
+            converter.process_matcher_definition(matcher_definition)
+          end
+        end
+      end
+    end
+
     describe '#process_rspec_configure' do
       let(:rspec_configure) { double('rspec_configure').as_null_object }
 

data/spec/transpec/dynamic_analyzer/rewriter_spec.rb

@@ -15,10 +15,8 @@ module Transpec
 
         let(:source) do
           <<-END
-            describe 'example' do
-              it 'is foo' do
-                subject.should be(foo)
-              end
+            it 'is foo' do
+              subject.should be(foo)
             end
           END
         end
@@ -26,10 +24,8 @@ module Transpec
         # rubocop:disable LineLength
         let(:expected_source) do
           <<-END
-            describe 'example' do
-              it 'is foo' do
-                transpec_analysis((transpec_analysis((subject), self, { :should_source_location => [:object, "method(:should).source_location"] }, __FILE__, 79, 86).should be(foo)), self, { :expect_available? => [:context, "self.class.ancestors.any? { |a| a.name.start_with?('RSpec::') } && respond_to?(:expect)"] }, __FILE__, 79, 101)
-              end
+            it 'is foo' do
+              transpec_analysis((transpec_analysis((subject), self, { :should_source_location => [:object, "method(:should).source_location"] }, __FILE__, 41, 48).should be(foo)), self, { :expect_available? => [:context, "self.class.ancestors.any? { |a| a.name.start_with?('RSpec::') } && respond_to?(:expect)"] }, __FILE__, 41, 63)
             end
           END
         end
@@ -42,12 +38,10 @@ module Transpec
         context 'when the target includes here document' do
           let(:source) do
             <<-END
-              describe 'example' do
-                it 'matches to foo' do
-                  subject.should =~ <<-HEREDOC.gsub('foo', 'bar')
-                  foo
-                  HEREDOC
-                end
+              it 'matches to foo' do
+                subject.should =~ <<-HEREDOC.gsub('foo', 'bar')
+                foo
+                HEREDOC
               end
             END
           end
@@ -55,13 +49,10 @@ module Transpec
           # rubocop:disable LineLength
           let(:expected_source) do
             <<-END
-              describe 'example' do
-                it 'matches to foo' do
-                  transpec_analysis((transpec_analysis((subject), self, { :should_source_location => [:object, "method(:should).source_location"] }, __FILE__, 93, 100).should), self, { :"=~_source_location" => [:object, "method(:=~).source_location"], :expect_available? => [:context, "self.class.ancestors.any? { |a| a.name.start_with?('RSpec::') } && respond_to?(:expect)"] }, __FILE__, 93, 107) =~ transpec_analysis((<<-HEREDOC.gsub('foo', 'bar')
-                  foo
-                  HEREDOC
-                  ), self, { :arg_is_enumerable? => [:object, "is_a?(Enumerable)"] }, __FILE__, 111, 188)
-                end
+              it 'matches to foo' do
+                transpec_analysis((transpec_analysis((subject), self, { :should_source_location => [:object, "method(:should).source_location"] }, __FILE__, 53, 60).should), self, { :"=~_source_location" => [:object, "method(:=~).source_location"], :expect_available? => [:context, "self.class.ancestors.any? { |a| a.name.start_with?('RSpec::') } && respond_to?(:expect)"] }, __FILE__, 53, 67) =~ transpec_analysis((<<-HEREDOC.gsub('foo', 'bar')), self, { :arg_is_enumerable? => [:object, "is_a?(Enumerable)"] }, __FILE__, 71, 100)
+                foo
+                HEREDOC
               end
             END
           end
@@ -75,10 +66,8 @@ module Transpec
         context 'when the target takes block' do
           let(:source) do
             <<-END
-              describe 'example' do
-                it 'raises error' do
-                  expect { do_something }.to throw_symbol
-                end
+              it 'raises error' do
+                expect { do_something }.to throw_symbol
               end
             END
           end
@@ -86,10 +75,8 @@ module Transpec
           # rubocop:disable LineLength
           let(:expected_source) do
             <<-END
-              describe 'example' do
-                it 'raises error' do
-                  transpec_analysis((expect { do_something }), self, { :expect_source_location => [:context, "method(:expect).source_location"] }, __FILE__, 91, 97).to throw_symbol
-                end
+              it 'raises error' do
+                transpec_analysis((expect { do_something }), self, { :expect_source_location => [:context, "method(:expect).source_location"] }, __FILE__, 51, 57).to throw_symbol
               end
             END
           end
@@ -103,10 +90,8 @@ module Transpec
         context 'when the target is only the expression in a block' do
           let(:source) do
             <<-END
-              describe 'example' do
-                it 'raises error' do
-                  expect
-                end
+              it 'raises error' do
+                expect
               end
             END
           end
@@ -114,10 +99,8 @@ module Transpec
           # rubocop:disable LineLength
           let(:expected_source) do
             <<-END
-              describe 'example' do
-                it 'raises error' do
-                  transpec_analysis((expect), self, { :expect_source_location => [:context, "method(:expect).source_location"] }, __FILE__, 91, 97)
-                end
+              it 'raises error' do
+                transpec_analysis((expect), self, { :expect_source_location => [:context, "method(:expect).source_location"] }, __FILE__, 51, 57)
               end
             END
           end
@@ -131,10 +114,8 @@ module Transpec
         context 'when the target is method invocation without parentheses' do
           let(:source) do
             <<-END
-              describe 'example' do
-                it 'raises error' do
-                  expect subject
-                end
+              it 'raises error' do
+                expect subject
               end
             END
           end
@@ -142,10 +123,8 @@ module Transpec
           # rubocop:disable LineLength
           let(:expected_source) do
             <<-END
-              describe 'example' do
-                it 'raises error' do
-                  transpec_analysis((expect subject), self, { :expect_source_location => [:context, "method(:expect).source_location"] }, __FILE__, 91, 105)
-                end
+              it 'raises error' do
+                transpec_analysis((expect subject), self, { :expect_source_location => [:context, "method(:expect).source_location"] }, __FILE__, 51, 65)
               end
             END
           end