transpec 1.5.0 → 1.5.1

data/lib/transpec/syntax/its.rb

@@ -13,7 +13,7 @@ module Transpec
         receiver_node.nil? && method_name == :its
       end
 
-      def register_request_for_dynamic_analysis(rewriter)
+      add_dynamic_analysis_request do |rewriter|
         key = :project_requires_its?
         code = 'defined?(RSpec::Its)'
         rewriter.register_request(@node, key, code, :context)

data/lib/transpec/syntax/method_stub.rb

@@ -13,17 +13,43 @@ module Transpec
     class MethodStub < Syntax
       include Mixin::Send, Mixin::MonkeyPatch, Mixin::AllowNoMessage, Mixin::AnyInstance, Util
 
+      # rubocop:disable LineLength
+      CLASSES_DEFINING_OWN_STUB_METHOD = [
+        'Typhoeus', # https://github.com/typhoeus/typhoeus/blob/6a59c62/lib/typhoeus.rb#L66-L85
+        'Excon',    # https://github.com/geemus/excon/blob/6af4f9c/lib/excon.rb#L143-L178
+        'Factory'   # https://github.com/thoughtbot/factory_girl/blob/v3.6.2/lib/factory_girl/syntax/vintage.rb#L112
+      ]
+      # rubocop:enable LineLength
+
+      def self.dynamic_analysis_target_node?(node)
+        target_node?(node)
+      end
+
+      def self.conversion_target_node?(node, runtime_data = nil)
+        return false unless check_target_node_statically(node)
+
+        # Check if the method is RSpec's one or not.
+        if source_location(node, runtime_data)
+          # If we have a source location runtime data, check with it.
+          check_target_node_dynamically(node, runtime_data)
+        else
+          # Otherwise check with a static whitelist.
+          receiver_node = node.children.first
+          const_name = Util.const_name(receiver_node)
+          !CLASSES_DEFINING_OWN_STUB_METHOD.include?(const_name)
+        end
+      end
+
       def self.target_method?(receiver_node, method_name)
         !receiver_node.nil? && [:stub, :stub!, :stub_chain, :unstub, :unstub!].include?(method_name)
       end
 
-      def register_request_for_dynamic_analysis(rewriter)
+      add_dynamic_analysis_request do |rewriter|
         register_request_of_syntax_availability_inspection(
           rewriter,
           :allow_to_receive_available?,
           [:allow, :receive]
         )
-        register_request_of_any_instance_inspection(rewriter)
       end
 
       def allow_to_receive_available?
@@ -36,7 +62,7 @@ module Transpec
         return if method_name == :stub_chain && !rspec_version.receive_message_chain_available?
 
         unless allow_to_receive_available?
-          fail InvalidContextError.new(selector_range, "##{method_name}", '#allow')
+          fail ContextError.new(selector_range, "##{method_name}", '#allow')
         end
 
         source, type = replacement_source_and_conversion_type(rspec_version)

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

@@ -8,29 +8,30 @@ module Transpec
       module AnyInstance
         include ::AST::Sexp
 
-        def register_request_of_any_instance_inspection(rewriter)
-          key = :any_instance_target_class_name
-          code = <<-END.gsub(/^\s+\|/, '').chomp
-            |if self.class.name == 'RSpec::Mocks::AnyInstance::Recorder'
-            |  if respond_to?(:klass)
-            |    klass.name
-            |  elsif instance_variable_defined?(:@klass)
-            |    instance_variable_get(:@klass).name
-            |  else
-            |    nil
-            |  end
-            |else
-            |  nil
-            |end
-          END
-          rewriter.register_request(subject_node, key, code)
+        def self.included(syntax)
+          syntax.add_dynamic_analysis_request do |rewriter|
+            key = :any_instance_target_class_name
+            code = <<-END.gsub(/^\s+\|/, '').chomp
+              |if self.class.name == 'RSpec::Mocks::AnyInstance::Recorder'
+              |  if respond_to?(:klass)
+              |    klass.name
+              |  elsif instance_variable_defined?(:@klass)
+              |    instance_variable_get(:@klass).name
+              |  else
+              |    nil
+              |  end
+              |else
+              |  nil
+              |end
+            END
+            rewriter.register_request(subject_node, key, code)
+          end
         end
 
         def any_instance?
           return true unless any_instance_target_node.nil?
           node_data = runtime_node_data(subject_node)
