transpec 2.3.2 → 2.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2ca68d2ec61ab33ba2a0111a03728a08925606d
-  data.tar.gz: df0d66e1266197c0fe17a3533cafa4a6cd1649ee
+  metadata.gz: 585693816f02d6ca49a0a8a4e0ccec79e5514b96
+  data.tar.gz: 082314811f1021acf7036e0bccd4f88c99348f07
 SHA512:
-  metadata.gz: 7221ef0ade502c3ab43987fc1fcb24c671795f840ebe4e29d073803f417592e616dc97130a12e8bcd4b75c78fb21b1b693bd7630522577b084c090747656092d
-  data.tar.gz: 5aa6b286c235b51e47ab7bba1ac8f26bc25a26e85e3632f3305bdcd0f4c12bc39e04096fe4ee76b71bcc47652c78b53810e6a4a3c178bee42867bc425f77e2ec
+  metadata.gz: e7c2c4e9b46e0a3e70939acbcda80531511edab54637e75ff1e070e88490e648f36ff69a55dd86af680d0b355c67537f2e86747e392b86d3e1889bfb8e40fc54
+  data.tar.gz: 648882d9a093d0be7abc399922f3d1deadef1af0386e0028fd25b7cfc0f7aee5c71af05e050940c3e12d7bb34e8e5013f1523d1dd06a68b6737fc3531b96a286

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Development
 
