rails5-spec-converter 1.0.9 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5bf0eb89b52036356b4302e4ac69ce3b55b7736
-  data.tar.gz: 5a1af9450f8b860194ef3fbf3a81248a1747219f
+  metadata.gz: decc1a2e5df2d25320f01d2bbcb93e03054382e3
+  data.tar.gz: e26b4a67c196eb1dde0240d5bcb4a2dbc9bf1036
 SHA512:
-  metadata.gz: 4eb378462e4741677c8f55eeaad228c4b8b028f7087bddc7240e47fa851c37c0fe7e1a4a868d64d6660fa8c7149934783a2194b939dbb3cce02c425a212181e0
-  data.tar.gz: 6e1715037451e0cba49b3d3c4c618f29382df4b0a45e296bebc929f46d2d437a69bf1359272f149d1acdbe058b1ba71f2eb20ef19f024343109f6c997502dc82
+  metadata.gz: b42d4eb6bf97ad55b37885c6d9778e3060847b3c9a8d81a2e1ad230f12de02f16b5fff07dc20c97afeea320041b7440203544580de7591355bdf30786ea9d4d9
+  data.tar.gz: d7756ca27cf33f234175a33fb9b8569adbcf123cbce411cab9164a382bb105e616a9d41a09ad87ed78f749235112933cce2ffd4ca6a39c9d43c9fbc6352a847b

data/README.md

@@ -41,6 +41,8 @@ By default it will make some noise, run with `rails5-spec-converter --quiet` if
 
 ### Whitespace
 
+#### Indentation
+
 The tool will attempt to indent the newly-added "params" hash in situations when the arguments are on newlines, e.g.:
 
 ```
@@ -65,6 +67,24 @@ Since the extra spaces in front of 'params' are brand-new whitespace, you may wa
 
 `rails5-spec-converter --indent '\t'`
 
+#### Hash Spacing
+
+By default, for single-line hashes, a single space will be added after the opening curly brace and before the ending curly brace. The space will be omitted if the new params hash will contain any hash literals that do not have surrounding whitespace, ex:
+
+```
+post :users, user: {name: 'bayleef'}
+```
+
+becomes
+
+```
+post :users, params: {user: {name: 'bayleef'}}
+```
+
+To force hashes to be written without extra whitespace in all files regardless of context, use the argument `--no-hash-spacing`.
+
+To force hashes to be written WITH extra whitespace in all files regardless of context, use the argument `--hash-spacing`.
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `bundle exec rspec spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/rails5/spec_converter/cli.rb

@@ -22,6 +22,10 @@ module Rails5
           opts.on("-i", "--indent INDENT", "Use specified string for indentation (default is two spaces)") do |indent|
             @options[:indent] = indent.gsub("\\t", "\t")
           end
+
+          opts.on("--[no-]hash-spacing", "Always/never add space around hashes ({foo: 'bar'} vs { foo: 'bar' })") do |hash_spacing|
+            @options[:hash_spacing] = hash_spacing
+          end
         end.parse!
 
         @files = ARGV

data/lib/rails5/spec_converter/text_transformer.rb

@@ -10,6 +10,7 @@ module Rails5
     class TextTransformer
       def initialize(content, options = {})
         @indent = options[:indent] || '  '
+        @hash_spacing = options[:hash_spacing]
         @quiet = options[:quiet]
         @content = content
 
@@ -152,7 +153,7 @@ module Rails5
         extract_indent(joiner) || ''
       end
 
-      def has_space_after_curly?(hash_node)
+      def no_space_after_curly?(hash_node)
         hash_node.parent.loc.expression.source.match(/{\S/)
       end
 
@@ -194,11 +195,18 @@ module Rails5
                                end
           "{\n#{restrung_hash}\n#{final_brace_indent}}"
         else
-          curly_sep = has_space_after_curly?(hash_node) ? '' : ' '
+          curly_sep = determine_curly_sep(hash_node)
           "{#{curly_sep}#{restring_hash(pairs)}#{curly_sep}}"
         end
       end
 
+      def determine_curly_sep(hash_node)
+        return ' ' if @hash_spacing == true
+        return '' if @hash_spacing == false
+
+        no_space_after_curly?(hash_node) ? '' : ' '
+      end
+
       def wrap_arg(node, key)
         node_loc = node.loc.expression
         node_source = node_loc.source

data/lib/rails5/spec_converter/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails5-spec-converter
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors:
 - Travis Grathwell