transpec 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e113c8ac0e1041e1b1704f1119af7e1dc57567ad
-  data.tar.gz: 5f531ea384b0ff31c32126bf03cc88d69474c2bd
+  metadata.gz: f1cbae52577334b666b5a02f1c926f8a8ca1af16
+  data.tar.gz: 181c31e4d34c5b5f4e966d0627fb30fa9d875142
 SHA512:
-  metadata.gz: 4dda416fa2df40afd219d2b78b0c7420c0850cec9c31d3607fec6c3623bf38a712a778c428fda819a9b1cf1d8370be8a43042e40763e299ad65fd306e5525d2a
-  data.tar.gz: 67de6752f2ea60e243c850efa449a807be0d52cb8f4d3d25182b89c52599788f8e40b244c7f5ec20dc980b4e46634a338c37fd3989789309d7ab248ff4522c4c
+  metadata.gz: 1d41de85a3be6bb7e6d271c170c169358a46a8501e52023b13a1fc74df4633c5be597798359312e805666156e85119b6911d712981ca35fd1a3c8105c616f468
+  data.tar.gz: c0970c8ed8a6daefe39fc0bf136d54d58872255d0dfdaef1ebf4aff500fd1511e369af3c0c06f81c52153ca5cbcc29a12a884380a59256fff8f9274e4c533cf4

data/.rubocop.yml

@@ -11,6 +11,9 @@ LineLength:
 MethodLength:
   Max: 17
 
+CyclomaticComplexity:
+  Max: 8
+
 WordArray:
   Enabled: false
 
@@ -48,6 +51,10 @@ Documentation:
 IndentationWidth:
   Enabled: false
 
+# TODO: This should not register offences for non keyword hashes.
+BracesAroundHashParameters:
+  Enabled: false
+
 # TODO: Shorten to 100.
 ClassLength:
   Max: 150

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Development
 
+## v1.2.1
+
+* Apply `-p/--no-parentheses-matcher-arg` to the conversion of `have(n).items` (`obj.should have(n).items` is now converted to `expect(obj.size).to eq n` with `-p/--no-parentheses-matcher-arg`)
+
 ## v1.2.0
 
 * Transpec is now ready for RSpec 2.99 and 3.0 beta!

data/README.md