-          return false unless node_data
-          return false unless node_data[:any_instance_target_class_name]
+          return false unless node_data && node_data[:any_instance_target_class_name]
           !node_data[:any_instance_target_class_name].result.nil?
         end
 

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

@@ -0,0 +1,35 @@
+# coding: utf-8
+
+require 'transpec/syntax/have'
+
+module Transpec
+  class Syntax
+    module Mixin
+      module HaveMatcherOwner
+        def self.included(syntax)
+          syntax.add_dynamic_analysis_request do |rewriter|
+            if Have.dynamic_analysis_target_node?(matcher_node)
+              create_have_matcher.register_request_for_dynamic_analysis(rewriter)
+            end
+          end
+        end
+
+        def have_matcher
+          return @have_matcher if instance_variable_defined?(:@have_matcher)
+
+          @have_matcher ||= if Have.conversion_target_node?(matcher_node, @runtime_data)
+                              create_have_matcher
+                            else
+                              nil
+                            end
+        end
+
+        private
+
+        def create_have_matcher
+          Have.new(matcher_node, self, @source_rewriter, @runtime_data, @report)
+        end
+      end
+    end
+  end
+end

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

@@ -1,58 +1,42 @@
 # coding: utf-8
 
+require 'active_support/concern'
+
 module Transpec
   class Syntax
     module Mixin
       module Send
-        def self.included(klass)
-          klass.extend(ClassMethods)
-        end
+        extend ActiveSupport::Concern
 
         module ClassMethods
-          def register_request_for_dynamic_analysis(node, rewriter)
-            return unless target_node?(node)
-
-            receiver_node, method_name, *_ = *node
-
-            if receiver_node
-              target_node = receiver_node
-              target_object_type = :object
-            else
-              target_node = node
-              target_object_type = :context
-            end
-
-            key = source_location_key(method_name)
-            code = "method(#{method_name.inspect}).source_location"
-            rewriter.register_request(target_node, key, code, target_object_type)
-          end
-
           def target_node?(node, runtime_data = nil)
             check_target_node_statically(node) && check_target_node_dynamically(node, runtime_data)
           end
 
-          def target_method?(receiver_node, method_name)
-            false
-          end
-
           def check_target_node_statically(node)
             return false unless node && node.type == :send
             receiver_node, method_name, *_ = *node
             target_method?(receiver_node, method_name)
           end
 
+          def target_method?(receiver_node, method_name)
+            NotImplementedError
+          end
+
           def check_target_node_dynamically(node, runtime_data)
-            return true unless runtime_data
+            source_location = source_location(node, runtime_data)
+            return true unless source_location
+            file_path = source_location.first
+            !file_path.match(%r{/gems/rspec\-[^/]+/lib/rspec/}).nil?
+          end
 
+          def source_location(node, runtime_data)
+            return unless runtime_data
             receiver_node, method_name, *_ = *node
             target_node = receiver_node ? receiver_node : node
-
-            return true unless (node_data = runtime_data[target_node])
-            return true unless (eval_data = node_data[source_location_key(method_name)])
-            return true unless (source_location = eval_data.result)
-
-            file_path = source_location.first
-            !file_path.match(%r{/gems/rspec\-[^/]+/lib/rspec/}).nil?
+            return unless (node_data = runtime_data[target_node])
+            return unless (eval_data = node_data[source_location_key(method_name)])
+            eval_data.result
           end
 
           def source_location_key(method_name)
@@ -60,6 +44,22 @@ module Transpec
           end
         end
 
