sitepress-server 0.1.23 → 0.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9c87dd590485def5851a81c610ee882c6e5233f
-  data.tar.gz: 31cc3e65dc7295406f5118f65b52d9d6a9fe3018
+  metadata.gz: 5c84e7696249f2cd29204723fb03cec97a558e08
+  data.tar.gz: e62564accecf300020a29f8371c015ade27e391b
 SHA512:
-  metadata.gz: 185986c8942b10c4061baa6b3cf9b02e34bb48fb0e0fe630b806f592ac191aee499e24ad99a80af3d035ebc4fe7c60be3ef91bdeb151a4efb9839efffc174291
-  data.tar.gz: 37440265df7a5c835f8fcb4dbe4ef379a3ad8cf3842d4c9c67cf4f3d7cae7a988870bb8e3cb694e9fcf761653d6766ee5367ff3c851a4e5f73f7295d800b052c
+  metadata.gz: 18784fd05ed9658103543acbcd052a8ce36a9f59e4c311c53118fd4a639918af85481fabca29ae24ab13a69d747fb66dfc0f02e6a4736fcb33ae102c2b008e3a
+  data.tar.gz: 80679da18d651d2e172abd60a3421265d1d534da321a1240dae711cd3184a5e2cbd9994e0c12579bc1810b11d5e889069df261ba9155f6a1299308f73f386e2f

data/lib/sitepress/asset_template.rb

@@ -0,0 +1,46 @@
+require "tilt"
+
+module Sitepress
+  # Since we use Frontmatter, we have to do some parsing to
+  # get a Tilt template working properly.
+  class AssetTemplate
+    attr_reader :asset
+
+    def initialize(asset)
+      @asset = ceorce_asset(asset)
+    end
+
+    def render(*args, &block)
+      if renderable_resource?
+        template.render(*args, &block)
+      else
+        asset.body
+      end
+    end
+
+    def template
+      @_template ||= engine.new{ asset.body }
+    end
+
+    private
+    def renderable_resource?
+      asset.template_extensions.any?
+    end
+
+    def engine
+      @_engine ||= Tilt[asset.path]
+    end
+
+    # TODO: Replace this with a "fuzzy asset finder"
+    def ceorce_asset(assetish)
+      case assetish
+      when String
+        Asset.new(path: assetish)
+      when Asset
+        assetish
+      else
+        raise RuntimeError, "#{assetish.inspect} cannot be coerce into Sitepress::Asset"
+      end
+    end
+  end
+end

data/lib/sitepress/helper_loader.rb

@@ -10,24 +10,22 @@ module Sitepress
       @paths = Array(paths)
     end
 
-    def context(locals: {})
+    def extend_instance(object, locals: {})
       modules = helpers
-      Object.new.tap do |object|
-        # Locals of rendering context that are accessible from the
-        # helper modules.
-        locals.each do |name, value|
-          object.define_singleton_method(name) { value }
-        end
-        # Include the helper modules of the rendering context.
-        modules.constants.each do |module_name|
-          object.send(:extend, modules.const_get(module_name))
-        end
+      # Locals of rendering context that are accessible from the
+      # helper modules.
+      locals.each do |name, value|
+        object.define_singleton_method(name) { value }
+      end
+      # Include the helper modules of the rendering context.
+      modules.constants.each do |module_name|
+        object.send(:extend, modules.const_get(module_name))
       end
     end
 
     private
     def helpers
-      Module.new.tap do |m|
+      @_helpers ||= Module.new.tap do |m|
         @paths.each do |path|
           m.module_eval File.read(path)
         end

data/lib/sitepress/rendering_context.rb

