transpec 1.13.0 → 1.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1380a29e5d1d69345538ed009fee77b52c9c1476
-  data.tar.gz: 76891cd865379b4e43d55e890bf076e6be404777
+  metadata.gz: cb62942d4b92b4b76ee2e2a74d1287ea3a54e8fb
+  data.tar.gz: 72298e837998e51fcb53877389d9d407f302c3dd
 SHA512:
-  metadata.gz: 6b6f75a2ea40fa95e6cb8d7eba12ac63e6ea3d7c03bc3b8b2e0cd85b39d5a4a0215a3139aad09e980c89eaaccc8d5880392d8f4793ef5e314d37d25a755ec5f9
-  data.tar.gz: df0ecc276f65e263cf1c0fe53275ef84d8d884e159a4ade6d92f83a3348b8d2f35829fc98b29ae6d87609a0c0d8b5d8cba66e5331e3c22aed94689473db255df
+  metadata.gz: 8541244f475226a74a364370e379a1c188d173e0813553e04c96f419fd805247c30703abdba3dab20db9ba92f56f48e3720ff04f99c871a67bdb306b39883249
+  data.tar.gz: 9f906de970f67fd2638fb26103ac8ceea32fffeb940b2fcc271c51b7a1662e9920993c70e7c1c4b1f4efd671c78b6bf3b400f884cc0037b86f8871bd46601b8a

data/.rubocop.yml

@@ -1,10 +1,10 @@
 
 AllCops:
   Include:
-    - tasks/*.rake
+    - '**/*.rake'
   Exclude:
-    - tmp/*
-    - vendor/*
+    - 'tmp/**/*'
+    - 'vendor/**/*'
 
 LineLength:
   Max: 100

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Development
 
