rails5-spec-converter 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb40ce4087decb84d90621dbff3754da8bc1041d
-  data.tar.gz: 65f8db8ed9d02fd5620e0ab3b9ccc038c145f5b8
+  metadata.gz: a87dd8dccefd54232cff542938557421517353d6
+  data.tar.gz: b32a003889fef8fbb189461e52fd3296318f8396
 SHA512:
-  metadata.gz: c1c235aa76ee06967885c10c64317147c32cb7b45cf5efb55aee13bb8060e46d1b866a09bea38e2926ca4c0a50b4bc6a232036f96c1fed77c6c04f0de39b3cde
-  data.tar.gz: 34741b22342fa50139323f00b8ed12d801f3f90877c0a823e57082d96eb16f30cc36c7834995424057439f074bbc4459579d79fcde3446551316ceb4d86f6368
+  metadata.gz: c2d0dd74529daee5d8c96a2a48c99290b70d4b64d3c50539a8f9a078a5e5dafdea2827904230a78ea846850e838c7d8b57dd662a2bc0229ab8c093936cd55fa1
+  data.tar.gz: 1a6b4ed2701cca74c3263336ab88d6c6d2c4fda8dd59cc6bb74bbd7dbb0ed390012212e16da3486a9fce385955a234e7552bc4a5a10fb1984c5b916658a9740b

data/lib/rails5/spec_converter/text_transformer.rb

@@ -23,36 +23,51 @@ module Rails5
 
         root_node = parser.parse(source_buffer)
         root_node.each_node(:send) do |node|
-          target, verb, action, first_argument = node.children
-          if target.nil? && HTTP_VERBS.include?(verb)
-            if first_argument && first_argument.hash_type?
-              hash_node = first_argument
-
-              pairs_that_belong_in_params = []
-              pairs_that_belong_outside_params = []
-
-              hash_node.children.each do |pair|
-                key = pair.children[0].children[0]
-
-                if ALLOWED_KWARG_KEYS.include?(key)
-                  pairs_that_belong_outside_params << pair
-                else
-                  pairs_that_belong_in_params << pair
-                end
+          target, verb, action, *args = node.children
+          next unless args.length > 0
+          next unless target.nil? && HTTP_VERBS.include?(verb)
+
+          first_argument = args.first
+          if args.length == 1 && !first_argument.hash_type?
+            source_rewriter.replace(
+              first_argument.loc.expression,
+              "params: #{first_argument.loc.expression.source}"
+            )
+            next
+          end
+
+          if first_argument.hash_type?
+            hash_node = first_argument
+
+            pairs_that_belong_in_params = []
+            pairs_that_belong_outside_params = []
+
+            hash_node.children.each do |pair|
+              key = pair.children[0].children[0]
+
+              if ALLOWED_KWARG_KEYS.include?(key)
+                pairs_that_belong_outside_params << pair
+              else
+                pairs_that_belong_in_params << pair
               end
+            end
+
+            if pairs_that_belong_in_params.length == 0 && pairs_that_belong_outside_params.length == 0
+              source_rewriter.replace(hash_node.loc.expression, 'params: {}')
+              next
+            end
+
+            curly_sep = hash_node.parent.loc.expression.source.match(/{\S/) ? '' : ' '
 
-              curly_sep = hash_node.parent.loc.expression.source.match(/{\S/) ? '' : ' '
-
-              if pairs_that_belong_in_params.length > 0
-                rewritten_hashes = ["params: {#{curly_sep}#{restring_hash(pairs_that_belong_in_params)}#{curly_sep}}"]
-                if pairs_that_belong_outside_params.length > 0
-                  rewritten_hashes << restring_hash(pairs_that_belong_outside_params)
-                end
-                source_rewriter.replace(
-                  hash_node.loc.expression,
-                  rewritten_hashes.join(', ')
-                )
+            if pairs_that_belong_in_params.length > 0
+              rewritten_hashes = ["params: {#{curly_sep}#{restring_hash(pairs_that_belong_in_params)}#{curly_sep}}"]
+              if pairs_that_belong_outside_params.length > 0
+                rewritten_hashes << restring_hash(pairs_that_belong_outside_params)
               end
+              source_rewriter.replace(
+                hash_node.loc.expression,
+                rewritten_hashes.join(', ')
+              )
             end
           end
         end

data/lib/rails5/spec_converter/version.rb

@@ -1,5 +1,5 @@
 module Rails5
   module SpecConverter
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails5-spec-converter
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Travis Grathwell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-19 00:00:00.000000000 Z
+date: 2016-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -139,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A tool to upgrade Rails 4-style specs to Rails 5-style