pry-byetypo 1.3.5 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f15529f2e08377a72e5f53a9760054290f2d02c503fcb083bf4a302fc4431f5
-  data.tar.gz: 3c79cf73afb8e8854828136769681f3f668ad5464da41c9da4659fbf3cb87493
+  metadata.gz: a33e074d9f5da4f065da3f5cdbf37807b1de2a0565d81a3bf89f0fd751286ee5
+  data.tar.gz: 59b098fd8d154d4315c931a9869b0feedcbed19e022ecb71f828b61913759d13
 SHA512:
-  metadata.gz: 8054993c420a8c032d70f786d87564e2d9ea81a1a1393e35d68d4f2b64afdee3180b4661a8fb4b4f56fb9cc0c5d95e135321022a3b656978d1380e80ad66fe4f
-  data.tar.gz: e75803de9ae6d6f644cc98551dddae9281d77219044882408e99a05c0bb3f14c45d6f69478e009907d231b0ad23614e561352c47057b3fb609acdfd958906b92
+  metadata.gz: 158849f7db42283374d60ed2cc3fee8c48443101870cbb03ba5e032ee5a0a467c07b0fa584afba5428cecc98cd4528113d66447a760c77ee539fe136e6f008ee
+  data.tar.gz: 5cf13d244cef3a3f8538ad21817bd179a67fbd2fb6170ff5c85e80f959f179c4a0ffa8eb38408006b862f727b381811d622a010cb7daed799cca4939c5d85a8f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pry-byetypo (1.3.5)
+    pry-byetypo (1.3.6)
       pry (~> 0.15)
 
 GEM

data/lib/pry-byetypo/exceptions/active_record/base.rb

@@ -8,7 +8,7 @@ module Exceptions
       private
 
       def corrected_cmd
-        @corrected_cmd ||= last_cmd.gsub(/\b#{unknown_from_exception}\b/, corrected_word)
+        @corrected_cmd ||= last_cmd.gsub(/\b#{unknown_from_exception}\b/, corrected_word.to_s)
       end
 
       def unknown_from_exception

data/lib/pry-byetypo/exceptions/active_record/uninitialized_constant.rb

@@ -8,7 +8,8 @@ module Exceptions
       private
 
       def unknown_from_exception
-        exception.to_s.split.last
+        # Returns the first word after Unitialized constant error message.
+        exception.to_s.split[2]
       end
 
       def corrected_cmd

data/lib/pry-byetypo/exceptions/exceptions_base.rb

@@ -29,6 +29,8 @@ class ExceptionsBase < Base
   end
 
   def can_correct?
+    return true if did_you_mean_output
+
     error_from_typo? && dictionary && corrected_word
   end
 
@@ -37,7 +39,15 @@ class ExceptionsBase < Base
   end
 
   def corrected_word
-    @corrected_word ||= spell_checker.correct(unknown_from_exception).first
+    @corrected_word ||= did_you_mean_output ||
+      spell_checker.correct(unknown_from_exception).first
+  end
+
+  def did_you_mean_output
+    match_data = exception.message.match(/Did you mean\?\s+(\w+)/)
+    return unless match_data
+
+    match_data[1]
   end
 
   def spell_checker

data/lib/pry-byetypo/exceptions/no_method_error.rb

@@ -15,21 +15,45 @@ module Exceptions
     end
 
     def dictionary
-      klass_methods = eval(infer_klass).methods # rubocop:disable Security/Eval
-      # Early return because built_in class does not have access to `instance_methods`.
-      return klass_methods.map(&:to_s) if built_in_klass
+      @dictionary ||= begin
+        klass_eval = eval(infer_klass)  # rubocop:disable Security/Eval
+        klass_methods = klass_eval.methods
+        # Conditions below exist because built_in class does not have access to `instance_methods` or `column_names`. eg: []
+        instance_methods = klass_eval.respond_to?(:instance_methods) ? klass_eval.instance_methods(false) : []
+        column_names = klass_eval.respond_to?(:column_names) ? klass_eval.column_names : []
 
-      instance_methods = eval(infer_klass).instance_methods(false) # rubocop:disable Security/Eval
-      instance_methods.push(klass_methods).flatten.map(&:to_s)
+        [instance_methods, klass_methods, model_associations, column_names, active_records_methods].flatten.map(&:to_s)
+      end
+    end
+
+    def model_associations
+      store.transaction { |s| [s["associations"]] }
+    end
+
+    def active_records_methods
+      store.transaction { |s| [s["ar_methods"]] }
     end
 
     def exception_regexp
       /`([^']+)' for/
     end
 
+    def klass_regexp
+      return /for an instance of (\w+)/ if instance_exception?
+      return /for class (\w+)/ if exception.to_s.include?("class")
+
+      /for #<(\w+)/
+    end
+
     def klass
-      exception_without_class_module = exception.to_s.gsub(":Class", "")
-      exception_without_class_module.split.last
+      @klass ||= begin
+        exception_without_class_module = exception.to_s.match(klass_regexp)
+        exception_without_class_module[1]
+      end
+    end
+
+    def instance_exception?
+      exception.to_s.include?("for an instance of")
     end
 
     # [].methods and Array.methods have a different output.

data/lib/pry-byetypo/setup/dictionary/active_record.rb

@@ -5,6 +5,7 @@ require_relative "../checks/database_pool"
 require_relative "../store"
 
 require "pstore"
+require "zeitwerk"
 
 module Setup
   module Dictionary
@@ -25,6 +26,7 @@ module Setup
 
             store["active_record_models"] = populate_active_record_models_dictionary
             store["associations"] = populate_associations
+            store["ar_methods"] = ::ActiveRecord::Base.methods
             store["synced_at"] = Time.now
           end
         end
@@ -36,13 +38,15 @@ module Setup
 
         def populate_active_record_models_dictionary
           Zeitwerk::Loader.eager_load_all
-          ::ActiveRecord::Base.descendants.map { |model| format_active_record_model(model) }.flatten
+          models.map { |model| format_active_record_model(model) }.flatten
         end
 
         def populate_associations
-          table_names = ::ActiveRecord::Base.connection.tables
-          singularize_table_names = table_names.map { |a| a.chop }
-          table_names.zip(singularize_table_names).flatten
+          models.map { |model| model.reflect_on_all_associations.map(&:name) }.flatten.uniq
+        end
+
+        def models
+          @models ||= ::ActiveRecord::Base.descendants
         end
 
         # This method takes an ActiveRecord model as an argument and formats its name and module information.

data/lib/pry-byetypo/version.rb

@@ -2,6 +2,6 @@
 
 class Pry
   module Byetypo
-    VERSION = "1.3.5"
+    VERSION = "1.3.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pry-byetypo
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.3.6
 platform: ruby
 authors:
 - Clément Morisset
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-28 00:00:00.000000000 Z
+date: 2025-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -102,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: Autocorrects typos in your Pry console