be-let-it-be 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a90cf24bfc3bff9e7fae3cf454c213cb9e98d2e75f7fa2a0461579de14ae9f55
-  data.tar.gz: bb50797917fcf5dd15d3bf51b4a71d7353a9425341e15fd6ab5a052192c98e39
+  metadata.gz: 15176b1a907a256ee2b544ff198041fdce5d64599f70209d6ec498898b75ad9c
+  data.tar.gz: 2cb16333cfb481c3392716be02a2900e837e6de27b45eff297789daf7b1f3d1c
 SHA512:
-  metadata.gz: 17c94400b69be02e85c41769ab2ac214d6c38ca56f9d86748158589a06d0d65f7c17774573b61086e0e557a7a485fdbce8008c584b115d551221f15fffe347f1
-  data.tar.gz: 790225081995f8772b01b8ae08273d6fceddd6907a15c09e14bc8e8164db3fdfd0b1062195d12aa752705a12ad8e5473c84316b5d4c0d613c4b6bdeb3b0d644d
+  metadata.gz: 7a7407883bc8103b91493f2e8e97f725967419015d6e450583d8663ee1981e26100f22c614c8e5205cbb211f4626689c51d47b3fe384235410f13c8ca82cafd4
+  data.tar.gz: 550a4e4d787185bc322814b18f13deed3c686bfa122e27bd3259936be08a24c37be97d2aaeab8196ad01926d428b9975ce9682f2c32c507c8e507bdbf8e7dbd0

data/lib/be_let_it_be/analyzer.rb

@@ -1,47 +1,58 @@
 # frozen_string_literal: true
 
-require "parser/current"
+require "prism"
 
 module BeLetItBe
   class Analyzer
     def initialize(file)
-      @ast = Parser::CurrentRuby.parse(File.read(file))
+      file_path = file.respond_to?(:path) ? file.path : file
+      @ast = Prism.parse_file(file_path).value
     end
 
     def find_lets
-      traverse(@ast, [])
+      traverse(@ast)
     end
 
     private
 
-    def traverse(node, lets)
-      # FIXME: lets should be immutable
-      return lets unless node.is_a?(Parser::AST::Node)
+    def traverse(node)
+      return [] unless node.is_a?(Prism::Node)
 
       let_info = extract_let_info(node)
-      lets << let_info unless let_info.nil?
-
-      node.children.each do |child|
-        traverse(child, lets) if child.is_a?(Parser::AST::Node)
+      current_lets = let_info.nil? ? [] : [let_info]
+
+      child_lets = case node
+      when Prism::ProgramNode
+        traverse(node.statements)
+      when Prism::StatementsNode
+        node.body.flat_map { |child| traverse(child) }
+      when Prism::CallNode
+        traverse(node.block)
+      when Prism::BlockNode
+        traverse(node.body)
+      else
+        []
       end
 
-      lets
+      current_lets + child_lets
     end
 
     def extract_let_info(node)
-      return nil unless node.type == :send
-      return nil unless node.children[0].nil?
+      return nil unless node.is_a?(Prism::CallNode)
+      return nil unless node.receiver.nil?
+
+      method_name = node.name
+      return nil unless [:let, :let!].include?(method_name)
 
-      method_name = node.children[1]
-      return nil unless %i[let let!].include?(method_name)
+      return nil unless node.arguments && node.arguments.arguments.length > 0
 
-      args = node.children[2]
-      let_name = args.children[0]
-      return nil unless args && args.type == :sym
+      first_arg = node.arguments.arguments[0]
+      return nil unless first_arg.is_a?(Prism::SymbolNode)
 
-      line = node.location.line
+      name = first_arg.value.to_sym
+      line = node.location.start_line
 
-      {type: method_name, name: let_name, line:, node:}
+      {type: method_name, name:, line:, node:}
     end
   end
 end

data/lib/be_let_it_be/cli.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 require "thor"
-require "parser/current"
-require "unparser"
 require "open3"
 
 module BeLetItBe

data/lib/be_let_it_be/converter.rb

@@ -1,22 +1,18 @@
 # frozen_string_literal: true
 
-require "parser/current"
-require "unparser"
+require "prism"
 require "tempfile"
 
 module BeLetItBe
   class Converter
     def initialize(file)
-      @file = file
+      @file = file.respond_to?(:path) ? file.path : file
     end
 
     def try_conversion_single_let(let_info, output_file, exam)
       source = File.read(@file)
-      buffer = Parser::Source::Buffer.new(@file, source:)
 
-      temp_rewriter = Parser::Source::TreeRewriter.new(buffer)
-      apply_single_conversion(let_info, temp_rewriter)
-      File.write(output_file, temp_rewriter.process)
+      File.write(output_file, apply_single_conversion(let_info, source))
 
       passed = exam.call
       unless passed
@@ -27,11 +23,16 @@ module BeLetItBe
 
     private
 
-    def apply_single_conversion(let_info, rewriter)
+    def apply_single_conversion(let_info, source)
       node = let_info[:node]
-      method_range = node.loc.selector
 
-      rewriter.replace(method_range, "let_it_be")
+      start_offset = node.message_loc.start_offset
+      end_offset = node.message_loc.end_offset
+
+      new_source = source.dup
+      new_source[start_offset...end_offset] = "let_it_be"
+
+      new_source
     end
   end
 end

data/lib/be_let_it_be/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BeLetItBe
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: be-let-it-be
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - moznion
@@ -10,33 +10,19 @@ cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: parser
+  name: prism
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
-- !ruby/object:Gem::Dependency
-  name: unparser
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -51,8 +37,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-description: A command-line tool that analyzes RSpec files and converts let/let! to
-  let_it_be where tests still pass
+description: A command-line tool that automatically converts RSpec's `let` and `let!`
+  declarations to `let_it_be` where it's safe to do so.
 email:
 - moznion@mail.moznion.net
 executables: