yard-aggredator 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8d51de96d18a4f40507f25516ce950428dbf78431c8398759ff79d1e22b8dff
-  data.tar.gz: 9e4b2c58234383c940024a779784e09725386dbfc3978c565c959761fc4372b5
+  metadata.gz: 883431c6c272284d50bc24fc97f8da6f513c2ebfd6d8ee32480947bcfef258f6
+  data.tar.gz: 82605aa22c6cb2078bca0584367039511020d19267a7af78182253e8b18938ea
 SHA512:
-  metadata.gz: 0e9472a0058b88ea793525b1779f871a20a1b196fa76dc8f583c799271b365ec0846595c166f53b270d4e5d2a68e9b0f3409f789fa1c96dd837bbf2cd0efad6a
-  data.tar.gz: edc9a5386a1f9a4a041c4d2284c0ec2c7a5fe54cb957ab443b0454285cb4d2d37b698024628e0b388d23a8fbcae389e80f3d3c8cda05b4a2df72c6f9ae942017
+  metadata.gz: a331da53d97bb4473b34b005079ba8cab5c0185bf5bef3b284da048f279de2517c66e118b3b83327fcbae1900ef6d99e2857e8b0fec18aeaa7262e8244caabcc
+  data.tar.gz: 8f841de208c7080aff30563edbb73eb0b7185cef2cbf06b379446d857f7584be3dab4387a86ba78c0c3a3c1b0d571cd03f7c2b28552fdcb0d03e30798f2d4e60

data/lib/yard/aggredator/plugin.rb

@@ -131,6 +131,17 @@ module YARD
         @current_linking_file = nil
       end
 
+      def self.find_static_file(file, root: nil)
+        files = [file]
+        files << File.relative_path(Dir.pwd, File.expand_path(file))
+        if root.to_s['.yardoc']
+          files << root.to_s.sub('.yardoc', file)
+          files << files.last.sub('/doc/', '/gems/')
+        end
+
+        files.find { |f| File.file?(f) }
+      end
+
       def linkify(*args)
         if args.first.is_a?(String) && /^link:file:(\S+)/.match(args.first)
           file = ::Regexp.last_match(1)
@@ -145,13 +156,10 @@ module YARD
         elsif args.first.is_a?(String) && /^include:file:(\S+)/.match(args.first)
           file = ::Regexp.last_match(1)
           root = YARD::Registry.send(:thread_local_store).file.to_s
-          if root['.yardoc']
-            file1 = root.sub('.yardoc', file)
-            file2 = file1.sub('/doc/', '/gems/')
-            if (finded = [file, file1, file2].find { |f| File.file?(f) })
-              return link_include_file(finded)
-            end
+          if (finded = Aggredator::Helper.find_static_file(file, root: root))
+            return link_include_file(finded)
           end
+
           super
         else
           super
@@ -271,17 +279,18 @@ module YARD
       def expand
         if reference?
           result = if (r = directives_from_reference.first&.expand)
-            r
-          else
-            "<code>see [#{name}] #{reference}</code>"
-          end
+                     r
+                   else
+                     "<code>see [#{name}] #{reference}</code>"
+                   end
           return result
         end
 
-        if File.file?(tag.text.to_s)
-          "{include:file:#{tag.text}}"
+        root = YARD::Registry.send(:thread_local_store).file.to_s
+        if (finded = Aggredator::Helper.find_static_file(tag.text.to_s, root: root))
+          "{include:file:#{finded}}"
         else
-          tag.text.to_s
+          "<code>@!include #{tag.text}</code>"
         end
       end
     end
@@ -290,17 +299,18 @@ module YARD
       def expand
         if reference?
           result = if (r = directives_from_reference.first&.expand)
-            r
-          else
-            "<code>see [#{name}] #{reference}</code>"
-          end
+                     r
+                   else
+                     "<code>see [#{name}] #{reference}</code>"
+                   end
           return result
         end
 
-        if File.file?(tag.text.to_s)
-          File.read(tag.text)
+        root = YARD::Registry.send(:thread_local_store).file.to_s
+        if (finded = Aggredator::Helper.find_static_file(tag.text.to_s, root: root))
+          File.read(finded)
         else
-          tag.text.to_s
+          "<code>@!embed #{tag.text}</code>"
         end
       end
     end

data/lib/yard/aggredator/version.rb

@@ -1,5 +1,5 @@
 module YARD
   module Aggredator
-    VERSION = '1.1.0'
+    VERSION = '1.1.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yard-aggredator
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Samoilenko Yuri