refactor 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 237c531a5ad2b86c4ef7cf3276e448f23fb26a5f
-  data.tar.gz: 6299ca36877ccbaa5e7b39ec8c6045defb3c06c7
+SHA256:
+  metadata.gz: 4a5e69664afcb410d257cc1cf07419ad948dbf36b52a8530c11901985561bd99
+  data.tar.gz: 4c96cfe97ef59000be90ecbfb071e613e8f9c7081d8efc20e47344f149c45a86
 SHA512:
-  metadata.gz: 871c020fcbccbe84385e59fb5276509a9d157ae77a39ffdc0991b4826aa039bc1a351edabe0122743c55fc5e152c92ed80e4f89d1d2abf5d87698cb0ea1ccde9
-  data.tar.gz: d163e31206b0fd386b6baaab416be47bc32cf9c118e20ff8b87d689501dac8b72d0c6383017179e7ee1d32bc93ac90c07dab594ef2e328193aecf8e613f9164b
+  metadata.gz: f22be527ca6164f7b1997f4d1de1a40c835f4e3664a42bd02e2e019646374d7b70f5fdf3815e535f3b73e026f2c05f4d1e9e8592633214f13a15bdfe02b99afd
+  data.tar.gz: 1e1b728e24065868e8a821de6f39e9d033fb3a2611fd1a2c10e8917d83601b08d8823fab66c8f0dd9f98b5e6569d335bae7132ccb4344b3ea24a1dccbbe609d8

data/.rspec

@@ -1,2 +1,3 @@
 --format documentation
 --color
+--require spec_helper

data/.rubocop.yml

@@ -0,0 +1,6 @@
+Metrics/BlockLength:
+  Enabled: false
+Style/StringLiterals:
+  Enabled: false
+Style/AccessModifierDeclarations:
+  Enabled: false

data/.ruby-version

@@ -0,0 +1 @@
+ruby-3.3.0

data/CHANGELOG.md

@@ -0,0 +1,9 @@
+## [Unreleased]
+
+## [0.1.0] - 2024-02-27
+
+- Gem transferred to @baweaver
+
+## [0.0.1] - 2014-06-12
+
+- Initial release by original author: https://github.com/afeld/refactor

data/CODE_OF_CONDUCT.md

@@ -0,0 +1,84 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our community a harassment-free experience for everyone, regardless of age, body size, visible or invisible disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming, diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes, and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of acceptable behavior and will take appropriate and fair corrective action in response to any behavior that they deem inappropriate, threatening, offensive, or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, and will communicate reasons for moderation decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when an individual is officially representing the community in public spaces. Examples of representing our community include using an official e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at keystonelemur@gmail.com. All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing clarity around the nature of the violation and an explanation of why the behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, for a specified period of time. This includes avoiding interactions in community spaces as well as external channels like social media. Violating these terms may lead to a temporary or permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public communication with the community for a specified period of time. No public or private interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, is allowed during this period. Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community standards, including sustained inappropriate behavior,  harassment of an individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 2.0,
+available at https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at https://www.contributor-covenant.org/translations.

data/Guardfile

@@ -0,0 +1,17 @@
+guard :rspec, cmd: "bundle exec rspec" do
+  require "guard/rspec/dsl"
+
+  dsl = Guard::RSpec::Dsl.new(self)
+
+  # RSpec files
+  rspec = dsl.rspec
+
+  watch(rspec.spec_helper) { rspec.spec_dir }
+  watch(rspec.spec_support) { rspec.spec_dir }
+  watch(rspec.spec_files)
+
+  # Ruby files
+  ruby = dsl.ruby
+
+  dsl.watch_spec_files_for(ruby.lib_files)
+end

data/LICENSE.txt

@@ -1,22 +1,21 @@
-Copyright (c) 2014 Aidan Feldman
+The MIT License (MIT)
 
-MIT License
+Copyright (c) 2024 Brandon Weaver
 
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -1,15 +1,114 @@
 # Refactor
 
