transpec 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 977f1d1608ec0a3279e492d25b71f6d89406d6c8
-  data.tar.gz: 6e66591a69cf5ac38b5d0591ce999f70461d462a
+  metadata.gz: d51fbf6111c8bb052b53353d56c3f50016252f70
+  data.tar.gz: 79b7518a8f6b3f70cc019196e874ef342a4b3b69
 SHA512:
-  metadata.gz: 2255fba8e8680c8dd0bcaf41375f4f189092c7eec52c50776b6cbb4eac0b714d726db8609385729dcdb3831cd1e7f973da84a6f488b2630a57e4fe2cd09dd5b3
-  data.tar.gz: 6e7c92b6b6305ac0b9afc00c5101f5bff45b582241bedb306dae75d7f449d0f2013abff19d372fcb8c3aa075e7ea263bd575eab816d358bfe9a009650b0f5c73
+  metadata.gz: cb6b058d22be9aa35e1503982c4527ebe44ea19d87f8f2574190d025a9d2721e7ea1bee327be30dcba0ba4bdaf7395d658def09682d4349aa58476b4fc46564c
+  data.tar.gz: de624193ea2e966b865e4c1102ff0be66fd813b8af4a3843ee650401122eb1607fcaee113050c1d12972f77e66263eccf0a5c70f7583d3ed5083c6f894edfd23

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Master
 
