middleman-mdocs 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb54592f35eb15d08a0927f628697104f328df57201e57245421351e474b2b48
-  data.tar.gz: f7d18fde1f265c79074f755ce507713029d1b897b89b5db1491372d68dafe2b1
+  metadata.gz: cbfbd40e49f58b11ba5a574c16976c4c13d74bffbc931a9600470ec8ea54cbe9
+  data.tar.gz: 409e96bc9d7e9023f15fc23b2d79bb7870387018bec1d2ec96142010a1bc266f
 SHA512:
-  metadata.gz: c3ca18414c8acfecab8cca3e3b149a8cc6dc915708f7c1bd5c942186ad317564d98f11f151802b665c0af33ea2cf1c66a20d78083022b7cd0ad4d8d92b7487e1
-  data.tar.gz: 9668398c78d8a30d94e98c23a92300136badb8c40958d6321527642abde2d54c12f458e5d4a9fdeab0a065eb6c7cd57301fb63bfd9da1c76cc5e612382b6aa9e
+  metadata.gz: 2547991a43fea03ad9c614548926bfe060d4bc46cc6908dbba07180238b9e97b64ac84184f8f841b346b0ab792fddd18d9262d2f12a6f625ef86a853e4013d07
+  data.tar.gz: 937f5865c60c4155ea4be1f7702a3bd44d1c8177ebd9ee35adfefaf9462f7283e4829f4f5a94f5db65268389bca155272de56807b25fe949e6cf668939d52443

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    middleman-mdocs (0.1.4)
+    middleman-mdocs (0.1.8)
       activesupport
       awesome_print
       kramdown
@@ -18,43 +18,44 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.6)
+    activesupport (5.2.8.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.1)
+      public_suffix (>= 2.0.2, < 6.0)
     ansi (1.5.0)
-    asciidoctor (2.0.16)
-    asciidoctor-plantuml (0.0.14)
-      asciidoctor (>= 1.5.6, < 3.0.0)
+    asciidoctor (2.0.18)
+    asciidoctor-plantuml (0.0.16)
+      asciidoctor (>= 2.0.17, < 3.0.0)
     ast (2.4.2)
     awesome_print (1.9.2)
-    backports (3.21.0)
+    backports (3.23.0)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     contracts (0.13.0)
     diff-lcs (1.4.4)
     docile (1.4.0)
-    dotenv (2.7.6)
+    dotenv (2.8.1)
     erubis (2.7.0)
     execjs (2.8.1)
-    exifr (1.3.9)
+    exifr (1.3.10)
     fast_blank (1.0.1)
-    fastimage (2.2.5)
-    ffi (1.15.4)
+    fastimage (2.2.6)
+    ffi (1.15.5)
     fspath (3.1.2)
-    gitlab_kramdown (0.14.0)
-      asciidoctor-plantuml (= 0.0.14)
-      kramdown (~> 2.3.1)
-      nokogiri (~> 1.12.0)
-      rouge (~> 3.26.0)
-    haml (5.2.2)
-      temple (>= 0.8.0)
+    gitlab_kramdown (0.22.0)
+      asciidoctor-plantuml (= 0.0.16)
+      kramdown (~> 2.4.0)
+      nokogiri (~> 1.13.0)
+      rouge (~> 4.0.0)
+    haml (6.0.10)
+      temple (>= 0.8.2)
+      thor
       tilt
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
@@ -71,14 +72,14 @@ GEM
       fspath (>= 2.1, < 4)
       image_optim (~> 0.19)
     image_size (1.5.0)
-    in_threads (1.5.4)
-    kramdown (2.3.1)
+    in_threads (1.6.0)
+    kramdown (2.4.0)
       rexml
     libv8 (3.16.14.19-x86_64-linux)
     listen (3.0.8)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    mdocs_kramdown (0.1.1.47381)
+    mdocs_kramdown (0.1.2.70482)
       gitlab_kramdown (~> 0)
     memoist (0.16.2)
     middleman (4.3.11)
