transpec 1.9.1 → 1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c34e8b6406b750b87a6af37fd7ed8e1df46a235
-  data.tar.gz: 6d778d31bc2c9518fda218793f8a740268ab3dc7
+  metadata.gz: a34ff8e04af60263124c8b388b44b5784ceba70f
+  data.tar.gz: a00f6ffbf41aab7e020aedd0487837279557e039
 SHA512:
-  metadata.gz: a9e4b610441d631390420e67e391e759b1180e3260abe01ff78deb4fe3cefc57838f9d33da1a1cd5560d5e411a9ddd65f06c8c2fd287dce6a4203cacd737d5eb
-  data.tar.gz: 1ba96f0b28b40c05dd29257caead516bedfb4e4fac7fc4d51a56445f1e6734514385d1a27bd0610975d8ba4e513920b5d4e0c40807f6dc4c69c6d158bfa26bab
+  metadata.gz: 8258e12de1f9553ac0a89f32e05c061c529dbda6d7e7877b46356359f7bdd6899ee2eebe527bbcce7b4f72a8031b91ace460b06fc8662215f711930277f05401
+  data.tar.gz: aeafa19c49cf9fa8dfe031c13118681dff4351fa56a1279117f878af27a033ff8620b2ec316ca49cf03caee2396ce326c719d9275f156927558139278bb6f700

data/.rubocop.yml

@@ -54,4 +54,4 @@ BracesAroundHashParameters:
 
 # TODO: Shorten to 100.
 ClassLength:
-  Max: 170
+  Max: 173

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Development
 
