transpec 1.5.0 → 1.5.1

data/spec/transpec/dynamic_analyzer/rewriter_spec.rb

@@ -57,7 +57,7 @@ module Transpec
             <<-END
               describe 'example' do
                 it 'matches to foo' do
-                  transpec_analysis((transpec_analysis((subject), self, { :should_source_location => [:object, "method(:should).source_location"] }, __FILE__, 93, 100).should), self, { :expect_available? => [:context, "self.class.ancestors.any? { |a| a.name.start_with?('RSpec::') } && respond_to?(:expect)"] }, __FILE__, 93, 107) =~ transpec_analysis((<<-HEREDOC.gsub('foo', 'bar')
+                  transpec_analysis((transpec_analysis((subject), self, { :should_source_location => [:object, "method(:should).source_location"] }, __FILE__, 93, 100).should), self, { :"=~_source_location" => [:object, "method(:=~).source_location"], :expect_available? => [:context, "self.class.ancestors.any? { |a| a.name.start_with?('RSpec::') } && respond_to?(:expect)"] }, __FILE__, 93, 107) =~ transpec_analysis((<<-HEREDOC.gsub('foo', 'bar')
                   foo
                   HEREDOC
                   ), self, { :arg_is_enumerable? => [:object, "is_a?(Enumerable)"] }, __FILE__, 111, 188)

data/spec/transpec/report_spec.rb

@@ -13,8 +13,7 @@ module Transpec
       report.records << Record.new('obj.stub(:message)', 'allow(obj).to receive(:message)')
       report.records << Record.new('obj.should', 'expect(obj).to')
       report.records << Record.new('obj.should', 'expect(obj).to')
-      report.invalid_context_errors <<
-        Syntax::InvalidContextError.new(double('range'), '#should', '#expect')
+      report.context_errors << ContextError.new(double('range'), '#should', '#expect')
     end
 
     describe '#unique_record_counts' do

data/spec/transpec/rspec_version_spec.rb

@@ -27,8 +27,10 @@ module Transpec
       include_examples 'feature availability', method, [
         ['2.14.0',       false],
         ['2.99.0.beta1', true],
+        ['2.99.0.beta2', true],
         ['2.99.0',       true],
         ['3.0.0.beta1',  true],
+        ['3.0.0.beta2',  true],
         ['3.0.0',        true]
       ]
     end
@@ -39,7 +41,8 @@ module Transpec
         ['2.99.0.beta1', false],
         ['2.99.0.beta2', true],
         ['2.99.0',       true],
-        ['3.0.0.beta1',  true],
+        ['3.0.0.beta1',  false],
+        ['3.0.0.beta2',  true],
         ['3.0.0',        true]
       ]
     end
@@ -48,8 +51,10 @@ module Transpec
       include_examples 'feature availability', method, [
         ['2.14.0',       false],
         ['2.99.0.beta1', false],
+        ['2.99.0.beta2', false],
         ['2.99.0',       false],
         ['3.0.0.beta1',  true],
+        ['3.0.0.beta2',  true],
         ['3.0.0',        true]
       ]
     end
@@ -58,6 +63,7 @@ module Transpec
       include_examples 'feature availability', method, [
         ['2.14.0',       false],
         ['2.99.0.beta1', false],
+        ['2.99.0.beta2', false],
         ['2.99.0',       false],
         ['3.0.0.beta1',  false],
         ['3.0.0.beta2',  true],

data/spec/transpec/syntax/double_spec.rb

@@ -9,7 +9,7 @@ module Transpec
       include_context 'parsed objects'
       include_context 'syntax object', Double, :double_object
 
-      describe '.target_node?' do
+      describe '.conversion_target_node?' do
         let(:send_node) do
           ast.each_descendent_node do |node|
             next unless node.type == :send
@@ -33,7 +33,7 @@ module Transpec
           end
 
           it 'returns true' do
-            Double.target_node?(send_node).should be_true
+            Double.conversion_target_node?(send_node).should be_true
           end
         end
 
@@ -53,7 +53,7 @@ module Transpec
             end
 
             it 'returns true' do
-              Double.target_node?(send_node).should be_true
+              Double.conversion_target_node?(send_node).should be_true
             end
           end
 
@@ -88,7 +88,7 @@ module Transpec
             end
 
             it 'returns false' do
-              Double.target_node?(send_node, runtime_data).should be_false
+              Double.conversion_target_node?(send_node, runtime_data).should be_false
             end
           end
         end

data/spec/transpec/syntax/example_spec.rb

@@ -159,7 +159,7 @@ module Transpec
 
           let(:example_objects) do
             ast.each_node.reduce([]) do |objects, node|
-              objects << Example.new(node, source_rewriter, runtime_data) if Example.target_node?(node)
+              objects << Example.new(node, source_rewriter, runtime_data) if Example.conversion_target_node?(node)
               objects
             end
           end

data/spec/transpec/syntax/method_stub_spec.rb

@@ -12,7 +12,7 @@ module Transpec
 
       let(:record) { method_stub_object.report.records.first }
 
-      describe '.target_node?' do
+      describe '.conversion_target_node?' do
         let(:send_node) do
           ast.each_descendent_node do |node|
             next unless node.type == :send
@@ -35,7 +35,23 @@ module Transpec
           end
 
           it 'returns true' do
-            MethodStub.target_node?(send_node).should be_true
+            MethodStub.conversion_target_node?(send_node).should be_true
+          end
+        end
+
+        context 'when Factory.stub node is passed' do
+          let(:source) do
+            <<-END
+              describe 'example' do
+                it "is not RSpec's #stub" do
+                  Factory.stub(:foo)
+                end
+              end
+            END
+          end
+
+          it 'returns false' do
+            MethodStub.conversion_target_node?(send_node).should be_false
           end
         end
 
@@ -54,7 +70,7 @@ module Transpec
             end
 
             it 'returns true' do
-              MethodStub.target_node?(send_node, runtime_data).should be_true
+              MethodStub.conversion_target_node?(send_node, runtime_data).should be_true
             end
           end
 
@@ -75,7 +91,45 @@ module Transpec
             end
 
             it 'returns false' do
-              MethodStub.target_node?(send_node, runtime_data).should be_false
+              MethodStub.conversion_target_node?(send_node, runtime_data).should be_false
+            end
+          end
+
+          context "when Factory.stub node is passed and it's RSpec's #stub" do
+            let(:source) do
+              <<-END
+                module Factory
+                end
+
+                describe 'example' do
+                  it 'responds to #foo' do
+                    Factory.stub(:foo)
+                  end
+                end
+              END
+            end
+
+            it 'returns true' do
+              MethodStub.conversion_target_node?(send_node, runtime_data).should be_true
+            end
+          end
+
+          context 'when Factory.stub node is passed and it has not been run' do
+            let(:source) do
+              <<-END
+                module Factory
+                end
+
+                describe 'example' do
+                  it 'responds to #foo' do
+                    true || Factory.stub(:foo)
+                  end
+                end
+              END
+            end
+
+            it 'returns false' do
+              MethodStub.conversion_target_node?(send_node, runtime_data).should be_false
             end
           end
         end
@@ -155,16 +209,16 @@ module Transpec
               context 'with runtime information' do
                 include_context 'dynamic analysis objects'
 
-                it 'raises InvalidContextError' do
+                it 'raises ContextError' do
                   -> { method_stub_object.allowize!(rspec_version) }
-                    .should raise_error(InvalidContextError)
+                    .should raise_error(ContextError)
                 end
               end
 
               context 'without runtime information' do
-                it 'raises InvalidContextError' do
+                it 'raises ContextError' do
                   -> { method_stub_object.allowize!(rspec_version) }
-                    .should raise_error(InvalidContextError)
+                    .should raise_error(ContextError)
                 end
               end
             end
@@ -187,14 +241,14 @@ module Transpec
               context 'with runtime information' do
                 include_context 'dynamic analysis objects'
 
-                it 'raises InvalidContextError' do
+                it 'raises ContextError' do
                   -> { method_stub_object.allowize!(rspec_version) }
-                    .should raise_error(InvalidContextError)
+                    .should raise_error(ContextError)
                 end
               end
 
               context 'without runtime information' do
-                it 'does not raise InvalidContextError' do
+                it 'does not raise ContextError' do
                   -> { method_stub_object.allowize!(rspec_version) }
                     .should_not raise_error
                 end

data/spec/transpec/syntax/should_receive_spec.rb

@@ -104,14 +104,14 @@ module Transpec
               context 'with runtime information' do
                 include_context 'dynamic analysis objects'
 
-                it 'raises InvalidContextError' do
-                  -> { should_receive_object.expectize! }.should raise_error(InvalidContextError)
+                it 'raises ContextError' do
+                  -> { should_receive_object.expectize! }.should raise_error(ContextError)
                 end
               end
 
               context 'without runtime information' do
-                it 'raises InvalidContextError' do
-                  -> { should_receive_object.expectize! }.should raise_error(InvalidContextError)
+                it 'raises ContextError' do
+                  -> { should_receive_object.expectize! }.should raise_error(ContextError)
                 end
               end
             end
@@ -138,13 +138,13 @@ module Transpec
               context 'with runtime information' do
                 include_context 'dynamic analysis objects'
 
-                it 'raises InvalidContextError' do
-                  -> { should_receive_object.expectize! }.should raise_error(InvalidContextError)
+                it 'raises ContextError' do
+                  -> { should_receive_object.expectize! }.should raise_error(ContextError)
                 end
               end
 
               context 'without runtime information' do
-                it 'does not raise InvalidContextError' do
+                it 'does not raise ContextError' do
                   -> { should_receive_object.expectize! }.should_not raise_error
                 end
               end
@@ -681,16 +681,16 @@ module Transpec
               context 'with runtime information' do
                 include_context 'dynamic analysis objects'
 
-                it 'raises InvalidContextError' do
+                it 'raises ContextError' do
                   -> { should_receive_object.allowize_useless_expectation! }
-                    .should raise_error(InvalidContextError)
+                    .should raise_error(ContextError)
                 end
               end
 
               context 'without runtime information' do
-                it 'raises InvalidContextError' do
+                it 'raises ContextError' do
                   -> { should_receive_object.allowize_useless_expectation! }
-                    .should raise_error(InvalidContextError)
+                    .should raise_error(ContextError)
                 end
               end
             end
@@ -713,14 +713,14 @@ module Transpec
               context 'with runtime information' do
                 include_context 'dynamic analysis objects'
 
-                it 'raises InvalidContextError' do
+                it 'raises ContextError' do
                   -> { should_receive_object.allowize_useless_expectation! }
-                    .should raise_error(InvalidContextError)
+                    .should raise_error(ContextError)
                 end
               end
 
               context 'without runtime information' do
-                it 'does not raise InvalidContextError' do
+                it 'does not raise ContextError' do
                   -> { should_receive_object.allowize_useless_expectation! }
                     .should_not raise_error
                 end

data/spec/transpec/syntax/should_spec.rb

@@ -250,14 +250,14 @@ module Transpec
             context 'with runtime information' do
               include_context 'dynamic analysis objects'
 
-              it 'does not raise InvalidContextError' do
+              it 'does not raise ContextError' do
                 -> { should_object.expectize! }.should_not raise_error
               end
             end
 
             context 'without runtime information' do
-              it 'raises InvalidContextError' do
-                -> { should_object.expectize! }.should raise_error(InvalidContextError)
+              it 'raises ContextError' do
+                -> { should_object.expectize! }.should raise_error(ContextError)
               end
             end
           end
@@ -283,14 +283,14 @@ module Transpec
               context 'with runtime information' do
                 include_context 'dynamic analysis objects'
 
-                it 'raises InvalidContextError' do
-                  -> { should_object.expectize! }.should raise_error(InvalidContextError)
+                it 'raises ContextError' do
+                  -> { should_object.expectize! }.should raise_error(ContextError)
                 end
               end
 
               context 'without runtime information' do
-                it 'raises InvalidContextError' do
-                  -> { should_object.expectize! }.should raise_error(InvalidContextError)
+                it 'raises ContextError' do
+                  -> { should_object.expectize! }.should raise_error(ContextError)
                 end
               end
             end
@@ -313,13 +313,13 @@ module Transpec
               context 'with runtime information' do
                 include_context 'dynamic analysis objects'
 
-                it 'raises InvalidContextError' do
-                  -> { should_object.expectize! }.should raise_error(InvalidContextError)
+                it 'raises ContextError' do
+                  -> { should_object.expectize! }.should raise_error(ContextError)
                 end
               end
 
               context 'without runtime information' do
-                it 'does not raise InvalidContextError' do
+                it 'does not raise ContextError' do
                   -> { should_object.expectize! }.should_not raise_error
                 end
               end

data/transpec.gemspec

@@ -9,10 +9,10 @@ Gem::Specification.new do |spec|
   spec.version       = Transpec::Version.to_s
   spec.authors       = ['Yuji Nakayama']
   spec.email         = ['nkymyj@gmail.com']
-  spec.summary       = 'An RSpec syntax converter'
+  spec.summary       = 'The RSpec syntax converter'
   spec.description   = 'Transpec converts your specs to the latest RSpec syntax ' +
                        'with static and dynamic code analysis.'
-  spec.homepage      = 'https://github.com/yujinakayama/transpec'
+  spec.homepage      = 'http://yujinakayama.me/transpec/'
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($/)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: transpec
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Yuji Nakayama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-06 00:00:00.000000000 Z
+date: 2013-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -219,6 +219,7 @@ files:
 - lib/transpec/cli.rb
 - lib/transpec/commit_message.rb
 - lib/transpec/configuration.rb
+- lib/transpec/context_error.rb
 - lib/transpec/converter.rb
 - lib/transpec/dynamic_analyzer.rb
 - lib/transpec/dynamic_analyzer/rewriter.rb
@@ -245,7 +246,7 @@ files:
 - lib/transpec/syntax/mixin/allow_no_message.rb
 - lib/transpec/syntax/mixin/any_instance.rb
 - lib/transpec/syntax/mixin/expectizable.rb
-- lib/transpec/syntax/mixin/have_matcher.rb
+- lib/transpec/syntax/mixin/have_matcher_owner.rb
 - lib/transpec/syntax/mixin/monkey_patch.rb
 - lib/transpec/syntax/mixin/send.rb
 - lib/transpec/syntax/mixin/should_base.rb
@@ -300,7 +301,7 @@ files:
 - tasks/readme.rake
 - tasks/test.rake
 - transpec.gemspec
-homepage: https://github.com/yujinakayama/transpec
+homepage: http://yujinakayama.me/transpec/
 licenses:
 - MIT
 metadata: {}
@@ -323,7 +324,7 @@ rubyforge_project:
 rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
-summary: An RSpec syntax converter
+summary: The RSpec syntax converter
 test_files:
 - spec/.rubocop.yml
 - spec/spec_helper.rb

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

@@ -1,23 +0,0 @@
-# coding: utf-8
-
-require 'transpec/syntax/have'
-
-module Transpec
-  class Syntax
-    module Mixin
-      module HaveMatcher
-        def have_matcher
-          return @have_matcher if instance_variable_defined?(:@have_matcher)
-
-          @have_matcher ||= begin
-            if Have.target_node?(matcher_node, @runtime_data)
-              Have.new(matcher_node, self, @source_rewriter, @runtime_data, @report)
-            else
-              nil
-            end
-          end
-        end
-      end
-    end
-  end
-end