rails5-spec-converter 1.0.22 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 427f7dc30dd3cf4bd47d8fa81cb76dc67af01e16
-  data.tar.gz: af054a465c522657dd8b34544bc4a20609f9beb2
+  metadata.gz: 7eb8605294b0f3e4029d4a37a66b92cfb59af830
+  data.tar.gz: 9cf52cc55cdd1d225469ad8d8995ad7cea52a4ae
 SHA512:
-  metadata.gz: 174bf93337cba877b6acb4d80fa5971457be07d1c719c98fe7e7a3b1a357be85fa4610216230031adc1244f91bcba0ae1c02c21b6e27a5e852aade7471eac42f
-  data.tar.gz: 24b722ce305474f002a69ebfd87dc494e9766a4559d30bf01b2db11ffc96eb0157a463ad3d0a1f24076430f354bcd1ca1e3da68ee803cc938582d39ff6cd5865
+  metadata.gz: 3ad5d20ee93db7c0ae5ecec047b647aab9f3661765b7c2d6c8dd1f22a88c9a0b4b5e1055fe47d9d7a962dbdf9a88bc34fb5ee2329769b827642910ae2f524a34
+  data.tar.gz: 88b4aa44487e0a6772e84949f3f41cebbc0dc98f06e10e25af31217d5317a3bb40501a8b7939bf24b6723ea7822fe391cb0b51b1c7951cf5401143dd1db4d753

data/README.md