@@ -4,7 +4,7 @@
 
 **Transpec** automatically converts your specs into latest [RSpec](http://rspec.info/) syntax with static and dynamic code analysis.
 
-This aims to facilitate smooth transition to RSpec 3, and Transpec is now ready for RSpec 2.99 and 3.0 beta!
+This aims to facilitate smooth transition to RSpec 3, and is now ready for RSpec 2.99 and 3.0 beta!
 
 See the following pages for the new RSpec syntax and the plan for RSpec 3:
 
@@ -101,10 +101,14 @@ You can see actual conversion examples below:
 
 ## Installation
 
+Simply install `transpec` with `gem` command:
+
 ```bash
 $ gem install transpec
 ```
 
+Usually you don't need to add `transpec` to your `*.gemspec` or `Gemfile` since this isn't a tool to be used daily.
+
 ## Basic Usage
 
 Before converting your specs:
@@ -216,7 +220,7 @@ See [Supported Conversions](#supported-conversions) for more details.
 
 ### `-n/--negative-form`
 
-Specify negative form of `to` that is used in `expect` syntax.
+Specify negative form of `to` that is used in the `expect` syntax.
 Either `not_to` or `to_not`.
 `not_to` is used by default.
 
@@ -224,11 +228,23 @@ Either `not_to` or `to_not`.
 $ transpec --negative-form to_not
 ```
 
+### `-b/--boolean-matcher`
+
+Specify matcher type that `be_true` and `be_false` will be converted to.
+Any of `truthy,falsey`, `truthy,falsy` or `true,false` can be specified.
+`truthy,falsey` is used by default.
+
+```bash
+$ transpec --boolean-matcher true,false
+```
+
+See [Supported Conversions - Boolean matchers](#boolean-matchers) for more details.
+
 ### `-p/--no-parentheses-matcher-arg`
 
 Suppress parenthesizing argument of matcher when converting
 `should` with operator matcher to `expect` with non-operator matcher
-(`expect` syntax does not directly support the operator matchers).
+(the `expect` syntax does not directly support the operator matchers).
 Note that it will be parenthesized even if this option is specified
 when parentheses are necessary to keep the meaning of the expression.
 
@@ -295,7 +311,7 @@ end
 ### Reason
 
 * `should` is defined on `BasicObject` class, so you can use `should` everywhere.
-* `expect` is defined on `RSpec::Matchers` module that is included by `RSpec::Core::ExampleGroup` class, so you can use `expect` only where `self` is an instance of `RSpec::Core::ExampleGroup` (i.e. in `it` blocks, `:each` hook blocks or included module methods) or other classes that include `RSpec::Matchers`.
+* `expect` is defined on `RSpec::Matchers` module that is included by `RSpec::Core::ExampleGroup` class, so you can use `expect` only where `self` is an instance of `RSpec::Core::ExampleGroup` (i.e. in `it` blocks, `:each` hook blocks or included module methods) or other classes that explicitly include `RSpec::Matchers`.
 
 With the above example, in the context of `1.should == 1`, the `self` is an instance of `MyAwesomeTestRunner`.
 Transpec tracks contexts and skips conversion if the target syntax cannot be converted in a case like this.
@@ -331,7 +347,8 @@ expect(obj).not_to matcher
 expect(obj).to_not matcher # with `--negative-form to_not`
 ```
 
-* Disabled by: `--keep should`
+* Conversion can be disabled by: `--keep should`
+* Deprecation: Deprecated since RSpec 3.0
 * See also: [Myron Marston » RSpec's New Expectation Syntax](http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax)
 
 ### Operator matchers
@@ -352,6 +369,8 @@ expect('string').to match(/^str/)
 expect([1, 2, 3]).to match_array([2, 1, 3])
 ```
 
+This conversion is combined with the conversion of [Standard expectations](#standard-expecatations) and cannot be disabled separately because the `expect` syntax does not directly support the operator matchers.
+
 * See also: [(Almost) All Matchers Are Supported - RSpec's New Expectation Syntax](http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax#almost_all_matchers_are_supported)
 
 ### Boolean matchers
@@ -384,7 +403,8 @@ expect(obj).to be false
 
 So, converting `be_true`/`be_false` to `be_truthy`/`be_falsey` never breaks your specs and this is the Transpec's default. If you are willing to test boolean values strictly, you can convert them to `be true`/`be false` with `--boolean-matcher true,false` option. Note that this may break your specs if your library codes don't return exact boolean values.
 
-* Disabled by: `--keep deprecated`
+* Conversion can be disabled by: `--keep deprecated`
+* Deprecation: Deprecated since RSpec 2.99, removed at RSpec 3.0
 * See also: [Consider renaming `be_true` and `be_false` to `be_truthy` and `be_falsey` · rspec/rspec-expectations](https://github.com/rspec/rspec-expectations/issues/283)
 
 ### `be_close` matcher
@@ -397,7 +417,8 @@ expect(1.0 / 3.0).to be_close(0.333, 0.001)
 expect(1.0 / 3.0).to be_within(0.001).of(0.333)
 ```
 
-* Disabled by: `--keep deprecated`
+* Conversion can be disabled by: `--keep deprecated`
+* Deprecation: Deprecated since RSpec 2.1, removed at RSpec 3.0
 * See also: [New be within matcher and RSpec.deprecate fix · rspec/rspec-expectations](https://github.com/rspec/rspec-expectations/pull/32)
 
 ### `have(n).items` matcher
@@ -410,6 +431,7 @@ expect(collection).to have_at_least(3).items
 expect(collection).to have_at_most(3).items
 collection.should have(3).items
 
+# Assume `team` responds to #players.
 expect(team).to have(3).players
 
 # Assume #players is a private method.
@@ -430,7 +452,8 @@ expect(team.send(:players).size).to eq(3)
 There's the option to continue using `have(n).items` matcher with [rspec-collection_matchers](https://github.com/rspec/rspec-collection_matchers) that is an external gem extracted from `rspec-expectations`.
 If you choose so, disable this conversion with `--keep have_items`.
 
-* Disabled by: `--keep have_items`
+* Conversion can be disabled by: `--keep have_items`
+* Deprecation: Deprecated since RSpec 2.99, removed at RSpec 3.0
 * 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
@@ -445,7 +468,8 @@ proc { do_something }.should raise_error
 expect { do_something }.to raise_error
 ```
 
-* Disabled by: `--keep should`
+* Conversion can be disabled by: `--keep should`
+* Deprecation: Deprecated since RSpec 3.0
 * See also: [Unification of Block vs. Value Syntaxes - 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
@@ -462,7 +486,8 @@ expect { do_something }.not_to raise_error
 lambda { do_something }.should_not raise_error # with `--keep should`
 ```
 
-* Disabled by: `--keep deprecated`
+* Conversion can be disabled by: `--keep deprecated`
+* Deprecation: Deprecated since RSpec 2.14, removed at RSpec 3.0
 * See also: [Consider deprecating `expect { }.not_to raise_error(SpecificErrorClass)` · rspec/rspec-expectations](https://github.com/rspec/rspec-expectations/issues/231)
 
 ### Message expectations
@@ -477,7 +502,8 @@ expect(obj).to receive(:foo)
 expect_any_instance_of(SomeClass).to receive(:foo)
 ```
 
-* Disabled by: `--keep should_receive`
+* Conversion can be disabled by: `--keep should_receive`
+* Deprecation: Deprecated since RSpec 3.0
 * See also: [RSpec's new message expectation syntax - Tea is awesome.](http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/)
 
 ### Message expectations that are actually method stubs
@@ -498,7 +524,8 @@ allow_any_instance_of(SomeClass).to receive(:foo)
 SomeClass.any_instance.stub(:foo) # with `--keep stub`
 ```
 
-* Disabled by: `--keep deprecated`
+* Conversion can be disabled by: `--keep deprecated`
+* Deprecation: Deprecated since RSpec 2.14, removed at RSpec 3.0
 * See also: [Don't allow at_least(0) · rspec/rspec-mocks](https://github.com/rspec/rspec-mocks/issues/133)
 
 ### Method stubs
@@ -528,7 +555,17 @@ allow(obj).to receive_messages(:foo => 1, :bar => 2)
 allow_any_instance_of(SomeClass).to receive(:foo)
 ```
 
-* Disabled by: `--keep stub`
+Note: `allow(obj).to receive_messages(:foo => 1, :bar => 2)` that is designed to be the replacement for `obj.stub(:foo => 1, :bar => 2)` is available from RSpec 3.0 (though [it's now being considered to be backported to RSpec 2.99](https://github.com/rspec/rspec-mocks/issues/454)). So, in [the upgrade path to RSpec 3](http://myronmars.to/n/dev-blog/2013/07/the-plan-for-rspec-3#the_upgrade_path), if you want to convert them with keeping the syntax correspondence, you need to follow these steps:
+
+1. Upgrade to RSpec 2.99
+2. Run `transpec --keep stub`
+3. Upgrade to RSpec 3.0
+4. Run `transpec`
+
+Otherwise `obj.stub(:foo => 1, :bar => 2)` will be converted to two `allow(obj).to receive(...).and_return(...)` expressions on RSpec 2.99.
+
+* Conversion can be disabled by: `--keep stub`
+* Deprecation: Deprecated since RSpec 3.0
 * See also:
     * [RSpec's new message expectation syntax - Tea is awesome.](http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/)
     * [allow receive with multiple methods · rspec/rspec-mocks](https://github.com/rspec/rspec-mocks/issues/368)
@@ -545,7 +582,8 @@ obj.stub(:foo) # with `--keep stub`
 obj.unstub(:foo)
 ```
 
-* Disabled by: `--keep deprecated`
+* Conversion can be disabled by: `--keep deprecated`
+* Deprecation: Deprecated since RSpec 2.14, removed at RSpec 3.0
 * See also: [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 deprecated specification of number of times
@@ -560,7 +598,8 @@ allow(obj).to receive(:foo)
 obj.stub(:foo) # with `--keep stub`
 ```
 
-* Disabled by: `--keep deprecated`
+* Conversion can be disabled by: `--keep deprecated`
+* Deprecation: Deprecated since RSpec 2.14, removed at RSpec 3.0
 * See also: [Don't allow at_least(0) · rspec/rspec-mocks](https://github.com/rspec/rspec-mocks/issues/133)
 
 ### Deprecated test double aliases
@@ -574,8 +613,9 @@ mock('something')
 double('something')
 ```
 
-* Disabled by: `--keep deprecated`
-* See also: [Deprecate "stub" for doubles · rspec/rspec-mocks](https://github.com/rspec/rspec-mocks/issues/214)
+* Conversion can be disabled by: `--keep deprecated`
+* Deprecation: Deprecated since RSpec 2.14, removed at RSpec 3.0
+* See also: [myronmarston / why_double.md - Gist](https://gist.github.com/myronmarston/6576665)
 
 ### Expectations on attribute of subject with `its`
 
@@ -615,7 +655,8 @@ end
 There's the option to continue using `its` with [rspec-its](https://github.com/rspec/rspec-its) that is an external gem extracted from `rspec-core`.
 If you choose so, disable this conversion with `--keep its`.
 
-* Disabled by: `--keep its`
+* Conversion can be disabled by: `--keep its`
+* Deprecation: Deprecated since RSpec 2.99, removed at RSpec 3.0
 * See also: [Core: its 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#core__will_be_moved_into_an_external_gem)
 
 ## Compatibility

data/README.md.erb

@@ -4,7 +4,7 @@
 
 **Transpec** automatically converts your specs into latest [RSpec](http://rspec.info/) syntax with static and dynamic code analysis.
 
-This aims to facilitate smooth transition to RSpec 3, and Transpec is now ready for RSpec 2.99 and 3.0 beta!
+This aims to facilitate smooth transition to RSpec 3, and is now ready for RSpec 2.99 and 3.0 beta!
 
 See the following pages for the new RSpec syntax and the plan for RSpec 3:
 
@@ -74,10 +74,14 @@ You can see actual conversion examples below:
 
 ## Installation
 
+Simply install `transpec` with `gem` command:
+
 ```bash
 $ gem install transpec
 ```
 
+Usually you don't need to add `transpec` to your `*.gemspec` or `Gemfile` since this isn't a tool to be used daily.
+
 ## Basic Usage
 
 Before converting your specs:
@@ -207,7 +211,7 @@ See [Supported Conversions](#supported-conversions) for more details.
 
 ### `-n/--negative-form`
 
-Specify negative form of `to` that is used in `expect` syntax.
+Specify negative form of `to` that is used in the `expect` syntax.
 Either `not_to` or `to_not`.
 `not_to` is used by default.
 
@@ -215,11 +219,23 @@ Either `not_to` or `to_not`.
 $ transpec --negative-form to_not
 ```
 
+### `-b/--boolean-matcher`
+
+Specify matcher type that `be_true` and `be_false` will be converted to.
+Any of `truthy,falsey`, `truthy,falsy` or `true,false` can be specified.
+`truthy,falsey` is used by default.
+
+```bash
+$ transpec --boolean-matcher true,false
+```
+
+See [Supported Conversions - Boolean matchers](#boolean-matchers) for more details.
+
 ### `-p/--no-parentheses-matcher-arg`
 
 Suppress parenthesizing argument of matcher when converting
 `should` with operator matcher to `expect` with non-operator matcher
-(`expect` syntax does not directly support the operator matchers).
+(the `expect` syntax does not directly support the operator matchers).
 Note that it will be parenthesized even if this option is specified
 when parentheses are necessary to keep the meaning of the expression.
 
@@ -291,7 +307,7 @@ end
 ### Reason
 
 * `should` is defined on `BasicObject` class, so you can use `should` everywhere.
-* `expect` is defined on `RSpec::Matchers` module that is included by `RSpec::Core::ExampleGroup` class, so you can use `expect` only where `self` is an instance of `RSpec::Core::ExampleGroup` (i.e. in `it` blocks, `:each` hook blocks or included module methods) or other classes that include `RSpec::Matchers`.
+* `expect` is defined on `RSpec::Matchers` module that is included by `RSpec::Core::ExampleGroup` class, so you can use `expect` only where `self` is an instance of `RSpec::Core::ExampleGroup` (i.e. in `it` blocks, `:each` hook blocks or included module methods) or other classes that explicitly include `RSpec::Matchers`.
 
 With the above example, in the context of `1.should == 1`, the `self` is an instance of `MyAwesomeTestRunner`.
 Transpec tracks contexts and skips conversion if the target syntax cannot be converted in a case like this.
@@ -327,7 +343,8 @@ expect(obj).not_to matcher
 expect(obj).to_not matcher # with `--negative-form to_not`
 ```
 
-* Disabled by: `--keep should`
+* Conversion can be disabled by: `--keep should`
+* Deprecation: Deprecated since RSpec 3.0
 * See also: [Myron Marston » RSpec's New Expectation Syntax](http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax)
 
 ### Operator matchers
@@ -348,6 +365,8 @@ expect('string').to match(/^str/)
 expect([1, 2, 3]).to match_array([2, 1, 3])
 ```
 
+This conversion is combined with the conversion of [Standard expectations](#standard-expecatations) and cannot be disabled separately because the `expect` syntax does not directly support the operator matchers.
+
 * See also: [(Almost) All Matchers Are Supported - RSpec's New Expectation Syntax](http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax#almost_all_matchers_are_supported)
 
 ### Boolean matchers
@@ -380,7 +399,8 @@ expect(obj).to be false
 
 So, converting `be_true`/`be_false` to `be_truthy`/`be_falsey` never breaks your specs and this is the Transpec's default. If you are willing to test boolean values strictly, you can convert them to `be true`/`be false` with `--boolean-matcher true,false` option. Note that this may break your specs if your library codes don't return exact boolean values.
 
-* Disabled by: `--keep deprecated`
+* Conversion can be disabled by: `--keep deprecated`
+* Deprecation: Deprecated since RSpec 2.99, removed at RSpec 3.0
 * See also: [Consider renaming `be_true` and `be_false` to `be_truthy` and `be_falsey` · rspec/rspec-expectations](https://github.com/rspec/rspec-expectations/issues/283)
 
 ### `be_close` matcher
@@ -393,7 +413,8 @@ expect(1.0 / 3.0).to be_close(0.333, 0.001)
 expect(1.0 / 3.0).to be_within(0.001).of(0.333)
 ```
 
-* Disabled by: `--keep deprecated`
+* Conversion can be disabled by: `--keep deprecated`
+* Deprecation: Deprecated since RSpec 2.1, removed at RSpec 3.0
 * See also: [New be within matcher and RSpec.deprecate fix · rspec/rspec-expectations](https://github.com/rspec/rspec-expectations/pull/32)
 
 ### `have(n).items` matcher
@@ -406,6 +427,7 @@ expect(collection).to have_at_least(3).items
 expect(collection).to have_at_most(3).items
 collection.should have(3).items
 
+# Assume `team` responds to #players.
 expect(team).to have(3).players
 
 # Assume #players is a private method.
@@ -426,7 +448,8 @@ expect(team.send(:players).size).to eq(3)
 There's the option to continue using `have(n).items` matcher with [rspec-collection_matchers](https://github.com/rspec/rspec-collection_matchers) that is an external gem extracted from `rspec-expectations`.
 If you choose so, disable this conversion with `--keep have_items`.
 
-* Disabled by: `--keep have_items`
+* Conversion can be disabled by: `--keep have_items`
+* Deprecation: Deprecated since RSpec 2.99, removed at RSpec 3.0
 * 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
@@ -441,7 +464,8 @@ proc { do_something }.should raise_error
 expect { do_something }.to raise_error
 ```
 
-* Disabled by: `--keep should`
+* Conversion can be disabled by: `--keep should`
+* Deprecation: Deprecated since RSpec 3.0
 * See also: [Unification of Block vs. Value Syntaxes - 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
@@ -458,7 +482,8 @@ expect { do_something }.not_to raise_error
 lambda { do_something }.should_not raise_error # with `--keep should`
 ```
 
-* Disabled by: `--keep deprecated`
+* Conversion can be disabled by: `--keep deprecated`
+* Deprecation: Deprecated since RSpec 2.14, removed at RSpec 3.0
 * See also: [Consider deprecating `expect { }.not_to raise_error(SpecificErrorClass)` · rspec/rspec-expectations](https://github.com/rspec/rspec-expectations/issues/231)
 
 ### Message expectations
@@ -473,7 +498,8 @@ expect(obj).to receive(:foo)
 expect_any_instance_of(SomeClass).to receive(:foo)
 ```
 
-* Disabled by: `--keep should_receive`
+* Conversion can be disabled by: `--keep should_receive`
+* Deprecation: Deprecated since RSpec 3.0
 * See also: [RSpec's new message expectation syntax - Tea is awesome.](http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/)
 
 ### Message expectations that are actually method stubs
@@ -494,7 +520,8 @@ allow_any_instance_of(SomeClass).to receive(:foo)
 SomeClass.any_instance.stub(:foo) # with `--keep stub`
 ```
 
-* Disabled by: `--keep deprecated`
+* Conversion can be disabled by: `--keep deprecated`
+* Deprecation: Deprecated since RSpec 2.14, removed at RSpec 3.0
 * See also: [Don't allow at_least(0) · rspec/rspec-mocks](https://github.com/rspec/rspec-mocks/issues/133)
 
 ### Method stubs
@@ -524,7 +551,17 @@ allow(obj).to receive_messages(:foo => 1, :bar => 2)
 allow_any_instance_of(SomeClass).to receive(:foo)
 ```
 
-* Disabled by: `--keep stub`
+Note: `allow(obj).to receive_messages(:foo => 1, :bar => 2)` that is designed to be the replacement for `obj.stub(:foo => 1, :bar => 2)` is available from RSpec 3.0 (though [it's now being considered to be backported to RSpec 2.99](https://github.com/rspec/rspec-mocks/issues/454)). So, in [the upgrade path to RSpec 3](http://myronmars.to/n/dev-blog/2013/07/the-plan-for-rspec-3#the_upgrade_path), if you want to convert them with keeping the syntax correspondence, you need to follow these steps:
+
+1. Upgrade to RSpec 2.99
+2. Run `transpec --keep stub`
+3. Upgrade to RSpec 3.0
+4. Run `transpec`
+
+Otherwise `obj.stub(:foo => 1, :bar => 2)` will be converted to two `allow(obj).to receive(...).and_return(...)` expressions on RSpec 2.99.
+
+* Conversion can be disabled by: `--keep stub`
+* Deprecation: Deprecated since RSpec 3.0
 * See also:
     * [RSpec's new message expectation syntax - Tea is awesome.](http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/)
     * [allow receive with multiple methods · rspec/rspec-mocks](https://github.com/rspec/rspec-mocks/issues/368)
@@ -541,7 +578,8 @@ obj.stub(:foo) # with `--keep stub`
 obj.unstub(:foo)
 ```
 
-* Disabled by: `--keep deprecated`
+* Conversion can be disabled by: `--keep deprecated`
+* Deprecation: Deprecated since RSpec 2.14, removed at RSpec 3.0
 * See also: [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 deprecated specification of number of times
@@ -556,7 +594,8 @@ allow(obj).to receive(:foo)
 obj.stub(:foo) # with `--keep stub`
 ```
 
-* Disabled by: `--keep deprecated`
+* Conversion can be disabled by: `--keep deprecated`
+* Deprecation: Deprecated since RSpec 2.14, removed at RSpec 3.0
 * See also: [Don't allow at_least(0) · rspec/rspec-mocks](https://github.com/rspec/rspec-mocks/issues/133)
 
 ### Deprecated test double aliases
@@ -570,8 +609,9 @@ mock('something')
 double('something')
 ```
 
-* Disabled by: `--keep deprecated`
-* See also: [Deprecate "stub" for doubles · rspec/rspec-mocks](https://github.com/rspec/rspec-mocks/issues/214)
+* Conversion can be disabled by: `--keep deprecated`
+* Deprecation: Deprecated since RSpec 2.14, removed at RSpec 3.0
+* See also: [myronmarston / why_double.md - Gist](https://gist.github.com/myronmarston/6576665)
 
 ### Expectations on attribute of subject with `its`
 
@@ -595,7 +635,8 @@ END
 There's the option to continue using `its` with [rspec-its](https://github.com/rspec/rspec-its) that is an external gem extracted from `rspec-core`.
 If you choose so, disable this conversion with `--keep its`.
 
-* Disabled by: `--keep its`
+* Conversion can be disabled by: `--keep its`
+* Deprecation: Deprecated since RSpec 2.99, removed at RSpec 3.0
 * See also: [Core: its 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#core__will_be_moved_into_an_external_gem)
 
 ## Compatibility

data/lib/transpec/converter.rb

@@ -63,7 +63,8 @@ module Transpec
       end
 
       if should.have_matcher && @configuration.convert_have_items?
-        should.have_matcher.convert_to_standard_expectation!
+        parenthesize_matcher_arg = @configuration.parenthesize_matcher_arg
+        should.have_matcher.convert_to_standard_expectation!(parenthesize_matcher_arg)
       end
     end
 

data/lib/transpec/option_parser.rb

@@ -149,7 +149,7 @@ module Transpec
         ],
         '-n' => [
           "Specify negative form of #{'to'.underline} that is used in",
-          "#{'expect(...).to'.underline} syntax.",
+          "the #{'expect(...).to'.underline} syntax.",
           "Either #{'not_to'.bright} or #{'to_not'.bright}.",
           "Default: #{'not_to'.bright}"
         ],
@@ -164,7 +164,7 @@ module Transpec
         '-p' => [
           'Suppress parenthesizing argument of matcher',
           'when converting operator to non-operator in',
-          "#{'expect'.underline} syntax. Note that it will be",
+          "the #{'expect'.underline} syntax. Note that it will be",
           'parenthesized even if this option is',
           'specified when parentheses are necessary to',
           'keep the meaning of the expression.',

data/lib/transpec/record.rb

@@ -11,14 +11,14 @@ module Transpec
 
     def ==(other)
       self.class == other.class &&
-        @original_syntax == other.original_syntax &&
-        @converted_syntax == other.converted_syntax
+        original_syntax == other.original_syntax &&
+        converted_syntax == other.converted_syntax
     end
 
     alias_method :eql?, :==
 
     def hash
-      @original_syntax.hash ^ @converted_syntax.hash
+      original_syntax.hash ^ converted_syntax.hash
     end
 
     def to_s

data/lib/transpec/syntax/have.rb

@@ -17,6 +17,8 @@ module Transpec
       # for String (String responds to #size).
       QUERY_METHOD_PRIORITIES = [:size, :count, :length].freeze
 
+      attr_reader :expectation
+
       def self.standalone?
         false
       end
@@ -60,9 +62,9 @@ module Transpec
         rewriter.register_request(node, key, code)
       end
 
-      def convert_to_standard_expectation!
+      def convert_to_standard_expectation!(parenthesize_matcher_arg = true)
         replace(@expectation.subject_range, replacement_subject_source)
-        replace(expression_range, replacement_matcher_source(size_source))
+        replace(expression_range, replacement_matcher_source(size_source, parenthesize_matcher_arg))
         register_record
       end
 
@@ -103,12 +105,21 @@ module Transpec
         end
       end
 
-      private
-
       def default_query_method
         QUERY_METHOD_PRIORITIES.first
       end
 
+      def replacement_matcher_source(size_source, parenthesize_arg = true)
+        case @expectation.current_syntax_type
+        when :should
+          replacement_matcher_source_for_should(size_source)
+        when :expect
+          replacement_matcher_source_for_expect(size_source, parenthesize_arg)
+        end
+      end
+
+      private
+
       def replacement_subject_source
         source = @expectation.subject_range.source
         if subject_is_owner_of_collection?
@@ -121,20 +132,26 @@ module Transpec
         source << ".#{query_method}"
       end
 
-      def replacement_matcher_source(size_source)
-        case @expectation.current_syntax_type
-        when :should
-          case have_method_name
-          when :have, :have_exactly then "== #{size_source}"
-          when :have_at_least       then ">= #{size_source}"
-          when :have_at_most        then "<= #{size_source}"
-          end
-        when :expect
-          case have_method_name
-          when :have, :have_exactly then "eq(#{size_source})"
-          when :have_at_least       then "be >= #{size_source}"
-          when :have_at_most        then "be <= #{size_source}"
+      def replacement_matcher_source_for_should(size_source)
+        case have_method_name
+        when :have, :have_exactly then "== #{size_source}"
+        when :have_at_least       then ">= #{size_source}"
+        when :have_at_most        then "<= #{size_source}"
+        end
+      end
+
+      def replacement_matcher_source_for_expect(size_source, parenthesize_arg)
+        case have_method_name
+        when :have, :have_exactly
+          if parenthesize_arg
+            "eq(#{size_source})"
+          else
+            "eq #{size_source}"
           end
+        when :have_at_least
+          "be >= #{size_source}"
+        when :have_at_most
+          "be <= #{size_source}"
         end
       end
 
@@ -148,47 +165,67 @@ module Transpec
       end
 
       def register_record
-        @report.records << Record.new(original_syntax, converted_syntax)
+        @report.records << HaveRecord.new(self)
       end
 
-      def original_syntax
-        if subject_is_owner_of_collection?
-          subject = 'obj'
-          items = items_name
-        else
-          subject = 'collection'
-          items = 'items'
+      class HaveRecord < Record
+        def initialize(have)
+          @have = have
+        end
+
+        def original_syntax
+          @original_syntax ||= begin
+            syntax = case @have.expectation
+                     when Should
+                       "#{original_subject}.should"
+                     when Expect
+                       "expect(#{original_subject}).to"
+                     end
+
+            syntax << " #{@have.have_method_name}(n).#{original_items}"
+          end
+        end
+
+        def converted_syntax
+          @converted_syntax ||= begin
+            syntax = case @have.expectation.current_syntax_type
+                     when :should
+                       "#{converted_subject}.should"
+                     when :expect
+                       "expect(#{converted_subject}).to"
+                     end
+
+            syntax << " #{@have.replacement_matcher_source('n')}"
+          end
+        end
+
+        def original_subject
+          if @have.subject_is_owner_of_collection?
+            'obj'
+          else
+            'collection'
+          end
+        end
+
+        def original_items
+          if @have.subject_is_owner_of_collection?
+            @have.items_name
+          else
+            'items'
+          end
         end
 
-        syntax = case @expectation
-                 when Should
-                   "#{subject}.should"
-                 when Expect
-                   "expect(#{subject}).to"
-                 end
-
-        syntax << " #{have_method_name}(n).#{items}"
-      end
-
-      def converted_syntax
-        subject = if subject_is_owner_of_collection?
-                    if collection_accessor_is_private?
-                      "obj.send(#{items_name.inspect}).#{query_method}"
-                    else
-                      "obj.#{items_name}.#{query_method}"
-                    end
-                  else
-                    "collection.#{default_query_method}"
-                  end
-
-        syntax = case @expectation.current_syntax_type
-                 when :should
-                   "#{subject}.should"
-                 when :expect
-                   "expect(#{subject}).to"
-                 end
-
-        syntax << " #{replacement_matcher_source('n')}"
+        def converted_subject
+          if @have.subject_is_owner_of_collection?
+            if @have.collection_accessor_is_private?
+              "obj.send(#{@have.items_name.inspect}).#{@have.query_method}"
+            else
+              "obj.#{@have.items_name}.#{@have.query_method}"
+            end
+          else
+            "collection.#{@have.default_query_method}"
+          end
+        end
       end
     end
   end

data/lib/transpec/version.rb

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

data/spec/transpec/ast/node_spec.rb

@@ -77,7 +77,7 @@ module Transpec
           end
 
           it 'returns itself' do
-            returned_value = target_node.each_ancestor_node { }
+            returned_value = target_node.each_ancestor_node {}
             returned_value.should be(target_node)
           end
         end
@@ -133,7 +133,7 @@ module Transpec
           end
 
           it 'returns itself' do
-            returned_value = ast.each_child_node { }
+            returned_value = ast.each_child_node {}
             returned_value.should be(ast)
           end
         end
@@ -191,7 +191,7 @@ module Transpec
           end
 
           it 'returns itself' do
-            returned_value = ast.each_descendent_node { }
+            returned_value = ast.each_descendent_node {}
             returned_value.should be(ast)
           end
         end
@@ -245,7 +245,7 @@ module Transpec
           end
 
           it 'returns itself' do
-            returned_value = ast.each_node { }
+            returned_value = ast.each_node {}
             returned_value.should be(ast)
           end
         end

data/spec/transpec/converter_spec.rb

@@ -171,9 +171,22 @@ module Transpec
       context 'when Configuration#convert_have_items? is true' do
         before { configuration.convert_have_items = true }
 
-        it 'invokes Have#convert_to_standard_expectation!' do
-          should_object.have_matcher.should_receive(:convert_to_standard_expectation!)
-          converter.process_should(should_object)
+        context 'and Configuration#parenthesize_matcher_arg is true' do
+          before { configuration.parenthesize_matcher_arg = true }
+
+          it 'invokes Have#convert_to_standard_expectation! with true' do
+            should_object.have_matcher.should_receive(:convert_to_standard_expectation!).with(true)
+            converter.process_should(should_object)
+          end
+        end
+
+        context 'and Configuration#parenthesize_matcher_arg is false' do
+          before { configuration.parenthesize_matcher_arg = false }
+
+          it 'invokes Have#convert_to_standard_expectation! with false' do
+            should_object.have_matcher.should_receive(:convert_to_standard_expectation!).with(false)
+            converter.process_should(should_object)
+          end
         end
 
         context 'and Configuration#convert_should? is true' do

data/spec/transpec/syntax/have_spec.rb

@@ -105,6 +105,8 @@ module Transpec
           end
 
           context 'and Should#expectize! is invoked before it' do
+            let(:parenthesize_matcher_arg) { true }
+
             let(:expected_source) do
             <<-END
               describe 'example' do
@@ -117,7 +119,7 @@ module Transpec
 
             before do
               should_object.expectize!
-              should_object.have_matcher.convert_to_standard_expectation!
+              should_object.have_matcher.convert_to_standard_expectation!(parenthesize_matcher_arg)
             end
 
             it 'converts into `expect(collection.size).to eq(2)` form' do
@@ -128,6 +130,29 @@ module Transpec
               record.original_syntax.should  == 'collection.should have(n).items'
               record.converted_syntax.should == 'expect(collection.size).to eq(n)'
             end
+
+            context 'and false is passed as `parenthesize_matcher_arg` argument' do
+              let(:parenthesize_matcher_arg) { false }
+
+              let(:expected_source) do
+              <<-END
+              describe 'example' do
+                it 'has 2 items' do
+                  expect(collection.size).to eq 2
+                end
+              end
+              END
+              end
+
+              it 'converts into `expect(collection.size).to eq 2` form' do
+                rewritten_source.should == expected_source
+              end
+
+              it 'adds record "`collection.should have(n).items` -> `expect(collection.size).to eq(n)`"' do
+                record.original_syntax.should  == 'collection.should have(n).items'
+                record.converted_syntax.should == 'expect(collection.size).to eq(n)'
+              end
+            end
           end
         end
 

data/tasks/demo.rake

@@ -5,9 +5,9 @@ require_relative 'lib/transpec_demo'
 namespace :demo do
   # rubocop:disable LineLength
   demos = [
-    TranspecDemo.new('git@github.com:yujinakayama/twitter.git', 'v4.1.0'),
-    TranspecDemo.new('git@github.com:yujinakayama/guard.git', 'transpec-test', %w(--without development)),
-    TranspecDemo.new('git@github.com:yujinakayama/mail.git', 'transpec-test')
+    TranspecDemo.new('git@github.com:yujinakayama/twitter.git', 'transpec-test-rspec-2-99'),
+    TranspecDemo.new('git@github.com:yujinakayama/guard.git', 'transpec-test-rspec-2-99', %w(--without development)),
+    TranspecDemo.new('git@github.com:yujinakayama/mail.git', 'transpec-test-rspec-2-99')
   ]
   # rubocop:enable LineLength
 

metadata

@@ -1,167 +1,167 @@
 --- !ruby/object:Gem::Specification
 name: transpec
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Yuji Nakayama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-05 00:00:00.000000000 Z
+date: 2013-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.14'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.1'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.7'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.10'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: guard-rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: guard-shell
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.5'
 - !ruby/object:Gem::Dependency
   name: ruby_gntp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.3'
 description: Transpec converts your specs into latest RSpec syntax with static and
@@ -173,9 +173,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rubocop.yml"
-- ".travis.yml"
+- .gitignore
+- .rubocop.yml
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - Guardfile
@@ -275,12 +275,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []