transpec 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 184be0fbb9de5a2d47804fc8611719692da19749
-  data.tar.gz: abcbeecdc14d0061e07e50542a3fa784e4f890af
+  metadata.gz: e92704929f93992b64fdcb82e658214425bd23cb
+  data.tar.gz: c224583a7f8d0e0c44bf7f3a715d1c3aeff090ca
 SHA512:
-  metadata.gz: b6edfa9df6df92ee56fa47a19b1fd389c92835f2e69bdd7a0cd64e9937b7f78af3890fb5cf8fdf408f2c9c167d1d056a5ae0b100f0c655e58edc46bcc7b514a2
-  data.tar.gz: a863cc647d30798d4c5815eef33e555dcb3a70c38c840277f05e57e398f9f40189346ad8f788d1068cb86f91745532ea2daf44edb97f7415cc8b24e0cc050468
+  metadata.gz: 1da1c8cd1bd30a65f25836b87e7ee6454158eeb7f69462b54e13614cbbc4af90002f1625af5077b5868c249498d356efe6dfc06a4b79c05c5ebe497afae015db
+  data.tar.gz: 758cb3a86ee46ea070c0a03c814d9c9aa81a82b853e950b5e2ba508ba101df78d63aa24092044609cb52fdc23a5fff90c0646908017d7b1a5c9cbfbb4b1e3748

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Master
 
+## v0.0.10
+
+* Support conversion of `at_least(0)`
+* Add `-f` shorthand for `--force` option
+
 ## v0.0.9
 
 * Use `--disable allow_to_receive` to disable conversion from `obj.should_receive(:foo).any_number_of_times` to `allow(obj).to receive(:foo)` (Previously it was `--disable expect_to_receive`)

data/README.md

@@ -103,6 +103,7 @@ Before converting your specs:
 
 * Make sure your project has `rspec` gem dependency `2.14` or later. If not, change your `*.gemspec` or `Gemfile` to do so.
 * Run `rspec` and check if all the specs pass.
+* Ensure the Git repository is clean. (You don't want to mix up your changes and Transpec's changes, right?)
 
 Then, run `transpec` with no arguments in the project root directory:
 
@@ -123,7 +124,7 @@ After the conversion, run `rspec` again and check if all pass.
 
 ## Options
 
-### `--force`
+### `-f/--force`
 
 Force processing even if the current Git repository is not clean.
 
@@ -222,7 +223,8 @@ expect(obj).not_to matcher
 expect(obj).to_not matcher # with `--negative-form to_not`
 ```
 
-Disabled by: `--disable expect_to_matcher`
+* Disabled by: `--disable expect_to_matcher`
+* Related Information: [Myron Marston » RSpec's New Expectation Syntax](http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax)
 
 ### Operator matchers
 
@@ -242,6 +244,8 @@ expect('string').to match(/^str/)
 expect([1, 2, 3]).to match_array([2, 1, 3])
 ```
 
