middleman-mdocs 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a35ee2eddd12fc6e7e714025cfced82f0b146d99d5f291ad454d886e1cbfa36d
-  data.tar.gz: 10bb17e3827afaae875a58986dcc9fbda80b20f9c81a6b1aa2f47f4e5e331381
+  metadata.gz: cbfbd40e49f58b11ba5a574c16976c4c13d74bffbc931a9600470ec8ea54cbe9
+  data.tar.gz: 409e96bc9d7e9023f15fc23b2d79bb7870387018bec1d2ec96142010a1bc266f
 SHA512:
-  metadata.gz: b86385fb5f48aff00ee5e14ee1fce4eba3b2de6ea6fd35525b07afef04ab84fdde34e8b9acc802cc2675d5e5abaa25af3546605a503e155ecbf118d938cc6774
-  data.tar.gz: a36b0d3dafdf1c16d6a0370b8b3c9e3af44435242413dd932e154a28ff31390a4fc98dcd856cc3d104d65ff2f030f3d545d519088506b8cb772925d727bf1b7c
+  metadata.gz: 2547991a43fea03ad9c614548926bfe060d4bc46cc6908dbba07180238b9e97b64ac84184f8f841b346b0ab792fddd18d9262d2f12a6f625ef86a853e4013d07
+  data.tar.gz: 937f5865c60c4155ea4be1f7702a3bd44d1c8177ebd9ee35adfefaf9462f7283e4829f4f5a94f5db65268389bca155272de56807b25fe949e6cf668939d52443

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    middleman-mdocs (0.1.6)
+    middleman-mdocs (0.1.8)
       activesupport
       awesome_print
       kramdown

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,32 +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  # cache now work on FileRenderer level
-      
-      #old cache impl
       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.7'
+  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.7
+  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