rails5-spec-converter 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09acdaf5aac98f957adf479e15e41fdcb50c15b8
-  data.tar.gz: 944323eb7a81f0968b71add26521ef9c05a056c7
+  metadata.gz: d5bf0eb89b52036356b4302e4ac69ce3b55b7736
+  data.tar.gz: 5a1af9450f8b860194ef3fbf3a81248a1747219f
 SHA512:
-  metadata.gz: 0cdfe7db58fdef963722fabe00c9cf97ba976ad4ec9f5b6501f6c469fdcab2832aaf6a50d68f2dfdafc328923eb538712ba1316c002ced809ae50eea3a0b7504
-  data.tar.gz: 0f717273ca4a3c6767852cf248ceb9a137325f093de2ce1fee6475207dc24b3b1cf9abd1c90a127e7d4373662b14b085eff5d6a5a4106d3e613b05cfe534ce46
+  metadata.gz: 4eb378462e4741677c8f55eeaad228c4b8b028f7087bddc7240e47fa851c37c0fe7e1a4a868d64d6660fa8c7149934783a2194b939dbb3cce02c425a212181e0
+  data.tar.gz: 6e1715037451e0cba49b3d3c4c618f29382df4b0a45e296bebc929f46d2d437a69bf1359272f149d1acdbe058b1ba71f2eb20ef19f024343109f6c997502dc82

data/lib/rails5/spec_converter/text_transformer.rb

@@ -12,18 +12,18 @@ module Rails5
         @indent = options[:indent] || '  '
         @quiet = options[:quiet]
         @content = content
-      end
 
-      def transform
-        source_buffer = Parser::Source::Buffer.new('(string)')
-        source_buffer.source = @content
+        @source_buffer = Parser::Source::Buffer.new('(string)')
+        @source_buffer.source = @content
 
         ast_builder = Astrolabe::Builder.new
-        parser = Parser::CurrentRuby.new(ast_builder)
+        @parser = Parser::CurrentRuby.new(ast_builder)
 
-        source_rewriter = Parser::Source::Rewriter.new(source_buffer)
+        @source_rewriter = Parser::Source::Rewriter.new(@source_buffer)
+      end
 
-        root_node = parser.parse(source_buffer)
+      def transform
+        root_node = @parser.parse(@source_buffer)
         root_node.each_node(:send) do |node|
           target, verb, action, *args = node.children
           next unless args.length > 0
@@ -33,15 +33,18 @@ module Rails5
             next if looks_like_route_definition?(args[0])
             next if has_key?(args[0], :params)
 
-            write_params_hash(source_rewriter, args[0])
+            write_params_hash(
+              hash_node: args[0],
+              original_indent: node.loc.expression.source_line.match(/^(\s*)/)[1]
+            )
           else
-            wrap_arg(source_rewriter, args[0], 'params')
+            wrap_arg(args[0], 'params')
           end
 
-          wrap_arg(source_rewriter, args[1], 'headers') if args[1]
+          wrap_arg(args[1], 'headers') if args[1]
         end
 
-        source_rewriter.process
+        @source_rewriter.process
       end
 
       private
@@ -68,38 +71,44 @@ module Rails5
         hash_node.children.any? { |pair| pair.children[0].children[0] == key }
       end
 
-      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
+      def write_params_hash(hash_node:, original_indent: )
+        pairs_that_belong_in_params, pairs_that_belong_outside_params = partition_params(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
+            pairs: pairs_that_belong_in_params,
+            original_indent: original_indent
           )
 
           rewritten_hashes = ["params: #{params_hash}"]
           if pairs_that_belong_outside_params.length > 0
             rewritten_hashes << restring_hash(pairs_that_belong_outside_params, joiner: joiner)
           end