+## v1.1.1
+
+* Fix failure of dynamic analysis when cwd was changed at exit of rspec
+
 ## v1.1.0
 
 * Support conversion of `its` (#9)

data/README.md

@@ -12,8 +12,8 @@ See the following pages for the new RSpec syntax and the plan for RSpec 3:
 * [RSpec's new message expectation syntax - Tea is awesome.](http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/)
 * [Myron Marston » The Plan for RSpec 3](http://myronmars.to/n/dev-blog/2013/07/the-plan-for-rspec-3)
 
-Note that Transpec does not yet support all conversions for the RSpec changes,
-and also the changes for RSpec 3 is not fixed and may vary in the future.
+Transpec now supports almost all conversions for the RSpec changes,
+but the changes for RSpec 3 is not fixed and may vary in the future.
 So it's recommended to follow updates of both RSpec and Transpec.
 
 ## Examples
@@ -91,7 +91,7 @@ describe Account do
 end
 ```
 
-### Actual Examples
+### Actual examples
 
 You can see actual conversion examples below:
 
@@ -346,10 +346,10 @@ expect([1, 2, 3]).to match_array([2, 1, 3])
 
 ```ruby
 # Targets
-(1.0 / 3.0).should be_close(0.333, 0.001)
+expect(1.0 / 3.0).to be_close(0.333, 0.001)
 
 # Converted
-(1.0 / 3.0).should be_within(0.001).of(0.333)
+expect(1.0 / 3.0).to be_within(0.001).of(0.333)
 ```
 
 * Disabled by: `--keep deprecated`
@@ -388,7 +388,7 @@ If you choose so, disable this conversion with `--keep have_items`.
 * Disabled by: `--keep have_items`
 * See also: [Expectations: have(x).items matchers will be moved into an external gem - The Plan for RSpec 3](http://myronmars.to/n/dev-blog/2013/07/the-plan-for-rspec-3#expectations__matchers_will_be_moved_into_an_external_gem)
 
-### Expectations on Block
+### Expectations on block
 
 ```ruby
 # Targets

data/README.md.erb

@@ -12,8 +12,8 @@ See the following pages for the new RSpec syntax and the plan for RSpec 3:
 * [RSpec's new message expectation syntax - Tea is awesome.](http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/)
 * [Myron Marston » The Plan for RSpec 3](http://myronmars.to/n/dev-blog/2013/07/the-plan-for-rspec-3)
 
-Note that Transpec does not yet support all conversions for the RSpec changes,
-and also the changes for RSpec 3 is not fixed and may vary in the future.
+Transpec now supports almost all conversions for the RSpec changes,
+but the changes for RSpec 3 is not fixed and may vary in the future.
 So it's recommended to follow updates of both RSpec and Transpec.
 
 ## Examples
@@ -64,7 +64,7 @@ Transpec would convert it to the following form:
 <%= Transpec::Converter.new.convert(example) -%>
 ```
 
-### Actual Examples
+### Actual examples
 
 You can see actual conversion examples below:
 
@@ -342,10 +342,10 @@ expect([1, 2, 3]).to match_array([2, 1, 3])
 
 ```ruby
 # Targets
-(1.0 / 3.0).should be_close(0.333, 0.001)
+expect(1.0 / 3.0).to be_close(0.333, 0.001)
 
 # Converted
-(1.0 / 3.0).should be_within(0.001).of(0.333)
+expect(1.0 / 3.0).to be_within(0.001).of(0.333)
 ```
 
 * Disabled by: `--keep deprecated`
@@ -384,7 +384,7 @@ If you choose so, disable this conversion with `--keep have_items`.
 * Disabled by: `--keep have_items`
 * See also: [Expectations: have(x).items matchers will be moved into an external gem - The Plan for RSpec 3](http://myronmars.to/n/dev-blog/2013/07/the-plan-for-rspec-3#expectations__matchers_will_be_moved_into_an_external_gem)
 
-### Expectations on Block
+### Expectations on block
 
 ```ruby
 # Targets

data/lib/transpec/ast/node.rb

@@ -68,10 +68,10 @@ module Transpec
         each_descendent_node.to_a
       end
 
-      private
-
-      def properties
-        @properties ||= {}
+      def each_node(&block)
+        return to_enum(__method__) unless block_given?
+        yield self
+        each_descendent_node(&block)
       end
     end
   end

data/lib/transpec/converter.rb

@@ -3,7 +3,6 @@
 require 'transpec/base_rewriter'
 require 'transpec/configuration'
 require 'transpec/report'
-require 'transpec/ast/scanner'
 require 'transpec/syntax'
 require 'transpec/syntax/be_close'
 require 'transpec/syntax/double'
@@ -30,22 +29,17 @@ module Transpec
     end
 
     def process(ast, source_rewriter)
-      AST::Scanner.scan(ast) do |node, ancestor_nodes|
-        dispatch_node(node, ancestor_nodes, source_rewriter)
+      return unless ast
+      ast.each_node do |node|
+        dispatch_node(node, source_rewriter)
       end
     end
 
-    def dispatch_node(node, ancestor_nodes, source_rewriter)
+    def dispatch_node(node, source_rewriter)
       Syntax.standalone_syntaxes.each do |syntax_class|
         next unless syntax_class.target_node?(node, @runtime_data)
 
-        syntax = syntax_class.new(
-          node,
-          ancestor_nodes,
-          source_rewriter,
-          @runtime_data,
-          @report
-        )
+        syntax = syntax_class.new(node, source_rewriter, @runtime_data, @report)
 
         handler_name = "process_#{syntax_class.snake_case_name}"
         send(handler_name, syntax)

data/lib/transpec/dynamic_analyzer.rb

@@ -20,7 +20,7 @@ module Transpec
       require 'pathname'
 
       module TranspecAnalysis
-        @base_pathname = Pathname.pwd
+        @base_path = Dir.pwd
 
         def self.data
           @data ||= {}
@@ -28,12 +28,17 @@ module Transpec
 
         def self.node_id(filename, begin_pos, end_pos)
           absolute_path = File.expand_path(filename)
-          relative_path = Pathname.new(absolute_path).relative_path_from(@base_pathname).to_s
+          relative_path = Pathname.new(absolute_path).relative_path_from(base_pathname).to_s
           [relative_path, begin_pos, end_pos].join('_')
         end
 
+        def self.base_pathname
+          @base_pathname ||= Pathname.new(@base_path)
+        end
+
         at_exit do
-          File.open('#{RESULT_FILE}', 'w') do |file|
+          path = File.join(@base_path, '#{RESULT_FILE}')
+          File.open(path, 'w') do |file|
             Marshal.dump(data, file)
           end
         end
@@ -82,13 +87,17 @@ module Transpec
     end
 
     def default_rspec_command
-      if File.exist?('Gemfile')
+      if project_requires_bundler?
         'bundle exec rspec'
       else
         'rspec'
       end
     end
 
+    def project_requires_bundler?
+      File.exist?('Gemfile')
+    end
+
     def analyze(paths = [])
       in_copied_project do
         rewriter = Rewriter.new
@@ -152,7 +161,7 @@ module Transpec
     end
 
     def with_bundler_clean_env
-      if defined?(Bundler)
+      if defined?(Bundler) && project_requires_bundler?
         Bundler.with_clean_env do
           # Bundler.with_clean_env cleans environment variables
           # which are set after bundler is loaded.

data/lib/transpec/dynamic_analyzer/rewriter.rb

@@ -2,7 +2,6 @@
 
 require 'transpec/base_rewriter'
 require 'transpec/util'
-require 'transpec/ast/scanner'
 
 module Transpec
   class DynamicAnalyzer
@@ -36,11 +35,13 @@ module Transpec
       private
 
       def collect_requests(ast)
-        AST::Scanner.scan(ast) do |node, ancestor_nodes|
+        return unless ast
+
+        ast.each_node do |node|
           Syntax.standalone_syntaxes.each do |syntax_class|
             syntax_class.register_request_for_dynamic_analysis(node, self)
             next unless syntax_class.target_node?(node)
-            syntax = syntax_class.new(node, ancestor_nodes)
+            syntax = syntax_class.new(node)
             syntax.register_request_for_dynamic_analysis(self)
           end
         end
@@ -53,24 +54,31 @@ module Transpec
       end
 
       def inject_analysis_method(node, analysis_codes, source_rewriter)
+        front, rear = build_wrapper_codes(node, analysis_codes)
+
+        source_range = if taking_block?(node)
+                         node.parent_node.loc.expression
+                       else
+                         node.loc.expression
+                       end
+
+        source_rewriter.insert_before(source_range, front)
+        source_rewriter.insert_after(source_range, rear)
+      rescue OverlappedRewriteError # rubocop:disable HandleExceptions
+      end
+
+      def build_wrapper_codes(node, analysis_codes)
         source_range = node.loc.expression
 
         front = "#{ANALYSIS_METHOD}(("
+
         rear = format(
           '), 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)
 
-        parent_node = node.parent_node
-
-        if parent_node && parent_node.type == :block && parent_node.children.first.equal?(node)
-          source_range = node.parent_node.loc.expression
-        end
-
-        source_rewriter.insert_before(source_range, front)
-        source_rewriter.insert_after(source_range, rear)
-      rescue OverlappedRewriteError # rubocop:disable HandleExceptions
+        [front, rear]
       end
 
       # Hash#inspect generates invalid literal with following example:
@@ -89,6 +97,11 @@ module Transpec
 
         literal << ' }'
       end
+
+      def taking_block?(node)
+        parent_node = node.parent_node
+        parent_node && parent_node.type == :block && parent_node.children.first.equal?(node)
+      end
     end
   end
 end

data/lib/transpec/static_context_inspector.rb

@@ -47,16 +47,15 @@ module Transpec
       [:module, :def]
     ].freeze
 
-    attr_reader :nodes
+    attr_reader :node
 
-    # @param nodes [Array] An array containing from root node to the target node.
-    def initialize(nodes)
-      @nodes = nodes
+    def initialize(node)
+      @node = node
     end
 
     def scopes
       @scopes ||= begin
-        scopes = @nodes.map { |node| scope_type(node) }
+        scopes = @node.each_ancestor_node.reverse_each.map { |node| scope_type(node) }
         scopes.compact!
         scopes.extend(ArrayExtension)
       end

data/lib/transpec/syntax.rb

@@ -6,7 +6,7 @@ require 'transpec/report'
 
 module Transpec
   class Syntax
-    attr_reader :node, :ancestor_nodes, :source_rewriter, :runtime_data, :report
+    attr_reader :node, :source_rewriter, :runtime_data, :report
 
     def self.inherited(subclass)
       all_syntaxes << subclass
@@ -38,9 +38,8 @@ module Transpec
       false
     end
 
-    def initialize(node, ancestor_nodes, source_rewriter = nil, runtime_data = nil, report = nil)
+    def initialize(node, source_rewriter = nil, runtime_data = nil, report = nil)
       @node = node
-      @ancestor_nodes = ancestor_nodes
       @source_rewriter = source_rewriter
       @runtime_data = runtime_data
       @report = report || Report.new
@@ -50,11 +49,11 @@ module Transpec
     end
 
     def static_context_inspector
-      @static_context_inspector ||= StaticContextInspector.new(@ancestor_nodes)
+      @static_context_inspector ||= StaticContextInspector.new(@node)
     end
 
     def parent_node
-      @ancestor_nodes.last
+      @node.parent_node
     end
 
     def expression_range

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

@@ -59,7 +59,7 @@ module Transpec
         def each_following_chained_method_node
           return to_enum(__method__) unless block_given?
 
-          @ancestor_nodes.reverse.reduce(@node) do |child_node, parent_node|
+          @node.each_ancestor_node.reduce(@node) do |child_node, parent_node|
             return unless [:send, :block].include?(parent_node.type)
             return unless parent_node.children.first == child_node
             yield parent_node, child_node

data/lib/transpec/syntax/operator_matcher.rb

@@ -19,13 +19,6 @@ module Transpec
         !receiver_node.nil? && OPERATORS.include?(method_name)
       end
 
-      def initialize(node, source_rewriter = nil, runtime_data = nil, report = nil)
-        @node = node
-        @source_rewriter = source_rewriter
-        @runtime_data = runtime_data
-        @report = report || Report.new
-      end
-
       def register_request_for_dynamic_analysis(rewriter)
         return unless method_name == :=~
         rewriter.register_request(arg_node, :arg_is_enumerable?, 'is_a?(Enumerable)')

data/lib/transpec/syntax/raise_error.rb

@@ -24,7 +24,7 @@ module Transpec
       end
 
       def positive?
-        ancestor_nodes.reverse_each do |ancestor_node|
+        @node.each_ancestor_node do |ancestor_node|
           next unless ancestor_node.type == :send
           expectation_method_name = ancestor_node.children[1]
           return [:should, :to].include?(expectation_method_name)

data/lib/transpec/syntax/should.rb

@@ -19,7 +19,7 @@ module Transpec
         !receiver_node.nil? && [:should, :should_not].include?(method_name)
       end
 
-      def initialize(node, ancestor_nodes, source_rewriter = nil, runtime_data = nil, report = nil)
+      def initialize(node, source_rewriter = nil, runtime_data = nil, report = nil)
         super
         @current_syntax_type = :should
       end

data/lib/transpec/version.rb

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

data/spec/spec_helper.rb

@@ -15,8 +15,6 @@ RSpec.configure do |config|
   config.color_enabled = true
   config.treat_symbols_as_metadata_keys_with_true_values = true
 
-  config.filter_run_excluding :skip_on_jruby if RUBY_ENGINE == 'jruby'
-
   config.before(:all) do
     require 'rainbow'
     Sickill::Rainbow.enabled = false

data/spec/support/shared_context.rb

@@ -2,7 +2,6 @@
 
 require 'transpec/dynamic_analyzer'
 require 'transpec/ast/builder'
-require 'transpec/ast/scanner'
 require 'transpec/syntax/should'
 require 'transpec/syntax/expect'
 require 'parser'
@@ -55,14 +54,9 @@ end
 
 shared_context 'should object' do
   let(:should_object) do
-    Transpec::AST::Scanner.scan(ast) do |node, ancestor_nodes|
+    ast.each_node do |node|
       next unless Transpec::Syntax::Should.target_node?(node)
-      return Transpec::Syntax::Should.new(
-        node,
-        ancestor_nodes,
-        source_rewriter,
-        runtime_data
-      )
+      return Transpec::Syntax::Should.new(node, source_rewriter, runtime_data)
     end
 
     fail 'No should node is found!'
@@ -73,14 +67,9 @@ end
 
 shared_context 'expect object' do
   let(:expect_object) do
-    Transpec::AST::Scanner.scan(ast) do |node, ancestor_nodes|
+    ast.each_node do |node|
       next unless Transpec::Syntax::Expect.target_node?(node)
-      return Transpec::Syntax::Expect.new(
-        node,
-        ancestor_nodes,
-        source_rewriter,
-        runtime_data
-      )
+      return Transpec::Syntax::Expect.new(node, source_rewriter, runtime_data)
     end
 
     fail 'No expect node is found!'

data/spec/transpec/ast/node_spec.rb

@@ -50,7 +50,7 @@ module Transpec
         end
       end
 
-      describe '#each_ancestor_node' do
+      shared_context 'ancestor nodes' do
         let(:target_node) do
           ast.each_descendent_node do |node|
             return node if node == s(:args)
@@ -58,6 +58,10 @@ module Transpec
         end
 
         let(:expected_types) { [:block, :def] }
+      end
+
+      describe '#each_ancestor_node' do
+        include_context 'ancestor nodes'
 
         context 'when a block is given' do
           it 'yields each ancestor node' do
@@ -95,8 +99,25 @@ module Transpec
         end
       end
 
-      describe '#each_child_node' do
+      describe '#ancestor_nodes' do
+        include_context 'ancestor nodes'
+
+        it 'returns an array' do
+          target_node.ancestor_nodes.should be_an(Array)
+        end
+
+        it 'returns same nodes as #each_ancestor_node' do
+          types = target_node.ancestor_nodes.map(&:type)
+          types.should == expected_types
+        end
+      end
+
+      shared_context 'child nodes' do
         let(:expected_types) { [:args, :block] }
+      end
+
+      describe '#each_child_node' do
+        include_context 'child nodes'
 
         context 'when a block is given' do
           it 'yields each child node' do
@@ -134,10 +155,27 @@ module Transpec
         end
       end
 
-      describe '#each_descendent_node' do
+      describe '#child_nodes' do
+        include_context 'child nodes'
+
+        it 'returns an array' do
+          ast.child_nodes.should be_an(Array)
+        end
+
+        it 'returns same nodes as #each_child_node' do
+          types = ast.child_nodes.map(&:type)
+          types.should == expected_types
+        end
+      end
+
+      shared_context 'descendent nodes' do
         let(:expected_types) do
           [:args, :arg, :arg, :block, :send, :int, :args, :send, :lvar]
         end
+      end
+
+      describe '#each_descendent_node' do
+        include_context 'descendent nodes'
 
         context 'when a block is given' do
           it 'yields each descendent node with depth first order' do
@@ -174,6 +212,60 @@ module Transpec
           end
         end
       end
+
+      describe '#descendent_nodes' do
+        include_context 'descendent nodes'
+
+        it 'returns an array' do
+          ast.descendent_nodes.should be_an(Array)
+        end
+
+        it 'returns same nodes as #each_descendent_node' do
+          types = ast.descendent_nodes.map(&:type)
+          types.should == expected_types
+        end
+      end
+
+      describe '#each_node' do
+        let(:expected_types) do
+          [:def, :args, :arg, :arg, :block, :send, :int, :args, :send, :lvar]
+        end
+
+        context 'when a block is given' do
+          it 'yields itself and each descendent node with depth first order' do
+            index = 0
+
+            ast.each_node do |node|
+              expected_type = expected_types[index]
+              node.type.should == expected_type
+              index += 1
+            end
+
+            index.should_not == 0
+          end
+
+          it 'returns itself' do
+            returned_value = ast.each_node { }
+            returned_value.should be(ast)
+          end
+        end
+
+        context 'when no block is given' do
+          it 'returns enumerator' do
+            ast.each_node.should be_a(Enumerator)
+          end
+
+          describe 'the returned enumerator' do
+            it 'enumerates the child nodes' do
+              enumerator = ast.each_node
+
+              expected_types.each do |expected_type|
+                enumerator.next.type.should == expected_type
+              end
+            end
+          end
+        end
+      end
     end
   end
 end

data/spec/transpec/dynamic_analyzer_spec.rb

@@ -118,6 +118,22 @@ module Transpec
         end
       end
 
+      context 'when rspec exited with non-0 status' do
+        let(:source) { 'This is invalid syntax <' }
+
+        it 'raises error' do
+          -> { dynamic_analyzer.analyze }.should raise_error(/Dynamic analysis failed/)
+        end
+      end
+
+      context 'when working directory has been changed at exit of rspec' do
+        let(:source) { "Dir.chdir('spec')" }
+
+        it 'does not raise error' do
+          -> { dynamic_analyzer.analyze }.should_not raise_error
+        end
+      end
+
       runtime_data_cache = {}
 
       subject(:runtime_data) do

data/spec/transpec/static_context_inspector_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 require 'transpec/static_context_inspector'
 
 module Transpec
-  describe StaticContextInspector, :skip_on_jruby do
+  describe StaticContextInspector do
     include CacheHelper
     include ::AST::Sexp
     include_context 'parsed objects'
@@ -51,7 +51,7 @@ module Transpec
       end
 
       it 'returns scope stack' do
-        AST::Scanner.scan(ast) do |node, ancestor_nodes|
+        ast.each_node do |node|
           expected_scopes = begin
             case node_id(node)
             when 'send nil :top_level'
@@ -90,7 +90,7 @@ module Transpec
 
           next unless expected_scopes
 
-          context_inspector = StaticContextInspector.new(ancestor_nodes)
+          context_inspector = StaticContextInspector.new(node)
           context_inspector.scopes.should == expected_scopes
         end
       end
@@ -98,9 +98,9 @@ module Transpec
 
     shared_examples 'context inspection methods' do
       let(:context_inspector) do
-        AST::Scanner.scan(ast) do |node, ancestor_nodes|
+        ast.each_node do |node|
           next unless node == s(:send, nil, :target)
-          return StaticContextInspector.new(ancestor_nodes)
+          return StaticContextInspector.new(node)
         end
 
         fail 'Target node not found!'

data/spec/transpec/syntax/be_close_spec.rb

@@ -9,13 +9,9 @@ module Transpec
       include_context 'parsed objects'
 
       subject(:be_close_object) do
-        AST::Scanner.scan(ast) do |node, ancestor_nodes|
+        ast.each_node do |node|
           next unless BeClose.target_node?(node)
-          return BeClose.new(
-            node,
-            ancestor_nodes,
-            source_rewriter
-          )
+          return BeClose.new(node, source_rewriter)
         end
         fail 'No be_close node is found!'
       end

data/spec/transpec/syntax/double_spec.rb

@@ -9,13 +9,9 @@ module Transpec
       include_context 'parsed objects'
 
       subject(:double_object) do
-        AST::Scanner.scan(ast) do |node, ancestor_nodes|
+        ast.each_node do |node|
           next unless Double.target_node?(node)
-          return Double.new(
-            node,
-            ancestor_nodes,
-            source_rewriter
-          )
+          return Double.new(node, source_rewriter)
         end
         fail 'No double node is found!'
       end

data/spec/transpec/syntax/its_spec.rb

@@ -9,13 +9,9 @@ module Transpec
       include_context 'parsed objects'
 
       subject(:its_object) do
-        AST::Scanner.scan(ast) do |node, ancestor_nodes|
+        ast.each_node do |node|
           next unless Its.target_node?(node)
-          return Its.new(
-            node,
-            ancestor_nodes,
-            source_rewriter
-          )
+          return Its.new(node, source_rewriter)
         end
         fail 'No #its node is found!'
       end

data/spec/transpec/syntax/method_stub_spec.rb

@@ -9,14 +9,9 @@ module Transpec
       include_context 'parsed objects'
 
       subject(:method_stub_object) do
-        AST::Scanner.scan(ast) do |node, ancestor_nodes|
+        ast.each_node do |node|
           next unless MethodStub.target_node?(node)
-          return MethodStub.new(
-            node,
-            ancestor_nodes,
-            source_rewriter,
-            runtime_data
-          )
+          return MethodStub.new(node, source_rewriter, runtime_data)
         end
         fail 'No method stub node is found!'
       end

data/spec/transpec/syntax/raise_error_spec.rb

@@ -9,13 +9,9 @@ module Transpec
       include_context 'parsed objects'
 
       subject(:raise_error_object) do
-        AST::Scanner.scan(ast) do |node, ancestor_nodes|
+        ast.each_node do |node|
           next unless RaiseError.target_node?(node)
-          return RaiseError.new(
-            node,
-            ancestor_nodes,
-            source_rewriter
-          )
+          return RaiseError.new(node, source_rewriter)
         end
         fail 'No raise_error node is found!'
       end

data/spec/transpec/syntax/rspec_configure_spec.rb

@@ -9,13 +9,9 @@ module Transpec
       include_context 'parsed objects'
 
       subject(:rspec_configure) do
-        AST::Scanner.scan(ast) do |node, ancestor_nodes|
+        ast.each_node do |node|
           next unless RSpecConfigure.target_node?(node)
-          return RSpecConfigure.new(
-            node,
-            ancestor_nodes,
-            source_rewriter
-          )
+          return RSpecConfigure.new(node, source_rewriter)
         end
         fail 'No RSpec.configure node is found!'
       end

data/spec/transpec/syntax/should_receive_spec.rb

@@ -9,14 +9,9 @@ module Transpec
       include_context 'parsed objects'
 
       subject(:should_receive_object) do
-        AST::Scanner.scan(ast) do |node, ancestor_nodes|
+        ast.each_node do |node|
           next unless ShouldReceive.target_node?(node)
-          return ShouldReceive.new(
-            node,
-            ancestor_nodes,
-            source_rewriter,
-            runtime_data
-          )
+          return ShouldReceive.new(node, source_rewriter, runtime_data)
         end
         fail 'No should_receive node is found!'
       end

data/transpec.gemspec

@@ -10,7 +10,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Yuji Nakayama']
   spec.email         = ['nkymyj@gmail.com']
   spec.summary       = 'RSpec syntax converter'
-  spec.description   = 'Transpec automatically converts your specs into latest RSpec syntax with static analysis.'
+  spec.description   = 'Transpec automatically converts your specs into latest RSpec syntax ' +
+                       'with static and dynamic code analysis.'
   spec.homepage      = 'https://github.com/yujinakayama/transpec'
   spec.license       = 'MIT'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: transpec
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Yuji Nakayama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-28 00:00:00.000000000 Z
+date: 2013-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -165,7 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.3'
 description: Transpec automatically converts your specs into latest RSpec syntax with
-  static analysis.
+  static and dynamic code analysis.
 email:
 - nkymyj@gmail.com
 executables:
@@ -187,7 +187,6 @@ files:
 - lib/transpec.rb
 - lib/transpec/ast/builder.rb
 - lib/transpec/ast/node.rb
-- lib/transpec/ast/scanner.rb
 - lib/transpec/base_rewriter.rb
 - lib/transpec/cli.rb
 - lib/transpec/commit_message.rb
@@ -228,7 +227,6 @@ files:
 - spec/support/file_helper.rb
 - spec/support/shared_context.rb
 - spec/transpec/ast/node_spec.rb
-- spec/transpec/ast/scanner_spec.rb
 - spec/transpec/cli_spec.rb
 - spec/transpec/commit_message_spec.rb
 - spec/transpec/configuration_spec.rb
@@ -291,7 +289,6 @@ test_files:
 - spec/support/file_helper.rb
 - spec/support/shared_context.rb
 - spec/transpec/ast/node_spec.rb
-- spec/transpec/ast/scanner_spec.rb
 - spec/transpec/cli_spec.rb
 - spec/transpec/commit_message_spec.rb
 - spec/transpec/configuration_spec.rb

data/lib/transpec/ast/scanner.rb

@@ -1,41 +0,0 @@
-# coding: utf-8
-
-module Transpec
-  module AST
-    class Scanner
-      attr_reader :context
-
-      def self.scan(origin_node, &block)
-        instance = new(&block)
-        instance.scan(origin_node, true)
-        nil
-      end
-
-      def initialize(&block)
-        @callback = block
-        @ancestor_nodes = []
-      end
-
-      def scan(origin_node, yield_origin_node = false)
-        return unless origin_node
-
-        yield_node(origin_node) if yield_origin_node
-
-        @ancestor_nodes.push(origin_node)
-
-        origin_node.each_child_node do |child_node|
-          yield_node(child_node)
-          scan(child_node)
-        end
-
-        @ancestor_nodes.pop
-      end
-
-      private
-
-      def yield_node(node)
-        @callback.call(node, @ancestor_nodes)
-      end
-    end
-  end
-end

data/spec/transpec/ast/scanner_spec.rb

@@ -1,124 +0,0 @@
-# coding: utf-8
-
-require 'spec_helper'
-require 'transpec/ast/scanner'
-
-module Transpec
-  module AST
-    describe Scanner do
-      include_context 'parsed objects'
-
-      let(:source) do
-        <<-END
-          some_var = 1
-
-          RSpec.configure do |config|
-            config.before do
-              prepare_something
-            end
-          end
-
-          module SomeModule
-            SOME_CONST = 1
-
-            describe 'something' do
-              def some_method(some_arg)
-                do_something
-              end
-
-              it 'is 1' do
-                something.should == 1
-              end
-            end
-          end
-        END
-      end
-
-      # (begin
-      #   (lvasgn :some_var
-      #     (int 1))
-      #   (block
-      #     (send
-      #       (const nil :RSpec) :configure)
-      #     (args
-      #       (arg :config))
-      #     (block
-      #       (send
-      #         (lvar :config) :before)
-      #       (args)
-      #       (send nil :prepare_something)))
-      #   (module
-      #     (const nil :SomeModule)
-      #     (begin
-      #       (casgn nil :SOME_CONST
-      #         (int 1))
-      #       (block
-      #         (send nil :describe
-      #           (str "something"))
-      #         (args)
-      #         (begin
-      #           (def :some_method
-      #             (args
-      #               (arg :some_arg))
-      #             (send nil :do_something))
-      #           (block
-      #             (send nil :it
-      #               (str "is 1"))
-      #             (args)
-      #             (send
-      #               (send
-      #                 (send nil :something) :should) :==
-      #               (int 1))))))))
-
-      describe '.scan' do
-        it 'scans nodes with depth first order' do
-          expected_node_type_order = [
-            :begin,
-            :lvasgn,
-            :int,
-            :block,
-            :send,
-            :const,
-            :args
-          ]
-
-          index = 0
-
-          Scanner.scan(ast) do |node|
-            expected_node_type = expected_node_type_order[index]
-            node.type.should == expected_node_type if expected_node_type
-            index += 1
-          end
-
-          index.should_not == 0
-        end
-
-        it 'passes ancestor nodes of the current node to the block' do
-          each_expected_ancestor_nodes_types = [
-            [],
-            [:begin],
-            [:begin, :lvasgn],
-            [:begin],
-            [:begin, :block],
-            [:begin, :block, :send],
-            [:begin, :block],
-            [:begin, :block, :args]
-          ]
-
-          index = 0
-
-          Scanner.scan(ast) do |node, ancestor_nodes|
-            expected_ancestor_node_types = each_expected_ancestor_nodes_types[index]
-            if expected_ancestor_node_types
-              ancestor_node_types = ancestor_nodes.map(&:type)
-              ancestor_node_types.should == expected_ancestor_node_types
-            end
-            index += 1
-          end
-
-          index.should_not == 0
-        end
-      end
-    end
-  end
-end