transpec 1.10.3 → 1.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81c1501cb0bedfa4aa3c8a489b27cff42d227aa0
-  data.tar.gz: bebe4a68c3997619529e74e6bcdca7cda64fe5c1
+  metadata.gz: 10bda7931ceab8672bcf49f68c925b59448543b4
+  data.tar.gz: acf1950a6c9b917d2af8fc16ea292c7ec91aa2b8
 SHA512:
-  metadata.gz: 63483d99b750ee2ac2db638fdbe1b654151bb0960609595243b49083238117fca9d975710221aa34ea5e57aa53ec65d6b09c7a51b06685f890220ca09692de45
-  data.tar.gz: 0c99b74e4fdfef91915484fc71a6f5579625849c9f7cd3ea82fb12d254109c13f77cd3721908e69d7ca362cf5879150fc75ae7d1e328b0c8619b602b348af7f2
+  metadata.gz: 02b7167fc857ccb4956f439dd793eeae452d2e71e0666be7c6419f571e6b4facb026cd5a649f41fb07b1bf87ac493177deed91e1ee51945442f191d097689c93
+  data.tar.gz: 1ce039438135ccbccdeecc92b73812650d86a811671a9d7e2ec67f1907912c04b59efe753f2394aa434911e25d6f9bde82c9614aa40d5da3376b5f5cab45087f

data/.travis.yml

@@ -3,6 +3,10 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.1
+  - ruby-head
   - jruby
+matrix:
+  allow_failures:
+    - rvm: ruby-head
 before_install: gem update --remote bundler
 script: bundle exec rake ci

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Development
 