+## v1.9.2
+
+* Fix a bug where `expect(method_returns_collection :some_arg).to have(2).items` was converted to `expect(method_returns_collection :some_arg.size).to eq(2)` ([#43](https://github.com/yujinakayama/transpec/issues/43))
+* Fix false positive conversion of `raise_error` with `with_message` ([#41](https://github.com/yujinakayama/transpec/issues/41))
+
 ## v1.9.1
 
 * Fix crash on `expect(obj).to non_matcher_object` in dynamic analysis ([#39](https://github.com/yujinakayama/transpec/issues/39))

data/README.md

@@ -404,7 +404,7 @@ The one-liner (implicit receiver) `should`:
 * Is 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 (not yet released).
+* There's the alternative syntax [`is_expected.to`](#one-liner-expectations) since RSpec 2.99.beta2.
 
 ## Supported Conversions
 
@@ -453,7 +453,7 @@ expect(obj).to_not matcher # with `--negative-form to_not`
 
 ### One-liner expectations
 
-**This conversion is available only if your project's RSpec is `2.99.0.beta2` (not yet released) or later.**
+**This conversion is available only if your project's RSpec is `2.99.0.beta2` or later.**
 
 Targets:
 
@@ -802,7 +802,7 @@ Will be converted to:
 allow(obj).to receive(:message)
 
 # Conversion from `stub_chain` to `receive_message_chain` is available
-# only if the target project's RSpec is 3.0.0.beta2 (not yet released) or later
+# only if the target project's RSpec is 3.0.0.beta2 or later
 allow(obj).to receive_message_chain(:foo, :bar, :baz)
 
 allow_any_instance_of(Klass).to receive(:message)
@@ -1079,7 +1079,7 @@ Here's an excerpt from [the warning](https://github.com/rspec/rspec-core/blob/7d
 
 ### Custom matcher DSL
 
-**This conversion is available only if your project's RSpec is `3.0.0.beta2` (not yet released) or later.**
+**This conversion is available only if your project's RSpec is `3.0.0.beta2` or later.**
 
 Targets:
 

data/README.md.erb

@@ -401,20 +401,13 @@ The one-liner (implicit receiver) `should`:
 * Is 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 (not yet released).
+* There's the alternative syntax [`is_expected.to`](#one-liner-expectations) since RSpec 2.99.beta2.
 
 ## Supported Conversions
 
 <%=
-
-sections = readme.each_line.slice_before(/^## /)
-
-supported_conversions_section = sections.find do |section|
-  section.first.include?('Supported Conversions')
-end
-
+supported_conversions_section = select_sections(readme, 2, 'Supported Conversions').first
 table_of_contents(supported_conversions_section, 3)
-
 %>
 
 ### Standard expectations
@@ -440,7 +433,7 @@ expect(obj).to_not matcher # with `--negative-form to_not`
 
 ### One-liner expectations
 
-**This conversion is available only if your project's RSpec is `<%= Transpec::RSpecVersion.oneliner_is_expected_available_version %>` (not yet released) or later.**
+**This conversion is available only if your project's RSpec is `<%= Transpec::RSpecVersion.oneliner_is_expected_available_version %>` or later.**
 
 Targets:
 
@@ -773,7 +766,7 @@ Will be converted to:
 allow(obj).to receive(:message)
 
 # Conversion from `stub_chain` to `receive_message_chain` is available
-# only if the target project's RSpec is <%= Transpec::RSpecVersion.receive_message_chain_available_version %> (not yet released) or later
+# only if the target project's RSpec is <%= Transpec::RSpecVersion.receive_message_chain_available_version %> or later
 allow(obj).to receive_message_chain(:foo, :bar, :baz)
 
 allow_any_instance_of(Klass).to receive(:message)
@@ -1031,7 +1024,7 @@ Here's an excerpt from [the warning](https://github.com/rspec/rspec-core/blob/7d
 
 ### Custom matcher DSL
 
-**This conversion is available only if your project's RSpec is `<%= Transpec::RSpecVersion.non_should_matcher_protocol_available_version %>` (not yet released) or later.**
+**This conversion is available only if your project's RSpec is `<%= Transpec::RSpecVersion.non_should_matcher_protocol_available_version %>` or later.**
 
 Targets:
 

data/lib/transpec/converter.rb

@@ -55,6 +55,7 @@ module Transpec
       end
 
       process_have(should.have_matcher)
+      process_raise_error(should.raise_error_matcher)
     end
 
     def process_oneliner_should(oneliner_should)
@@ -76,10 +77,13 @@ module Transpec
       elsif @configuration.convert_oneliner? && @rspec_version.oneliner_is_expected_available?
         oneliner_should.expectize!(negative_form, parenthesize)
       end
+
+      process_raise_error(oneliner_should.raise_error_matcher)
     end
 
     def process_expect(expect)
       process_have(expect.have_matcher)
+      process_raise_error(expect.raise_error_matcher)
       process_messaging_host(expect.receive_matcher)
     end
 
@@ -144,6 +148,7 @@ module Transpec
     end
 
     def process_raise_error(raise_error)
+      return unless raise_error
       if @configuration.convert_deprecated_method?
         raise_error.remove_error_specification_with_negative_expectation!
       end

data/lib/transpec/syntax/expect.rb

@@ -2,12 +2,16 @@
 
 require 'transpec/syntax'
 require 'transpec/syntax/mixin/expect_base'
-require 'transpec/syntax/mixin/have_matcher_owner'
+require 'transpec/syntax/have'
+require 'transpec/syntax/raise_error'
 
 module Transpec
   class Syntax
     class Expect < Syntax
-      include Mixin::ExpectBase, Mixin::HaveMatcherOwner
+      include Mixin::ExpectBase
+
+      add_matcher Have
+      add_matcher RaiseError
 
       def self.target_method?(receiver_node, method_name)
         receiver_node.nil? && [:expect, :expect_any_instance_of].include?(method_name)

data/lib/transpec/syntax/have.rb

@@ -22,8 +22,6 @@ module Transpec
       # for String (String responds to #size).
       QUERY_METHOD_PRIORITIES = [:size, :count, :length].freeze
 
-      attr_reader :expectation
-
       def self.target_method?(receiver_node, method_name)
         receiver_node.nil? &&
           [:have, :have_exactly, :have_at_least, :have_at_most].include?(method_name)
@@ -95,9 +93,9 @@ module Transpec
         QUERY_METHOD_PRIORITIES.first
       end
 
-      def replacement_subject_source(original_subject_source = nil)
-        original_subject_source ||= expectation.subject_range.source
-        source_builder.replacement_subject_source(original_subject_source)
+      def replacement_subject_source(base_subject = nil)
+        base_subject ||= expectation.subject_node
+        source_builder.replacement_subject_source(base_subject)
       end
 
       def size_source

data/lib/transpec/syntax/have/source_builder.rb

@@ -13,8 +13,13 @@ module Transpec
           @size_source = size_source
         end
 
-        def replacement_subject_source(original_subject_source)
-          source = original_subject_source
+        def replacement_subject_source(base_subject)
+          source = case base_subject
+                   when String    then base_subject
+                   when AST::Node then base_subject_source(base_subject)
+                   else fail "Invalid base subject #{base_subject}"
+                   end
+
           if have.subject_is_owner_of_collection?
             if have.collection_accessor_is_private?
               source << ".send(#{have.collection_accessor.inspect}"
@@ -26,9 +31,26 @@ module Transpec
               source << ".#{have.collection_accessor}#{collection_accessor_args_parentheses_source}"
             end
           end
+
           source << ".#{have.query_method}"
         end
 
+        def base_subject_source(node)
+          if node.send_type? && (arg_node = node.children[2])
+            left_of_arg_source = node.loc.selector.end.join(arg_node.loc.expression.begin).source
+
+            if left_of_arg_source.match(/\A\s*\Z/)
+              source = node.loc.expression.begin.join(node.loc.selector.end).source
+              source << '('
+              source << arg_node.loc.expression.begin.join(node.loc.expression.end).source
+              source << ')'
+              return source
+            end
+          end
+
+          node.loc.expression.source
+        end
+
         def replacement_matcher_source(parenthesize_arg = true)
           case have.expectation.current_syntax_type
           when :should

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

@@ -2,6 +2,7 @@
 
 require 'active_support/concern'
 require 'transpec/syntax/mixin/send'
+require 'transpec/syntax/mixin/matcher_owner'
 require 'transpec/syntax/receive'
 require 'transpec/util'
 
@@ -10,17 +11,10 @@ module Transpec
     module Mixin
       module ExpectBase
         extend ActiveSupport::Concern
-        include Send
+        include Send, MatcherOwner
 
         included do
-          define_dynamic_analysis_request do |rewriter|
-            if Receive.dynamic_analysis_target_node?(matcher_node)
-              create_receive_matcher.register_request_for_dynamic_analysis(rewriter)
-            end
-          end
-
-          alias_method :subject_node, :arg_node
-          alias_method :to_node, :parent_node
+          add_matcher Receive
         end
 
         def current_syntax_type
@@ -36,6 +30,18 @@ module Transpec
           to_method_name == :to
         end
 
+        def subject_node
+          arg_node || parent_node
+        end
+
+        def to_node
+          if parent_node.block_type? && parent_node.children.first.equal?(node)
+            parent_node.parent_node
+          else
+            parent_node
+          end
+        end
+
         def matcher_node
           to_arg_node = to_node.children[2]
           Util.each_forward_chained_node(to_arg_node, :include_origin)
@@ -49,22 +55,6 @@ module Transpec
         def subject_range
           subject_node.loc.expression
         end
-
-        def receive_matcher
-          return @receive_matcher if instance_variable_defined?(:@receive_matcher)
-
-          @receive_matcher ||= if Receive.conversion_target_node?(matcher_node, @runtime_data)
-                                 create_receive_matcher
-                               else
-                                 nil
-                               end
-        end
-
-        private
-
-        def create_receive_matcher
-          Receive.new(matcher_node, self, @source_rewriter, @runtime_data, @report)
-        end
       end
     end
   end

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

@@ -0,0 +1,43 @@
+# coding: utf-8
+
+require 'active_support/concern'
+
+module Transpec
+  class Syntax
+    module Mixin
+      module MatcherOwner
+        extend ActiveSupport::Concern
+
+        module ClassMethods
+          def add_matcher(matcher_class) # rubocop:disable MethodLength
+            matcher_accessor_name = "#{matcher_class.snake_case_name}_matcher"
+            matcher_ivar_name = "@#{matcher_accessor_name}"
+            matcher_creator_name = "create_#{matcher_class.snake_case_name}"
+
+            define_dynamic_analysis_request do |rewriter|
+              if matcher_class.dynamic_analysis_target_node?(matcher_node)
+                send(matcher_creator_name).register_request_for_dynamic_analysis(rewriter)
+              end
+            end
+
+            define_method(matcher_accessor_name) do
+              if instance_variable_defined?(matcher_ivar_name)
+                return instance_variable_get(matcher_ivar_name)
+              end
+
+              if matcher_class.conversion_target_node?(matcher_node, @runtime_data)
+                instance_variable_set(matcher_ivar_name, send(matcher_creator_name))
+              else
+                instance_variable_set(matcher_ivar_name, nil)
+              end
+            end
+
+            define_method(matcher_creator_name) do
+              matcher_class.new(matcher_node, self, @source_rewriter, @runtime_data, @report)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -8,6 +8,10 @@ module Transpec
       module OwnedMatcher
         extend ActiveSupport::Concern
 
+        included do
+          attr_reader :expectation
+        end
+
         module ClassMethods
           def standalone?
             false

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

@@ -2,8 +2,10 @@
 
 require 'active_support/concern'
 require 'transpec/syntax/mixin/send'
-require 'transpec/syntax/mixin/have_matcher_owner'
-require 'transpec/syntax/operator_matcher'
+require 'transpec/syntax/mixin/matcher_owner'
+require 'transpec/syntax/have'
+require 'transpec/syntax/operator'
+require 'transpec/syntax/raise_error'
 require 'transpec/util'
 
 module Transpec
@@ -11,14 +13,12 @@ module Transpec
     module Mixin
       module ShouldBase
         extend ActiveSupport::Concern
-        include Send, HaveMatcherOwner
+        include Send, MatcherOwner
 
         included do
-          define_dynamic_analysis_request do |rewriter|
-            if OperatorMatcher.dynamic_analysis_target_node?(matcher_node)
-              create_operator_matcher.register_request_for_dynamic_analysis(rewriter)
-            end
-          end
+          add_matcher Have
+          add_matcher Operator
+          add_matcher RaiseError
         end
 
         def positive?
@@ -41,24 +41,6 @@ module Transpec
             selector_range.join(expression_range.end)
           end
         end
-
-        def operator_matcher
-          return @operator_matcher if instance_variable_defined?(:@operator_matcher)
-
-          @operator_matcher ||= begin
-            if OperatorMatcher.conversion_target_node?(matcher_node, @runtime_data)
-              create_operator_matcher
-            else
-              nil
-            end
-          end
-        end
-
-        private
-
-        def create_operator_matcher
-          OperatorMatcher.new(matcher_node, @source_rewriter, @runtime_data, @report)
-        end
       end
     end
   end

data/lib/transpec/syntax/{operator_matcher.rb → operator.rb}

@@ -2,14 +2,15 @@
 
 require 'transpec/syntax'
 require 'transpec/syntax/mixin/send'
+require 'transpec/syntax/mixin/owned_matcher'
 require 'transpec/util'
 require 'ast'
 
 module Transpec
   class Syntax
-    class OperatorMatcher < Syntax
+    class Operator < Syntax
       extend ::AST::Sexp
-      include Mixin::Send, Util
+      include Mixin::Send, Mixin::OwnedMatcher, Util
 
       OPERATORS = [:==, :===, :<, :<=, :>, :>=, :=~].freeze
       BE_NODE = s(:send, nil, :be)
@@ -32,14 +33,14 @@ module Transpec
         end
       end
 
-      def initialize(node, source_rewriter = nil, runtime_data = nil, report = nil)
+      def initialize(node, expectation, source_rewriter = nil, runtime_data = nil, report = nil)
         operator_node = if node == BE_NODE
                           node.parent_node
                         else
                           node
                         end
 
-        super(operator_node, source_rewriter, runtime_data, report)
+        super(operator_node, expectation, source_rewriter, runtime_data, report)
       end
 
       def convert_operator!(parenthesize_arg = true)

data/lib/transpec/syntax/raise_error.rb

@@ -2,18 +2,19 @@
 
 require 'transpec/syntax'
 require 'transpec/syntax/mixin/send'
+require 'transpec/syntax/mixin/owned_matcher'
 
 module Transpec
   class Syntax
     class RaiseError < Syntax
-      include Mixin::Send
+      include Mixin::Send, Mixin::OwnedMatcher
 
       def self.target_method?(receiver_node, method_name)
         receiver_node.nil? && method_name == :raise_error
       end
 
       def remove_error_specification_with_negative_expectation!
-        return if positive?
+        return if expectation.positive?
 
         _receiver_node, _method_name, *arg_nodes = *node
         return if arg_nodes.empty?
@@ -23,16 +24,6 @@ module Transpec
         register_record
       end
 
-      def positive?
-        @node.each_ancestor_node do |ancestor_node|
-          next unless ancestor_node.send_type?
-          expectation_method_name = ancestor_node.children[1]
-          return [:should, :to].include?(expectation_method_name)
-        end
-
-        false
-      end
-
       private
 
       def register_record

data/lib/transpec/syntax/receive.rb

@@ -10,8 +10,6 @@ module Transpec
     class Receive < Syntax
       include Mixin::Send, Mixin::OwnedMatcher, Mixin::MessagingHost
 
-      attr_reader :expectation
-
       def self.target_method?(receiver_node, method_name)
         receiver_node.nil? && method_name == :receive
       end

data/lib/transpec/version.rb

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

data/spec/transpec/converter_spec.rb

@@ -121,7 +121,8 @@ module Transpec
     end
 
     describe '#process_should' do
-      let(:should_object) { double('should_object').as_null_object }
+      let(:should_object) { double('should_object', raise_error_matcher: raise_error_object).as_null_object }
+      let(:raise_error_object) { double('raise_error_object').as_null_object }
 
       context 'when Configuration#convert_should? is true' do
         before { configuration.convert_should = true }
@@ -212,10 +213,16 @@ module Transpec
           converter.process_should(should_object)
         end
       end
+
+      it 'invokes #process_raise_error with its #raise_error_matcher' do
+        converter.should_receive(:process_raise_error).with(raise_error_object)
+        converter.process_should(should_object)
+      end
     end
 
     describe '#process_oneliner_should' do
-      let(:should_object) { double('oneliner_should_object').as_null_object }
+      let(:should_object) { double('oneliner_should_object', raise_error_matcher: raise_error_object).as_null_object }
+      let(:raise_error_object) { double('raise_error_object').as_null_object }
 
       shared_examples 'does nothing' do
         it 'does nothing' do
@@ -363,11 +370,22 @@ module Transpec
           end
         end
       end
+
+      it 'invokes #process_raise_error with its #raise_error_matcher' do
+        converter.should_receive(:process_raise_error).with(raise_error_object)
+        converter.process_oneliner_should(should_object)
+      end
     end
 
     describe '#process_expect' do
-      let(:expect_object) { double('expect_object', receive_matcher: receive_object).as_null_object }
+      let(:expect_object) do
+        double('expect_object',
+               receive_matcher: receive_object,
+           raise_error_matcher: raise_error_object
+        ).as_null_object
+      end
       let(:receive_object) { double('receive_object').as_null_object }
+      let(:raise_error_object) { double('raise_error_object').as_null_object }
 
       context 'when Configuration#convert_have_items? is true' do
         before { configuration.convert_have_items = true }
@@ -409,6 +427,11 @@ module Transpec
         converter.should_receive(:process_any_instance_block).with(receive_object)
         converter.process_expect(expect_object)
       end
+
+      it 'invokes #process_raise_error with its #raise_error_matcher' do
+        converter.should_receive(:process_raise_error).with(raise_error_object)
+        converter.process_expect(expect_object)
+      end
     end
 
     describe '#process_allow' do

data/spec/transpec/syntax/expect_spec.rb

@@ -10,19 +10,73 @@ module Transpec
       include_context 'syntax object', Expect, :expect_object
 
       describe '#subject_node' do
-        let(:source) do
-          <<-END
-            describe 'example' do
-              it 'is empty' do
-                expect(subject).to be_empty
+        context 'when the subject is a normal argument' do
+          let(:source) do
+            <<-END
+              describe 'example' do
+                it 'is empty' do
+                  expect(subject).to be_empty
+                end
               end
-            end
-          END
+            END
+          end
+
+          it 'returns the subject node' do
+            method_name = expect_object.subject_node.children[1]
+            method_name.should == :subject
+          end
         end
 
-        it 'returns subject node' do
-          method_name = expect_object.subject_node.children[1]
-          method_name.should == :subject
+        context 'when the subject is a block' do
+          let(:source) do
+            <<-END
+              describe 'example' do
+                it 'raises error' do
+                  expect { do_something }.to raise_error
+                end
+              end
+            END
+          end
+
+          it 'returns the block node' do
+            expect_object.subject_node.should be_block_type
+          end
+        end
+      end
+
+      describe '#to_node' do
+        context 'when the subject is a normal argument' do
+          let(:source) do
+            <<-END
+              describe 'example' do
+                it 'is empty' do
+                  expect(subject).to be_empty
+                end
+              end
+            END
+          end
+
+          it 'returns #to node' do
+            method_name = expect_object.to_node.children[1]
+            method_name.should == :to
+          end
+        end
+
+        context 'when the subject is a block' do
+          let(:source) do
+            <<-END
+              describe 'example' do
+                it 'raises error' do
+                  expect { do_something }.to raise_error
+                end
+              end
+            END
+          end
+
+          it 'returns #to node' do
+            method_name = expect_object.to_node.children[1]
+            method_name.should == :to
+          end
         end
       end
 

data/spec/transpec/syntax/have_spec.rb

@@ -1049,6 +1049,64 @@ module Transpec
           end
         end
 
+        context 'when it is `expect(method_returns_collection :some_arg).to have(2).items` form' do
+          let(:source) do
+            <<-END
+              describe 'example' do
+                it 'has 2 items' do
+                  expect(method_returns_collection :some_arg).to have(2).items
+                end
+              end
+            END
+          end
+
+          let(:expected_source) do
+            <<-END
+              describe 'example' do
+                it 'has 2 items' do
+                  expect(method_returns_collection(:some_arg).size).to eq(2)
+                end
+              end
+            END
+          end
+
+          let(:have_object) { expect_object.have_matcher }
+
+          it 'converts into `expect(method_returns_collection(:some_arg).size).to eq(2)` form' do
+            have_object.convert_to_standard_expectation!
+            rewritten_source.should == expected_source
+          end
+        end
+
+        context 'when it is `expect(method_returns_collection(:some_arg) { do_something }).to have(2).items` form' do
+          let(:source) do
+            <<-END
+              describe 'example' do
+                it 'has 2 items' do
+                  expect(method_returns_collection(:some_arg) { do_something }).to have(2).items
+                end
+              end
+            END
+          end
+
+          let(:expected_source) do
+            <<-END
+              describe 'example' do
+                it 'has 2 items' do
+                  expect(method_returns_collection(:some_arg) { do_something }.size).to eq(2)
+                end
+              end
+            END
+          end
+
+          let(:have_object) { expect_object.have_matcher }
+
+          it 'converts into `expect(method_returns_collection(:some_arg) { do_something }.size).to eq(2)` form' do
+            have_object.convert_to_standard_expectation!
+            rewritten_source.should == expected_source
+          end
+        end
+
         context 'when it is `it { should have(2).items }` form' do
           let(:source) do
             <<-END

data/spec/transpec/syntax/oneliner_should_spec.rb

@@ -70,8 +70,8 @@ module Transpec
             END
           end
 
-          it 'returns an instance of OperatorMatcher' do
-            should be_an(OperatorMatcher)
+          it 'returns an instance of Operator' do
+            should be_an(Operator)
           end
         end
 
@@ -146,7 +146,7 @@ module Transpec
             END
           end
 
-          it 'invokes OperatorMatcher#convert_operator!' do
+          it 'invokes Operator#convert_operator!' do
             should_object.operator_matcher.should_receive(:convert_operator!)
             should_object.expectize!
           end

data/spec/transpec/syntax/{operator_matcher_spec.rb → operator_spec.rb}

@@ -1,12 +1,12 @@
 # coding: utf-8
 
 require 'spec_helper'
-require 'transpec/syntax/operator_matcher'
+require 'transpec/syntax/operator'
 require 'transpec/syntax/should'
 
 module Transpec
   class Syntax
-    describe OperatorMatcher do
+    describe Operator do
       include ::AST::Sexp
       include_context 'parsed objects'
       include_context 'syntax object', Should, :should_object

data/spec/transpec/syntax/raise_error_spec.rb

@@ -2,133 +2,58 @@
 
 require 'spec_helper'
 require 'transpec/syntax/raise_error'
+require 'transpec/syntax/should'
+require 'transpec/syntax/expect'
 
 module Transpec
   class Syntax
     describe RaiseError do
       include_context 'parsed objects'
-      include_context 'syntax object', RaiseError, :raise_error_object
+      include_context 'syntax object', Should, :should_object
+      include_context 'syntax object', Expect, :expect_object
 
       let(:record) { raise_error_object.report.records.first }
 
-      describe '#positive?' do
-        subject { raise_error_object.positive? }
-
-        context 'when it is `lambda { }.should raise_error` form' do
-          let(:source) do
-            <<-END
-              describe 'example' do
-                it 'raises error' do
-                  lambda { do_something }.should raise_error
-                end
-              end
-            END
-          end
-
-          it { should be_true }
-        end
-
-        context 'when it is `expect { }.to raise_error` form' do
-          let(:source) do
-            <<-END
-              describe 'example' do
-                it 'raises error' do
-                  expect { do_something }.to raise_error
-                end
-              end
-            END
-          end
-
-          it { should be_true }
-        end
-
-        context 'when it is `lambda { }.should raise_error { |error| ... }` form' do
-          let(:source) do
-            <<-END
-              describe 'example' do
-                it 'raises error' do
-                  lambda { do_something }.should raise_error { |error| do_anything }
-                end
-              end
-            END
-          end
-
-          it { should be_true }
-        end
-
-        context 'when it is `expect { }.to raise_error { |error| ... }` form' do
-          let(:source) do
-            <<-END
-              describe 'example' do
-                it 'raises error' do
-                  expect { do_something }.to raise_error { |error| do_anything }
-                end
-              end
-            END
-          end
-
-          it { should be_true }
+      describe '#remove_error_specification_with_negative_expectation!' do
+        before do
+          raise_error_object.remove_error_specification_with_negative_expectation!
         end
 
-        context 'when it is `lambda { }.should_not raise_error` form' do
+        context 'when it is `lambda { }.should raise_error(SpecificErrorClass)` form' do
           let(:source) do
             <<-END
               describe 'example' do
-                it 'does not raise error' do
-                  lambda { do_something }.should_not raise_error
+                it 'raises SpecificErrorClass' do
+                  lambda { do_something }.should raise_error(SpecificErrorClass)
                 end
               end
             END
           end
 
-          it { should be_false }
-        end
+          let(:raise_error_object) { should_object.raise_error_matcher }
 
-        context 'when it is `expect { }.not_to raise_error` form' do
-          let(:source) do
-            <<-END
-              describe 'example' do
-                it 'does not raise error' do
-                  expect { do_something }.not_to raise_error
-                end
-              end
-            END
+          it 'does nothing' do
+            rewritten_source.should == source
           end
 
-          it { should be_false }
-        end
-
-        context 'when it is `expect { }.to_not raise_error` form' do
-          let(:source) do
-            <<-END
-              describe 'example' do
-                it 'does not raise error' do
-                  expect { do_something }.to_not raise_error
-                end
-              end
-            END
+          it 'reports nothing' do
+            raise_error_object.report.records.should be_empty
           end
-
-          it { should be_false }
-        end
-      end
-
-      describe '#remove_error_specification_with_negative_expectation!' do
-        before do
-          raise_error_object.remove_error_specification_with_negative_expectation!
         end
 
-        context 'when it is `lambda { }.should raise_error(SpecificErrorClass)` form' do
+        context 'when it is `expect { }.to raise_error(SpecificErrorClass)` form' do
           let(:source) do
             <<-END
               describe 'example' do
                 it 'raises SpecificErrorClass' do
-                  lambda { do_something }.should raise_error(SpecificErrorClass)
+                  expect { do_something }.to raise_error(SpecificErrorClass)
                 end
               end
             END
           end
 
+          let(:raise_error_object) { expect_object.raise_error_matcher }
+
           it 'does nothing' do
             rewritten_source.should == source
           end
@@ -138,17 +63,19 @@ module Transpec
           end
         end
 
-        context 'when it is `expect { }.to raise_error(SpecificErrorClass)` form' do
+        context 'when it is `lambda { }.should raise_error(SpecificErrorClass) { |error| ... }` form' do
           let(:source) do
             <<-END
               describe 'example' do
                 it 'raises SpecificErrorClass' do
-                  expect { do_something }.to raise_error(SpecificErrorClass)
+                  lambda { do_something }.should raise_error(SpecificErrorClass) { |error| do_anything }
                 end
               end
             END
           end
 
+          let(:raise_error_object) { should_object.raise_error_matcher }
+
           it 'does nothing' do
             rewritten_source.should == source
           end
@@ -158,17 +85,19 @@ module Transpec
           end
         end
 
-        context 'when it is `lambda { }.should raise_error(SpecificErrorClass) { |error| ... }` form' do
+        context 'when it is `expect { }.to raise_error(SpecificErrorClass) { |error| ... }` form' do
           let(:source) do
             <<-END
               describe 'example' do
                 it 'raises SpecificErrorClass' do
-                  lambda { do_something }.should raise_error(SpecificErrorClass) { |error| do_anything }
+                  expect { do_something }.to raise_error(SpecificErrorClass) { |error| do_anything }
                 end
               end
             END
           end
 
+          let(:raise_error_object) { expect_object.raise_error_matcher }
+
           it 'does nothing' do
             rewritten_source.should == source
           end
@@ -178,17 +107,19 @@ module Transpec
           end
         end
 
-        context 'when it is `expect { }.to raise_error(SpecificErrorClass) { |error| ... }` form' do
+        context 'when it is `expect { }.to raise_error(SpecificErrorClass).with_message(message)` form' do
           let(:source) do
             <<-END
               describe 'example' do
-                it 'raises SpecificErrorClass' do
-                  expect { do_something }.to raise_error(SpecificErrorClass) { |error| do_anything }
+                it 'raises SpecificErrorClass with message' do
+                  expect { do_something }.to raise_error(SpecificErrorClass).with_message(message)
                 end
               end
             END
           end
 
+          let(:raise_error_object) { expect_object.raise_error_matcher }
+
           it 'does nothing' do
             rewritten_source.should == source
           end
@@ -219,6 +150,8 @@ module Transpec
             END
           end
 
+          let(:raise_error_object) { should_object.raise_error_matcher }
+
           it 'converts into `lambda { }.should_not raise_error` form' do
             rewritten_source.should == expected_source
           end
@@ -251,6 +184,8 @@ module Transpec
             END
           end
 
+          let(:raise_error_object) { expect_object.raise_error_matcher }
+
           it 'converts into `expect { }.not_to raise_error` form' do
             rewritten_source.should == expected_source
           end
@@ -277,6 +212,8 @@ module Transpec
             END
           end
 
+          let(:raise_error_object) { expect_object.raise_error_matcher }
+
           it 'converts into `expect { }.to_not raise_error` form' do
             rewritten_source.should == expected_source
           end
@@ -309,6 +246,8 @@ module Transpec
             END
           end
 
+          let(:raise_error_object) { expect_object.raise_error_matcher }
+
           it 'converts into `expect { }.not_to raise_error` form' do
             rewritten_source.should == expected_source
           end
@@ -341,6 +280,8 @@ module Transpec
             END
           end
 
+          let(:raise_error_object) { expect_object.raise_error_matcher }
+
           it 'converts into `expect { }.not_to raise_error` form' do
             rewritten_source.should == expected_source
           end
@@ -373,6 +314,8 @@ module Transpec
             END
           end
 
+          let(:raise_error_object) { expect_object.raise_error_matcher }
+
           it 'converts into `expect { }.not_to raise_error` form' do
             rewritten_source.should == expected_source
           end

data/spec/transpec/syntax/should_spec.rb

@@ -93,8 +93,8 @@ module Transpec
             END
           end
 
-          it 'returns an instance of OperatorMatcher' do
-            should be_an(OperatorMatcher)
+          it 'returns an instance of Operator' do
+            should be_an(Operator)
           end
         end
 
@@ -179,7 +179,7 @@ module Transpec
             END
           end
 
-          it 'invokes OperatorMatcher#convert_operator!' do
+          it 'invokes Operator#convert_operator!' do
             should_object.operator_matcher.should_receive(:convert_operator!)
             should_object.expectize!
           end

data/tasks/readme.rake

@@ -28,8 +28,18 @@ def generate_readme
   erb.result(binding)
 end
 
+def select_sections(content, header_level, *section_names)
+  header_pattern = pattern_for_header_level(header_level)
+  sections = content.each_line.slice_before(header_pattern)
+
+  sections.select do |section|
+    header_line = section.first
+    section_names.any? { |name| header_line.include?(name) }
+  end
+end
+
 def table_of_contents(lines, header_level)
-  header_pattern = /^#{'#' * header_level}[^#]/
+  header_pattern = pattern_for_header_level(header_level)
 
   titles = lines.map do |line|
     next unless line.match(header_pattern)
@@ -41,3 +51,7 @@ def table_of_contents(lines, header_level)
     "* [#{title}](#{anchor})"
   end.join("\n")
 end
+
+def pattern_for_header_level(level)
+  /^#{'#' * level}[^#]/
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: transpec
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.9.2
 platform: ruby
 authors:
 - Yuji Nakayama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-15 00:00:00.000000000 Z
+date: 2014-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -268,7 +268,7 @@ files:
 - lib/transpec/syntax/mixin/any_instance_block.rb
 - lib/transpec/syntax/mixin/expect_base.rb
 - lib/transpec/syntax/mixin/expectizable.rb
-- lib/transpec/syntax/mixin/have_matcher_owner.rb
+- lib/transpec/syntax/mixin/matcher_owner.rb
 - lib/transpec/syntax/mixin/messaging_host.rb
 - lib/transpec/syntax/mixin/monkey_patch.rb
 - lib/transpec/syntax/mixin/monkey_patch_any_instance.rb
@@ -278,7 +278,7 @@ files:
 - lib/transpec/syntax/mixin/should_base.rb
 - lib/transpec/syntax/mixin/useless_and_return.rb
 - lib/transpec/syntax/oneliner_should.rb
-- lib/transpec/syntax/operator_matcher.rb
+- lib/transpec/syntax/operator.rb
 - lib/transpec/syntax/raise_error.rb
 - lib/transpec/syntax/receive.rb
 - lib/transpec/syntax/rspec_configure.rb
@@ -320,7 +320,7 @@ files:
 - spec/transpec/syntax/matcher_definition_spec.rb
 - spec/transpec/syntax/method_stub_spec.rb
 - spec/transpec/syntax/oneliner_should_spec.rb
-- spec/transpec/syntax/operator_matcher_spec.rb
+- spec/transpec/syntax/operator_spec.rb
 - spec/transpec/syntax/raise_error_spec.rb
 - spec/transpec/syntax/receive_spec.rb
 - spec/transpec/syntax/rspec_configure_spec.rb
@@ -391,7 +391,7 @@ test_files:
 - spec/transpec/syntax/matcher_definition_spec.rb
 - spec/transpec/syntax/method_stub_spec.rb
 - spec/transpec/syntax/oneliner_should_spec.rb
-- spec/transpec/syntax/operator_matcher_spec.rb
+- spec/transpec/syntax/operator_spec.rb
 - spec/transpec/syntax/raise_error_spec.rb
 - spec/transpec/syntax/receive_spec.rb
 - spec/transpec/syntax/rspec_configure_spec.rb

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

@@ -1,38 +0,0 @@
-# coding: utf-8
-
-require 'active_support/concern'
-require 'transpec/syntax/have'
-
-module Transpec
-  class Syntax
-    module Mixin
-      module HaveMatcherOwner
-        extend ActiveSupport::Concern
-
-        included do
-          define_dynamic_analysis_request do |rewriter|
-            if Have.dynamic_analysis_target_node?(matcher_node)
-              create_have_matcher.register_request_for_dynamic_analysis(rewriter)
-            end
-          end
-        end
-
-        def have_matcher # rubocop:disable PredicateName
-          return @have_matcher if instance_variable_defined?(:@have_matcher)
-
-          @have_matcher ||= if Have.conversion_target_node?(matcher_node, @runtime_data)
-                              create_have_matcher
-                            else
-                              nil
-                            end
-        end
-
-        private
-
-        def create_have_matcher
-          Have.new(matcher_node, self, @source_rewriter, @runtime_data, @report)
-        end
-      end
-    end
-  end
-end