@@ -0,0 +1,42 @@
+module Sitepress
+  # TODO: We're starting to get too many rendering contexts ... and this
+  # won't quite fit in with the Tilt rendering context. We'll want to merge
+  # this and support `capture` so that we can get `wrap_layout` working.
+  class RenderingContext
+    attr_reader :resource, :site
+    alias :current_page :resource
+
+    def initialize(resource:, site:)
+      @resource = resource
+      @site = site
+      # TODO: Remove this from RenderingContext ... it should build
+      load_helpers
+    end
+
+    def render(layout: nil, locals: {}, &block)
+      layout ||= resource.data["layout"]
+      render_with_layout(layout) { renderer.render(self, **locals, &block) }
+    end
+
+    private
+    def render_with_layout(path, &block)
+      if path
+        template = AssetTemplate.new(path)
+        template.render(self, &block)
+      else
+        block.call
+      end
+    end
+
+    def renderer
+      @_renderer ||= AssetTemplate.new(resource.asset)
+    end
+
+    # TODO: This might be accessible from the rendering scope, which wouldn't be good.
+    # Figure out if this needs to be removed.
+    def load_helpers
+      paths = Dir.glob @site.helpers_path.join("**.rb")
+      HelperLoader.new(paths: paths).extend_instance(self)
+    end
+  end
+end

data/lib/sitepress/server.rb

@@ -3,9 +3,6 @@ module Sitepress
   class Server
     def initialize(site: )
       @site = site
-      # TODO: This is in the wrong place. Needs to be configurable by
-      # Sitepress::Site.
-      @helper_paths = Dir.glob(@site.root_path.join("helpers/**.rb"))
     end
 
     def call(env)
@@ -13,14 +10,9 @@ module Sitepress
       resource = @site.get req.path
 
       if resource
-        # TODO: Lets slim this down a bit.
-        helpers = HelperLoader.new paths: @helper_paths
-        context = helpers.context locals: {
-          current_page: resource, site: @site }
-        renderer = ResourceRenderer.new resource: resource
-
         mime_type = resource.mime_type.to_s
-        body = renderer.render context: context
+        context = RenderingContext.new(resource: resource, site: @site)
+        body = context.render
 
         [ 200, {"Content-Type" => mime_type}, Array(body) ]
       else

data/lib/sitepress-server.rb

@@ -1,66 +1,8 @@
 require "sitepress-core"
-require "tilt"
 
 module Sitepress
-  # TODO: These renderers are confusing. They need to render
-  # a resource, be able to wrap a resource with another resource,
-  # and have rendering partial from within the context of the resource redender.
-  class AssetRenderer
-    def initialize(asset)
-      @asset = asset
-    end
-
-    def render(locals: {}, layout: nil, context: , &block)
-      template = engine.new { @asset.body }
-      with_layout layout: layout, context: context do
-        template.render(context, **locals, &block)
-      end
-    end
-
-    private
-    def with_layout(layout: , **args, &block)
-      if layout
-        layout_renderer = AssetRenderer.new(layout)
-        layout_renderer.render **args, &block
-      else
-        block.call
-      end
-    end
-
-    def engine
-      Tilt[@asset.path]
-    end
-  end
-
-  # Renders a resource
-  class ResourceRenderer
-    def initialize(resource:)
-      @resource = resource
-    end
-
-    def render(context:)
-      if renderable_resource?
-        renderer.render layout: layout, context: context
-      else
-        @resource.body
-      end
-    end
-
-    private
-    # TODO: Add layout_path to Site#layout_path.
-    def layout
-      @resource.data.has_key?("layout") ? Asset.new(path: @resource.data["layout"]) : nil
-    end
-
-    def renderer
-      AssetRenderer.new(@resource.asset)
-    end
-
-    def renderable_resource?
-      @resource.asset.template_extensions.any?
-    end
-  end
-
-  autoload :HelperLoader, "sitepress/helper_loader"
-  autoload :Server,       "sitepress/server"
+  autoload :AssetTemplate,    "sitepress/asset_template"
+  autoload :HelperLoader,     "sitepress/helper_loader"
+  autoload :RenderingContext, "sitepress/rendering_context"
+  autoload :Server,           "sitepress/server"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sitepress-server
 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: haml
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.23
+        version: 0.1.24
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.23
+        version: 0.1.24
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -88,7 +88,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/sitepress-server.rb
+- lib/sitepress/asset_template.rb
 - lib/sitepress/helper_loader.rb
+- lib/sitepress/rendering_context.rb
 - lib/sitepress/server.rb
 - sitepress-server.gemspec
 homepage: https://github.com/sitepress/sitepress