pakyow-presenter 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff2206682c1ecea87b0f187e466980504acb26e8afd855563f50616a704c403c
-  data.tar.gz: eb5f2a5ed2add51a1d8452e521b9b7398e1bf9fc73ad6c3c8b9464a332ba6bac
+  metadata.gz: 53d31a769ac231000d460220c8b77efe9a6db7614e3da9b527f05953085de9da
+  data.tar.gz: c226279147bcff73dc38ee709be02b79914c26ac715d6d7706dded0b8f0858ef
 SHA512:
-  metadata.gz: 9d36244aae51899cf62afd510c632865dfc2b846ed53766dfa49783046db0739fdeb4758fc83dddb2236c887700764971253352132221885a2ff88690dece453
-  data.tar.gz: 8e1d1fc3be2214d4abb1333dc6dc29413653a87c256ac42d5e43511f200ee5990b44fba846a78c1e873311f08f780bc982db40bbc2bf571d60a18a2b71d7bfef
+  metadata.gz: df02a40224c6f9aba3b711b796d0df40fb6b9a6d9957e4db69f2799b5cfac0763f26e3f0467e78b81210fe5d1db0e1cd9d7394ededb218c63e91d879321fdb57
+  data.tar.gz: fe85ef375749eee75124a62babf72242e9724f6625bc15fbed28083d7d3211d820ab1dba32740dddfd947d15843a94fa3826e1f21c27d20604b869277d7a8454

data/CHANGELOG.md

@@ -1,5 +1,18 @@
-# UNRELEASED
+# v1.0.2 (unreleased)
 
-# 1.0
+  * `fix` **Template store is more efficient for faster loading.**
+
+    *Related links:*
+    - [Pull Request #324][pr-324]
+
+  * `fix` **Now renders correctly when a collapsed string doc is transformed.**
+
+    *Related links:*
+    - [Commit 87b7a6c][87b7a6c]
+
+[pr-324]: https://github.com/pakyow/pakyow/pull/324/commits
+[87b7a6c]: https://github.com/pakyow/pakyow/commit/87b7a6c06a9524703dc1667b6a010930b682f6d7
+
+# v1.0.0
 
   * Hello, Web

data/lib/pakyow/presenter/composers/view.rb

@@ -51,9 +51,12 @@ module Pakyow
             # mostly an optimization, since it lets us collapse some nodes into single strings and
             # reduce the number of operations needed for a render.
             #
-            view.object.collapse(
-              *(StringDoc.significant_types.keys - UNRETAINED_SIGNIFICANCE)
-            )
+            # FIXME: This breaks when a collapsed string doc is transformed. Once that's fixed, we
+            # can enable this code again. It's pretty low-priority and not worth fixing right now.
+            #
+            # view.object.collapse(
+            #   *(StringDoc.significant_types.keys - UNRETAINED_SIGNIFICANCE)
+            # )
 
             # Empty nodes are removed as another render-time optimization leading to fewer operations.
             #

data/lib/pakyow/presenter/renderer/behavior/cleanup_prototype_nodes.rb

@@ -6,6 +6,7 @@ module Pakyow
   module Presenter
     class Renderer
       module Behavior
+        # @api private
         module CleanupPrototypeNodes
           extend Support::Extension
 

data/lib/pakyow/presenter/renderer/behavior/cleanup_unbound_bindings.rb

@@ -6,6 +6,7 @@ module Pakyow
   module Presenter
     class Renderer
       module Behavior
+        # @api private
         module CleanupUnboundBindings
           extend Support::Extension
 

data/lib/pakyow/presenter/renderer/behavior/create_template_nodes.rb

@@ -6,6 +6,7 @@ module Pakyow
   module Presenter
     class Renderer
       module Behavior
+        # @api private
         module CreateTemplateNodes
           extend Support::Extension
 

data/lib/pakyow/presenter/renderer/behavior/insert_prototype_bar.rb

@@ -6,6 +6,7 @@ module Pakyow
   module Presenter
     class Renderer
       module Behavior
+        # @api private
         module InsertPrototypeBar
           extend Support::Extension
 

data/lib/pakyow/presenter/renderer/behavior/install_authenticity.rb

@@ -8,6 +8,7 @@ module Pakyow
   module Presenter
     class Renderer
       module Behavior
+        # @api private
         module InstallAuthenticity
           extend Support::Extension
 

data/lib/pakyow/presenter/renderer/behavior/place_in_mode.rb

@@ -6,6 +6,7 @@ module Pakyow
   module Presenter
     class Renderer
       module Behavior
+        # @api private
         module PlaceInMode
           extend Support::Extension
 

data/lib/pakyow/presenter/renderer/behavior/render_components.rb

@@ -8,6 +8,7 @@ module Pakyow
   module Presenter
     class Renderer
       module Behavior
+        # @api private
         module RenderComponents
           extend Support::Extension
 

data/lib/pakyow/presenter/renderer/behavior/set_page_title.rb

@@ -6,6 +6,7 @@ module Pakyow
   module Presenter
     class Renderer
       module Behavior
+        # @api private
         module SetPageTitle
           extend Support::Extension
 

data/lib/pakyow/presenter/renderer/behavior/setup_endpoints.rb

@@ -8,6 +8,7 @@ module Pakyow
   module Presenter
     class Renderer
       module Behavior
+        # @api private
         module SetupEndpoints
           extend Support::Extension
 

data/lib/pakyow/presenter/renderer/behavior/setup_forms.rb

@@ -10,6 +10,7 @@ module Pakyow
   module Presenter
     class Renderer
       module Behavior
+        # @api private
         module SetupForms
           extend Support::Extension
 

data/lib/pakyow/presenter/templates.rb

@@ -17,6 +17,7 @@ module Pakyow
 
       def initialize(name, path, processor: nil, config: {})
         @name, @path, @processor = name, Pathname(path), processor
+        @layouts, @includes, @info = {}, {}, {}
         build_config(config)
         load_templates
       end
@@ -99,6 +100,10 @@ module Pakyow
         }
       end
 
