transpec 1.10.1 → 1.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 44ca6a93bd2bda16ddb06a1b392b577d4058e181
-  data.tar.gz: 157977020a4bff523c6e261722288b3f06d49bc1
+  metadata.gz: f63ab80111ffedb4a472083d734b97e3546a2378
+  data.tar.gz: e14e5cae27aa6e42915b8c82d3062122e156b711
 SHA512:
-  metadata.gz: 7aa89e910659d73dbe0c62bf494041cb94997f5a1d0fad85e01773dc8ff31be766f6f4f138cc0ec228391dded032e0181a75d1ba6f6cb9cd619769218db867e0
-  data.tar.gz: 9c902ba46ea0940d3d418bf5f9e752d97b9d19797d3543da814e41f568115dc4e17d3f8e6b0d132dd3704d06f7fc02a7efcf5a6070cfdaaf4b0bddf438f91ba5
+  metadata.gz: 017fccc8bed755513a5efaafcc11e32233457fc0cc87e40ba0606458898f48ce97a23127e783944193aff0d8ace73428858e0c8cffded85f857a93da15649a44
+  data.tar.gz: 22b1175c44bcc0f151c2d5bf307aabc866650190be0fc690e4aa7fd1b8ebaac78ec344c7e42109e4ea68334222eb28b2b8b2481bffba865b5284710d813e1a15

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Development
 
+## v1.10.2
+
+* Fix a bug where `expect(an_array + another_array).to have(2).items` was converted to `expect((an_array +(another_array).size).to eq(2)`
+
 ## v1.10.1
 
 * Fix a bug where `expect(hash['some_key']).to have(2).items` was converted to `expect(hash[().size).to eq(2)` ([#51](https://github.com/yujinakayama/transpec/issues/51))

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

@@ -6,6 +6,8 @@ module Transpec
   class Syntax
     class Have
       class SourceBuilder
+        include Util
+
         attr_reader :have, :size_source
 
         def initialize(have, size_source)
@@ -47,19 +49,11 @@ module Transpec
         private
 
         def base_subject_source(node)
-          map = node.loc
-          source = map.expression.source
-
-          if node.send_type? && (arg_node = node.children[2])
-            left_of_arg_range = map.selector.end.join(arg_node.loc.expression.begin)
-            if !map.selector.source.start_with?('[') && !left_of_arg_range.source.include?('(')
-              relative_index = left_of_arg_range.begin_pos - map.expression.begin_pos
-              source[relative_index, left_of_arg_range.length] = '('
-              source << ')'
-            end
+          if node.send_type?
+            chainable_source(node)
+          else
+            node.loc.expression.source
           end
-
-          source
         end
 
         def replacement_matcher_source_for_should

data/lib/transpec/util.rb

@@ -226,5 +226,28 @@ module Transpec
         end
       end
     end
+
+    def chainable_source(node)
+      fail "Invalid argument #{node}" unless node.send_type?
+
+      map = node.loc
+      source = map.expression.source
+
+      return source if map.selector.source.start_with?('[')
+
+      arg_node = node.children[2]
+      return source unless arg_node
+
+      left_of_arg_range = map.selector.end.join(arg_node.loc.expression.begin)
+      return source if left_of_arg_range.source.include?('(')
+
+      if map.selector.source.match(/^\w/)
+        relative_index = left_of_arg_range.begin_pos - map.expression.begin_pos
+        source[relative_index, left_of_arg_range.length] = '('
+        source << ')'
+      else
+        "(#{source})"
+      end
+    end
   end
 end

data/lib/transpec/version.rb

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

data/spec/transpec/util_spec.rb

@@ -92,5 +92,24 @@ module Transpec
         end
       end
     end
+
+    describe '#chainable_source' do
+      subject { Util.chainable_source(ast) }
+
+      [
+        ['receiver.do_something(arg1, arg2)', 'receiver.do_something(arg1, arg2)'],
+        ['receiver.do_something arg1, arg2',  'receiver.do_something(arg1, arg2)'],
+        ['receiver[arg1, arg2]',              'receiver[arg1, arg2]'],
+        ['receiver + arg',                    '(receiver + arg)']
+      ].each do |original, expected|
+        context "when the invocation is `#{original}` form" do
+          let(:source) { original }
+
+          it "returns `#{expected}`" do
+            should == expected
+          end
+        end
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: transpec
 version: !ruby/object:Gem::Version
-  version: 1.10.1
+  version: 1.10.2
 platform: ruby
 authors:
 - Yuji Nakayama