rails5-spec-converter 1.0.14 → 1.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9a3ed6b378206c21ca92e7fd621dd2e414cbfbc
-  data.tar.gz: 963503b2f6e547cabb3bf11a147d055e7d04c53a
+  metadata.gz: 8f809b54f88c799e62a3da375d7e1c6386a24e71
+  data.tar.gz: 853ab71eb42ad2ff5f6834f25596e6f92a45a1d9
 SHA512:
-  metadata.gz: c3fdfd22196475dc10ff315347fb4057903b7ec98fa5a8a906b579abc3c2ffb4b0ebe7c073175ee2e296756a7494f4fa6b29647bf326212fc9255e99c9b4acfe
-  data.tar.gz: f2706c33bd3f869a9030f9296325666b61b0183d5085591991b73c7174687b33110cd85de0dc83a43452c940255af686315b7fc838bbf74743bd267eea9a5231
+  metadata.gz: 169d693d60ed16a8f81b30cf0e2e77d1cb019451b0ab64b5224bfaf2b3ed9c3a610fde5723a8d322b87c14aa8d70b8f9fb0943e1d979dbf1f1a5d633decd3f70
+  data.tar.gz: b2683718f15845812229c662c977302d58bcfa18a1d47b1efe95cf679194b5678fae3b9236d66f7fd962366c251d738f8787c85f6e1c8efe2421a3c02b9f3d73

data/lib/rails5/spec_converter/hash_node_text_analyzer.rb

@@ -0,0 +1,16 @@
+class HashNodeTextAnalyzer
+  attr_reader :content, :hash_node
+
+  def initialize(content, hash_node)
+    @content = content
+    @hash_node = hash_node
+  end
+
+  def text_before_first_pair
+    content[hash_node.loc.expression.begin_pos...hash_node.children.first.loc.expression.begin_pos]
+  end
+
+  def text_after_last_pair
+    content[hash_node.children.last.loc.expression.end_pos...hash_node.loc.expression.end_pos]
+  end
+end

data/lib/rails5/spec_converter/text_transformer.rb

@@ -1,6 +1,7 @@
 require 'parser/current'
 require 'astrolabe/builder'
 require 'rails5/spec_converter/text_transformer_options'
+require 'rails5/spec_converter/hash_node_text_analyzer'
 
 module Rails5
   module SpecConverter
@@ -80,24 +81,34 @@ module Rails5
         hash_node.children.any? { |node| node.kwsplat_type? }
       end
 
+      def has_trailing_comma?(hash_node)
+        HashNodeTextAnalyzer.new(@content, hash_node).text_after_last_pair =~ /,/
+      end
+
       def has_key?(hash_node, key)
         hash_node.children.any? { |pair| pair.children[0].children[0] == key }
       end
 
       def write_params_hash(hash_node:, original_indent: )
         pairs_that_belong_in_params, pairs_that_belong_outside_params = partition_params(hash_node)
+        use_trailing_comma = has_trailing_comma?(hash_node)
 
         if pairs_that_belong_in_params.length > 0
           joiner = joiner_between_pairs(hash_node)
           params_hash = appropriately_spaced_params_hash(
             hash_node: hash_node,
             pairs: pairs_that_belong_in_params,
-            original_indent: original_indent
+            original_indent: original_indent,
+            use_trailing_comma: use_trailing_comma
           )
 
           rewritten_hashes = ["params: #{params_hash}"]
           if pairs_that_belong_outside_params.length > 0
-            rewritten_hashes << restring_hash(pairs_that_belong_outside_params, joiner: joiner)
+            rewritten_hashes << restring_hash(
+              pairs_that_belong_outside_params,
+              joiner: joiner,
+              use_trailing_comma: use_trailing_comma
+            )
           end
           @source_rewriter.replace(
             hash_node.loc.expression,
@@ -125,15 +136,13 @@ module Rails5
       def indent_before_first_pair(hash_node)
         return nil unless hash_node.children.length > 0
 
-        text_before_first_pair = @content[hash_node.loc.expression.begin_pos...hash_node.children.first.loc.expression.begin_pos]
-        extract_indent(text_before_first_pair)
+        extract_indent(HashNodeTextAnalyzer.new(@content, hash_node).text_before_first_pair)
       end
 
       def indent_after_last_pair(hash_node)
         return nil unless hash_node.children.length > 0
 
-        text_after_last_pair = @content[hash_node.children.last.loc.expression.end_pos...hash_node.loc.expression.end_pos]
-        extract_indent(text_after_last_pair)
+        extract_indent(HashNodeTextAnalyzer.new(@content, hash_node).text_after_last_pair)
       end
 
       def indent_of_first_value_if_multiline(hash_node, original_indent)
@@ -188,7 +197,7 @@ module Rails5
         @content[node1.loc.expression.end_pos...node2.loc.expression.begin_pos]
       end
 
-      def appropriately_spaced_params_hash(hash_node:, pairs:, original_indent: )
+      def appropriately_spaced_params_hash(hash_node:, pairs:, original_indent:, use_trailing_comma:)
         outer_indent = existing_indent(hash_node)
         middle_indent = indent_of_first_value_if_multiline(hash_node, original_indent)
         inner_indent = additional_indent(hash_node)
@@ -197,7 +206,8 @@ module Rails5
           restrung_hash = restring_hash(
             pairs,
             indent: outer_indent + (inner_indent || ''),
-            joiner: ",\n"
+            joiner: ",\n",
+            use_trailing_comma: use_trailing_comma
           )
           if middle_indent
             restrung_hash = original_indent + add_indent(restrung_hash, middle_indent)
@@ -210,7 +220,7 @@ module Rails5
           "{\n#{restrung_hash}\n#{final_brace_indent}}"
         else
           curly_sep = determine_curly_sep(hash_node)
-          "{#{curly_sep}#{restring_hash(pairs)}#{curly_sep}}"
+          "{#{curly_sep}#{restring_hash(pairs, use_trailing_comma: use_trailing_comma)}#{curly_sep}}"
         end
       end
 
@@ -230,8 +240,13 @@ module Rails5
         @source_rewriter.replace(node_loc, "#{key}: #{node_source}")
       end
 
-      def restring_hash(pairs, joiner: ", ", indent: '')
-        pairs.map { |pair| "#{indent}#{pair.loc.expression.source}" }.join(joiner)
+      def restring_hash(pairs, joiner: ", ", indent: '', use_trailing_comma: false)
+        hash_string = pairs.map { |pair| "#{indent}#{pair.loc.expression.source}" }.join(joiner)
+        if use_trailing_comma
+          hash_string + ','
+        else
+          hash_string
+        end
       end
 
       def add_indent(str, indent)

data/lib/rails5/spec_converter/version.rb

@@ -1,5 +1,5 @@
 module Rails5
   module SpecConverter
-    VERSION = "1.0.14"
+    VERSION = "1.0.15"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails5-spec-converter
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.0.15
 platform: ruby
 authors:
 - Travis Grathwell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-11 00:00:00.000000000 Z
+date: 2016-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -116,6 +116,7 @@ files:
 - exe/rails5-spec-converter
 - lib/rails5/spec_converter.rb
 - lib/rails5/spec_converter/cli.rb
+- lib/rails5/spec_converter/hash_node_text_analyzer.rb
 - lib/rails5/spec_converter/text_transformer.rb
 - lib/rails5/spec_converter/text_transformer_options.rb
 - lib/rails5/spec_converter/version.rb