+      def layout_with_name(name)
+        @layouts[name.to_sym]
+      end
+
       def load_templates
         load_layouts
         load_partials
@@ -106,62 +111,63 @@ module Pakyow
       end
 
       def load_layouts
-        @layouts = if File.exist?(layouts_path)
-          layouts_path.children.each_with_object({}) { |file, layouts|
-            next unless template?(file)
-            if layout = load_view_of_type_at_path(Views::Layout, file)
-              layouts[layout.name] = layout
-            end
-          }
-        else
-          {}
-        end
-      end
+        return unless layouts_path.exist?
 
-      def load_partials
-        @includes = if File.exist?(partials_path)
-          partials_path.children.each_with_object({}) { |file, partials|
-            next unless template?(file)
-            if partial = load_view_of_type_at_path(Views::Partial, file, normalize_path(file))
-              partials[partial.name] = partial
-            end
-          }
-        else
-          {}
-        end
-      end
+        layouts_path.children.each_with_object(@layouts) { |file, layouts|
+          next unless template?(file)
 
-      def load_path_info
-        @info = {}
+          if layout = load_view_of_type_at_path(Views::Layout, file)
+            layouts[layout.name] = layout
+          end
+        }
+      end
 
-        Pathname.glob(File.join(pages_path, "**/*")) do |path|
-          # TODO: better way to skip partials?
-          next if path.basename.to_s.start_with?("_")
+      def load_partials
+        return unless partials_path.exist?
 
-          next unless template?(path)
+        partials_path.children.each_with_object(@includes) { |file, partials|
+          next unless template?(file)
 
-          begin
-            if page = page_at_path(path)
-              @info[String.normalize_path(File.join(@config[:prefix], normalize_path(path, pages_path)))] = {
-                page: page,
-                layout: layout_with_name(page.info(:layout)),
-                partials: @includes.merge(partials_at_path(path))
-              }
-            end
-          rescue FrontMatterParsingError => e
-            message = "Could not parse front matter for #{path}:\n\n#{e.context}"
+          if partial = load_view_of_type_at_path(Views::Partial, file, normalize_path(file))
+            partials[partial.name] = partial
+          end
+        }
+      end
 
