sitepress-server 0.1.20 → 0.1.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d91517d56e59f48bf4c8951db24fc55055a71a71
-  data.tar.gz: 40f13195eea362e060027892e43cc7c77f6d35a2
+  metadata.gz: 1ea1399d159fbe7092f1437667333bd5c4c8ceb2
+  data.tar.gz: e5d09019b47a63bd1a3259f07450983432374872
 SHA512:
-  metadata.gz: b036b8dd7ddf03ec25c15a76964bba410e5a83e8ed404b01814b4d2f2f70b4d815b6a257b441d6f8ab61329ecd06b950140c86a11515e12c665894afd49bf3c3
-  data.tar.gz: 6fd62160834758c17291ab0b7bf41a99843ee2be8fee1088e165353f184e6acf2b701d8f145fd909a01f47f5cd784f5763e4d6ed40efa9be797d9049f79c0a8c
+  metadata.gz: 3d742e3d1a6e299ba9ed30836223307a97a897986e04a831e2a5104dbdf86a490d73c36584ebf41a84a53f725e6920de68c60942e936ca995716f4094b252b7c
+  data.tar.gz: 371cbf55936e26d057062e05d395f1ed115db2b2d3ffe360df6a11336a87cb02d49f549c6602b0ef5caae1632ca95bc6dd7e3b751f44a4cc7792b0d96101785b

data/lib/sitepress/helper_loader.rb

@@ -0,0 +1,37 @@
+module Sitepress
+  # Loads modules into an isolated namespace that will be
+  # used for the rendering context. This loader is designed to
+  # be immutable so that it throws away the constants and modules
+  # on each load.
+  #
+  # TODO: Rename this to a RenderingContext, or something.
+  class HelperLoader
+    def initialize(paths:)
+      @paths = Array(paths)
+    end
+
+    def context(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
+      end
+    end
+
+    private
+    def helpers
+      Module.new.tap do |m|
+        @paths.each do |path|
+          m.module_eval File.read(path)
+        end
+      end
+    end
+  end
+end

data/lib/sitepress/server.rb

@@ -0,0 +1,31 @@
+module Sitepress
+  # Run a Sitepress site as a rack app.
+  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)
+      req = Rack::Request.new(env)
+      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
+
+        [ 200, {"Content-Type" => mime_type}, Array(body) ]
+      else
+        [ 404, {"Content-Type" => "text/plain"}, ["Not Found"]]
+      end
+    end
+  end
+end

data/lib/sitepress-server.rb

@@ -1,52 +1,66 @@
-require "sitepress"
+require "sitepress-core"
 require "tilt"
-require "pathname"
 
 module Sitepress
-  class TiltResourceRenderer
-    def initialize(resource)
-      @resource = resource
+  # 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: "layout")
-      template = engine.new { @resource.body }
-      template.render(Object.new, **locals.merge(resource: @resource))
+    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[@resource.asset.path]
+      Tilt[@asset.path]
     end
   end
 
-  # Mount inside of a config.ru file to run this as a server.
-  class Server
-    ROOT_PATH = Pathname.new("/")
+  # Renders a resource
+  class ResourceRenderer
+    def initialize(resource:)
+      @resource = resource
+    end
 
-    def initialize(site: , relative_to: "/")
-      @relative_to = Pathname.new(relative_to)
-      @site = site
+    def render(context:)
+      if renderable_resource?
+        renderer.render layout: layout, context: context
+      else
+        @resource.body
+      end
     end
 
-    def call(env)
-      req = Rack::Request.new(env)
-      resource = @site.get req.path
-      # TODO: Memoize this per request and between requests eventually.
-      resources = @site.root
+    private
+    # TODO: Add layout_path to Site#layout_path.
+    def layout
+      @resource.data.has_key?("layout") ? Asset.new(path: @resource.data["layout"]) : nil
+    end
 
-      if resource
-        body = if resource.asset.template_extensions.empty?
-          # TODO: This is not efficient for huge files. Research how Rack::File
-          # serves this up (or just take that, maybe mount it as a cascading middleware.)
-          resource.body
-        else
-          TiltResourceRenderer.new(resource).render(locals: {resources: resources})
-        end
+    def renderer
+      AssetRenderer.new(@resource.asset)
+    end
 
-        [ 200, {"Content-Type" => resource.mime_type.to_s}, Array(body) ]
-      else
-        [ 404, {"Content-Type" => "text/plain"}, ["Not Found"]]
-      end
+    def renderable_resource?
+      @resource.asset.template_extensions.any?
     end
   end
+
+  autoload :HelperLoader, "sitepress/helper_loader"
+  autoload :Server,       "sitepress/server"
 end

data/sitepress-server.gemspec

@@ -21,6 +21,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rack-test"
   spec.add_development_dependency "rack"
 
-  spec.add_runtime_dependency "sitepress", spec.version
-  spec.add_runtime_dependency "tilt"
+  spec.add_runtime_dependency "sitepress-core", spec.version
+  spec.add_runtime_dependency "tilt", "~> 2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sitepress-server
 version: !ruby/object:Gem::Version
-  version: 0.1.20
+  version: 0.1.21
 platform: ruby
 authors:
 - Brad Gessler
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-12 00:00:00.000000000 Z
+date: 2016-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -53,33 +53,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sitepress
+  name: sitepress-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.20
+        version: 0.1.21
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.20
+        version: 0.1.21
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 description: 
 email:
 - bradgessler@gmail.com
@@ -88,6 +88,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/sitepress-server.rb
+- lib/sitepress/helper_loader.rb
+- lib/sitepress/server.rb
 - sitepress-server.gemspec
 homepage: https://github.com/sitepress/sitepress
 licenses: []