+        def self.included(syntax)
+          syntax.add_dynamic_analysis_request do |rewriter|
+            if receiver_node
+              target_node = receiver_node
+              target_object_type = :object
+            else
+              target_node = @node
+              target_object_type = :context
+            end
+
+            key = self.class.source_location_key(method_name)
+            code = "method(#{method_name.inspect}).source_location"
+            rewriter.register_request(target_node, key, code, target_object_type)
+          end
+        end
+
         def receiver_node
           @node.children[0]
         end

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

@@ -6,6 +6,14 @@ module Transpec
   class Syntax
     module Mixin
       module ShouldBase
+        def self.included(syntax)
+          syntax.add_dynamic_analysis_request do |rewriter|
+            if OperatorMatcher.dynamic_analysis_target_node?(matcher_node)
+              create_operator_matcher.register_request_for_dynamic_analysis(rewriter)
+            end
+          end
+        end
+
         def positive?
           method_name == :should
         end
@@ -14,24 +22,30 @@ module Transpec
           arg_node || parent_node
         end
 
+        def should_range
+          if arg_node
+            selector_range
+          else
+            selector_range.join(expression_range.end)
+          end
+        end
+
         def operator_matcher
           return @operator_matcher if instance_variable_defined?(:@operator_matcher)
 
           @operator_matcher ||= begin
-            if OperatorMatcher.target_node?(matcher_node, @runtime_data)
-              OperatorMatcher.new(matcher_node, @source_rewriter, @runtime_data, @report)
+            if OperatorMatcher.conversion_target_node?(matcher_node, @runtime_data)
+              create_operator_matcher
             else
               nil
             end
           end
         end
 
-        def should_range
-          if arg_node
-            selector_range
-          else
-            selector_range.join(expression_range.end)
-          end
+        private
+
+        def create_operator_matcher
+          OperatorMatcher.new(matcher_node, @source_rewriter, @runtime_data, @report)
         end
       end
     end

data/lib/transpec/syntax/oneliner_should.rb

@@ -3,7 +3,7 @@
 require 'transpec/syntax'
 require 'transpec/syntax/mixin/should_base'
 require 'transpec/syntax/mixin/send'
-require 'transpec/syntax/mixin/have_matcher'
+require 'transpec/syntax/mixin/have_matcher_owner'
 require 'transpec/rspec_dsl'
 require 'transpec/util'
 require 'active_support/inflector/methods'
@@ -11,7 +11,7 @@ require 'active_support/inflector/methods'
 module Transpec
   class Syntax
     class OnelinerShould < Syntax
-      include Mixin::ShouldBase, Mixin::Send, Mixin::HaveMatcher, RSpecDSL, Util
+      include Mixin::ShouldBase, Mixin::Send, Mixin::HaveMatcherOwner, RSpecDSL, Util
 
       attr_reader :current_syntax_type
 
@@ -24,11 +24,6 @@ module Transpec
         @current_syntax_type = :should
       end
 
-      def register_request_for_dynamic_analysis(rewriter)
-        operator_matcher.register_request_for_dynamic_analysis(rewriter) if operator_matcher
-        have_matcher.register_request_for_dynamic_analysis(rewriter) if have_matcher
-      end
-
       def expectize!(negative_form = 'not_to', parenthesize_matcher_arg = true)
         replacement = 'is_expected.'
         replacement << (positive? ? 'to' : negative_form)

data/lib/transpec/syntax/operator_matcher.rb

@@ -20,9 +20,10 @@ module Transpec
         !receiver_node.nil? && OPERATORS.include?(method_name)
       end
 
-      def register_request_for_dynamic_analysis(rewriter)
-        return unless method_name == :=~
-        rewriter.register_request(arg_node, :arg_is_enumerable?, 'is_a?(Enumerable)')
+      add_dynamic_analysis_request do |rewriter|
+        if method_name == :=~
+          rewriter.register_request(arg_node, :arg_is_enumerable?, 'is_a?(Enumerable)')
+        end
       end
 
       def convert_operator!(parenthesize_arg = true)

data/lib/transpec/syntax/should.rb

@@ -5,14 +5,14 @@ require 'transpec/syntax/mixin/should_base'
 require 'transpec/syntax/mixin/send'
 require 'transpec/syntax/mixin/monkey_patch'
 require 'transpec/syntax/mixin/expectizable'