+* Related Information: [Myron Marston » RSpec's New Expectation Syntax](http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax#almost_all_matchers_are_supported)
+
 ### `be_close` matcher
 
 ```ruby
@@ -252,9 +256,10 @@ expect([1, 2, 3]).to match_array([2, 1, 3])
 (1.0 / 3.0).should be_within(0.001).of(0.333)
 ```
 
-Disabled by: `--disable deprecated`
+* Disabled by: `--disable deprecated`
+* Related Information: [New be within matcher and RSpec.deprecate fix · rspec/rspec-expectations](https://github.com/rspec/rspec-expectations/pull/32)
 
-### Error expectations
+### Expectations on Proc
 
 ```ruby
 # Target
@@ -266,7 +271,8 @@ proc { do_something }.should raise_error
 expect { do_something }.to raise_error
 ```
 
-Disabled by: `--disable expect_to_matcher`
+* Disabled by: `--disable expect_to_matcher`
+* Related Information: [Myron Marston » RSpec's New Expectation Syntax](http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax#unification_of_block_vs_value_syntaxes)
 
 ### Negative error expectations with specific error
 
@@ -282,7 +288,8 @@ expect { do_something }.not_to raise_error
 lambda { do_something }.should_not raise_error # with `--disable expect_to_matcher`
 ```
 
-Disabled by: `--disable deprecated`
+* Disabled by: `--disable deprecated`
+* Related Information: [Consider deprecating `expect { }.not_to raise_error(SpecificErrorClass)` · rspec/rspec-expectations](https://github.com/rspec/rspec-expectations/issues/231)
 
 ### Message expectations
 
@@ -296,15 +303,18 @@ expect(obj).to receive(:foo)
 expect_any_instance_of(SomeClass).to receive(:foo)
 ```
 
-Disabled by: `--disable expect_to_receive`
+* Disabled by: `--disable expect_to_receive`
+* Related Information: [RSpec's new message expectation syntax - Tea is awesome.](http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/)
 
-### Message expectations with `any_number_of_times`
+### Message expectations that are actually method stubs
 
 ```ruby
 # Target
 obj.should_receive(:foo).any_number_of_times
+obj.should_receive(:foo).at_least(0)
 
 SomeClass.any_instance.should_receive(:foo).any_number_of_times
+SomeClass.any_instance.should_receive(:foo).at_least(0)
 
 # Converted
 allow(obj).to receive(:foo)
@@ -314,7 +324,8 @@ allow_any_instance_of(SomeClass).to receive(:foo)
 SomeClass.any_instance.stub(:foo) # with `--disable allow_to_receive`
 ```
 
-Disabled by: `--disable deprecated`
+* Disabled by: `--disable deprecated`
+* Related Information: [Don't allow at_least(0) · rspec/rspec-mocks](https://github.com/rspec/rspec-mocks/issues/133)
 
 ### Method stubs
 
@@ -339,7 +350,8 @@ allow(obj).to receive(:bar).and_return(2)
 allow_any_instance_of(SomeClass).to receive(:foo)
 ```
 
-Disabled by: `--disable allow_to_receive`
+* Disabled by: `--disable allow_to_receive`
+* Related Information: [RSpec's new message expectation syntax - Tea is awesome.](http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/)
 
 ### Deprecated method stub aliases
 
@@ -353,20 +365,23 @@ obj.stub(:foo) # with `--disable allow_to_receive`
 obj.unstub(:foo)
 ```
 
-Disabled by: `--disable deprecated`
+* Disabled by: `--disable deprecated`
+* Related Information: [Consider deprecating and/or removing #stub! and #unstub! at some point · rspec/rspec-mocks](https://github.com/rspec/rspec-mocks/issues/122)
 
-### Method stubs with `any_number_of_times`
+### Method stubs with deprecated specification of number of times
 
 ```ruby
 # Target
 obj.stub(:foo).any_number_of_times
+obj.stub(:foo).at_least(0)
 
 # Converted
 allow(obj).to receive(:foo)
 obj.stub(:foo) # with `--disable allow_to_receive`
 ```
 
-Disabled by: `--disable deprecated`
+* Disabled by: `--disable deprecated`
+* Related Information: [Don't allow at_least(0) · rspec/rspec-mocks](https://github.com/rspec/rspec-mocks/issues/133)
 
 ### Deprecated test double aliases
 
@@ -379,7 +394,8 @@ mock('something')
 double('something')
 ```
 
-Disabled by: `--disable deprecated`
+* Disabled by: `--disable deprecated`
+* Related Information: [Deprecate "stub" for doubles · rspec/rspec-mocks](https://github.com/rspec/rspec-mocks/issues/214)
 
 ## Compatibility
 

data/README.md.erb

@@ -76,6 +76,7 @@ Before converting your specs:
 
 * Make sure your project has `rspec` gem dependency `<%= rspec_version %>` or later. If not, change your `*.gemspec` or `Gemfile` to do so.
 * Run `rspec` and check if all the specs pass.
+* Ensure the Git repository is clean. (You don't want to mix up your changes and Transpec's changes, right?)
 
 Then, run `transpec` with no arguments in the project root directory:
 
@@ -96,7 +97,7 @@ After the conversion, run `rspec` again and check if all pass.
 
 ## Options
 
-### `--force`
+### `-f/--force`
 
 Force processing even if the current Git repository is not clean.
 
@@ -218,7 +219,8 @@ expect(obj).not_to matcher
 expect(obj).to_not matcher # with `--negative-form to_not`
 ```
 
-Disabled by: `--disable expect_to_matcher`
+* Disabled by: `--disable expect_to_matcher`
+* Related Information: [Myron Marston » RSpec's New Expectation Syntax](http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax)
 
 ### Operator matchers
 
@@ -238,6 +240,8 @@ expect('string').to match(/^str/)
 expect([1, 2, 3]).to match_array([2, 1, 3])
 ```
 
+* Related Information: [Myron Marston » RSpec's New Expectation Syntax](http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax#almost_all_matchers_are_supported)
+
 ### `be_close` matcher
 
 ```ruby
@@ -248,9 +252,10 @@ expect([1, 2, 3]).to match_array([2, 1, 3])
 (1.0 / 3.0).should be_within(0.001).of(0.333)
 ```
 
-Disabled by: `--disable deprecated`
+* Disabled by: `--disable deprecated`
+* Related Information: [New be within matcher and RSpec.deprecate fix · rspec/rspec-expectations](https://github.com/rspec/rspec-expectations/pull/32)
 
-### Error expectations
+### Expectations on Proc
 
 ```ruby
 # Target
@@ -262,7 +267,8 @@ proc { do_something }.should raise_error
 expect { do_something }.to raise_error
 ```
 
-Disabled by: `--disable expect_to_matcher`
+* Disabled by: `--disable expect_to_matcher`
+* Related Information: [Myron Marston » RSpec's New Expectation Syntax](http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax#unification_of_block_vs_value_syntaxes)
 
 ### Negative error expectations with specific error
 
@@ -278,7 +284,8 @@ expect { do_something }.not_to raise_error
 lambda { do_something }.should_not raise_error # with `--disable expect_to_matcher`
 ```
 
-Disabled by: `--disable deprecated`
+* Disabled by: `--disable deprecated`
+* Related Information: [Consider deprecating `expect { }.not_to raise_error(SpecificErrorClass)` · rspec/rspec-expectations](https://github.com/rspec/rspec-expectations/issues/231)
 
 ### Message expectations
 
@@ -292,15 +299,18 @@ expect(obj).to receive(:foo)
 expect_any_instance_of(SomeClass).to receive(:foo)
 ```
 
-Disabled by: `--disable expect_to_receive`
+* Disabled by: `--disable expect_to_receive`
+* Related Information: [RSpec's new message expectation syntax - Tea is awesome.](http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/)
 
-### Message expectations with `any_number_of_times`
+### Message expectations that are actually method stubs
 
 ```ruby
 # Target
 obj.should_receive(:foo).any_number_of_times
+obj.should_receive(:foo).at_least(0)
 
 SomeClass.any_instance.should_receive(:foo).any_number_of_times
+SomeClass.any_instance.should_receive(:foo).at_least(0)
 
 # Converted
 allow(obj).to receive(:foo)
@@ -310,7 +320,8 @@ allow_any_instance_of(SomeClass).to receive(:foo)
 SomeClass.any_instance.stub(:foo) # with `--disable allow_to_receive`
 ```
 
-Disabled by: `--disable deprecated`
+* Disabled by: `--disable deprecated`
+* Related Information: [Don't allow at_least(0) · rspec/rspec-mocks](https://github.com/rspec/rspec-mocks/issues/133)
 
 ### Method stubs
 
@@ -335,7 +346,8 @@ allow(obj).to receive(:bar).and_return(2)
 allow_any_instance_of(SomeClass).to receive(:foo)
 ```
 
-Disabled by: `--disable allow_to_receive`
+* Disabled by: `--disable allow_to_receive`
+* Related Information: [RSpec's new message expectation syntax - Tea is awesome.](http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/)
 
 ### Deprecated method stub aliases
 
@@ -349,20 +361,23 @@ obj.stub(:foo) # with `--disable allow_to_receive`
 obj.unstub(:foo)
 ```
 
-Disabled by: `--disable deprecated`
+* Disabled by: `--disable deprecated`
+* Related Information: [Consider deprecating and/or removing #stub! and #unstub! at some point · rspec/rspec-mocks](https://github.com/rspec/rspec-mocks/issues/122)
 
-### Method stubs with `any_number_of_times`
+### Method stubs with deprecated specification of number of times
 
 ```ruby
 # Target
 obj.stub(:foo).any_number_of_times
+obj.stub(:foo).at_least(0)
 
 # Converted
 allow(obj).to receive(:foo)
 obj.stub(:foo) # with `--disable allow_to_receive`
 ```
 
-Disabled by: `--disable deprecated`
+* Disabled by: `--disable deprecated`
+* Related Information: [Don't allow at_least(0) · rspec/rspec-mocks](https://github.com/rspec/rspec-mocks/issues/133)
 
 ### Deprecated test double aliases
 
@@ -375,7 +390,8 @@ mock('something')
 double('something')
 ```
 
-Disabled by: `--disable deprecated`
+* Disabled by: `--disable deprecated`
+* Related Information: [Deprecate "stub" for doubles · rspec/rspec-mocks](https://github.com/rspec/rspec-mocks/issues/214)
 
 ## Compatibility
 

data/lib/transpec/ast/builder.rb

@@ -0,0 +1,13 @@
+# coding: utf-8
+
+require 'transpec/ast/node'
+
+module Transpec
+  module AST
+    class Builder < Parser::Builders::Default
+      def n(type, children, source_map)
+        Node.new(type, children, location: source_map)
+      end
+    end
+  end
+end

data/lib/transpec/ast/node.rb

@@ -0,0 +1,37 @@
+# coding: utf-8
+
+require 'parser'
+
+module Transpec
+  module AST
+    class Node < Parser::AST::Node
+      def each_child_node
+        return to_enum(__method__) unless block_given?
+
+        children.each do |child|
+          next unless child.is_a?(self.class)
+          yield child
+        end
+
+        self
+      end
+
+      def child_nodes
+        each_child_node.to_a
+      end
+
+      def each_descendent_node(&block)
+        return to_enum(__method__) unless block_given?
+
+        each_child_node do |child_node|
+          yield child_node
+          child_node.each_child_node(&block)
+        end
+      end
+
+      def descendent_nodes
+        each_descendent_node.to_a
+      end
+    end
+  end
+end

data/lib/transpec/cli.rb

@@ -63,7 +63,7 @@ module Transpec
       parser.banner = "Usage: transpec [options] [files or directories]\n\n"
 
       parser.on(
-        '--force',
+        '-f', '--force',
         'Force processing even if the current Git',
         'repository is not clean.'
       ) do

data/lib/transpec/rewriter.rb

@@ -1,5 +1,6 @@
 # coding: utf-8
 
+require 'transpec/ast/builder'
 require 'transpec/ast/scanner'
 require 'transpec/configuration'
 require 'transpec/syntax'
@@ -54,7 +55,8 @@ module Transpec
     end
 
     def parse(source_buffer)
-      parser = Parser::CurrentRuby.new
+      builder = AST::Builder.new
+      parser = Parser::CurrentRuby.new(builder)
       ast = parser.parse(source_buffer)
       ast
     end
@@ -99,12 +101,12 @@ module Transpec
     end
 
     def process_should_receive(should_receive)
-      if should_receive.any_number_of_times?
+      if should_receive.useless_expectation?
         if @configuration.replace_deprecated_method?
           if @configuration.convert_to_allow_to_receive?
-            should_receive.allowize_any_number_of_times!(@configuration.negative_form_of_to)
+            should_receive.allowize_useless_expectation!(@configuration.negative_form_of_to)
           else
-            should_receive.stubize_any_number_of_times!
+            should_receive.stubize_useless_expectation!
           end
         elsif @configuration.convert_to_expect_to_receive?
           should_receive.expectize!(@configuration.negative_form_of_to)
@@ -125,7 +127,7 @@ module Transpec
         method_stub.replace_deprecated_method!
       end
 
-      method_stub.remove_any_number_of_times! if @configuration.replace_deprecated_method?
+      method_stub.remove_allowance_for_no_message! if @configuration.replace_deprecated_method?
     end
 
     def process_be_close(be_close)

data/lib/transpec/syntax/able_to_allow_no_message.rb

@@ -0,0 +1,73 @@
+# coding: utf-8
+
+require 'transpec/syntax'
+
+module Transpec
+  class Syntax
+    module AbleToAllowNoMessage
+      include ::AST::Sexp
+
+      def allow_no_message?
+        any_number_of_times? || at_least_zero?
+      end
+
+      def remove_allowance_for_no_message!
+        remove_any_number_of_times!
+        remove_at_least_zero!
+      end
+
+      private
+
+      def any_number_of_times?
+        !any_number_of_times_node.nil?
+      end
+
+      def at_least_zero?
+        !at_least_zero_node.nil?
+      end
+
+      def remove_any_number_of_times!
+        return unless any_number_of_times?
+        remove_dot_and_method!(any_number_of_times_node)
+      end
+
+      def remove_at_least_zero!
+        return unless at_least_zero?
+        remove_dot_and_method!(at_least_zero_node)
+      end
+
+      def remove_dot_and_method!(send_node)
+        map = send_node.loc
+        dot_and_method_range = map.dot.join(map.expression.end)
+        remove(dot_and_method_range)
+      end
+
+      def any_number_of_times_node
+        each_following_chained_method_node do |chained_node|
+          method_name = chained_node.children[1]
+          return chained_node if method_name == :any_number_of_times
+        end
+      end
+
+      def at_least_zero_node
+        each_following_chained_method_node do |chained_node|
+          _, method_name, arg_node = *chained_node
+          next unless method_name == :at_least
+          return chained_node if arg_node == s(:int, 0)
+        end
+      end
+
+      def each_following_chained_method_node
+        return to_enum(__method__) unless block_given?
+
+        @ancestor_nodes.reverse.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
+          parent_node
+        end
+        nil
+      end
+    end
+  end
+end

data/lib/transpec/syntax/{any_instanceable.rb → able_to_target_any_instance.rb}

@@ -4,7 +4,7 @@ require 'transpec/syntax/send_node_syntax'
 
 module Transpec
   class Syntax
-    module AnyInstanceable
+    module AbleToTargetAnyInstance
       include SendNodeSyntax
 
       def any_instance?

data/lib/transpec/syntax/method_stub.rb

@@ -1,15 +1,15 @@
 # coding: utf-8
 
 require 'transpec/syntax'
-require 'transpec/syntax/any_instanceable'
-require 'transpec/syntax/any_number_of_timesable'
+require 'transpec/syntax/able_to_allow_no_message'
+require 'transpec/syntax/able_to_target_any_instance'
 require 'transpec/util'
 require 'English'
 
 module Transpec
   class Syntax
     class MethodStub < Syntax
-      include AnyInstanceable, AnyNumberOfTimesable, Util
+      include AbleToAllowNoMessage, AbleToTargetAnyInstance, Util
 
       RECEIVER_CLASS_WHITELIST = ['Typhoeus']
 

data/lib/transpec/syntax/should_receive.rb

@@ -2,13 +2,15 @@
 
 require 'transpec/syntax'
 require 'transpec/syntax/expectizable'
-require 'transpec/syntax/any_instanceable'
-require 'transpec/syntax/any_number_of_timesable'
+require 'transpec/syntax/able_to_allow_no_message'
+require 'transpec/syntax/able_to_target_any_instance'
 
 module Transpec
   class Syntax
     class ShouldReceive < Syntax
-      include Expectizable, AnyInstanceable, AnyNumberOfTimesable
+      include Expectizable, AbleToAllowNoMessage, AbleToTargetAnyInstance
+
+      alias_method :useless_expectation?, :allow_no_message?
 
       def positive?
         method_name == :should_receive
@@ -18,18 +20,18 @@ module Transpec
         convert_to_syntax!('expect', negative_form)
       end
 
-      def allowize_any_number_of_times!(negative_form = 'not_to')
-        return unless any_number_of_times?
+      def allowize_useless_expectation!(negative_form = 'not_to')
+        return unless useless_expectation?
 
         convert_to_syntax!('allow', negative_form)
-        remove_any_number_of_times!
+        remove_allowance_for_no_message!
       end
 
-      def stubize_any_number_of_times!(negative_form = 'not_to')
-        return unless any_number_of_times?
+      def stubize_useless_expectation!(negative_form = 'not_to')
+        return unless useless_expectation?
 
         replace(selector_range, 'stub')
-        remove_any_number_of_times!
+        remove_allowance_for_no_message!
       end
 
       private

data/lib/transpec/version.rb

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

data/spec/support/shared_context.rb

@@ -1,5 +1,6 @@
 # coding: utf-8
 
+require 'transpec/ast/builder'
 require 'transpec/ast/scanner'
 require 'transpec/syntax/should'
 require 'parser'
@@ -15,9 +16,9 @@ shared_context 'parsed objects' do
   end
 
   let(:ast) do
-    parser = Parser::CurrentRuby.new
-    ast = parser.parse(source_buffer)
-    ast
+    builder = Transpec::AST::Builder.new
+    parser = Parser::CurrentRuby.new(builder)
+    parser.parse(source_buffer)
   end
 
   let(:source_rewriter) { Parser::Source::Rewriter.new(source_buffer) }

data/spec/transpec/ast/node_spec.rb

@@ -0,0 +1,106 @@
+# coding: utf-8
+
+require 'spec_helper'
+require 'transpec/ast/node'
+
+module Transpec
+  module AST
+    describe Node do
+      include ::AST::Sexp
+      include_context 'parsed objects'
+
+      let(:source) do
+        <<-END
+          def some_method(arg_a, arg_b)
+            do_something(arg_a)
+          end
+        END
+      end
+
+      # (def :some_method
+      #   (args
+      #     (arg :arg_a)
+      #     (arg :arg_b))
+      #   (send nil :do_something
+      #     (lvar :arg_a)))
+
+      describe '#each_child_node' do
+        let(:expected_types) { [:args, :send] }
+
+        context 'when a block is given' do
+          it 'yields each child node' do
+            index = 0
+
+            ast.each_child_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_child_node { }
+            returned_value.should be(ast)
+          end
+        end
+
+        context 'when no block is given' do
+          it 'returns enumerator' do
+            ast.each_child_node.should be_a(Enumerator)
+          end
+
+          describe 'the returned enumerator' do
+            it 'enumerates the child nodes' do
+              enumerator = ast.each_child_node
+
+              expected_types.each do |expected_type|
+                enumerator.next.type.should == expected_type
+              end
+            end
+          end
+        end
+      end
+
+      describe '#each_descendent_node' do
+        let(:expected_types) { [:args, :arg, :arg, :send, :lvar] }
+
+        context 'when a block is given' do
+          it 'yields each descendent node with depth first order' do
+            index = 0
+
+            ast.each_descendent_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_descendent_node { }
+            returned_value.should be(ast)
+          end
+        end
+
+        context 'when no block is given' do
+          it 'returns enumerator' do
+            ast.each_descendent_node.should be_a(Enumerator)
+          end
+
+          describe 'the returned enumerator' do
+            it 'enumerates the child nodes' do
+              enumerator = ast.each_descendent_node
+
+              expected_types.each do |expected_type|
+                enumerator.next.type.should == expected_type
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/spec/transpec/cli_spec.rb

@@ -145,7 +145,7 @@ module Transpec
         args.should == ['some_file', '--negative-form', 'to_not', 'some_dir']
       end
 
-      describe '--force option' do
+      describe '-f/--force option' do
         let(:args) { ['--force'] }
 
         it 'sets #forced? true' do

data/spec/transpec/rewriter_spec.rb

@@ -172,8 +172,8 @@ module Transpec
         end
       end
 
-      context 'when ShouldReceive#any_number_of_times? returns true' do
-        before { should_receive_object.stub(:any_number_of_times?).and_return(true) }
+      context 'when ShouldReceive#useless_expectation? returns true' do
+        before { should_receive_object.stub(:useless_expectation?).and_return(true) }
 
         context 'and Configuration#replace_deprecated_method? is true' do
           before { configuration.replace_deprecated_method = true }
@@ -188,8 +188,8 @@ module Transpec
                 context 'and Configuration#negative_form_of_to is "not_to"' do
                   before { configuration.negative_form_of_to = 'not_to' }
 
-                  it 'invokes ShouldReceive#allowize_any_number_of_times! with "not_to"' do
-                    should_receive_object.should_receive(:allowize_any_number_of_times!).with('not_to')
+                  it 'invokes ShouldReceive#allowize_useless_expectation! with "not_to"' do
+                    should_receive_object.should_receive(:allowize_useless_expectation!).with('not_to')
                     rewriter.process_should_receive(should_receive_object)
                   end
                 end
@@ -197,8 +197,8 @@ module Transpec
                 context 'and Configuration#negative_form_of_to is "to_not"' do
                   before { configuration.negative_form_of_to = 'to_not' }
 
-                  it 'invokes ShouldReceive#allowize_any_number_of_times! with "to_not"' do
-                    should_receive_object.should_receive(:allowize_any_number_of_times!).with('to_not')
+                  it 'invokes ShouldReceive#allowize_useless_expectation! with "to_not"' do
+                    should_receive_object.should_receive(:allowize_useless_expectation!).with('to_not')
                     rewriter.process_should_receive(should_receive_object)
                   end
                 end
@@ -213,8 +213,8 @@ module Transpec
               context "and Configuration#convert_to_expect_to_receive? is #{convert_to_expect_to_receive}" do
                 before { configuration.convert_to_expect_to_receive = convert_to_expect_to_receive }
 
-                it 'invokes ShouldReceive#stubize_any_number_of_times!' do
-                  should_receive_object.should_receive(:stubize_any_number_of_times!)
+                it 'invokes ShouldReceive#stubize_useless_expectation!' do
+                  should_receive_object.should_receive(:stubize_useless_expectation!)
                   rewriter.process_should_receive(should_receive_object)
                 end
               end
@@ -261,8 +261,8 @@ module Transpec
         end
       end
 
-      context 'when ShouldReceive#any_number_of_times? returns false' do
-        before { should_receive_object.stub(:any_number_of_times?).and_return(false) }
+      context 'when ShouldReceive#useless_expectation? returns false' do
+        before { should_receive_object.stub(:useless_expectation?).and_return(false) }
 
         context 'and Configuration#convert_to_expect_to_receive? is true' do
           before { configuration.convert_to_expect_to_receive = true }
@@ -349,16 +349,16 @@ module Transpec
         end
       end
 
-      shared_examples 'invokes MethodStub#remove_any_number_of_times!' do
-        it 'invokes MethodStub#remove_any_number_of_times!' do
-          method_stub_object.should_receive(:remove_any_number_of_times!)
+      shared_examples 'invokes MethodStub#remove_allowance_for_no_message!' do
+        it 'invokes MethodStub#remove_allowance_for_no_message!' do
+          method_stub_object.should_receive(:remove_allowance_for_no_message!)
           rewriter.process_method_stub(method_stub_object)
         end
       end
 
-      shared_examples 'does not invoke MethodStub#remove_any_number_of_times!' do
-        it 'does not invoke MethodStub#remove_any_number_of_times!' do
-          method_stub_object.should_not_receive(:remove_any_number_of_times!)
+      shared_examples 'does not invoke MethodStub#remove_allowance_for_no_message!' do
+        it 'does not invoke MethodStub#remove_allowance_for_no_message!' do
+          method_stub_object.should_not_receive(:remove_allowance_for_no_message!)
           rewriter.process_method_stub(method_stub_object)
         end
       end
@@ -371,7 +371,7 @@ module Transpec
 
           include_examples 'invokes MethodStub#allowize!'
           include_examples 'does not invoke MethodStub#replace_deprecated_method!'
-          include_examples 'invokes MethodStub#remove_any_number_of_times!'
+          include_examples 'invokes MethodStub#remove_allowance_for_no_message!'
         end
 
         context 'and Configuration#replace_deprecated_method? is false' do
@@ -379,7 +379,7 @@ module Transpec
 
           include_examples 'invokes MethodStub#allowize!'
           include_examples 'does not invoke MethodStub#replace_deprecated_method!'
-          include_examples 'does not invoke MethodStub#remove_any_number_of_times!'
+          include_examples 'does not invoke MethodStub#remove_allowance_for_no_message!'
         end
       end
 
@@ -391,7 +391,7 @@ module Transpec
 
           include_examples 'does not invoke MethodStub#allowize!'
           include_examples 'invokes MethodStub#replace_deprecated_method!'
-          include_examples 'invokes MethodStub#remove_any_number_of_times!'
+          include_examples 'invokes MethodStub#remove_allowance_for_no_message!'
         end
 
         context 'and Configuration#replace_deprecated_method? is false' do
@@ -399,7 +399,7 @@ module Transpec
 
           include_examples 'does not invoke MethodStub#allowize!'
           include_examples 'does not invoke MethodStub#replace_deprecated_method!'
-          include_examples 'does not invoke MethodStub#remove_any_number_of_times!'
+          include_examples 'does not invoke MethodStub#remove_allowance_for_no_message!'
         end
       end
     end

data/spec/transpec/syntax/method_stub_spec.rb

@@ -24,10 +24,8 @@ module Transpec
       let(:in_example_group_context?) { true }
 
       describe '.target_node?' do
-        include ASTHelper
-
         let(:send_node) do
-          scan_node(ast, include_origin_node: true) do |node|
+          ast.each_descendent_node do |node|
             next unless node.type == :send
             method_name = node.children[1]
             next unless method_name == :stub
@@ -53,7 +51,9 @@ module Transpec
         context 'when #stub node with Typhoeus receiver is passed' do
           let(:source) do
             <<-END
-              ::Typhoeus.stub(url, :method => method).and_return(response)
+              it "is not RSpec's #stub" do
+                ::Typhoeus.stub(url, :method => method).and_return(response)
+              end
             END
           end
 
@@ -423,8 +423,8 @@ module Transpec
         end
       end
 
-      describe '#any_number_of_times?' do
-        subject { method_stub_object.any_number_of_times? }
+      describe '#allow_no_message?' do
+        subject { method_stub_object.allow_no_message? }
 
         context 'when it is `subject.stub(:method).any_number_of_times` form' do
           let(:source) do
@@ -450,6 +450,18 @@ module Transpec
           it { should be_true }
         end
 
+        context 'when it is `subject.stub(:method).at_least(0)` form' do
+          let(:source) do
+            <<-END
+              it 'responds to #foo' do
+                subject.stub(:foo).at_least(0)
+              end
+            END
+          end
+
+          it { should be_true }
+        end
+
         context 'when it is `subject.stub(:method)` form' do
           let(:source) do
             <<-END
@@ -463,7 +475,7 @@ module Transpec
         end
       end
 
-      describe '#remove_any_number_of_times!' do
+      describe '#remove_allowance_for_no_message!' do
         context 'when it is `subject.stub(:method).any_number_of_times` form' do
           let(:source) do
             <<-END
@@ -482,7 +494,30 @@ module Transpec
           end
 
           it 'removes `.any_number_of_times`' do
-            method_stub_object.remove_any_number_of_times!
+            method_stub_object.remove_allowance_for_no_message!
+            rewritten_source.should == expected_source
+          end
+        end
+
+        context 'when it is `subject.stub(:method).at_least(0)` form' do
+          let(:source) do
+            <<-END
+              it 'responds to #foo' do
+                subject.stub(:foo).at_least(0)
+              end
+            END
+          end
+
+          let(:expected_source) do
+            <<-END
+              it 'responds to #foo' do
+                subject.stub(:foo)
+              end
+            END
+          end
+
+          it 'removes `.at_least(0)`' do
+            method_stub_object.remove_allowance_for_no_message!
             rewritten_source.should == expected_source
           end
         end
@@ -497,7 +532,7 @@ module Transpec
           end
 
           it 'does nothing' do
-            method_stub_object.remove_any_number_of_times!
+            method_stub_object.remove_allowance_for_no_message!
             rewritten_source.should == source
           end
         end

data/spec/transpec/syntax/should_receive_spec.rb

@@ -283,8 +283,8 @@ module Transpec
         end
       end
 
-      describe '#any_number_of_times?' do
-        subject { should_receive_object.any_number_of_times? }
+      describe '#useless_expectation?' do
+        subject { should_receive_object.useless_expectation? }
 
         context 'when it is `subject.should_receive(:method).any_number_of_times` form' do
           let(:source) do
@@ -310,6 +310,30 @@ module Transpec
           it { should be_true }
         end
 
+        context 'when it is `subject.should_receive(:method).at_least(0)` form' do
+          let(:source) do
+            <<-END
+              it 'responds to #foo' do
+                subject.should_receive(:foo).at_least(0)
+              end
+            END
+          end
+
+          it { should be_true }
+        end
+
+        context 'when it is `subject.should_receive(:method).at_least(1)` form' do
+          let(:source) do
+            <<-END
+              it 'receives #foo at least once' do
+                subject.should_receive(:foo).with(1).at_least(1)
+              end
+            END
+          end
+
+          it { should be_false }
+        end
+
         context 'when it is `subject.should_receive(:method)` form' do
           let(:source) do
             <<-END
@@ -323,7 +347,7 @@ module Transpec
         end
       end
 
-      describe '#allowize_any_number_of_times!' do
+      describe '#allowize_useless_expectation!' do
         context 'when it is `subject.should_receive(:method).any_number_of_times` form' do
           let(:source) do
             <<-END
@@ -342,7 +366,7 @@ module Transpec
           end
 
           it 'converts into `allow(subject).to receive(:method)` form' do
-            should_receive_object.allowize_any_number_of_times!
+            should_receive_object.allowize_useless_expectation!
             rewritten_source.should == expected_source
           end
         end
@@ -365,7 +389,53 @@ module Transpec
           end
 
           it 'converts into `allow_any_instance_of(subject).to receive(:method)` form' do
-            should_receive_object.allowize_any_number_of_times!
+            should_receive_object.allowize_useless_expectation!
+            rewritten_source.should == expected_source
+          end
+        end
+
+        context 'when it is `subject.should_receive(:method).at_least(0)` form' do
+          let(:source) do
+            <<-END
+              it 'responds to #foo' do
+                subject.should_receive(:foo).at_least(0)
+              end
+            END
+          end
+
+          let(:expected_source) do
+            <<-END
+              it 'responds to #foo' do
+                allow(subject).to receive(:foo)
+              end
+            END
+          end
+
+          it 'converts into `allow(subject).to receive(:method)` form' do
+            should_receive_object.allowize_useless_expectation!
+            rewritten_source.should == expected_source
+          end
+        end
+
+        context 'when it is `SomeClass.any_instance.should_receive(:method).at_least(0)` form' do
+          let(:source) do
+            <<-END
+              it 'responds to #foo' do
+                SomeClass.any_instance.should_receive(:foo).at_least(0)
+              end
+            END
+          end
+
+          let(:expected_source) do
+            <<-END
+              it 'responds to #foo' do
+                allow_any_instance_of(SomeClass).to receive(:foo)
+              end
+            END
+          end
+
+          it 'converts into `allow_any_instance_of(subject).to receive(:method)` form' do
+            should_receive_object.allowize_useless_expectation!
             rewritten_source.should == expected_source
           end
         end
@@ -380,13 +450,13 @@ module Transpec
           end
 
           it 'does nothing' do
-            should_receive_object.allowize_any_number_of_times!
+            should_receive_object.allowize_useless_expectation!
             rewritten_source.should == source
           end
         end
       end
 
-      describe '#stubize_any_number_of_times!' do
+      describe '#stubize_useless_expectation!' do
         context 'when it is `subject.should_receive(:method).any_number_of_times` form' do
           let(:source) do
             <<-END
@@ -405,7 +475,7 @@ module Transpec
           end
 
           it 'converts into `subject.stub(:method)` form' do
-            should_receive_object.stubize_any_number_of_times!
+            should_receive_object.stubize_useless_expectation!
             rewritten_source.should == expected_source
           end
         end
@@ -420,7 +490,7 @@ module Transpec
           end
 
           it 'does nothing' do
-            should_receive_object.stubize_any_number_of_times!
+            should_receive_object.stubize_useless_expectation!
             rewritten_source.should == source
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: transpec
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Yuji Nakayama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-23 00:00:00.000000000 Z
+date: 2013-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -171,6 +171,8 @@ files:
 - Rakefile
 - bin/transpec
 - lib/transpec.rb
+- lib/transpec/ast/builder.rb
+- lib/transpec/ast/node.rb
 - lib/transpec/ast/scanner.rb
 - lib/transpec/ast/scope_stack.rb
 - lib/transpec/cli.rb
@@ -178,8 +180,8 @@ files:
 - lib/transpec/git.rb
 - lib/transpec/rewriter.rb
 - lib/transpec/syntax.rb
-- lib/transpec/syntax/any_instanceable.rb
-- lib/transpec/syntax/any_number_of_timesable.rb
+- lib/transpec/syntax/able_to_allow_no_message.rb
+- lib/transpec/syntax/able_to_target_any_instance.rb
 - lib/transpec/syntax/be_close.rb
 - lib/transpec/syntax/double.rb
 - lib/transpec/syntax/expectizable.rb
@@ -195,9 +197,9 @@ files:
 - spec/.rubocop.yml
 - spec/spec_helper.rb
 - spec/spec_spec.rb
-- spec/support/ast_helper.rb
 - spec/support/file_helper.rb
 - spec/support/shared_context.rb
+- spec/transpec/ast/node_spec.rb
 - spec/transpec/ast/scanner_spec.rb
 - spec/transpec/ast/scope_stack_spec.rb
 - spec/transpec/cli_spec.rb
@@ -242,9 +244,9 @@ test_files:
 - spec/.rubocop.yml
 - spec/spec_helper.rb
 - spec/spec_spec.rb
-- spec/support/ast_helper.rb
 - spec/support/file_helper.rb
 - spec/support/shared_context.rb
+- spec/transpec/ast/node_spec.rb
 - spec/transpec/ast/scanner_spec.rb
 - spec/transpec/ast/scope_stack_spec.rb
 - spec/transpec/cli_spec.rb

data/lib/transpec/syntax/any_number_of_timesable.rb

@@ -1,42 +0,0 @@
-# coding: utf-8
-
-require 'transpec/syntax'
-
-module Transpec
-  class Syntax
-    module AnyNumberOfTimesable
-      def any_number_of_times?
-        !any_number_of_times_node.nil?
-      end
-
-      def remove_any_number_of_times!
-        return unless any_number_of_times?
-
-        map = any_number_of_times_node.loc
-        dot_any_number_of_times_range = map.dot.join(map.selector)
-        remove(dot_any_number_of_times_range)
-      end
-
-      private
-
-      def any_number_of_times_node
-        each_following_chained_method_node do |chained_node|
-          method_name = chained_node.children[1]
-          return chained_node if method_name == :any_number_of_times
-        end
-      end
-
-      def each_following_chained_method_node
-        return to_enum(__method__) unless block_given?
-
-        @ancestor_nodes.reverse.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
-          parent_node
-        end
-        nil
-      end
-    end
-  end
-end

data/spec/support/ast_helper.rb

@@ -1,15 +0,0 @@
-# encoding: utf-8
-
-module ASTHelper
-  def scan_node(node, options = {}, &block)
-    yield node if options[:include_origin_node]
-
-    node.children.each do |child|
-      next unless child.is_a?(Parser::AST::Node)
-      yield child
-      scan_node(child, &block)
-    end
-
-    nil
-  end
-end