@@ -121,8 +122,8 @@ GEM
       middleman-core (>= 3.2)
       nokogiri (~> 1.6)
       therubyracer (~> 0.12.2)
-    minitest (5.14.4)
-    nokogiri (1.12.5-x86_64-linux)
+    minitest (5.16.3)
+    nokogiri (1.13.9-x86_64-linux)
       racc (~> 1.4)
     padrino-helpers (0.13.3.4)
       i18n (~> 0.6, >= 0.6.7)
@@ -134,19 +135,19 @@ GEM
     parser (3.0.2.0)
       ast (~> 2.4.1)
     progress (3.6.0)
-    public_suffix (4.0.6)
-    racc (1.5.2)
-    rack (2.2.3)
+    public_suffix (5.0.0)
+    racc (1.6.0)
+    rack (2.2.4)
     rainbow (3.0.0)
     rake (13.0.6)
-    rb-fsevent (0.11.0)
+    rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     redcarpet (3.5.1)
     ref (2.0.0)
     regexp_parser (2.1.1)
     rexml (3.2.5)
-    rouge (3.26.1)
+    rouge (4.0.0)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
       rspec-expectations (~> 3.10.0)
@@ -199,16 +200,17 @@ GEM
     therubyracer (0.12.3)
       libv8 (~> 3.16.14.15)
       ref
-    thor (1.1.0)
+    thor (1.2.1)
     thread_safe (0.3.6)
-    tilt (2.0.10)
-    tzinfo (1.2.9)
+    tilt (2.0.11)
+    tzinfo (1.2.10)
       thread_safe (~> 0.1)
     uglifier (3.2.0)
       execjs (>= 0.3.0, < 3)
     unicode-display_width (2.1.0)
 
 PLATFORMS
+  ruby
   x86_64-linux
 
 DEPENDENCIES

data/lib/middleman-mdocs/file_renderer_cache.rb

@@ -7,7 +7,7 @@ module ::Middleman
     ORIGINAL_RENDER = Engine.fetch_from(self).decorated_methods_for(:instance_methods, :render)[0].method.instance_variable_get('@method')
   
     def render(locs, opts, context, &block)
-      return ORIGINAL_RENDER.bind(self).call(locs, opts, context, &block) if locs[:rack]
+      return ORIGINAL_RENDER.bind(self).call(locs, opts, context, &block) # if locs[:rack]
 
       cache_key = Digest::MD5.hexdigest("#{locs.to_h.to_json}_#{opts.to_h.to_json}")
       

data/lib/middleman-mdocs/resource.rb

@@ -21,11 +21,25 @@ module MiddlemanMdocs
     def html?
       @html ||= destination_path.end_with?('.html')
     end
-
+    
     def ready?
       mdocs.ready?
     end
 
+    def touch
+      @updated = SecureRandom.hex
+    end
+
+    def data
+      $data_cache ||= {}
+      $data_cache[page_id] ||= super
+    end
+
+    def metadata
+      $metadata_cache ||= {}
+      $metadata_cache[destination_path] ||= super
+    end
+
     def copy_from(other)
       resource = self
       unless @patched
@@ -70,12 +84,8 @@ module MiddlemanMdocs
       (mdocs.dependencies(self).map(&:timestamp) + [File.mtime(File.realdirpath(source_file)), File.mtime(source_file)]).max
     end
 
-    def cache_key
-      "#{page_id}/#{timestamp}/"
-    end
-
     def title
-      with_cache(:title, @updated) do
+      with_cache(:title) do
         data[:title] || metadata[:title] || toc&.children&.first&.raw_text
       end
     end
@@ -87,11 +97,11 @@ module MiddlemanMdocs
     end
 
     def text
-      force_render if !metadata[:ignore] && html?
+      force_render(:text) if !metadata[:ignore] && html?
     end
 
     def tags
-      with_cache(:tags, @updated) do
+      with_cache(:tags) do
         guard_recursive('tags', page_id, []) do |_key|
           text
         end
@@ -101,14 +111,14 @@ module MiddlemanMdocs
     end
 
     def keywords
