rails-annotate-solargraph 0.2.0 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 744b5deaf3bfdd5fdf4b81b54abd8f4672336402bce178af67b04ff704b6ceab
-  data.tar.gz: 062d49842f237ddb38202975c0c88733fb3a825ebcb4c7cbd7641b45b58ee993
+  metadata.gz: 0f1d0f284eac106e51e1abc19eec0d7b8790aab9ee188e1cabea5defb04417da
+  data.tar.gz: 392519ce6da6313e8a3308dee6f54b66629ee108120b8abcb94e1d838dc86470
 SHA512:
-  metadata.gz: 35eb981e6a0b52331164d80fd7238aadae0403cd9f4d93c7dc9a6c00e31714f6b731c23e961542ee5eac64a48c2820de926fcacaea1e6b8ff9b34c501781c05b
-  data.tar.gz: 6d0f472969a50ed833398216789d0000b8c288685946ab90621f48edca85f57034350df39a5006ae5ddb6b4a30623658c529584e6eca504b0202ff6b633b3379
+  metadata.gz: 23e25ae122d969be4f5d4081638592e3db7d6ab46adf60cdaf82057953441576d842bc2db79af664371637e332b25c5fee091fe930e53ffd88f97d78a04533c9
+  data.tar.gz: 43d0752100b231426877a84665ba8030d5121b8f0d7b07549f2312c7e30cb7f1c0f9c9807b99bc085394fd369cb81a95ec63c15366e92a9eb96116fdb91b8fee

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 ## [Unreleased]
 
+## [0.2.3] - 2022-04-16
+
+- A nicer fix for the previous problem
+
+## [0.2.2] - 2022-04-16
+
+- Inexistent class loading error has been resolved
+
+## [0.2.1] - 2022-04-16
+
+- Rakefile template refactoring and bug fix
+
 ## [0.2.0] - 2022-04-16
 
 - Associations get fully documented

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rails-annotate-solargraph (0.2.0)
+    rails-annotate-solargraph (0.2.3)
       rails (>= 5.0, < 8.0)
 
 GEM

data/lib/generators/annotate/solargraph/templates/rails_annotate_solargraph.rake

@@ -1,18 +1,16 @@
 # frozen_string_literal: true
 
-include ::Rails::Annotate::Solargraph::TerminalColors
-
 if ::Rails.env.development?
   namespace :annotate do
     namespace :solargraph do
       desc "Add YARD comments documenting the models' schemas"
       task generate: :environment do
-        system! 'bundle exec bin/rails runner "::Rails::Annotate::Solargraph.generate"'
+        ::Rails::Annotate::Solargraph.generate
       end
 
       desc "Remove YARD comments documenting the models' schemas"
       task remove: :environment do
-        system! 'bundle exec bin/rails runner "::Rails::Annotate::Solargraph.remove"'
+        ::Rails::Annotate::Solargraph.remove
       end
     end
 
@@ -25,8 +23,4 @@ if ::Rails.env.development?
       end
     end
   end
-
-  def system!(val)
-    system(val) || abort(error_string("Command `#{val}` failed"))
-  end
 end

data/lib/rails/annotate/solargraph/model.rb

@@ -147,17 +147,25 @@ module Rails
         # @param reflection [ActiveRecord::Reflection::AbstractReflection]
         # @return [void]
         def document_relation(doc_string, attr_name, reflection)
+          reflection_class = begin
+            reflection.klass
+          rescue ::NameError
+            Object
+          end
+
+          associated_table_name = reflection_class.try(:table_name) || '<unknown>'
+          foreign_key = reflection.try(:foreign_key) || '<unknown>'
           db_description = \
             case reflection
             when ::ActiveRecord::Reflection::BelongsToReflection
-              type_docstring = reflection.klass
-              "`belongs_to` relation with `#{reflection.klass}`. Database column `#{@klass.table_name}.#{reflection.foreign_key}`."
+              type_docstring = reflection_class
+              "`belongs_to` relation with `#{reflection_class}`. Database column `#{@klass.table_name}.#{foreign_key}`."
             when ::ActiveRecord::Reflection::HasOneReflection
-              type_docstring = reflection.klass
-              "`has_one` relation with `#{reflection.klass}`. Database column `#{reflection.klass.table_name}.#{reflection.foreign_key}`."
+              type_docstring = reflection_class
+              "`has_one` relation with `#{reflection_class}`. Database column `#{associated_table_name}.#{foreign_key}`."
             when ::ActiveRecord::Reflection::HasManyReflection
-              type_docstring = "Array<#{reflection.klass}>"
-              "`has_many` relation with `#{reflection.klass}`. Database column `#{reflection.klass.table_name}.#{reflection.foreign_key}`."
+              type_docstring = "Array<#{reflection_class}>"
+              "`has_many` relation with `#{reflection_class}`. Database column `#{associated_table_name}.#{foreign_key}`."
             end
 
           doc_string << <<~DOC

data/lib/rails/annotate/solargraph/version.rb

@@ -3,7 +3,7 @@
 module Rails
   module Annotate
     module Solargraph
-      VERSION = '0.2.0'
+      VERSION = '0.2.3'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-annotate-solargraph
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.3
 platform: ruby
 authors:
 - Mateusz Drewniak