-A command line tool to help refactor your code.
+Utilities for refactoring and upgrading Ruby code based on ASTs.
+
+Consider reading [ASTs in Ruby - Pattern Matching](https://dev.to/baweaver/asts-in-ruby-pattern-matching-mjd) as a primer for using this gem, as it will introduce concepts of pattern matching and ASTs in more detail.
+
+## Original Attribution
+
+This gem is a continuation of the work by @afeld and their Refactor gem here:
+
+https://github.com/afeld/refactor
 
 ## Usage
 
-Make sure your code is backed up (e.g. under version control and fully committed) first!
+Refactor works via rules, similar to RuboCop:
+
+```ruby
+# Inherits from base rule, which provides a lot of utilities
+# to match and replace with.
+class ShorthandRule < Refactor::Rule
+  # The code we're trying to work with here is:
+  #
+  #    [1, 2, 3].select { |v| v.even? }
+  #
+  # ...and we want to make it into:
+  #
+  #    [1, 2, 3].select(&:even?)
+  #
+  def on_block(node)
+    return unless node in [:block, receiver,
+      [[:arg, arg_name]], [:send, [:lvar, ^arg_name], method_name]
+    ]
+
+    replace(node, "#{receiver.source}(&:#{method_name})")
+  end
+end
+
+ShorthandRule.process("[1, 2, 3].select { |v| v.even? }")
+# => [1, 2, 3].select(&:even?)
+```
+
+If we add multiple rules we'll want to use a `Rewriter` instead to apply all of them without the potential for collision:
+
+```ruby
+class BigDecimalRule < Refactor::Rule
+  def on_send(node)
+    return unless node in [:send, _, :BigDecimal,
+      [:float | :int, value]
+    ]
+
+    replace(node, "BigDecimal('#{value}')")
+  end
+end
+
+class HashRefDefaultRule < Refactor::Rule
+  def on_send(node)
+    return unless node in [:send, [:const, nil, :Hash], :new,
+      [:array | :hash] => reference_value
+    ]
+
+    replace(node, "Hash.new { |h, k| h[k] = #{reference_value.source} }")
+  end
+end
+
+rewriter = Refactor::Rewriter.new(rules: [ShorthandRule, BigDecimalRule, HashRefDefaultRule])
+rewriter.process <<~RUBY
+  [1, 2, 3].select { |v| v.even? }
+
+  value = BigDecimal(5.3)
+  groups = Hash.new({})
+RUBY
+# => <<~RUBY
+#   [1, 2, 3].select(&:even?)
+#
+#   value = BigDecimal('5.3')
+#   groups = Hash.new { |h, k| h[k] = {} }
+# RUBY
+```
+
+## Why Not RuboCop?
 
-```bash
+In most cases you likely want to use RuboCop as it has more robust support and testing. This gem is currently more experimental and focused exclusively on refactoring and AST manipulations in a more minimal sense.
+
+## Installation
+
+Install the gem and add to the application's Gemfile by executing:
+
+```
+bundle add refactor
+```
+
+If bundler is not being used to manage dependencies, install the gem by executing:
+
+```
 gem install refactor
-# Then, from your project (sub)directory:
-refactor FROM TO
 ```
 
-where `FROM` and `TO` can each be a name that `has_underscores`, is `CamelCased`, `has-dashes`, or is `"separated with spaces between quotes"`.  It will replace the `FROM` with the `TO` in the corresponding format.
+## Development
+
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/baweaver/refactor. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/baweaver/refactor/blob/main/CODE_OF_CONDUCT.md).
+
+## License
+
+The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+
+## Code of Conduct
+
+Everyone interacting in the Refactor project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/baweaver/refactor/blob/main/CODE_OF_CONDUCT.md).

data/Rakefile

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
+
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
-
+task default: :spec

data/lib/refactor/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Refactor
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

data/lib/refactor.rb

@@ -1,68 +1,86 @@
-require 'active_support/core_ext/string/inflections'
-require 'fileutils'
+# frozen_string_literal: true
 
 require_relative 'refactor/version'
 
+# Eventually we may consider dropping RuboCop and working more directly
+# on top of Parser itself
+require 'rubocop'
+
 module Refactor
-  def run(from, to)
-    from_camelized = from.camelize
-    from_dashed = from.dasherize
-    from_humanized = from.humanize
-    from_underscored = from.underscore
-    to_camelized = to.camelize
-    to_dashed = to.dasherize
-    to_underscored = to.underscore
-
-    camelized_regex = /(?<=\b|_)#{Regexp.quote(from_camelized)}(?=\b|_)/
-    dashed_regex = /(?<=\b|_)#{Regexp.quote(from_dashed)}(?=\b|_)/
-    underscored_regex = /(?<=\b|_)#{Regexp.quote(from_underscored)}(?=\b|_)/
-
-    # all files in current directory
-    Dir.glob('**/*') do |old_path|
-      # ignore certain directories
-      unless old_path =~ %r{\A(coverage|pkg|tmp|vendor)(\z|/)}
-        # only check the basename so that the directory doesn't get renamed twice
-        old_basename = File.basename(old_path)
-        new_basename = old_basename.dup
-        new_basename.gsub!(dashed_regex, to_dashed)
-        new_basename.gsub!(underscored_regex, to_underscored)
-
-        if new_basename == old_basename
-          # no change
-          new_path = old_path
-        else
-          # rename file
-          new_path = File.join(File.dirname(old_path), new_basename)
-          puts "#{old_path} –> #{new_path}"
-          FileUtils.mv(old_path, new_path)
-        end
-
-        if File.file?(new_path)
-          # replace within file
-          old_text = File.read(new_path)
-
-          new_text = old_text.dup
-          new_text.gsub!(camelized_regex, to_camelized)
-          new_text.gsub!(dashed_regex, to_dashed)
-          new_text.gsub!(underscored_regex, to_underscored)
-
-          unless new_text == old_text
-            # rewrite existing file
-            File.write(new_path, new_text)
-          end
-
-          # show possible matches in body
-          line_num = 0
-          new_text.each_line do |old_line|
-            new_line = old_line.gsub(/#{Regexp.quote(from_humanized)}/i, "\e[33m\\0\e[0m")
-            unless new_line == old_line
-              puts "\e[36m#{new_path}:#{line_num}\e[0m #{new_line}"
-            end
-            line_num += 1
-          end
-        end
+  # Utilities for working with ASTs
+  module Util
+    def self.deconstruct_ast(string)
+      deep_deconstruct(ast_from(string))
+    end
+
+    # Makes it easier to break down an AST into what we'd like to match against
+    # eventually.
+    def self.deep_deconstruct(node)
+      return node unless node.respond_to?(:deconstruct)
+
+      node.deconstruct.map { deep_deconstruct(_1) }
+    end
+
+    # Convert a string into its AST representation
+    def self.ast_from(string)
+      processed_source_from(string).ast
+    end
+
+    def self.processed_source_from(string)
+      RuboCop::ProcessedSource.new(string, RUBY_VERSION.to_f)
+    end
+  end
+
+  # Wrapper for rule processors to simplify the code
+  # needed to run one.
+  class Rule < Parser::AST::Processor
+    include RuboCop::AST::Traversal
+
+    protected attr_reader :rewriter
+
+    def initialize(rewriter)
+      @rewriter = rewriter
+      super()
+    end
+
+    def self.process(string)
+      Rewriter.new(rules: [self]).process(string)
+    end
+
+    def process_regular_node(node)
+      return matches(node) if defined?(matches)
+
+      super()
+    end
+
+    protected def replace(node, new_code)
+      rewriter.replace(node.loc.expression, new_code)
+    end
+  end
+
+  # Full rewriter, typically used for processing multiple rules
+  class Rewriter
+    def initialize(rules: [])
+      @rules = rules
+    end
+
+    def process(string)
+      # No sense in processing anything if there's nothing to apply it to
+      return string if @rules.empty?
+
+      source = Util.processed_source_from(string)
+      ast = source.ast
+
+      source_buffer = source.buffer
+
+      rewriter = Parser::Source::TreeRewriter.new(source_buffer)
+
+      @rules.each do |rule_class|
+        rule = rule_class.new(rewriter)
+        ast.each_node { |node| rule.process(node) }
       end
+
+      rewriter.process
     end
   end
-  module_function :run
 end

data/refactor.gemspec

@@ -1,26 +1,37 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'refactor/version'
+# frozen_string_literal: true
+
+require_relative "lib/refactor/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = "refactor"
-  spec.version       = Refactor::VERSION
-  spec.authors       = ["Aidan Feldman"]
-  spec.email         = ["aidan.feldman@gmail.com"]
-  spec.summary       = %q{A command line tool to help refactor your code.}
-  # spec.description   = %q{TODO: Write a longer description. Optional.}
-  spec.homepage      = "https://github.com/afeld/refactor"
-  spec.license       = "MIT"
+  spec.name = "refactor"
+  spec.version = Refactor::VERSION
+  spec.authors = ["Brandon Weaver"]
+  spec.email = ["keystonelemur@gmail.com"]
+
+  spec.summary = "Ruby refactoring tool"
+  spec.description = "AST-based Ruby refactoring toolkit"
+  spec.homepage = "https://www.github.com/baweaver/refactor"
+  spec.license = "MIT"
+  spec.required_ruby_version = ">= 3.1.0"
+
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = spec.homepage
+  spec.metadata["changelog_uri"] = "#{spec.homepage}/CHANGELOG.md"
 
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  # Specify which files should be added to the gem when it is released.
+  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
+  spec.files = Dir.chdir(__dir__) do
+    `git ls-files -z`.split("\x0").reject do |f|
+      (File.expand_path(f) == __FILE__) ||
+        f.start_with?(*%w[bin/ test/ spec/ features/ .git .circleci appveyor Gemfile])
+    end
+  end
+  spec.bindir = "exe"
+  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activesupport", "~> 4.0"
+  # Consider removing this later and having a more minimal subset
+  spec.add_dependency "rubocop"
 
-  spec.add_development_dependency "bundler", "~> 1.6"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "guard-rspec"
 end

data/sandbox/experimental.rb

@@ -0,0 +1,288 @@
+# All the stuff I've extracted for the moment until I get it working cleanly
+# or for release in a later commit. For now this may be interesting for the
+# sake of reading so I'll leave this in.
+module Refactor
+  module Util
+    REPL_SOURCE = Regexp.union('(IRB)', '(pry)')
+
+    def self.extract_block_ast(block)
+      source_file, source_line = block.source_location
+
+      # REPL defined, we gotta do some more work here
+
+      raise ArgumentError, 'Cannot extract source from REPL' if REPL_SOURCE.match?(source_file)
+
+      file_ast = ast_from(File.read(source_file))
+
+      file_ast.each_node.find do |node|
+        node.block_type? && node.first_line == source_line
+      end
+    end
+
+    def self.pattern_deconstruct(node, tokens: [], seen: Hash.new(0), is_head: false)
+      if node.respond_to?(:deconstruct)
+        # Receivers especially tend to get nested like this
+        if node in [:send, nil, potential_token]
+          if potential_token == :_ || tokens.include?(potential_token)
+            return Tokens::Literal.new(potential_token)
+          end
+        end
+
+        node.deconstruct.each_with_index.map do |node, i|
+          pattern_deconstruct(node, tokens:, seen:, is_head: i.zero?)
+        end
+      else
+        return node if node.nil? || is_head || !tokens.include?(node)
+
+        seen[node] += 1
+        is_repeated = seen[node] > 1
+
+        Tokens::Literal.new("#{'^' if is_repeated}#{node}")
+      end
+    end
+  end
+
+  # Any special tokens that do not cleanly introspect.
+  module Tokens
+    # Prevents quotes from displaying when assembling
+    # code later.
+    class Literal
+      def initialize(string)
+        @string = string
+      end
+
+      def to_s
+        @string
+      end
+
+      def inspect
+        @string
+      end
+    end
+  end
+
+  # Wrap a pattern match, potentially do other interesting things
+  # later on.
+  class Matcher
+    def initialize(&pattern)
+      @pattern = pattern
+    end
+
+    def call(value)
+      @pattern.call(value)
+    end
+
+    alias === call
+
+    def to_proc
+      @pattern
+    end
+  end
+
+  # Not sure this is a wise idea, but it _is_ a fun idea.
+  module RuleMacros
+    def matches(string = nil, &block)
+      return matches_block(&block) if block_given?
+
+      # Sort is a stupid hack to beat partial word matches. Should make this smarter
+      # later on. Probably invoke this into a tree rewriter ruleset which
+      # is far more involved than I want to do tonight
+      tokens = string.scan(/\$\w+/).sort_by { -_1.size }
+      token_match = Regexp.union(tokens)
+      clean_string = string.gsub(token_match) { |v| v[1..-1] }
+      input_ast = ast_from(clean_string)
+      pattern_type = input_ast.type
+
+      # Strip off the global-psuedo-var syntax
+      scanned_tokens = tokens.map { _1[1..-1].to_sym }
+      match_data_hash = scanned_tokens
+        .map { |v| "#{v}:" }
+        .then { |vs| "{ #{vs.join(', ')}, pattern_type: :#{pattern_type} }" }
+
+      pattern_match_stanza = Util.pattern_deconstruct(input_ast, tokens: scanned_tokens)
+
+      source = <<~RUBY
+        def pattern_type
+          :#{pattern_type}
+        end
+
+        def match?(value)
+          ast = value.is_a?(RuboCop::AST::Node) ? value : Util.ast_from(value)
+
+          return false unless ast in #{pattern_match_stanza}
+          return false unless ast.type == :#{pattern_type}
+
+          true
+        end
+
+        def match(value)
+          ast = value.is_a?(RuboCop::AST::Node) ? value : Util.ast_from(value)
+
+          return false unless ast in #{pattern_match_stanza}
+          return false unless ast.type == :#{pattern_type}
+
+          #{match_data_hash}
+        end
+      RUBY
+
+      instance_eval(source)
+    end
+
+    def replace(string = nil, &block)
+      block_ast = Util.extract_block_ast(block)
+
+      # pp block_ast
+      # pp Util.deep_deconstruct(block_ast)
+
+      does_match = block_ast in [:block,
+        [:send, nil, :replace],
+        [[:arg, node_arg_name], [:arg, match_data_arg_name]],
+        replacement_body
+      ]
+
+      unless does_match
+        raise ArgumentError, "Block is not in correct format for matches macro: \n#{block_ast.source}"
+      end
+
+      new_method_source = <<~RUBY
+        def translate(#{node_arg_name}, #{match_data_arg_name})
+          #{replacement_body.source}
+        end
+
+        def match_and_replace(node)
+          pp(node:)
+          match_data = matches(node) or return false
+          pp(match_data:)
+          new_source = translate(node, match_data)
+          pp(new_source:)
+
+          @rewriter.replace(node.loc.expression, new_source)
+        end
+      RUBY
+
+      puts '', "REPLACE", new_method_source, '', ''
+
+      instance_eval(new_method_source)
+    end
+
+    private def matches_block(&block)
+      block_ast = Util.extract_block_ast(block)
+
+      does_match = block_ast in [:block,
+        [:send, nil, :matches],
+        [[:arg, node_arg_name]],
+        [:match_pattern_p,
+          [:lvar, ^node_arg_name], # Should be the same, or it'd fail anyways
+          [:array_pattern, [:sym, pattern_type], *], # The rest doesn't really matter
+          *
+        ] => pattern_match_stanza
+      ]
+
+      unless does_match
+        raise ArgumentError, "Block is not in correct format for matches macro: \n#{block_ast.source}"
+      end
+
+      # Requires descent, re-iterate
+      match_variables = block_ast.each_node.select { |n| n.type == :match_var }.map(&:source)
+      match_data_hash = match_variables
+        .map { |v| "#{v}:" }
+        .then { |vs| "{ #{vs.join(', ')}, pattern_type: :#{pattern_type} }" }
+
+      new_method_source = <<~RUBY
+        def pattern_type
+          :#{pattern_type}
+        end
+
+        def on_#{pattern_type}(node)
+          pp(on_#{pattern_type}: true, node:, pattern_type:)
+          match_and_replace(node)
+        end
+
+        def match_and_replace(node)
+          return # Fake version until a replacement happens and overwrites this later
+        end
+
+        def match?(#{node_arg_name})
+          return false unless #{node_arg_name}.type == :#{pattern_type}
+          return false unless #{pattern_match_stanza.source}
+
+          true
+        end
+
+        def match(#{node_arg_name})
+          return false unless #{node_arg_name}.type == :#{pattern_type}
+          return false unless #{pattern_match_stanza.source}
+
+          #{match_data_hash}
+        end
+      RUBY
+
+      puts '', "MATCH", new_method_source, '', ''
+
+      instance_eval(new_method_source)
+    end
+
+    private def create_translation_function(input_string:, target_string:)
+      # Sort is a stupid hack to beat partial word matches. Should make this smarter
+      # later on. Probably invoke this into a tree rewriter ruleset which
+      # is far more involved than I want to do tonight
+      input_tokens = input_string.scan(/\$\w+/).sort_by { -_1.size }
+      input_token_match = Regexp.union(input_tokens)
+      input_clean = input_string.gsub(input_token_match) { |v| v[1..-1] }
+      input_ast = ast_from(input_clean)
+
+      # Strip off the global-psuedo-var syntax
+      input_scan_tokens = input_tokens.map { _1[1..-1].to_sym }
+
+      pattern_match_stanza = pattern_deconstruct(input_ast, tokens: input_scan_tokens)
+
+      # Interpolate the new values
+      #
+      # Don't mind the really danged hacky AST to source coercion here,
+      # need to think on cleaning that up real fast later.
+      target_source = target_string.gsub(input_token_match) do |v|
+        "\#\{#{v[1..-1]}.then { |x| x.is_a?(RuboCop::AST::Node) ? x.source : x }\}"
+      end
+
+      extractor_source = <<~RUBY
+        -> node do
+          node = node.is_a?(String) ? ast_from(node) : node
+          return unless node in #{pattern_match_stanza}
+
+          "#{target_source}"
+        end
+      RUBY
+
+      puts extractor_source
+
+      eval(extractor_source)
+    end
+  end
+end
+
+# Tests for RuleMacros for later
+context 'When using RuleMacros' do
+  let(:macro_rule) do
+    Class.new(Refactor::Rule) do
+      matches do |macro_node|
+        macro_node in [:block, receiver,
+          [[:arg, arg_name]], [:send, [:lvar, ^arg_name], method_name]
+        ]
+      end
+
+      replace do |_macro_node, match_data|
+        "#{match_data[:receiver].source}(&:#{match_data[:method_name]})"
+      end
+    end
+  end
+
+  it 'creates a valid rule' do
+    expect(macro_rule.superclass).to eq(Refactor::Rule)
+  end
+
+  describe ".process" do
+    it "processes a rule inline for convenience" do
+      expect(macro_rule.process(target_source)).to eq(corrected_source)
+    end
+  end
+end

data/sig/refactor.rbs

@@ -0,0 +1,4 @@
+module Refactor
+  VERSION: String
+  # See the writing guide of rbs: https://github.com/ruby/rbs#guides
+end

metadata

@@ -1,116 +1,88 @@
 --- !ruby/object:Gem::Specification
 name: refactor
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
-- Aidan Feldman
-autorequire: 
-bindir: bin
+- Brandon Weaver
+autorequire:
+bindir: exe
 cert_chain: []
-date: 2014-06-12 00:00:00.000000000 Z
+date: 2024-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.6'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description: AST-based Ruby refactoring toolkit
 email:
-- aidan.feldman@gmail.com
-executables:
-- refactor
+- keystonelemur@gmail.com
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
-- Gemfile
+- ".rspec"
+- ".rubocop.yml"
+- ".ruby-version"
+- CHANGELOG.md
+- CODE_OF_CONDUCT.md
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/refactor
 - lib/refactor.rb
 - lib/refactor/version.rb
 - refactor.gemspec
-- spec/refactor_spec.rb
-- spec/spec_helper.rb
-homepage: https://github.com/afeld/refactor
+- sandbox/experimental.rb
+- sig/refactor.rbs
+homepage: https://www.github.com/baweaver/refactor
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  homepage_uri: https://www.github.com/baweaver/refactor
+  source_code_uri: https://www.github.com/baweaver/refactor
+  changelog_uri: https://www.github.com/baweaver/refactor/CHANGELOG.md
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubygems_version: 3.5.3
+signing_key:
 specification_version: 4
-summary: A command line tool to help refactor your code.
-test_files:
-- spec/refactor_spec.rb
-- spec/spec_helper.rb
+summary: Ruby refactoring tool
+test_files: []

data/.gitignore

@@ -1,22 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-*.bundle
-*.so
-*.o
-*.a
-mkmf.log

data/.travis.yml

@@ -1,3 +0,0 @@
-language: ruby
-rvm:
-  - 2.0.0

data/Gemfile

@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in refactor.gemspec
-gemspec

data/bin/refactor

@@ -1,7 +0,0 @@
-#!/usr/bin/env ruby
-
-require_relative File.join('..', 'lib', 'refactor')
-
-from = ARGV[0] || raise("Needs a FROM argument.")
-to = ARGV[1] || raise("Needs a TO argument.")
-Refactor.run(from, to)

data/spec/refactor_spec.rb

@@ -1,11 +0,0 @@
-require 'spec_helper'
-
-describe Refactor do
-  it 'has a version number' do
-    expect(Refactor::VERSION).not_to be nil
-  end
-
-  it 'does something useful' do
-    expect(false).to eq(true)
-  end
-end

data/spec/spec_helper.rb

@@ -1,2 +0,0 @@
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-require 'refactor'