-require 'transpec/syntax/mixin/have_matcher'
+require 'transpec/syntax/mixin/have_matcher_owner'
 require 'transpec/util'
 
 module Transpec
   class Syntax
     class Should < Syntax
       include Mixin::ShouldBase, Mixin::Send, Mixin::MonkeyPatch, Mixin::Expectizable,
-              Mixin::HaveMatcher, Util
+              Mixin::HaveMatcherOwner, Util
 
       attr_reader :current_syntax_type
 
@@ -25,15 +25,12 @@ module Transpec
         @current_syntax_type = :should
       end
 
-      def register_request_for_dynamic_analysis(rewriter)
+      add_dynamic_analysis_request do |rewriter|
         register_request_of_syntax_availability_inspection(
           rewriter,
           :expect_available?,
           [:expect]
         )
-
-        operator_matcher.register_request_for_dynamic_analysis(rewriter) if operator_matcher
-        have_matcher.register_request_for_dynamic_analysis(rewriter) if have_matcher
       end
 
       def expect_available?
@@ -41,9 +38,7 @@ module Transpec
       end
 
       def expectize!(negative_form = 'not_to', parenthesize_matcher_arg = true)
-        unless expect_available?
-          fail InvalidContextError.new(selector_range, "##{method_name}", '#expect')
-        end
+        fail ContextError.new(selector_range, "##{method_name}", '#expect') unless expect_available?
 
         if proc_literal?(subject_node)
           replace(range_of_subject_method_taking_block, 'expect')

data/lib/transpec/syntax/should_receive.rb

@@ -19,7 +19,7 @@ module Transpec
         !receiver_node.nil? && [:should_receive, :should_not_receive].include?(method_name)
       end
 
-      def register_request_for_dynamic_analysis(rewriter)
+      add_dynamic_analysis_request do |rewriter|
         register_request_of_syntax_availability_inspection(
           rewriter,
           :expect_to_receive_available?,
@@ -31,8 +31,6 @@ module Transpec
           :allow_to_receive_available?,
           [:allow, :receive]
         )
-
-        register_request_of_any_instance_inspection(rewriter)
       end
 
       def expect_to_receive_available?
@@ -49,7 +47,7 @@ module Transpec
 
       def expectize!(negative_form = 'not_to')
         unless expect_to_receive_available?
-          fail InvalidContextError.new(selector_range, "##{method_name}", '#expect')
+          fail ContextError.new(selector_range, "##{method_name}", '#expect')
         end
 
         convert_to_syntax!('expect', negative_form)
@@ -60,7 +58,7 @@ module Transpec
         return unless useless_expectation?
 
         unless allow_to_receive_available?
-          fail InvalidContextError.new(selector_range, "##{method_name}", '#allow')
+          fail ContextError.new(selector_range, "##{method_name}", '#allow')
         end
 
         convert_to_syntax!('allow', negative_form)

data/lib/transpec/version.rb

@@ -5,7 +5,7 @@ module Transpec
   module Version
     MAJOR = 1
     MINOR = 5
-    PATCH = 0
+    PATCH = 1
 
     def self.to_s
       [MAJOR, MINOR, PATCH].join('.')

data/spec/support/shared_context.rb

@@ -60,7 +60,7 @@ end
 shared_context 'syntax object' do |syntax_class, name|
   let(name) do
     ast.each_node do |node|
-      next unless syntax_class.target_node?(node)
+      next unless syntax_class.conversion_target_node?(node)
       return syntax_class.new(node, source_rewriter, runtime_data)
     end
 
@@ -70,6 +70,7 @@ end
 
 shared_context 'isolated environment' do
   around do |example|
+    require 'tmpdir'
     Dir.mktmpdir do |tmpdir|
       Dir.chdir(tmpdir) do
         example.run
@@ -79,8 +80,6 @@ shared_context 'isolated environment' do
 end
 
 shared_context 'inside of git repository' do
-  require 'tmpdir'
-
   around do |example|
     Dir.mkdir('repo')
     Dir.chdir('repo') do