-          source_rewriter.replace(
+          @source_rewriter.replace(
             hash_node.loc.expression,
             rewritten_hashes.join(joiner)
           )
         end
       end
 
+      def partition_params(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
+        return pairs_that_belong_in_params, pairs_that_belong_outside_params
+      end
+
       def indent_before_first_pair(hash_node)
         return nil unless hash_node.children.length > 0
 
@@ -114,6 +123,17 @@ module Rails5
         extract_indent(text_after_last_pair)
       end
 
+      def indent_of_first_value_if_multiline(hash_node, original_indent)
+        return nil if hash_node.children.length == 0
+        first_value = hash_node.children[0].children[1]
+        return nil unless first_value.hash_type? || first_value.array_type?
+        value_str_lines = node_to_string(first_value).split("\n")
+        return nil if value_str_lines.length == 1
+        return nil unless value_str_lines[0].match(/[\s\[{]/)
+
+        value_str_lines[1].match(/^(\s*)/)[1].sub(original_indent, '')
+      end
+
       def additional_indent(hash_node)
         return nil if indent_before_first_pair(hash_node)
 
@@ -122,15 +142,14 @@ module Rails5
       end
 
       def existing_indent(hash_node)
-        previous_sibling = hash_node.parent.children[hash_node.sibling_index - 1]
-        text_before_hash = text_between_siblings(previous_sibling, hash_node)
+        text_before_hash = text_before_node(hash_node)
         whitespace_indent = extract_indent(text_before_hash)
         return whitespace_indent if whitespace_indent
 
         return indent_before_first_pair(hash_node) if indent_before_first_pair(hash_node)
 
         joiner = joiner_between_pairs(hash_node)
-        extract_indent(joiner)
+        extract_indent(joiner) || ''
       end
 
       def has_space_after_curly?(hash_node)
@@ -154,36 +173,49 @@ module Rails5
         @content[node1.loc.expression.end_pos...node2.loc.expression.begin_pos]
       end
 
-      def appropriately_spaced_params_hash(hash_node:, pairs:)
+      def appropriately_spaced_params_hash(hash_node:, pairs:, original_indent: )
+        outer_indent = existing_indent(hash_node)
+        middle_indent = indent_of_first_value_if_multiline(hash_node, original_indent)
         inner_indent = additional_indent(hash_node)
 
-        if inner_indent || indent_before_first_pair(hash_node)
-          outer_indent = existing_indent(hash_node)
+        if inner_indent || middle_indent || indent_before_first_pair(hash_node)
           restrung_hash = restring_hash(
             pairs,
             indent: outer_indent + (inner_indent || ''),
             joiner: ",\n"
           )
-          "{\n#{restrung_hash}\n#{indent_after_last_pair(hash_node) || outer_indent}}"
+          if middle_indent
+            restrung_hash = original_indent + add_indent(restrung_hash, middle_indent)
+          end
+          final_brace_indent = if middle_indent
+                                 original_indent
+                               else
+                                 indent_after_last_pair(hash_node) || outer_indent
+                               end
+          "{\n#{restrung_hash}\n#{final_brace_indent}}"
         else
           curly_sep = has_space_after_curly?(hash_node) ? '' : ' '
           "{#{curly_sep}#{restring_hash(pairs)}#{curly_sep}}"
         end
       end
 
-      def wrap_arg(source_rewriter, node, key)
+      def wrap_arg(node, key)
         node_loc = node.loc.expression
         node_source = node_loc.source
         if node.hash_type? && !node_source.match(/^\s*\{.*\}$/m)
           node_source = "{ #{node_source} }"
         end
-        source_rewriter.replace(node_loc, "#{key}: #{node_source}")
+        @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)
       end
 
+      def add_indent(str, indent)
+        str.split("\n").map { |line| indent + line }.join("\n")
+      end
+
       def extract_indent(str)
         return unless str
 
@@ -191,6 +223,17 @@ module Rails5
         match[1] if match
       end
 
+      def text_before_node(node)
+        previous_sibling = node.parent.children[node.sibling_index - 1]
+        return nil unless previous_sibling.loc.expression
+
+        text_between_siblings(previous_sibling, node)
+      end
+
+      def node_to_string(node)
+        @content[node.loc.expression.begin_pos...node.loc.expression.end_pos]
+      end
+
       def log(str)
         return if @quiet
 

data/lib/rails5/spec_converter/version.rb

@@ -1,5 +1,5 @@
 module Rails5
   module SpecConverter
-    VERSION = "1.0.8"
+    VERSION = "1.0.9"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails5-spec-converter
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Travis Grathwell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-23 00:00:00.000000000 Z
+date: 2016-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -139,8 +139,9 @@ 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
 test_files: []
+has_rdoc: