rails5-spec-converter 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a87dd8dccefd54232cff542938557421517353d6
-  data.tar.gz: b32a003889fef8fbb189461e52fd3296318f8396
+  metadata.gz: e051f5090f09b08d27863b080ad002abc60a43a4
+  data.tar.gz: 6662badfc382d19cb8108ae8cf931f83afde9a4c
 SHA512:
-  metadata.gz: c2d0dd74529daee5d8c96a2a48c99290b70d4b64d3c50539a8f9a078a5e5dafdea2827904230a78ea846850e838c7d8b57dd662a2bc0229ab8c093936cd55fa1
-  data.tar.gz: 1a6b4ed2701cca74c3263336ab88d6c6d2c4fda8dd59cc6bb74bbd7dbb0ed390012212e16da3486a9fce385955a234e7552bc4a5a10fb1984c5b916658a9740b
+  metadata.gz: bed2ebb16380b55efc0fb5de791df001a061867d8157add9928c667be0752995860dd7ac004abe1f28f46c47f874612087103763ab60f52b2d6f2b9d4ee7c41c
+  data.tar.gz: f39109b7226c6f260d33441716d6ebaa34bbe51e59df80e04b6bba5dd275a66dbb3fb832b90ab6b065c586a7328d944df17c2b725532f711862aab99b717fb5d

data/lib/rails5/spec_converter/text_transformer.rb

@@ -27,49 +27,13 @@ module Rails5
           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
+          if args[0].hash_type? && args[0].children.length > 0
+            write_params_hash(source_rewriter, args[0])
+          else
+            wrap_arg(source_rewriter, args[0], 'params')
           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/) ? '' : ' '
-
-            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
+          wrap_arg(source_rewriter, args[1], 'headers') if args[1]
         end
 
         source_rewriter.process
@@ -77,6 +41,43 @@ module Rails5
 
       private
 
+      def write_params_hash(source_rewriter, hash_node)
+        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
+
+        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(', ')
+          )
+        end
+      end
+
+      def wrap_arg(source_rewriter, node, key)
+        node_loc = node.loc.expression
+        node_source = node_loc.source
+        if node.hash_type? && !node_source.match(/^\s*\{.*\}$/)
+          node_source = "{ #{node_source} }"
+        end
+        source_rewriter.replace(node_loc, "#{key}: #{node_source}")
+      end
+
       def restring_hash(pairs)
         pairs.map { |pair| pair.loc.expression.source }.join(", ")
       end

data/lib/rails5/spec_converter/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails5-spec-converter
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Travis Grathwell
@@ -139,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A tool to upgrade Rails 4-style specs to Rails 5-style