@@ -39,49 +39,6 @@ If you want to specify a specific set of files instead, you can run `rails5-spec
 
 By default it will make some noise, run with `rails5-spec-converter --quiet` if you want it not to.
 
-### Strategy
-
-`rails5-spec-converter` wants to partition your arguments into two sets, those that belong in `params` and those that don't.
-
-But it doesn't do any runtime analysis, so it can only effectively sort out non-`params` keys if they're included in a hash literal on the test invocation site. Hence:
-
-```
-all_the_params = {
-  search: 'bayleef',
-  format: :json
-}
-
-get :users, all_the_params
-```
-
-will become
-
-```
-get :users, params: all_the_params
-```
-
-even though `format` should be **outside** the params hash.
-
-* `--warn-if-ambiguous` will print a message every time `rails5-spec-converter` encounters this situation
-
-* `--strategy optimistic` (default) will always wrap the unknowable args in `params`
-
-* `--strategy skip` will never wrap the unknowable args in `params`
-
-* `--strategy uglify` will attempt to split the hash into `params` and non-`params` hashes at runtime, like so:
-
-  ```
-  all_the_params = {
-    search: 'bayleef',
-    format: :json
-  }
-
-  _outer, _inner = all_the_params.partition { |k,v| %i{format}.include?(k) }.map { |a| Hash[a] }
-  get :users, _outer.merge(params: _inner)
-  ```
-
-  This should allow your tests to pass without deprecation warnings while introducing an enticing code cleanup oppurtunity.
-
 ### Whitespace
 
 #### Indentation

data/lib/rails5/spec_converter/cli.rb

@@ -27,14 +27,6 @@ module Rails5
           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
-
-          opts.on("-s", "--strategy STRATEGY", "Set unknown hash parameters strategy (see README)") do |strategy|
-            @options.strategy = strategy.to_sym
-          end
-
-          opts.on("--warn-if-ambiguous", "Emit warnings when hash parameters are unknowable (see README)") do |warn_if_ambiguous|
-            @options.warn_if_ambiguous = warn_if_ambiguous
-          end
         end.parse!
 
         @files = ARGV

data/lib/rails5/spec_converter/text_transformer.rb

@@ -41,10 +41,6 @@ module Rails5
             else
               next if looks_like_route_definition?(args[0])
               next if has_key?(args[0], :params)
-              if has_kwsplat?(args[0])
-                warn_about_ambiguous_params(node) if @options.warn_about_ambiguous_params?
-                next unless @options.wrap_ambiguous_params?
-              end
 
               hash_rewriter = HashRewriter.new(
                 content: @content,
@@ -66,8 +62,7 @@ module Rails5
             )
             @source_rewriter.remove(nil_arg_range)
           else
-            warn_about_ambiguous_params(node) if @options.warn_about_ambiguous_params?
-            handle_ambiguous_method_call!(node)
+            wrap_arg(args[0], 'params')
           end
 
           wrap_extra_positional_args!(args) if args.length > 1
@@ -78,62 +73,6 @@ module Rails5
 
       private
 
-      def handle_ambiguous_method_call!(node)
-        target, verb, action, *args = node.children
-
-        if @options.wrap_ambiguous_params?
-          wrap_arg(args[0], 'params') if @options.wrap_ambiguous_params?
-        end
-
-        if @options.uglify_ambiguous_params?
-          keys = HashRewriter::OUTSIDE_PARAMS_KEYS.join(' ')
-          partition_clause = [
-            @textifier.node_to_string(args[0]),
-            "partition { |k,v| %i{#{keys}}.include?(k) }",
-            'map { |a| Hash[a] }'
-          ].join('.')
-
-          text_before_node = node.loc.expression.source_line[0...node.loc.expression.column]
-          first_line_content = "_outer, _inner = #{partition_clause}"
-          if text_before_node =~ /^\s+$/
-            @source_rewriter.insert_before(node.loc.expression, "#{first_line_content}\n#{line_indent(node)}")
-            if args.length == 1
-              @source_rewriter.replace(args[0].loc.expression, '_outer.merge(params: _inner)')
-            else
-              replacement_range = Parser::Source::Range.new(
-                @source_buffer,
-                args[0].loc.expression.begin_pos,
-                args[1].loc.expression.begin_pos
-              )
-              @source_rewriter.replace(replacement_range, '_outer.merge(params: _inner).merge(')
-              @source_rewriter.insert_after(args.last.loc.expression, ')')
-            end
-          else
-            return unless in_a_block_with_only_whitespace?(node)
-
-            new_indent = line_indent(node) + @options.indent
-            @source_rewriter.insert_before(node.loc.expression, "\n" + new_indent + first_line_content + "\n" + new_indent)
-            @source_rewriter.replace(args[0].loc.expression, '_outer.merge(params: _inner)')
-            @source_rewriter.insert_after(node.loc.expression, "\n#{line_indent(node)}")
-            trim_enclosing_spaces!(node)
-          end
-        end
-      end
-
-      def in_a_block_with_only_whitespace?(node)
-        return false unless node.parent && node.parent.block_type?
-        content_before = @content[node.parent.loc.begin.end_pos...node.loc.expression.begin_pos]
-        content_after = @content[node.loc.expression.end_pos...node.parent.loc.end.begin_pos]
-        content_before =~ /^\s*$/ && content_after =~ /^\s*$/
-      end
-
-      def trim_enclosing_spaces!(node)
-        before_range = Parser::Source::Range.new(@source_buffer, node.parent.loc.begin.end_pos, node.loc.expression.begin_pos)
-        after_range = Parser::Source::Range.new(@source_buffer, node.loc.expression.end_pos, node.parent.loc.end.begin_pos)
-        @source_rewriter.remove(before_range)
-        @source_rewriter.remove(after_range)
-      end
-
       def looks_like_route_definition?(hash_node)
         keys = hash_node.children.map { |pair| pair.children[0].children[0] }
         route_definition_keys = [:to, :controller]
@@ -179,12 +118,6 @@ module Rails5
         @source_rewriter.replace(node_loc, "#{key}: #{node_source}")
       end
 
-      def warn_about_ambiguous_params(node)
-        log "Ambiguous params found"
-        log "#{@options.file_path}:#{node.loc.line}" if @options.file_path
-        log "```\n#{node.loc.expression.source}\n```\n\n"
-      end
-
       def line_indent(node)
         node.loc.expression.source_line.match(/^(\s*)/)[1]
       end

data/lib/rails5/spec_converter/text_transformer_options.rb

@@ -1,26 +1,12 @@
 class TextTransformerOptions
-  attr_accessor :strategy, :hash_spacing, :indent, :file_path
-  attr_writer :quiet, :warn_if_ambiguous
+  attr_accessor :hash_spacing, :indent, :file_path
+  attr_writer :quiet
 
   def initialize
     @file_path = nil
-    @strategy = :optimistic
     @quiet = false
     @indent = '  '
     @hash_spacing = nil
-    @warn_if_ambiguous = false
-  end
-
-  def wrap_ambiguous_params?
-    @strategy == :optimistic
-  end
-
-  def uglify_ambiguous_params?
-    @strategy == :uglify
-  end
-
-  def warn_about_ambiguous_params?
-    @warn_if_ambiguous
   end
 
   def quiet?

data/lib/rails5/spec_converter/version.rb

@@ -1,5 +1,5 @@
 module Rails5
   module SpecConverter
-    VERSION = "1.0.22"
+    VERSION = "2.0.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails5-spec-converter
 version: !ruby/object:Gem::Version
-  version: 1.0.22
+  version: 2.0.0
 platform: ruby
 authors:
 - Travis Grathwell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-12 00:00:00.000000000 Z
+date: 2016-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser