sitepress-core 0.1.23 → 0.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f174159f7ac7c4a5da4ae85ddb935ddd8c00c86
-  data.tar.gz: c5fac5c7e577168b0b7f9cdda661b490bc4dcb13
+  metadata.gz: 8de27ae96f7b22a1365f8ee3db46834b2a690c6e
+  data.tar.gz: 3cd8b05e8d6198cf5672d9a05eb7ca3a766af3b2
 SHA512:
-  metadata.gz: dbf642bcb9c5da800cf250fca3d188c6341ef708527c6a6fe420d13ab279a34f2ce13901b22b103c60e663c60021eea37eee8c4f0d5143201a998a679ca40014
-  data.tar.gz: 6414e98c58001aa550148cf9d119fc02a4ae746773d9802a73505a17caf18b073b2f57b25a70bb2658ef1453f11b29179ac998e5ad9121abd59441794e7b1cea
+  metadata.gz: 50ebdd80f22f4b4efdb67f2adeb977cfbcf0bc9e604f218cf30afacd55255e7512d18b90a966f485829234154cd75bb378b0ad92de8eca3165adcb45a4ad66f8
+  data.tar.gz: 94f3fcc3de1d3f7595de7bb2993aea11d0a1d1955aa9f0ae89995a144701d142d696e06210120ecad0214217bdba4dd55eee91beb6967d39f0af1592791d492b

data/lib/sitepress-core.rb

@@ -16,4 +16,7 @@ module Sitepress
   autoload :ResourcesPipeline,    "sitepress/resources_pipeline"
   autoload :ResourcesNode,        "sitepress/resources_node"
   autoload :Site,                 "sitepress/site"
+  module Middleware
+    autoload :RequestCache,       "sitepress/middleware/request_cache"
+  end
 end

data/lib/sitepress/middleware/request_cache.rb

@@ -0,0 +1,26 @@
+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

data/lib/sitepress/site.rb

@@ -24,6 +24,9 @@ module Sitepress
 
     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
@@ -37,8 +40,13 @@ module Sitepress
 
     # Returns a list of all the resources within #root.
     def resources
-      @_resources = nil unless cache_resources
-      @_resources ||= ResourceCollection.new(node: root, root_path: root_path)
+      with_resources_cache do
+        ResourceCollection.new(node: root, root_path: root_path)
+      end
+    end
+
+    def clear_resources_cache
+      @_resources = nil
     end
 
     # Root path to website project. Contains helpers, pages, and more.
@@ -51,6 +59,10 @@ module Sitepress
       root_path.join("pages")
     end
 
+    def helpers_path
+      root_path.join("helpers")
+    end
+
     # Quick and dirty way to manipulate resources in the site without
     # creating classes that implement the #process_resources method.
     #
@@ -91,6 +103,11 @@ module Sitepress
     end
 
     private
+    def with_resources_cache
+      clear_resources_cache unless cache_resources
+      @_resources ||= yield
+    end
+
     # Lazy stream of files that will be rendered by resources.
     def pages_assets(glob = DEFAULT_GLOB)
       Dir.glob(pages_path.join(glob)).select(&File.method(:file?)).lazy.map do |path|

data/lib/sitepress/version.rb

@@ -1,3 +1,3 @@
 module Sitepress
-  VERSION = "0.1.23".freeze
+  VERSION = "0.1.24".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sitepress-core
 version: !ruby/object:Gem::Version
-  version: 0.1.23
+  version: 0.1.24
 platform: ruby
 authors:
 - Brad Gessler
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-04 00:00:00.000000000 Z
+date: 2016-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,7 @@ files:
 - lib/sitepress/extensions/proc_manipulator.rb
 - lib/sitepress/formats.rb
 - lib/sitepress/frontmatter.rb
+- lib/sitepress/middleware/request_cache.rb
 - lib/sitepress/resource.rb
 - lib/sitepress/resource_collection.rb
 - lib/sitepress/resources_node.rb