+## v1.10.4
+
+* Avoid confusing methods defined with `#let` or `#subject` by user with RSpec built-in methods ([#55](https://github.com/yujinakayama/transpec/issues/55))
+* Add experimental support for Ruby 2.2 (development version) by falling back to Ruby 2.1 parser
+
 ## v1.10.3
 
 * Suggest using `-c/--rspec-command` option and exit gracefully when dynamic analysis failed ([#52](https://github.com/yujinakayama/transpec/issues/52))

data/Gemfile

@@ -2,6 +2,8 @@ source 'https://rubygems.org'
 
 gemspec
 
+gem 'rubocop', github: 'bbatsov/rubocop' if RUBY_VERSION.start_with?('2.2')
+
 group :test do
   gem 'coveralls',      '~> 0.6'
   gem 'simplecov-rcov', '~> 0.2'

data/README.md

@@ -1,4 +1,8 @@
-[![Gem Version](https://badge.fury.io/rb/transpec.png)](http://badge.fury.io/rb/transpec) [![Dependency Status](https://gemnasium.com/yujinakayama/transpec.png)](https://gemnasium.com/yujinakayama/transpec) [![Build Status](https://travis-ci.org/yujinakayama/transpec.png?branch=master)](https://travis-ci.org/yujinakayama/transpec) [![Coverage Status](https://coveralls.io/repos/yujinakayama/transpec/badge.png)](https://coveralls.io/r/yujinakayama/transpec) [![Code Climate](https://codeclimate.com/github/yujinakayama/transpec.png)](https://codeclimate.com/github/yujinakayama/transpec)
+[![Gem Version](http://img.shields.io/gem/v/transpec.svg)](http://badge.fury.io/rb/transpec)
+[![Dependency Status](http://img.shields.io/gemnasium/yujinakayama/transpec.svg)](https://gemnasium.com/yujinakayama/transpec)
+[![Build Status](https://travis-ci.org/yujinakayama/transpec.svg?branch=master)](https://travis-ci.org/yujinakayama/transpec)
+[![Coverage Status](http://img.shields.io/coveralls/yujinakayama/transpec/master.svg)](https://coveralls.io/r/yujinakayama/transpec)
+[![Code Climate](http://img.shields.io/codeclimate/github/yujinakayama/transpec.svg)](https://codeclimate.com/github/yujinakayama/transpec)
 
 # Transpec
 
@@ -402,14 +406,14 @@ end
 
 The monkey-patched `obj.should`:
 
-* Is provided by `rspec-expectations` gem.
+* Is defined on `BasicObject` (or `Kernel`) and provided by `rspec-expectations` gem.
 * Is deprecated in RSpec 3.
 * Has [the issue](http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax#delegation_issues) with delegate/proxy objects.
 * There's the alternative syntax [`expect(obj).to`](#standard-expectations) since RSpec 2.11.
 
 The one-liner (implicit receiver) `should`:
 
-* Is provided by `rspec-core` gem.
+* Is defined on `RSpec::Core::ExampleGroup` and provided by `rspec-core` gem.
 * Is _not_ deprecated in RSpec 3.
 * Does _not_ have the issue with delegate/proxy objects.
 * There's the alternative syntax [`is_expected.to`](#one-liner-expectations) since RSpec 2.99.beta2.
@@ -481,9 +485,11 @@ it { is_expected.to_not matcher } # with `--negative-form to_not`
 
 `is_expected.to` is designed for the consistency with the `expect` syntax.
 However the one-liner `should` is still _not_ deprecated in RSpec 3.0
-and available even if the `should` syntax is disabled with `RSpec.configure`.
+and available even if the `should` syntax is
+[disabled with `RSpec.configure`](https://www.relishapp.com/rspec/rspec-expectations/v/3-0/docs/syntax-configuration#disable-should-syntax).
 So if you think `is_expected.to` is verbose,
 feel free to disable this conversion and continue using the one-liner `should`.
+See [Two Types of `should`](#two-types-of-should) also.
 
 * This conversion can be disabled by: `--keep oneliner`
 * Deprecation: Not deprecated
@@ -1191,6 +1197,6 @@ Tested on MRI 1.9, 2.0, 2.1 and JRuby in 1.9 mode.
 
 ## License
 
-Copyright (c) 2013 Yuji Nakayama
+Copyright (c) 2013–2014 Yuji Nakayama
 
 See the [LICENSE.txt](LICENSE.txt) for details.

data/README.md.erb

@@ -1,4 +1,8 @@
-[![Gem Version](https://badge.fury.io/rb/transpec.png)](http://badge.fury.io/rb/transpec) [![Dependency Status](https://gemnasium.com/yujinakayama/transpec.png)](https://gemnasium.com/yujinakayama/transpec) [![Build Status](https://travis-ci.org/yujinakayama/transpec.png?branch=master)](https://travis-ci.org/yujinakayama/transpec) [![Coverage Status](https://coveralls.io/repos/yujinakayama/transpec/badge.png)](https://coveralls.io/r/yujinakayama/transpec) [![Code Climate](https://codeclimate.com/github/yujinakayama/transpec.png)](https://codeclimate.com/github/yujinakayama/transpec)
+[![Gem Version](http://img.shields.io/gem/v/transpec.svg)](http://badge.fury.io/rb/transpec)
+[![Dependency Status](http://img.shields.io/gemnasium/yujinakayama/transpec.svg)](https://gemnasium.com/yujinakayama/transpec)
+[![Build Status](https://travis-ci.org/yujinakayama/transpec.svg?branch=master)](https://travis-ci.org/yujinakayama/transpec)
+[![Coverage Status](http://img.shields.io/coveralls/yujinakayama/transpec/master.svg)](https://coveralls.io/r/yujinakayama/transpec)
+[![Code Climate](http://img.shields.io/codeclimate/github/yujinakayama/transpec.svg)](https://codeclimate.com/github/yujinakayama/transpec)
 
 # Transpec
 
@@ -399,14 +403,14 @@ end
 
 The monkey-patched `obj.should`:
 
-* Is provided by `rspec-expectations` gem.
+* Is defined on `BasicObject` (or `Kernel`) and provided by `rspec-expectations` gem.
 * Is deprecated in RSpec 3.
 * Has [the issue](http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax#delegation_issues) with delegate/proxy objects.
 * There's the alternative syntax [`expect(obj).to`](#standard-expectations) since RSpec 2.11.
 
 The one-liner (implicit receiver) `should`:
 
-* Is provided by `rspec-core` gem.
+* Is defined on `RSpec::Core::ExampleGroup` and provided by `rspec-core` gem.
 * Is _not_ deprecated in RSpec 3.
 * Does _not_ have the issue with delegate/proxy objects.
 * There's the alternative syntax [`is_expected.to`](#one-liner-expectations) since RSpec 2.99.beta2.
@@ -460,9 +464,11 @@ it { is_expected.to_not matcher } # with `--negative-form to_not`
 
 `is_expected.to` is designed for the consistency with the `expect` syntax.
 However the one-liner `should` is still _not_ deprecated in RSpec 3.0
-and available even if the `should` syntax is disabled with `RSpec.configure`.
+and available even if the `should` syntax is
+[disabled with `RSpec.configure`](https://www.relishapp.com/rspec/rspec-expectations/v/3-0/docs/syntax-configuration#disable-should-syntax).
 So if you think `is_expected.to` is verbose,
 feel free to disable this conversion and continue using the one-liner `should`.
+See [Two Types of `should`](#two-types-of-should) also.
 
 * This conversion can be disabled by: `--keep oneliner`
 * Deprecation: Not deprecated
@@ -1127,6 +1133,6 @@ Tested on MRI 1.9, 2.0, 2.1 and JRuby in 1.9 mode.
 
 ## License
 
-Copyright (c) 2013 Yuji Nakayama
+Copyright (c) 2013–<%= DateTime.now.year %> Yuji Nakayama
 
 See the [LICENSE.txt](LICENSE.txt) for details.

data/lib/transpec.rb

@@ -8,24 +8,6 @@ module Transpec
   end
 
   def self.required_rspec_version
-    @required_rspec_version ||= begin
-      gemspec_path = File.join(root, 'transpec.gemspec')
-      gem_specification = Gem::Specification.load(gemspec_path)
-      rspec_dependency = gem_specification.dependencies.find { |d| d.name == 'rspec' }
-
-      if rspec_dependency
-        rspec_requirement = rspec_dependency.requirement
-        gem_version = rspec_requirement.requirements.first.find { |r| r.is_a?(Gem::Version) }
-        RSpecVersion.new(gem_version)
-      else
-        # Using development version of RSpec with Bundler.
-        current_rspec_version
-      end
-    end
-  end
-
-  def self.current_rspec_version
-    require 'rspec/version'
-    RSpecVersion.new(RSpec::Version::STRING)
+    @required_rspec_version ||= RSpecVersion.new('2.14')
   end
 end

data/lib/transpec/base_rewriter.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 
 require 'transpec/ast/builder'
-require 'parser/current'
+require 'transpec/parser'
 
 module Transpec
   class BaseRewriter

data/lib/transpec/converter.rb

@@ -17,7 +17,7 @@ module Transpec
 
     def initialize(configuration = nil, rspec_version = nil, runtime_data = nil)
       @configuration = configuration || Configuration.new
-      @rspec_version = rspec_version || Transpec.current_rspec_version
+      @rspec_version = rspec_version || Transpec.required_rspec_version
       @runtime_data = runtime_data
       @report = Report.new
     end
@@ -31,9 +31,8 @@ module Transpec
 
     def dispatch_node(node, source_rewriter)
       Syntax.standalone_syntaxes.each do |syntax_class|
-        next unless syntax_class.conversion_target_node?(node, runtime_data)
-
         syntax = syntax_class.new(node, source_rewriter, runtime_data, report)
+        next unless syntax.conversion_target?
 
         handler_name = "process_#{syntax_class.snake_case_name}"
         send(handler_name, syntax)

data/lib/transpec/dynamic_analyzer/rewriter.rb

@@ -45,9 +45,9 @@ module Transpec
 
         ast.each_node do |node|
           Syntax.standalone_syntaxes.each do |syntax_class|
-            next unless syntax_class.dynamic_analysis_target_node?(node)
             syntax = syntax_class.new(node)
-            syntax.register_request_for_dynamic_analysis(self)
+            next unless syntax.dynamic_analysis_target?
+            syntax.register_dynamic_analysis_request(self)
           end
         end
       end

data/lib/transpec/option_parser.rb

@@ -206,8 +206,8 @@ module Transpec
       args.reject do |arg|
         case arg
         when '-m', '--generate-commit-message'
-          warn 'DEPRECATION: -m/--generate-commit-message option is deprecated. ' \
-               'A commit message will always be generated.'
+          warn 'DEPRECATION: The -m/--generate-commit-message option is deprecated. ' \
+               'Now Transpec always generates the commit message.'
           true
         else
           false

data/lib/transpec/parser.rb

@@ -0,0 +1,9 @@
+# coding: utf-8
+
+begin
+  require 'parser/current'
+rescue NotImplementedError
+  warn 'Falling back to Ruby 2.1 parser.'
+  require 'parser/ruby21'
+  Parser::CurrentRuby = Parser::Ruby21 # rubocop:disable ConstantName
+end

data/lib/transpec/record.rb

@@ -4,28 +4,66 @@ require 'transpec/annotatable'
 
 module Transpec
   class Record
-    attr_reader :original_syntax, :converted_syntax, :annotation
+    OVERRIDDE_FORBIDDEN_METHODS = [
+      :original_syntax,
+      :original_syntax_type,
+      :converted_syntax,
+      :converted_syntax_type
+    ]
+
+    attr_reader :original_syntax_type, :converted_syntax_type, :annotation
 
     def initialize(original_syntax, converted_syntax, annotation = nil)
-      @original_syntax = original_syntax
-      @converted_syntax = converted_syntax
+      @original_syntax_type = original_syntax.to_sym
+      @converted_syntax_type = converted_syntax.to_sym
       @annotation = annotation
     end
 
+    def original_syntax
+      original_syntax_type.to_s
+    end
+
+    def converted_syntax
+      converted_syntax_type.to_s
+    end
+
+    def original_syntax_type
+      @original_syntax_type ||= build_original_syntax.to_sym
+    end
+
+    def converted_syntax_type
+      @converted_syntax_type ||= build_converted_syntax.to_sym
+    end
+
     def ==(other)
       self.class == other.class &&
-        original_syntax == other.original_syntax &&
-        converted_syntax == other.converted_syntax
+        original_syntax_type == other.original_syntax_type &&
+        converted_syntax_type == other.converted_syntax_type
     end
 
     alias_method :eql?, :==
 
     def hash
-      original_syntax.hash ^ converted_syntax.hash
+      original_syntax_type.hash ^ converted_syntax_type.hash
     end
 
     def to_s
-      "`#{original_syntax}` -> `#{converted_syntax}`"
+      "`#{original_syntax_type}` -> `#{converted_syntax_type}`"
+    end
+
+    private
+
+    def build_original_syntax
+      fail NotImplementedError
+    end
+
+    def build_converted_syntax
+      fail NotImplementedError
+    end
+
+    def self.method_added(method_name)
+      return unless OVERRIDDE_FORBIDDEN_METHODS.include?(method_name)
+      fail "Do not override Record##{method_name}."
     end
   end
 

data/lib/transpec/syntax.rb

@@ -62,22 +62,18 @@ module Transpec
       extend ActiveSupport::Concern
 
       module ClassMethods
-        def define_dynamic_analysis_request(&block)
-          dynamic_analysis_requests << block
+        def define_dynamic_analysis(&block)
+          dynamic_analyses << block
         end
 
-        def dynamic_analysis_requests
-          @dynamic_analysis_requests ||= []
-        end
-
-        def dynamic_analysis_target_node?(node)
-          target_node?(node)
+        def dynamic_analyses
+          @dynamic_analyses ||= []
         end
       end
 
-      def register_request_for_dynamic_analysis(rewriter)
-        self.class.dynamic_analysis_requests.each do |request|
-          instance_exec(rewriter, &request)
+      def register_dynamic_analysis_request(rewriter)
+        self.class.dynamic_analyses.each do |analysis|
+          instance_exec(rewriter, &analysis)
         end
       end
     end
@@ -102,16 +98,6 @@ module Transpec
       end
     end
 
-    # The default common method for .conversion_target_node? and .dynamic_analysis_target_node?.
-    # If they should behave differently, override either or both.
-    def self.target_node?(node, runtime_data = nil)
-      false
-    end
-
-    def self.conversion_target_node?(node, runtime_data = nil)
-      target_node?(node, runtime_data)
-    end
-
     def initialize(node, source_rewriter = nil, runtime_data = nil, report = nil)
       @node = node
       @source_rewriter = source_rewriter
@@ -119,6 +105,14 @@ module Transpec
       @report = report || Report.new
     end
 
+    def dynamic_analysis_target?
+      false
+    end
+
+    def conversion_target?
+      dynamic_analysis_target?
+    end
+
     def static_context_inspector
       @static_context_inspector ||= StaticContextInspector.new(node)
     end

data/lib/transpec/syntax/allow.rb

@@ -8,8 +8,8 @@ module Transpec
     class Allow < Syntax
       include Mixin::ExpectBase
 
-      def self.target_method?(receiver_node, method_name)
-        receiver_node.nil? && [:allow, :allow_any_instance_of].include?(method_name)
+      def dynamic_analysis_target?
+        super && receiver_node.nil? && [:allow, :allow_any_instance_of].include?(method_name)
       end
 
       def method_name_for_instance

data/lib/transpec/syntax/be_boolean.rb

@@ -8,8 +8,8 @@ module Transpec
     class BeBoolean < Syntax
       include Mixin::Send
 
-      def self.target_method?(receiver_node, method_name)
-        receiver_node.nil? && [:be_true, :be_false].include?(method_name)
+      def dynamic_analysis_target?
+        super && receiver_node.nil? && [:be_true, :be_false].include?(method_name)
       end
 
       def be_true?

data/lib/transpec/syntax/be_close.rb

@@ -8,8 +8,8 @@ module Transpec
     class BeClose < Syntax
       include Mixin::Send
 
-      def self.target_method?(receiver_node, method_name)
-        receiver_node.nil? && method_name == :be_close
+      def dynamic_analysis_target?
+        super && receiver_node.nil? && method_name == :be_close
       end
 
       def convert_to_be_within!

data/lib/transpec/syntax/current_example.rb

@@ -12,12 +12,11 @@ module Transpec
 
       METHODS_YIELD_EXAMPLE = (EXAMPLE_METHODS + HOOK_METHODS + HELPER_METHODS).freeze
 
-      def self.check_target_node_statically(node)
-        super(node) && Util.block_node_taken_by_method(node).nil?
-      end
-
-      def self.target_method?(receiver_node, method_name)
-        receiver_node.nil? && [:example, :running_example].include?(method_name)
+      def dynamic_analysis_target?
+        super &&
+          receiver_node.nil? &&
+          [:example, :running_example].include?(method_name) &&
+          block_node_taken_by_method(node).nil?
       end
 
       def convert!

data/lib/transpec/syntax/double.rb

@@ -8,8 +8,8 @@ module Transpec
     class Double < Syntax
       include Mixin::Send
 
-      def self.target_method?(receiver_node, method_name)
-        receiver_node.nil? && [:double, :mock, :stub].include?(method_name)
+      def dynamic_analysis_target?
+        super && receiver_node.nil? && [:double, :mock, :stub].include?(method_name)
       end
 
       def convert_to_double!

data/lib/transpec/syntax/example.rb

@@ -9,31 +9,30 @@ module Transpec
     class Example < Syntax
       include Mixin::Send, RSpecDSL
 
-      def self.conversion_target_node?(node, runtime_data = nil)
-        return false unless target_node?(node, runtime_data)
+      define_dynamic_analysis do |rewriter|
+        code = "is_a?(Class) && ancestors.any? { |a| a.name == 'RSpec::Core::ExampleGroup' }"
+        rewriter.register_request(node, :example_group_context?, code, :context)
+      end
+
+      def dynamic_analysis_target?
+        super && receiver_node.nil? && EXAMPLE_METHODS.include?(method_name)
+      end
+
+      def conversion_target?
+        return false unless dynamic_analysis_target?
 
         # Check whether the context is example group to differenciate
         # RSpec::Core::ExampleGroup.pending (a relative of #it) and
         # RSpec::Core::ExampleGroup#pending (marks the example as pending in #it block).
-        if runtime_data && runtime_data.run?(node)
+        if runtime_data.run?(node)
           # If we have runtime data, check with it.
           runtime_data[node, :example_group_context?]
         else
           # Otherwise check statically.
-          inspector = StaticContextInspector.new(node)
-          inspector.scopes.last == :example_group
+          static_context_inspector.scopes.last == :example_group
         end
       end
 
-      def self.target_method?(receiver_node, method_name)
-        receiver_node.nil? && EXAMPLE_METHODS.include?(method_name)
-      end
-
-      define_dynamic_analysis_request do |rewriter|
-        code = "is_a?(Class) && ancestors.any? { |a| a.name == 'RSpec::Core::ExampleGroup' }"
-        rewriter.register_request(node, :example_group_context?, code, :context)
-      end
-
       def convert_pending_to_skip!
         convert_pending_selector_to_skip!
         convert_pending_metadata_to_skip!