+## v2.3.3
+
+* Fix failure on dynamic analysis when there's a RSpec-like method invocation in a context that undefines `Object` methods (e.g. `after` callback in [factory_girl definition context](https://github.com/thoughtbot/factory_girl/blob/v4.4.0/lib/factory_girl/definition_proxy.rb#L3-L7)). ([#66](https://github.com/yujinakayama/transpec/issues/66))
+
 ## v2.3.2
 
 * Fix a bug where explicit spec type metadata are added to wrong position when the `describe` has multiple non-metadata arguments (e.g. `describe Something, '#some_method' { }`). ([#77](https://github.com/yujinakayama/transpec/issues/77))

data/lib/transpec/dynamic_analyzer.rb

@@ -12,7 +12,8 @@ require 'English'
 
 module Transpec
   class DynamicAnalyzer
-    ANALYSIS_METHOD = 'transpec_analyze'
+    ANALYSIS_MODULE = 'TranspecAnalysis'
+    ANALYSIS_METHOD = 'analyze'
     HELPER_TEMPLATE_FILE = 'transpec_analysis_helper.rb.erb'
     RESULT_FILE = 'transpec_analysis_result.json'
 

data/lib/transpec/dynamic_analyzer/rewriter.rb

@@ -82,7 +82,7 @@ module Transpec
       end
 
       def build_wrapper_codes(node, analysis_codes)
-        front = "#{ANALYSIS_METHOD}(("
+        front = "#{ANALYSIS_MODULE}.#{ANALYSIS_METHOD}(("
         rear = format('), self, %s, %s)', node_id(node).inspect, hash_literal(analysis_codes))
         [front, rear]
       end

data/lib/transpec/dynamic_analyzer/transpec_analysis_helper.rb.erb

@@ -1,14 +1,36 @@
-module TranspecAnalysis
+module <%= ANALYSIS_MODULE %>
   @base_path = Dir.pwd
 
-  def self.temporary_data
+  module_function
+
+  def temporary_data
     @temporary_data ||= {}
   end
 
-  def self.data
+  def data
     @data ||= {}
   end
 
+  def <%= ANALYSIS_METHOD %>(object, context, node_id, analysis_codes)
+    node_data = {}
+
+    analysis_codes.each do |key, (target_type, code)|
+      target = case target_type
+               when :object  then object
+               when :context then context
+               end
+
+      begin
+        node_data[key] = target.instance_eval(code)
+      rescue Exception
+      end
+    end
+
+    data[node_id] = node_data
+
+    object
+  end
+
   at_exit do
     # Use JSON rather than Marshal so that:
     # * Unknown third-party class information won't be serialized.
@@ -22,23 +44,3 @@ module TranspecAnalysis
     end
   end
 end
-
-def <%= ANALYSIS_METHOD %>(object, context, node_id, analysis_codes)
-  node_data = {}
-
-  analysis_codes.each do |key, (target_type, code)|
-    target = case target_type
-             when :object  then object
-             when :context then context
-             end
-
-    begin
-      node_data[key] = target.instance_eval(code)
-    rescue Exception
-    end
-  end
-
-  TranspecAnalysis.data[node_id] = node_data
-
-  object
-end

data/lib/transpec/version.rb

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

data/spec/transpec/dynamic_analyzer/rewriter_spec.rb

@@ -22,7 +22,7 @@ module Transpec
         # rubocop:disable LineLength
         let(:expected_source) do
           <<-'END'
-            transpec_analyze((transpec_analyze((subject), self, "(string)_12_19", { :should_source_location => [:object, "method(:should).source_location"], :should_example_method_defined_by_user? => [:object, "owner = method(:should).owner\nowner != RSpec::Core::ExampleGroup &&\n  owner.ancestors.include?(RSpec::Core::ExampleGroup)"] }).should be(foo)), self, "(string)_12_34", { :expect_available? => [:context, "self.class.ancestors.any? { |a| a.name.start_with?('RSpec::') } && respond_to?(:expect)"] })
+            TranspecAnalysis.analyze((TranspecAnalysis.analyze((subject), self, "(string)_12_19", { :should_source_location => [:object, "method(:should).source_location"], :should_example_method_defined_by_user? => [:object, "owner = method(:should).owner\nowner != RSpec::Core::ExampleGroup &&\n  owner.ancestors.include?(RSpec::Core::ExampleGroup)"] }).should be(foo)), self, "(string)_12_34", { :expect_available? => [:context, "self.class.ancestors.any? { |a| a.name.start_with?('RSpec::') } && respond_to?(:expect)"] })
           END
         end
         # rubocop:enable LineLength
@@ -43,7 +43,7 @@ module Transpec
           # rubocop:disable LineLength
           let(:expected_source) do
             <<-'END'
-              transpec_analyze((transpec_analyze((subject), self, "(string)_14_21", { :should_source_location => [:object, "method(:should).source_location"], :should_example_method_defined_by_user? => [:object, "owner = method(:should).owner\nowner != RSpec::Core::ExampleGroup &&\n  owner.ancestors.include?(RSpec::Core::ExampleGroup)"] }).should), self, "(string)_14_28", { :expect_available? => [:context, "self.class.ancestors.any? { |a| a.name.start_with?('RSpec::') } && respond_to?(:expect)"], :"=~_source_location" => [:object, "method(:=~).source_location"], :"=~_example_method_defined_by_user?" => [:object, "owner = method(:=~).owner\nowner != RSpec::Core::ExampleGroup &&\n  owner.ancestors.include?(RSpec::Core::ExampleGroup)"] }) =~ transpec_analyze((<<-HEREDOC.gsub('foo', 'bar')), self, "(string)_32_61", { :enumerable_arg? => [:object, "is_a?(Enumerable)"] })
+              TranspecAnalysis.analyze((TranspecAnalysis.analyze((subject), self, "(string)_14_21", { :should_source_location => [:object, "method(:should).source_location"], :should_example_method_defined_by_user? => [:object, "owner = method(:should).owner\nowner != RSpec::Core::ExampleGroup &&\n  owner.ancestors.include?(RSpec::Core::ExampleGroup)"] }).should), self, "(string)_14_28", { :expect_available? => [:context, "self.class.ancestors.any? { |a| a.name.start_with?('RSpec::') } && respond_to?(:expect)"], :"=~_source_location" => [:object, "method(:=~).source_location"], :"=~_example_method_defined_by_user?" => [:object, "owner = method(:=~).owner\nowner != RSpec::Core::ExampleGroup &&\n  owner.ancestors.include?(RSpec::Core::ExampleGroup)"] }) =~ TranspecAnalysis.analyze((<<-HEREDOC.gsub('foo', 'bar')), self, "(string)_32_61", { :enumerable_arg? => [:object, "is_a?(Enumerable)"] })
               foo
               HEREDOC
             END
@@ -65,7 +65,7 @@ module Transpec
           # rubocop:disable LineLength
           let(:expected_source) do
             <<-'END'
-              transpec_analyze((expect { do_something }), self, "(string)_14_20", { :expect_source_location => [:context, "method(:expect).source_location"], :expect_example_method_defined_by_user? => [:context, "owner = method(:expect).owner\nowner != RSpec::Core::ExampleGroup &&\n  owner.ancestors.include?(RSpec::Core::ExampleGroup)"] }).to throw_symbol
+              TranspecAnalysis.analyze((expect { do_something }), self, "(string)_14_20", { :expect_source_location => [:context, "method(:expect).source_location"], :expect_example_method_defined_by_user? => [:context, "owner = method(:expect).owner\nowner != RSpec::Core::ExampleGroup &&\n  owner.ancestors.include?(RSpec::Core::ExampleGroup)"] }).to throw_symbol
             END
           end
           # rubocop:enable LineLength
@@ -85,7 +85,7 @@ module Transpec
           # rubocop:disable LineLength
           let(:expected_source) do
             <<-'END'
-              transpec_analyze((double 'something'), self, "(string)_14_32", { :double_source_location => [:context, "method(:double).source_location"], :double_example_method_defined_by_user? => [:context, "owner = method(:double).owner\nowner != RSpec::Core::ExampleGroup &&\n  owner.ancestors.include?(RSpec::Core::ExampleGroup)"] })
+              TranspecAnalysis.analyze((double 'something'), self, "(string)_14_32", { :double_source_location => [:context, "method(:double).source_location"], :double_example_method_defined_by_user? => [:context, "owner = method(:double).owner\nowner != RSpec::Core::ExampleGroup &&\n  owner.ancestors.include?(RSpec::Core::ExampleGroup)"] })
             END
           end
           # rubocop:enable LineLength

data/spec/transpec/dynamic_analyzer_spec.rb

@@ -215,6 +215,39 @@ module Transpec
         end
       end
 
+      context 'when there is a proxy/delegator Class that undefines Object methods' do
+        let(:source) do
+          # https://github.com/thoughtbot/factory_girl/blob/v4.4.0/lib/factory_girl/definition_proxy.rb#L3-L7
+          <<-END
+            class SomeProxy
+              UNPROXIED_METHODS = %w(__send__ object_id initialize instance_eval).map(&:to_sym)
+
+              (instance_methods + private_instance_methods).each do |method|
+                undef_method(method) unless UNPROXIED_METHODS.include?(method)
+              end
+            end
+
+            describe 'example' do
+              it 'is 1' do
+                proxy = SomeProxy.new
+                proxy.instance_eval do
+                  1.should == 1
+                end
+              end
+            end
+          END
+        end
+
+        it 'properly analyzes even in such context' do
+          should_node = find_node_in_file(spec_file_path) do |node|
+            node.send_type? && node.children[1] == :should
+          end
+
+          runtime_data = dynamic_analyzer.analyze
+          runtime_data.run?(should_node).should be_true
+        end
+      end
+
       runtime_data_cache = {}
 
       subject(:runtime_data) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: transpec
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.3.3
 platform: ruby
 authors:
 - Yuji Nakayama