-      with_cache(:keywords, @updated) do
+      with_cache(:keywords) do
         options[:keywords] =
           ::MiddlemanMdocs::Resource.normalize_keywords(tags, options[:keywords], data[:keywords], metadata[:keywords])
       end
     end
 
     def toc
-      with_cache(:toc, @updated) do
+      with_cache(:toc) do
         if metadata[:ignore] || !html?
           nil
         else
@@ -131,7 +141,7 @@ module MiddlemanMdocs
       added = ::MiddlemanMdocs::Resource.normalize_tags(args)
       return if (added - (options[:tags] || [])).empty?
 
-      @updated = SecureRandom.hex
+      cache_reset(:tags)
       options[:tags] = ::MiddlemanMdocs::Resource.normalize_tags(options[:tags], data[:tags], metadata[:tags], added)
     end
 
@@ -141,7 +151,7 @@ module MiddlemanMdocs
       added = ::MiddlemanMdocs::Resource.normalize_keywords(args)
       return if (added - (options[:keywords] || [])).empty?
 
-      @updated = SecureRandom.hex
+      cache_reset(:keywords)
       options[:keywords] =
         ::MiddlemanMdocs::Resource.normalize_keywords(options[:tags], options[:keywords], data[:keywords], metadata[:keywords],
                                                       added)
@@ -167,29 +177,66 @@ module MiddlemanMdocs
       super.force_encoding(Encoding.default_external)
     end
 
-    def force_render
-      render({ layout: false }, { current_path: path, force_current_page: self })
+    def force_render key = :force
+      render({ layout: false, key: key}, { current_path: path, force_current_page: self })
     end
 
     def render(opts = {}, locs = {})
       return super if nocache? || locs.has_key?('rack') || locs.has_key?(:rack)
-
+     
       with_cache(Digest::MD5.hexdigest(opts.to_json + locs.to_json) + 'render') do
         # puts "REFRESH: #{binary?} #{page_id}: #{opts.to_json + locs.to_json}"
         super
       end
     end
 
+    def cache_key(*key)
+      "#{page_id}/#{timestamp}/#{key.map(&:to_s).sort.join('_')}"
+    end
+
     private
 
+    PARTIAL_RX = ['partial', 'include', 'render', 'merge'].map do |token|
+      /\b#{token}\b/
+    end
+
     def nocache?
-      binary? || metadata[:ignore] || metadata[:nocache] || data[:nocache]
+      tmpl = with_cache(:noacahe, expires_in: 1.minute) do
+        file_descriptor.try(:read).then do |content|
+          false if content.nil?
+          PARTIAL_RX.any? do |rx|
+            content.match(rx)
+          end
+        end
+      end
+
+      #r = binary? || metadata[:ignore] || metadata[:nocache] || data[:nocache] || tmpl
+      r = binary? || metadata[:nocache] || data[:nocache] || tmpl
+
+      # if r
+      #   puts "NOCACHE#{page_id}: #{r}"
+      #   puts "b:#{binary?}"
+      #   #puts "i:#{metadata[:ignore]}"
+      #   puts "c:#{metadata[:nocache]}"
+      #   puts "d:#{data[:nocache]}"
+      #   puts "t:#{tmpl}"
+      # end
+
+      r
+    end
+
+
+    
+    def cache_reset(*key)
+      extension.cache.delete([cache_key(key)])
     end
 
-    def with_cache(*key, &block)
-      extension.cache.fetch([cache_key, *key], &block)
+    def with_cache(*key, **opts, &block)
+      extension.cache.fetch([cache_key(key)], **opts, &block)
     end
 
+
+
     def custom_deep_merge!(left, right)
       left.merge!(right) do |_key, this_val, other_val|
         if this_val.is_a?(Hash) && other_val.is_a?(Hash)

data/lib/middleman-mdocs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MiddlemanMdocs
-  VERSION = '0.1.6'
+  VERSION = '0.1.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-mdocs
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - Samoylenko Yuri
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-15 00:00:00.000000000 Z
+date: 2022-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -222,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Extension for Middleman