sitepress-core 2.0.0.beta7 → 2.0.0.beta8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86ae1730830f940024cf418c59320540a22c1108017b6b8a54d9c75e53879b5b
-  data.tar.gz: 9282851713b69e6456cc589761f741609b9f9c17a5ab47ec0c42eaa509bbb2c3
+  metadata.gz: 83c9ae67ef108b15908409feb2d555c718019e667c187713969372910e688580
+  data.tar.gz: 077afc29c48638240747ba35f3be4dda71f038645d1de08411d5337698d45b6a
 SHA512:
-  metadata.gz: 78bbcf237ac225d6e90615e710163f65bb09bbc30fe017bb225ace3d4bf59a3186928bf02d75a8a9946812d04bdba7067c3d1eab35d6409f504f57bbd2df957f
-  data.tar.gz: a6c5ee1a44dbfdf3516b6c51391f951dd863484018770651cd4d2dde3cf12133ac17c668eb54024210ceb2ddde80dfc0d18354e3f6dc9e4cd1cea2453a6c6c57
+  metadata.gz: 68622942e6fb27b292154b2ab5b344b6ba6a34008d151aef31d0b69989c732ad9c5eefdc69f335f31650d8c8652fdad9fe935e0c02c63910648194b0123f45dc
+  data.tar.gz: aa63c9d8b7fdb3c9dda60503192799d00cdd4ca8219047b04d632d21dc8ada33a61305ec9059ef0753a8dbbebd7e04a3aadf1a5f1e27cec71407cd2361edcbc2

data/lib/sitepress-core.rb

@@ -17,7 +17,4 @@ module Sitepress
   autoload :ResourcesPipeline,    "sitepress/resources_pipeline"
   autoload :Site,                 "sitepress/site"
   autoload :SourceNodeMapper,     "sitepress/source_node_mapper"
-  module Middleware
-    autoload :RequestCache,       "sitepress/middleware/request_cache"
-  end
 end

data/lib/sitepress/site.rb

@@ -14,26 +14,18 @@ module Sitepress
     attr_reader :root_path
     attr_writer :resources_pipeline
 
-    # Cache resources for production runs of Sitepress. Development
-    # modes don't cache to optimize for files reloading.
-    attr_accessor :cache_resources
-    alias :cache_resources? :cache_resources
-
     # TODO: Get rid of these so that folks have ot call site.resources.get ...
     extend Forwardable
     def_delegators :resources, :get, :glob
 
     def initialize(root_path: DEFAULT_ROOT_PATH)
       self.root_path = root_path
-      # When Site#resources is called, the results should be cached in production
-      # environments for performance reasons, but not in development environments.
-      self.cache_resources = false
     end
 
     # A tree representation of the resourecs wthin the site. The root is a node that's
     # processed by the `resources_pipeline`.
     def root
-      Node.new.tap do |node|
+      @root ||= Node.new.tap do |node|
         source_node_mapper.mount node
         resources_pipeline.process node
       end
@@ -41,13 +33,12 @@ module Sitepress
 
     # Returns a list of all the resources within #root.
     def resources
-      with_resources_cache do
-        ResourceCollection.new(node: root, root_path: pages_path)
-      end
+      @resources ||= ResourceCollection.new(node: root, root_path: pages_path)
     end
 
-    def clear_resources_cache
-      @resources = nil
+    def reload!
+      @resources = @root = nil
+      self
     end
 
     # Root path to website project. Contains helpers, pages, and more.
@@ -108,10 +99,6 @@ module Sitepress
     end
 
     private
-    def with_resources_cache
-      clear_resources_cache unless cache_resources
-      @resources ||= yield
-    end
 
     def source_node_mapper
       @source_node_mapper ||= SourceNodeMapper.new(path: pages_path)

data/lib/sitepress/version.rb

@@ -1,3 +1,3 @@
 module Sitepress
-  VERSION = "2.0.0.beta7".freeze
+  VERSION = "2.0.0.beta8".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sitepress-core
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta7
+  version: 2.0.0.beta8
 platform: ruby
 authors:
 - Brad Gessler
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-15 00:00:00.000000000 Z
+date: 2021-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -79,7 +79,6 @@ files:
 - lib/sitepress/extensions/proc_manipulator.rb
 - lib/sitepress/formats.rb
 - lib/sitepress/frontmatter.rb
-- lib/sitepress/middleware/request_cache.rb
 - lib/sitepress/node.rb
 - lib/sitepress/path.rb
 - lib/sitepress/resource.rb

data/lib/sitepress/middleware/request_cache.rb

@@ -1,26 +0,0 @@
-module Sitepress
-  module Middleware
-    # Reloads the Sitepress cache between requests if cache resources is enabled.
-    # This ensures that the Sitepress resources are loaded only once per request
-    # for development environments so that the site isn're reloaded per call. Used
-    # from the Rails app and from the stand-alone Sitepress server.
-    class RequestCache
-      def initialize(app, site:)
-        @app, @site = app, site
-      end
-
-      # Cache resources for the duration of the request, even if
-      # caching is disabled.
-      def call(env)
-        cache_resources = @site.cache_resources
-        begin
-          @site.cache_resources = true
-          @app.call env
-        ensure
-          @site.cache_resources = cache_resources
-          @site.clear_resources_cache unless @site.cache_resources
-        end
-      end
-    end
-  end
-end