-            if e.wrapped_exception
-              message << "\n#{e.wrapped_exception.problem} at line #{e.wrapped_exception.line} column #{e.wrapped_exception.column}"
-            end
+      def load_path_info
+        pages_path.glob("**/*").select { |path|
+          template?(path)
+        }.reject { |path|
+          path.basename.to_s.start_with?("_")
+        }.each do |path|
+          if page = page_at_path(path)
+            path_to_page = String.normalize_path(
+              File.join(
+                @config[:prefix], normalize_path(path, pages_path)
+              )
+            )
+
+            @info[path_to_page] = {
+              page: page,
+
+              layout: layout_with_name(
+                page.info(:layout)
+              ),
+
+              partials: @includes.merge(
+                partials_at_path(path)
+              )
+            }
+          end
+        rescue FrontMatterParsingError => e
+          message = "Could not parse front matter for #{path}:\n\n#{e.context}"
 
-            raise FrontMatterParsingError.new(message)
+          if e.wrapped_exception
+            message << "\n#{e.wrapped_exception.problem} at line #{e.wrapped_exception.line} column #{e.wrapped_exception.column}"
           end
-        end
-      end
 
-      def layout_with_name(name)
-        @layouts[name.to_sym]
+          raise FrontMatterParsingError.new(message)
+        end
       end
 
       def page_at_path(path)
@@ -175,38 +181,15 @@ module Pakyow
       end
 
       def index_page_at_path(path)
-        # TODO: don't ascend above store path
-        path.ascend do |parent_path|
+        ascend(path) do |parent_path|
           next unless info = info(normalize_path(parent_path))
           next unless page = info[:page]
           return page
         end
       end
 
-      # TODO: do we always need to make it relative, etc here?
-      # maybe break up these responsibilities to the bare minimum required
-      def normalize_path(path, relative_from = @path)
-        path = path.expand_path
-        relative_from = relative_from.expand_path
-
-        # make it relative
-        path = path.relative_path_from(relative_from)
-        # we can short-circuit here
-        return "/" if path.to_s == "."
-
-        # remove the extension
-        path = path.sub_ext("")
-
-        # remove index from the end
-        path = path.sub("index", "")
-
-        # actually normalize it
-        String.normalize_path(path.to_s)
-      end
-
       def partials_at_path(path)
-        # FIXME: don't ascend above store path
-        path.ascend.select(&:directory?).each_with_object({}) { |parent_path, partials|
+        ascend(path).select(&:directory?).each_with_object({}) { |parent_path, partials|
           parent_path.children.select { |child|
             child.basename.to_s.start_with?("_")
           }.each_with_object(partials) { |child, child_partials|
@@ -233,6 +216,35 @@ module Pakyow
           nil
         end
       end
+
+      def ascend(path)
+        return enum_for(:ascend, path) unless block_given?
+
+        path.ascend.each do |path|
+          yield path
+
+          if path == @path
+            break
+          end
+        end
+      end
+
+      def normalize_path(path, relative_from = @path)
+        # make it relative
+        path = path.expand_path.relative_path_from(relative_from.expand_path)
+
+        # we can short-circuit here
+        return "/" if path.to_s == "."
+
+        # remove the extension
+        path = path.sub_ext("")
+
+        # remove index from the end
+        path = path.sub("index", "")
+
+        # actually normalize it
+        String.normalize_path(path.to_s)
+      end
     end
   end
 end

data/lib/string_doc.rb

@@ -444,8 +444,12 @@ class StringDoc
   # Returns the node as an xml string, without transforming.
   #
   def to_s
-    @nodes.each_with_object(String.new) do |node, string|
-      string << node.to_s
+    if collapsed && empty?
+      collapsed
+    else
+      @nodes.each_with_object(String.new) do |node, string|
+        string << node.to_s
+      end
     end
   end
 
@@ -459,7 +463,7 @@ class StringDoc
         node.children.collapse(*significance)
       end
     else
-      @collapsed = to_xml
+      @collapsed = render
       @nodes = []
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pakyow-presenter
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Bryan Powell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-16 00:00:00.000000000 Z
+date: 2019-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pakyow-core
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: pakyow-routing
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: pakyow-support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: oga
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.5'
 description: Views and presentation for Pakyow
 email: bryan@bryanp.org
 executables: []