rails5-spec-converter 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f063f02a538854ce40ba052bee57619976d13984
-  data.tar.gz: 2953c939e47421e564bb1c38009b25c7e55eab57
+  metadata.gz: 75759003b02014251aae8a73ba90520b0e449412
+  data.tar.gz: 90d16a171d1f9b20561f213611f34f0e6c7720dc
 SHA512:
-  metadata.gz: caec295f2a297a1f7041d8cddb3129555f4ff20b886ae1ccf5baf85bd512008daca842885b608fae1ac0df2ff35ab92d3cfd1bd64d2db8e29e6631098d5c9ba6
-  data.tar.gz: 38bd4a4c918a0cb108d20c3b7f120eac19caeae42bdfd31e0b79bed40d49cb4d84973110632707966e65b422e47a2b7bbea9f6fd900c031f4b70eb41255175aa
+  metadata.gz: 81753ebe7dd82067d0972ed3457f152f4461df3fc934573a3befbbb5dfe81d8481142f2f6ca21cf7900ce6101f39e870843e64e282ff46a59c8859b3e6557d64
+  data.tar.gz: 3a5e61d1fa027f4cba47220ba0b54222c0df770e655f586eaa89a59d88c864ecb3ac7ad7b5163e34c472588662ceb1031c553f4650963d0636997d93feb41893

data/README.md

@@ -1,5 +1,7 @@
 # Rails5::SpecConverter
 
+[![Build Status](https://travis-ci.org/tjgrathwell/rails5-spec-converter.svg?branch=master)](https://travis-ci.org/tjgrathwell/rails5-spec-converter)
+
 A script that fixes the syntax of your tests so Rails 5 will like them better. Inspired by [transpec](https://github.com/yujinakayama/transpec), the RSpec 2 -> 3 syntax conversion tool.
 
 If you write a test like this:

data/lib/rails5/spec_converter/cli.rb

@@ -1,4 +1,5 @@
 require 'rails5/spec_converter/text_transformer'
+require 'rails5/spec_converter/version'
 require 'optparse'
 
 module Rails5
@@ -9,6 +10,11 @@ module Rails5
         OptionParser.new do |opts|
           opts.banner = "Usage: rails5-spec-converter [options] [files]"
 
+          opts.on("--version", "Print version number") do |q|
+            puts Rails5::SpecConverter::VERSION
+            exit
+          end
+
           opts.on("-q", "--quiet", "Run quietly") do |q|
             @options[:quiet] = q
           end

data/lib/rails5/spec_converter/text_transformer.rb

@@ -95,7 +95,23 @@ module Rails5
         end
       end
 
+      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)
+      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.begin_pos...hash_node.loc.expression.end_pos]
+        extract_indent(text_after_last_pair)
+      end
+
       def additional_indent(hash_node)
+        return nil if indent_before_first_pair(hash_node)
+
         joiner = joiner_between_pairs(hash_node)
         joiner && joiner.include?("\n") ? @indent : nil
       end
@@ -103,12 +119,13 @@ module Rails5
       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)
-        whitespace_match = text_before_hash.match("\n(\s*)")
-        return whitespace_match[1] if whitespace_match
+        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)
-        pair_joiner_match = joiner.match("\n(\s*)") if joiner
-        return pair_joiner_match[1] if pair_joiner_match
+        extract_indent(joiner)
       end
 
       def has_space_after_curly?(hash_node)
@@ -133,11 +150,16 @@ module Rails5
       end
 
       def appropriately_spaced_params_hash(hash_node:, pairs:)
-        extra_indent = additional_indent(hash_node)
-
-        if extra_indent
-          base_indent = existing_indent(hash_node)
-          "{\n#{restring_hash(pairs, indent: base_indent + extra_indent, joiner: ",\n")}\n#{base_indent}}"
+        inner_indent = additional_indent(hash_node)
+
+        if inner_indent || indent_before_first_pair(hash_node)
+          outer_indent = existing_indent(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}}"
         else
           curly_sep = has_space_after_curly?(hash_node) ? '' : ' '
           "{#{curly_sep}#{restring_hash(pairs)}#{curly_sep}}"
@@ -147,7 +169,7 @@ module Rails5
       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*\{.*\}$/)
+        if node.hash_type? && !node_source.match(/^\s*\{.*\}$/m)
           node_source = "{ #{node_source} }"
         end
         source_rewriter.replace(node_loc, "#{key}: #{node_source}")
@@ -157,6 +179,13 @@ module Rails5
         pairs.map { |pair| "#{indent}#{pair.loc.expression.source}" }.join(joiner)
       end
 
+      def extract_indent(str)
+        return unless str
+
+        match = str.match("\n(\s*)")
+        match[1] if match
+      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.5"
+    VERSION = "1.0.6"
   end
 end

metadata

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