+## v1.13.1
+
+* Fix a bug where multiline expression `expect(obj).to receive(:message)\n.and_return { value }` was converted to `expect(obj).to.receive(:message)\n { value }` and the block was interpreted as a hash literal. ([#60](https://github.com/yujinakayama/transpec/issues/60))
+* Fix a bug where dynamic analysis were not run partially when there are same structure nodes in an AST with `ast` gem 2.0.
+
 ## v1.13.0
 
 * Improve the conversion performance.

data/lib/transpec/dynamic_analyzer/rewriter.rb

@@ -23,7 +23,9 @@ module Transpec
       end
 
       def requests
-        @requests ||= {}
+        # AST::Node#eql? returns true if two nodes have the same structure,
+        # even if they are not identical objects.
+        @requests ||= {}.compare_by_identity
       end
 
       def clear_requests!

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

@@ -13,8 +13,6 @@ module Transpec
 
         def remove_useless_and_return!
           return unless useless_and_return?
-          map = and_return_node.loc
-          and_return_range = map.dot.join(map.expression.end)
           remove(and_return_range)
           true
         end
@@ -43,6 +41,13 @@ module Transpec
           end
         end
 
+        private
+
+        def and_return_range
+          receiver_node = and_return_node.children.first
+          receiver_node.loc.expression.end.join(and_return_node.loc.expression.end)
+        end
+
         class UselessAndReturnRecord < Record
           def initialize(host, *)
             @host = host

data/lib/transpec/syntax/rspec_configure.rb

@@ -15,7 +15,7 @@ module Transpec
 
       define_dynamic_analysis do |rewriter|
         code = "TranspecAnalysis.global_data[:rspec_configure_run_order] ||= 0\n" \
-               "TranspecAnalysis.global_data[:rspec_configure_run_order] += 1"
+               'TranspecAnalysis.global_data[:rspec_configure_run_order] += 1'
         rewriter.register_request(node, :run_order, code)
       end
 

data/lib/transpec/version.rb

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

data/spec/transpec/dynamic_analyzer/rewriter_spec.rb

@@ -97,24 +97,45 @@ module Transpec
       end
 
       describe '#register_request' do
-        let(:some_node) { s(:int, 1) }
-        let(:another_node) { s(:int, 2) }
+        include_context 'parsed objects'
+
+        let(:source) do
+          <<-END
+            1
+            2
+          END
+        end
+
+        let(:a_node) { ast.children[0] }
+        let(:another_node) { ast.children[1] }
 
         it 'stores requests for each node' do
-          rewriter.register_request(some_node, :odd, 'odd?', :object)
+          rewriter.register_request(a_node, :odd, 'odd?', :object)
           rewriter.register_request(another_node, :even, 'even?', :object)
-          rewriter.requests.should == {
-            some_node    => { odd: [:object, 'odd?'] },
-            another_node => { even: [:object, 'even?'] }
-          }
+          rewriter.requests[a_node].should == { odd: [:object, 'odd?'] }
+          rewriter.requests[another_node].should == { even: [:object, 'even?'] }
         end
 
         it 'merges multiple requests for same node' do
-          rewriter.register_request(some_node, :odd, 'odd?', :object)
-          rewriter.register_request(some_node, :even, 'even?', :object)
-          rewriter.requests.should == {
-            some_node => { odd: [:object, 'odd?'], even: [:object, 'even?'] }
-          }
+          rewriter.register_request(a_node, :odd, 'odd?', :object)
+          rewriter.register_request(a_node, :even, 'even?', :object)
+          rewriter.requests[a_node].should == { odd: [:object, 'odd?'], even: [:object, 'even?'] }
+        end
+
+        context 'when there are same structure nodes but they are not identical objects' do
+          let(:source) do
+            <<-END
+              1
+              1
+            END
+          end
+
+          it 'properly diffrenciate them' do
+            rewriter.register_request(a_node, :odd, 'odd?', :object)
+            rewriter.register_request(another_node, :even, 'even?', :object)
+            rewriter.requests[a_node].should == { odd: [:object, 'odd?'] }
+            rewriter.requests[another_node].should == { even: [:object, 'even?'] }
+          end
         end
       end
     end

data/spec/transpec/syntax/method_stub_spec.rb

@@ -1132,6 +1132,62 @@ module Transpec
           end
         end
 
+        context 'with multiline expression `obj.stub(:message)\n.and_return { value }`' do
+          let(:source) do
+            <<-END
+              describe 'example' do
+                it 'responds to #foo and returns 1' do
+                  subject.stub(:foo)
+                    .and_return { 1 }
+                end
+              end
+            END
+          end
+
+          let(:expected_source) do
+            <<-END
+              describe 'example' do
+                it 'responds to #foo and returns 1' do
+                  subject.stub(:foo) { 1 }
+                end
+              end
+            END
+          end
+
+          it 'converts to `obj.stub(:message) { value }` form' \
+             'while preventing the block from being interpreted as a hash' do
+            rewritten_source.should == expected_source
+          end
+        end
+
+        context 'with multiline expression `obj.stub(:message).\nand_return { value }`' do
+          let(:source) do
+            <<-END
+              describe 'example' do
+                it 'responds to #foo and returns 1' do
+                  subject.stub(:foo).
+                    and_return { 1 }
+                end
+              end
+            END
+          end
+
+          let(:expected_source) do
+            <<-END
+              describe 'example' do
+                it 'responds to #foo and returns 1' do
+                  subject.stub(:foo) { 1 }
+                end
+              end
+            END
+          end
+
+          it 'converts to `obj.stub(:message) { value }` form' \
+             'while preventing the block from being interpreted as a hash' do
+            rewritten_source.should == expected_source
+          end
+        end
+
         context 'with expression `obj.stub(:message).and_return`' do
           let(:source) do
             <<-END

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: transpec
 version: !ruby/object:Gem::Version
-  version: 1.13.0
+  version: 1.13.1
 platform: ruby
 authors:
 - Yuji Nakayama
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-16 00:00:00.000000000 Z
+date: 2014-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser