rails-annotate-solargraph 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac8d7c78804560db17c10943c462e838059d5f74d6d5d2664083c6da0f26c43a
-  data.tar.gz: b9a0d329cb657bdb74220b75ec14a53785d75f2e6847c7bc41e884103edb21df
+  metadata.gz: f47a9a65cb37174ca12847169325afbecef1182e7d34bf555accf5551fbb7f1c
+  data.tar.gz: 97d1aae264b49adc45222847f6d2f25278abacec90134226cc7c023e205df6d5
 SHA512:
-  metadata.gz: 39567ae796da52823201081813575f0859aefad622a5c43522b0b82f0864f4f87a8e3cccc65a83d9631c9a6f4c9febae0968b2e51980d679d7f0736e6c55c552
-  data.tar.gz: a8d6a79aa396d9110bc157703678d91f8b0e0f664f4175f296a47e07429727dbc3eb7d3e6025facaaff3b3abea94f151abeaece7e07f2160ba4eb1d48cf23c88
+  metadata.gz: fa14e6c6068da07e1a4df3c2e41c021882ee65178fe124f2a729001964624900aa0578173870fac7bfac26bb474e530261a561a9082e267dfc8d4a48c3a3adc8
+  data.tar.gz: 84a6120026334a68f175c8fba73ddee4720d9d6913b52ef36cfc797409543a444419000d3a687843ee57cd1ad264523f761b2988984a74137079b67f413bb396

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## [Unreleased]
 
+## [0.5.3] - 2022-04-20
+
+- fix a minor bug which in some rails apps prevented scopes from being documented
+
 ## [0.5.2] - 2022-04-20
 
 - proxy method overrides get loaded during app initialization

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rails-annotate-solargraph (0.5.2)
+    rails-annotate-solargraph (0.5.3)
       rails (>= 5.0, < 8.0)
       solargraph
       yard

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

@@ -5,13 +5,11 @@ if ::Rails.env.development?
     namespace :solargraph do
       desc "Add YARD comments documenting the models' schemas"
       task generate: :environment do
-        ::ENV['ANNOTATE_SOLARGRAPH_RAKE_TASK'] = 'true'
         ::Rails::Annotate::Solargraph.generate
       end
 
       desc "Remove YARD comments documenting the models' schemas"
       task remove: :environment do
-        ::ENV['ANNOTATE_SOLARGRAPH_RAKE_TASK'] = 'true'
         ::Rails::Annotate::Solargraph.remove
       end
     end

data/lib/rails/annotate/overrides.rb

@@ -5,8 +5,6 @@ class ActiveRecord::Base
     alias orig_scope scope
 
     def scope(*args, **kwargs, &block)
-      return orig_scope(*args, **kwargs, &block) unless ::ENV['ANNOTATE_SOLARGRAPH_RAKE_TASK']
-
       file_path, scope_line_number = caller.first.split(':')
       scope_line_number = scope_line_number.to_i
       scope_name = args.first
@@ -26,6 +24,8 @@ class ActiveRecord::Base
 
       ::Rails::Annotate::Solargraph::Model.add_scope(scope_name.to_sym, scope_model_class, proc_parameters, scope_line)
 
+      orig_scope(*args, **kwargs, &block)
+    rescue
       orig_scope(*args, **kwargs, &block)
     end
   end

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

@@ -3,7 +3,7 @@
 module Rails
   module Annotate
     module Solargraph
-      VERSION = '0.5.2'
+      VERSION = '0.5.3'
     end
   end
 end

metadata

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