rails5-spec-converter 1.0.18 → 1.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bfd9be6c8436f667718042b22fb9c3c4391175f3
-  data.tar.gz: d5213028fc60af13ff39ea58167d55b038271416
+  metadata.gz: b8ed726d17eeded2ad212304686feb640a5a87e0
+  data.tar.gz: 5c3b38ee09a37981a347ff0e88fa432edf4f60f2
 SHA512:
-  metadata.gz: e0aa8e20f7b38a4702fd4729ea175b176fe9284a04f3367a5d01a16dd42379bb7d2742c7b16333a5500e0914f23ae79b5536525cec7f8e949041d4d42faf2f21
-  data.tar.gz: 718159ad161733c7b8384ea519560fae793caa430be899ef561a6b9b7c8cbb1224fcb73c649a143070bdb83c08c8db0e60744163628d248eeabbb38b0a0a910b
+  metadata.gz: 3526ec24e89a2ede5ba18da2cf814a23578f062f1206de35befae62fd49a35f2ce0a8d2b2a87f5ff1856cab5c3598e21c3dac1869f2586de9347c98622c0457d
+  data.tar.gz: 990cf71407cdf8017c3299b9639176cdd54056cc47e981cbcac027c3e7bf3482b7c2fca8bc5873c0a72c44b3a6a89abdd91a41564c3868896c8a2634d18acccb

data/README.md

@@ -124,9 +124,9 @@ 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`.
+* `--no-hash-spacing` will force hashes to be written **without** extra whitespace in all files regardless of context.
 
-To force hashes to be written WITH extra whitespace in all files regardless of context, use the argument `--hash-spacing`.
+* `--hash-spacing` will force hashes to be written **with** extra whitespace in all files regardless of context.
 
 ## Development
 
@@ -136,6 +136,9 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/tjgrathwell/rails5-spec-converter. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](contributor-covenant.org) code of conduct.
 
+## Contact
+
+If this Gem helped you out at all, or it didn't help because you wanted it to do something different or it broke all your computer code, please let me know on twitter [@tjgrathwell](http://twitter.com/tjgrathwell)
 
 ## License
 

data/lib/rails5/spec_converter/cli.rb

@@ -32,8 +32,8 @@ module Rails5
             @options.strategy = strategy.to_sym
           end
 
-          opts.on("--warn-if-ambiguous", "Emit warnings when hash parameters are unknowable (see README)") do |warn_if_ambigous|
-            @options.warn_if_ambiguous = warn_if_ambigous
+          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!
 

data/lib/rails5/spec_converter/test_type_identifier.rb

@@ -0,0 +1,74 @@
+require 'parser/current'
+require 'astrolabe/builder'
+
+module Rails5
+  module SpecConverter
+    class TestTypeIdentifier
+      DIRECTORY_TO_TYPE_MAP = {
+        'controllers' => :controller,
+        'requests'    => :request,
+        'integration' => :request,
+        'api'         => :request
+      }
+
+      def initialize(content, options = TextTransformerOptions.new)
+        @options = options
+        @content = content
+
+        @source_buffer = Parser::Source::Buffer.new('(string)')
+        @source_buffer.source = @content
+
+        ast_builder = Astrolabe::Builder.new
+        @parser = Parser::CurrentRuby.new(ast_builder)
+
+        @source_rewriter = Parser::Source::Rewriter.new(@source_buffer)
+      end
+
+      def test_type
+        test_type_from_content || test_type_from_filename || test_type_default
+      end
+
+      private
+
+      def test_type_default
+        :request
+      end
+
+      def test_type_from_content
+        root_node = @parser.parse(@source_buffer)
+        root_node.each_node(:send) do |node|
+          target, method, test_name, params = node.children
+          next unless target.nil? || target == :RSpec
+          next unless method == :describe
+
+          return type_from_params_hash(params)
+        end
+
+        nil
+      end
+
+      def test_type_from_filename
+        return nil unless @options.file_path
+
+        dirs = @options.file_path.split('/')
+        spec_folder_index = dirs.index('spec')
+        return nil unless spec_folder_index
+        DIRECTORY_TO_TYPE_MAP[dirs[spec_folder_index + 1]]
+      end
+
+      def type_from_params_hash(params)
+        return nil unless params && params.hash_type?
+
+        params.children.each do |node|
+          if node.pair_type? && node.children.all?(&:sym_type?)
+            key, value = node.children.map { |sym| sym.children.first }
+            return :controller if key == :type && value == :controller
+            return :request if key == :type && value == :request
+          end
+        end
+
+        nil
+      end
+    end
+  end
+end

data/lib/rails5/spec_converter/text_transformer.rb

@@ -1,5 +1,6 @@
 require 'parser/current'
 require 'astrolabe/builder'
+require 'rails5/spec_converter/test_type_identifier'
 require 'rails5/spec_converter/text_transformer_options'
 require 'rails5/spec_converter/hash_rewriter'
 
@@ -62,7 +63,7 @@ module Rails5
             handle_ambiguous_method_call!(node)
           end
 
-          wrap_arg(args[1], 'headers') if args[1]
+          wrap_extra_positional_args!(args) if args.length > 1
         end
 
         @source_rewriter.process
@@ -142,6 +143,16 @@ module Rails5
         hash_node.children.any? { |pair| pair.children[0].children[0] == key }
       end
 
+      def wrap_extra_positional_args!(args)
+        if test_type == :controller
+          wrap_arg(args[1], 'session') if args[1]
+          wrap_arg(args[2], 'flash') if args[2]
+        end
+        if test_type == :request
+          wrap_arg(args[1], 'headers') if args[1]
+        end
+      end
+
       def wrap_arg(node, key)
         node_loc = node.loc.expression
         node_source = node_loc.source
@@ -161,6 +172,10 @@ module Rails5
         node.loc.expression.source_line.match(/^(\s*)/)[1]
       end
 
+      def test_type
+        @test_type ||= TestTypeIdentifier.new(@content, @options).test_type
+      end
+
       def log(str)
         return if @options.quiet?
 

data/lib/rails5/spec_converter/version.rb

@@ -1,5 +1,5 @@
 module Rails5
   module SpecConverter
-    VERSION = "1.0.18"
+    VERSION = "1.0.19"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails5-spec-converter
 version: !ruby/object:Gem::Version
-  version: 1.0.18
+  version: 1.0.19
 platform: ruby
 authors:
 - Travis Grathwell
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-29 00:00:00.000000000 Z
+date: 2016-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -118,6 +118,7 @@ files:
 - lib/rails5/spec_converter/cli.rb
 - lib/rails5/spec_converter/hash_rewriter.rb
 - lib/rails5/spec_converter/node_textifier.rb
+- lib/rails5/spec_converter/test_type_identifier.rb
 - lib/rails5/spec_converter/text_transformer.rb
 - lib/rails5/spec_converter/text_transformer_options.rb
 - lib/rails5/spec_converter/version.rb