yard-aggredator 1.1.2 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfe1db4483e76ddaf3fbca7fef0839f09d8eb957b4f2924e8db45c38ad991bad
-  data.tar.gz: b479b33d87125e2329af0ae6b659076865e6dfb46644220953bf081916c25501
+  metadata.gz: 14937e3ed6eb62c4a2bb3f87c1623968a8adbaaf9acd31367180b58a39fc9bf4
+  data.tar.gz: 6cecc99100f8a4749df988d16e90cf51095f7939731a39b0a94c07e3182e0a31
 SHA512:
-  metadata.gz: dd2fee4680a0f242a068397dc3b80be0127e493c1ddf12bb01775623dfc87af49a0e1efdc6b3b800495d32fda2b355a68db410fcbbf565cec8c390a416d714e8
-  data.tar.gz: 28c6e1d26ebbc434d5f5db2bc3517d97d2b9941c424e3c35a1105b064d0a6fce3feaaa75bfb1492504bb898c774a444dfae338d2a53db34cb43557348a2e0480
+  metadata.gz: e2f9af68fff9948d344f2de4f8b9324087bc5c7eeec986d605c6936b02bcdd9dae4087aaea2d4a4759ccc8db13f0d396a31dc5a065eb183de783aa1424523975
+  data.tar.gz: ef1d741893d7d2494a2dbc254116059cbc34645238834cd9bb38ba11077ea13cba093f7272c04d51546b5c8eea465bb347651f6461bf7670a7982924d23058bf

data/lib/yard/aggredator/plugin.rb

@@ -14,6 +14,7 @@ module YARD
       def htmlify(text, markup = options.markup)
         detected_markup = plain_detect_markup(@current_linking_file || @file&.filename, markup)
 
+        text = text.dup
         # отложенные директивы @!include и @!embed могли оставить ссылки-заглушки, и теперь можно их заменить на реальный контент
         render_referenced_directives(text, owner)
 
@@ -325,8 +326,72 @@ module YARD
       self.name = "#{dirname}_#{name}"
     end
   end
+
+  module RegistryResolverPatch
+    # Отвратительный copy-paste из RegistryResolver
+    # при переходе из Yard v0.9.39 -> v0.9.40 бы исправлен баг 2017 года https://github.com/lsegal/yard/issues/1116
+    # из-за этого сломалась работа поиска статических родительских методов с привязаннми макросами...
+    # исправление: КОМЕНТИРУЕМ СТРОКУ
+    def lookup_by_path(path, opts = {})
+      path = path.to_s
+      namespace = opts[:namespace]
+      inheritance = opts[:inheritance] || false
+      proxy_fallback = opts[:proxy_fallback] || false
+      type = opts[:type]
+
+      if namespace.is_a?(CodeObjects::Proxy)
+        return proxy_fallback ? CodeObjects::Proxy.new(namespace, path, type) : nil
+      end
+
+      if namespace == :root || !namespace
+        namespace = @registry.root
+      else
+        namespace = namespace.parent until namespace.is_a?(CodeObjects::NamespaceObject)
+      end
+      orignamespace = namespace
+
+      if path =~ starts_with_default_separator_match
+        path = $'
+        namespace = @registry.root
+        orignamespace = @registry.root
+      end
+
+      resolved = nil
+      lexical_lookup = 0
+      while namespace && !resolved
+        resolved = lookup_path_direct(namespace, path, type)
+        # Prevent a bare name from resolving back to the namespace we started
+        # from when searching through a parent namespace. For example,
+        # `include Enumerable` inside `A::Enumerable` would walk up to namespace
+        # `A` and match `A::Enumerable`, creating a false self-referential mixin.
+        # Only skip when we have already moved to a parent (namespace != orignamespace).
+        # See https://github.com/lsegal/yard/issues/1116
+
+        # ВОТ ЭТУ СТРОКУ НАДО ЗАКОМЕНТИРОВАТЬ ЧТОБ РАБОТАЛ Aggredator::Api::V3::Message.schema_id
+        # resolved = nil if resolved.equal?(orignamespace) && !namespace.equal?(orignamespace)
+        resolved ||= lookup_path_inherited(namespace, path, type) if inheritance
+        break if resolved
+        namespace = namespace.parent
+        lexical_lookup += 1
+      end
+
+      # method objects cannot be resolved through lexical lookup by more than 1 ns
+      if lexical_lookup > 1 && resolved.is_a?(CodeObjects::MethodObject)
+        resolved = nil
+      end
+
+      if proxy_fallback
+        resolved ||= CodeObjects::Proxy.new(orignamespace, path, type)
+      end
+
+      resolved
+    end
+  end
+
 end
 
+::YARD::RegistryResolver.prepend(::YARD::RegistryResolverPatch)
+
 ::YARD::Tags::Library.define_directive :include, :with_types, ::YARD::Aggredator::IncludeDirective
 ::YARD::Tags::Library.define_directive :embed, :with_types, ::YARD::Aggredator::EmbedDirective
 

data/lib/yard/aggredator/version.rb

@@ -1,5 +1,5 @@
 module YARD
   module Aggredator
-    VERSION = '1.1.2'
+    VERSION = '1.1.4'
   end
 end

data/templates/default/tags/html/example.erb

@@ -5,11 +5,12 @@
       <% unless tag.name.empty? %>
         <h5 class="example_title"><%= htmlify_line(tag.name) %></h5>
       <% end %>
-      <% if tag.name.to_s.gsub(/^\[(\s*\w+\s*)\]/, '') %>
-        <% lang = $1.to_s %>
+      <% tag.name.to_s.gsub(/^\[(\s*\w+\s*)\]/, '') %>
+      <% lang = $1.to_s %>
+      <% if !lang.empty? %>
         <%= parse_codeblocks("<pre class=\"#{lang} example\"><code class=\"#{lang}\">#{tag.text}</code></pre>") %>
       <% else %>
-        <%= parse_codeblocks("<pre class=\"ruby example\"><code class=\"ruby\">#{tag.text}</code></pre>") %>
+        <%= parse_codeblocks("<pre class=\"ruby example\">#{tag.text}</pre>") %>
       <% end %>
     <% end %>
   </div>

data/yards-aggredator.gemspec

@@ -26,4 +26,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'yard'
   spec.add_dependency 'yard-relative_markdown_links'
   
+  spec.add_development_dependency 'webrick'
+  spec.add_development_dependency 'rack'
+  spec.add_development_dependency 'rackup'
+  spec.add_development_dependency 'redcarpet'
+  spec.add_development_dependency 'kramdown'
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yard-aggredator
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.4
 platform: ruby
 authors:
 - Samoilenko Yuri
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-05-27 00:00:00.000000000 Z
+date: 2026-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rouge
@@ -66,6 +66,76 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webrick
+  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'
+- !ruby/object:Gem::Dependency
+  name: rack
+  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'
+- !ruby/object:Gem::Dependency
+  name: rackup
+  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'
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  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'
+- !ruby/object:Gem::Dependency
+  name: kramdown
+  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: |2-
 
      Различные вспомогательные функции: работа с Mermaid Diagram, работа с сылками на статические файлы и другая косметика