rails5-spec-converter 1.0.19 → 1.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8ed726d17eeded2ad212304686feb640a5a87e0
-  data.tar.gz: 5c3b38ee09a37981a347ff0e88fa432edf4f60f2
+  metadata.gz: c39727a6db3accd9728ab2c8bfa6d815f643a4a8
+  data.tar.gz: 9e5417f24316cc7e52e641a9326300a53076b860
 SHA512:
-  metadata.gz: 3526ec24e89a2ede5ba18da2cf814a23578f062f1206de35befae62fd49a35f2ce0a8d2b2a87f5ff1856cab5c3598e21c3dac1869f2586de9347c98622c0457d
-  data.tar.gz: 990cf71407cdf8017c3299b9639176cdd54056cc47e981cbcac027c3e7bf3482b7c2fca8bc5873c0a72c44b3a6a89abdd91a41564c3868896c8a2634d18acccb
+  metadata.gz: 567c6d0ce3b8cb2ba351c66016cfca5b48237bb1a1320b75db87d422b8b666cf8bc0eeb20f16afa850a95da025b94445b58b366b9295e2c45f373dcb8baa294f
+  data.tar.gz: 1d24dea46469e77d819a67351601b004ac25ed9b4ef5fe53cefa241e2a5e27cdbcdffdd73c471746490a4a1148215a9b81fbc75d651787bf4200bde3546fee4c

data/lib/rails5/spec_converter/text_transformer.rb

@@ -58,6 +58,13 @@ module Rails5
                 hash_rewriter.rewritten_params_hash
               ) if hash_rewriter.should_rewrite_hash?
             end
+          elsif args[0].nil_type? && args.length > 1
+            nil_arg_range = Parser::Source::Range.new(
+              @source_buffer,
+              args[0].loc.expression.begin_pos,
+              args[1].loc.expression.begin_pos
+            )
+            @source_rewriter.remove(nil_arg_range)
           else
             warn_about_ambiguous_params(node) if @options.warn_about_ambiguous_params?
             handle_ambiguous_method_call!(node)
@@ -87,10 +94,20 @@ module Rails5
           ].join('.')
 
           text_before_node = node.loc.expression.source_line[0...node.loc.expression.column]
-          first_line_content = "_inner, _outer = #{partition_clause}"
+          first_line_content = "_outer, _inner = #{partition_clause}"
           if text_before_node =~ /^\s+$/
             @source_rewriter.insert_before(node.loc.expression, "#{first_line_content}\n#{line_indent(node)}")
-            @source_rewriter.replace(args[0].loc.expression, '_outer.merge(params: _inner)')
+            if args.length == 1
+              @source_rewriter.replace(args[0].loc.expression, '_outer.merge(params: _inner)')
+            else
+              replacement_range = Parser::Source::Range.new(
+                @source_buffer,
+                args[0].loc.expression.begin_pos,
+                args[1].loc.expression.begin_pos
+              )
+              @source_rewriter.replace(replacement_range, '_outer.merge(params: _inner).merge(')
+              @source_rewriter.insert_after(args.last.loc.expression, ')')
+            end
           else
             return unless in_a_block_with_only_whitespace?(node)
 

data/lib/rails5/spec_converter/version.rb

@@ -1,5 +1,5 @@
 module Rails5
   module SpecConverter
-    VERSION = "1.0.19"
+    VERSION = "1.0.20"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails5-spec-converter
 version: !ruby/object:Gem::Version
-  version: 1.0.19
+  version: 1.0.20
 platform: ruby
 authors:
 - Travis Grathwell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-11 00:00:00.000000000 Z
+date: 2016-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser