pakyow-presenter 1.0.0.rc3 → 1.0.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2edbafe8464ab22539cb0006e33b7e621f469aea71f65f936f53ad7043e098b8
-  data.tar.gz: e4bbf5824d079520da80228a16a450d5e8b8591f604771d37f11ac85274a9401
+  metadata.gz: 13fe32a06ee25c5db22efd7315240022a60ebe898879cf71577589073e7eebf9
+  data.tar.gz: ea6a93ad0aacccaa646332b2166b82d8eee0f8e705bc5dde0889c1624bb8f60f
 SHA512:
-  metadata.gz: d3009754a80da03f010543e5dbea35e747fd09d0ede2bdfac525ed321418938853d64941c1b88442d65d5aeacdc9c67195e9e4b5377e3b0e0e4c9c181dd102d2
-  data.tar.gz: 0f8d79a0256297763b366307d97ca1b0aa57a6995c86bffec0c00d3ae14829ebb69c38310cba26562118d5687b593175ac36170b926a9f2299d04d8eb67cf9a3
+  metadata.gz: 61102a1e5be58a90408451203129e44e87a43150d6fbc22e8bee588e1a4956f80497376e02ef2e202c108a225388986ba495330ac4f14be29310d31dcc648600
+  data.tar.gz: 064fe7f7bc471d8bb8e4ca7e83c00660b20d9995cf4f974a6f08715510bd058817ed2703d72b6d4c7beb8d172d92249c7f053b71127f01bdbf7f8d5306afec5b

data/lib/pakyow/presenter/component.rb

@@ -14,6 +14,7 @@ module Pakyow
 
       extend Support::ClassState
       class_state :__presenter_class, default: Presenter, inheritable: true
+      class_state :inherit_values, default: false
 
       include Support::Hookable
       events :render

data/lib/pakyow/presenter/presenter.rb

@@ -254,23 +254,12 @@ module Pakyow
                 presenter.use_implicit_version
               end
 
-              used_view = case presenter.view.object
-              when StringDoc::MetaNode
-                View.from_object(
-                  presenter.view.object.nodes.find { |node|
-                    node.labeled?(:versioned)
-                  }
-                )
-              else
-                presenter.view.versions.find { |version|
-                  version.object.labeled?(:versioned)
-                }
-              end
-
-              used_view.binding_props.map { |binding_prop|
+              # Implicitly use binding props.
+              #
+              presenter.view.binding_props.map { |binding_prop|
                 binding_prop.label(:binding)
               }.uniq.each do |binding_prop_name|
-                if found = used_view.find(binding_prop_name)
+                if found = presenter.view.find(binding_prop_name)
                   presenter_for(found).use_implicit_version unless found.used?
                 end
               end
@@ -283,14 +272,14 @@ module Pakyow
             }.each do |binding_node|
               plural_binding_node_name = Support.inflector.pluralize(binding_node.label(:binding)).to_sym
 
-              nested_view = presenter.find(binding_node.label(:binding))
-
-              if binder.object.include?(binding_node.label(:binding))
-                nested_view.present(binder.object[binding_node.label(:binding)])
-              elsif binder.object.include?(plural_binding_node_name)
-                nested_view.present(binder.object[plural_binding_node_name])
-              else
-                nested_view.remove
+              if nested_view = presenter.find(binding_node.label(:binding))
+                if binder.object.include?(binding_node.label(:binding))
+                  nested_view.present(binder.object[binding_node.label(:binding)])
+                elsif binder.object.include?(plural_binding_node_name)
+                  nested_view.present(binder.object[plural_binding_node_name])
+                else
+                  nested_view.remove
+                end
               end
             end
           end
@@ -389,7 +378,10 @@ module Pakyow
       def to_html(output = String.new)
         @view.object.to_html(output, context: self)
       end
-      alias to_s to_html
+
+      def to_s
+        @view.to_s
+      end
 
       def presenter_for(view, type: nil)
         if view.nil?
@@ -408,13 +400,23 @@ module Pakyow
 
       # @api private
       def endpoint(name)
+        found = []
+
         object.each_significant_node(:endpoint) do |endpoint_node|
           if endpoint_node.label(:endpoint) == name.to_sym
-            return presenter_for(View.from_object(endpoint_node))
+            found << endpoint_node
           end
         end
 
-        nil
+        if found.any?
+          if found[0].is_a?(StringDoc::MetaNode)
+            presenter_for(View.from_object(found[0]))
+          else
+            presenter_for(View.from_object(StringDoc::MetaNode.new(found)))
+          end
+        else
+          nil
+        end
       end
 
       # @api private
@@ -684,12 +686,7 @@ module Pakyow
           end
 
           views_with_renders.values.each do |view_with_renders, renders_for_view|
-            attach_to_node = case view_with_renders
-            when VersionedView
-              StringDoc::MetaNode.new(view_with_renders.versions.map(&:object))
-            when View
-              view_with_renders.object
-            end
+            attach_to_node = view_with_renders.object
 
             if attach_to_node.is_a?(StringDoc)
               attach_to_node = attach_to_node.find_first_significant_node(:html)
@@ -725,7 +722,7 @@ module Pakyow
               if node.nodes.any?
                 returning = node
                 presenter = context.presenter_for(
-                  VersionedView.new([View.from_object(node)])
+                  VersionedView.new(View.from_object(node))
                 )
               else
                 next node

data/lib/pakyow/presenter/presenters/endpoint.rb

@@ -8,15 +8,10 @@ module Pakyow
     module Presenters
       class Endpoint < DelegateClass(Presenter)
         def setup
-          if endpoint_method == :delete
-            setup_endpoint_for_removal(
-              path: endpoint_path
-            )
-          else
-            setup_endpoint(
-              path: endpoint_path,
-              method: endpoint_method
-            )
+          setup_endpoint(path: endpoint_path, method: endpoint_method)
+
+          unless endpoint_method == :get
+            setup_non_get_endpoint(path: endpoint_path, method: endpoint_method)
           end
         end
 
@@ -88,23 +83,38 @@ module Pakyow
           end
         end
 
-        def setup_endpoint_for_removal(path:)
-          if object.tagname == "form"
-            form_presenter = presenter_for(__getobj__, type: Form)
-            form_presenter.action = path
-            form_presenter.method = :delete
-            attributes[:"data-ui"] = "confirmable"
-          else
-            replace(
-              View.new(
-                <<~HTML
-                  <form action="#{path}" method="post" data-ui="confirmable">
-                    <input type="hidden" name="pw-http-method" value="delete">
-                    #{view.object.render}
-                  </form>
-                HTML
-              )
-            )
+        def setup_non_get_endpoint(path:, method:)
+          unless object.tagname == "form"
+            object.attributes.delete(:"data-e")
+
+            if object.tagname == "a"
+              object.attributes[:href] = "javascript:void(0)"
+            end
+
+            # FIXME: Everything below could probably be streamlined and improved. Some ideas:
+            #
+            #   * Build the form once, then attach a render that fills in the dynamic parts.
+            #   * Define the presenter class once, attached to the view in step one.
+            #   * Continue replacing with a string but all we'd be doing is building the string.
+            #
+            form_node = StringDoc.new(
+              <<~HTML
+                <form action="#{path}" method="post">
+                  <input type="hidden" name="pw-http-method" value="#{method}">
+                  #{object.render}
+                </form>
+              HTML
+            ).nodes[0]
+
+            form_view = View.from_object(form_node)
+            Renderer::Behavior::SetupForms.build(form_view, __getobj__.app)
+
+            presenter_class = Class.new(Presenter)
+            Renderer::Behavior::SetupForms.attach(presenter_class, __getobj__.app)
+
+            presenter_class.attach(form_view)
+            form_presenter = presenter_class.new(form_view, app: __getobj__.app, presentables: __getobj__.presentables)
+            replace(html_safe(form_presenter.to_html))
           end
         end
 

data/lib/pakyow/presenter/presenters/form.rb

@@ -86,7 +86,7 @@ module Pakyow
         # Populates a select field with options.
         #
         def options_for(field, options = nil)
-          unless field_presenter = find(field) || find(Support.inflector.singularize(field)) || find(Support.inflector.pluralize(field))
+          unless field_presenter = find(Support.inflector.singularize(field)) || find(Support.inflector.pluralize(field))
             raise ArgumentError.new("could not find field named `#{field}'")
           end
 
@@ -211,7 +211,8 @@ module Pakyow
 
         def use_binding_nodes
           view.object.set_label(:bound, true)
-          view.object.children.each_significant_node(:binding, descend: true) do |object|
+
+          view.object.each_significant_node(:binding, descend: true) do |object|
             if Pakyow::Presenter::Views::Form::FIELD_TAGS.include?(object.tagname)
               object.set_label(:bound, true)
             end
@@ -337,8 +338,8 @@ module Pakyow
           values = Array.ensure(values).compact
 
           if values.any?
-            field_view = Pakyow::Presenter::Views::Form.from_object(field_presenter.view.object)
-            field_template = field_view.dup
+            field_view = field_presenter.view
+            field_template = field_view.soft_copy
             insertable_field = field_view
             current_field = field_view
 
@@ -350,7 +351,7 @@ module Pakyow
                 insertable_field = current_field
               end
 
-              current_field = field_template.dup
+              current_field = field_template.soft_copy
             end
           else
             field_presenter.remove
@@ -361,8 +362,8 @@ module Pakyow
           values = Array.ensure(original_values).compact
 
           if values.any?
-            field_view = Pakyow::Presenter::Views::Form.from_object(field_presenter.view.object)
-            template = field_view.dup
+            field_view = field_presenter.view
+            template = field_view.soft_copy
             insertable = field_view
             current = field_view
 
@@ -432,7 +433,7 @@ module Pakyow
               end
 
               current.object.set_label(:bound, true)
-              current = template.dup
+              current = template.soft_copy
             end
           else
             field_presenter.remove

data/lib/pakyow/presenter/processor.rb

@@ -8,7 +8,7 @@ module Pakyow
       extend Support::ClassState
       class_state :name
       class_state :block
-      class_state :extensions, default: [], getter: false
+      class_state :extensions, default: [], reader: false
 
       extend Support::Makeable
 

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

@@ -105,6 +105,14 @@ module Pakyow
                       component_connection = component_connection.class.from_connection(component_connection, :@app => component_connection.app.parent)
                     end
 
+                    unless component[:class].inherit_values == true
+                      component_connection.values.each_key do |key|
+                        unless key.to_s.start_with?("__") || (component[:class].inherit_values && component[:class].inherit_values.include?(key))
+                          component_connection.values.delete(key)
+                        end
+                      end
+                    end
+
                     component_instance = component[:class].new(
                       connection: component_connection,
                       config: component[:config]

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

@@ -15,158 +15,170 @@ module Pakyow
 
           apply_extension do
             build do |view, app:|
-              forms = view.forms
-              if !view.object.is_a?(StringDoc) && view.object.significant?(:form)
-                forms << view
+              SetupForms.build(view, app)
+            end
+
+            attach do |presenter, app:|
+              SetupForms.attach(presenter, app)
+            end
+
+            expose do |connection|
+              connection.set(:__params, connection.params)
+              connection.set(:__endpoint, connection.endpoint)
+              connection.set(:__verifier, connection.verifier)
+
+              origin = if connection.set?(:__form)
+                connection.get(:__form)[:origin]
+              else
+                connection.fullpath
               end
 
-              forms.each do |form|
-                # Allows app renders to set metadata values on forms.
-                #
-                form.object.set_label(:form, {})
-
-                # Set the form id.
-                #
-                form_id = SecureRandom.hex(24)
-                form.object.label(:form)[:id] = form_id
-                form.object.set_label(Presenters::Form::ID_LABEL, form_id)
-
-                # Set the form binding.
-                #
-                form.object.label(:form)[:binding] = form.object.label(:channeled_binding)
-
-                # Setup field names.
-                #
-                form.object.children.each_significant_node(:binding) do |binding_node|
-                  if Pakyow::Presenter::Views::Form::FIELD_TAGS.include?(binding_node.tagname)
-                    if binding_node.attributes[:name].to_s.empty?
-                      binding_node.attributes[:name] = "#{form.object.label(:binding)}[#{binding_node.label(:binding)}]"
-                    end
+              connection.set(:__origin, origin)
+            end
+          end
 
-                    if binding_node.tagname == "select" && binding_node.attributes[:multiple]
-                      Presenters::Form.pluralize_field_name(binding_node)
-                    end
+          # @api private
+          def self.build(view, app)
+            forms = view.forms
+            if !view.object.is_a?(StringDoc) && view.object.significant?(:form)
+              forms << view
+            end
+
+            forms.each do |form|
+              # Allows app renders to set metadata values on forms.
+              #
+              form.object.set_label(:form, {})
+
+              # Set the form id.
+              #
+              form_id = SecureRandom.hex(24)
+              form.object.label(:form)[:id] = form_id
+              form.object.set_label(Presenters::Form::ID_LABEL, form_id)
+
+              # Set the form binding.
+              #
+              form.object.label(:form)[:binding] = form.object.label(:channeled_binding)
+
+              # Setup field names.
+              #
+              form.object.children.each_significant_node(:binding) do |binding_node|
+                if Pakyow::Presenter::Views::Form::FIELD_TAGS.include?(binding_node.tagname)
+                  if binding_node.attributes[:name].to_s.empty?
+                    binding_node.attributes[:name] = "#{form.object.label(:binding)}[#{binding_node.label(:binding)}]"
                   end
-                end
 
-                # Connect labels.
-                #
-                form.object.children.each_significant_node(:label) do |label_node|
-                  if label_node.attributes[:for] && input = form.find(*label_node.attributes[:for].to_s.split("."))
-                    Presenters::Form.connect_input_to_label(input, label_node)
+                  if binding_node.tagname == "select" && binding_node.attributes[:multiple]
+                    Presenters::Form.pluralize_field_name(binding_node)
                   end
                 end
+              end
 
-                form.prepend(
-                  Support::SafeStringHelpers.html_safe(
-                    "<input type=\"hidden\" name=\"pw-http-method\">"
-                  )
+              # Connect labels.
+              #
+              form.object.children.each_significant_node(:label) do |label_node|
+                if label_node.attributes[:for] && input = form.find(*label_node.attributes[:for].to_s.split("."))
+                  Presenters::Form.connect_input_to_label(input, label_node)
+                end
+              end
+
+              form.prepend(
+                Support::SafeStringHelpers.html_safe(
+                  "<input type=\"hidden\" name=\"pw-http-method\">"
+                )
+              )
+
+              form.prepend(
+                Support::SafeStringHelpers.html_safe(
+                  "<input type=\"hidden\" name=\"pw-form\">"
                 )
+              )
 
+              if app.config.presenter.embed_authenticity_token
                 form.prepend(
                   Support::SafeStringHelpers.html_safe(
-                    "<input type=\"hidden\" name=\"pw-form\">"
+                    "<input type=\"hidden\" name=\"#{app.config.security.csrf.param}\">"
                   )
                 )
-
-                if app.config.presenter.embed_authenticity_token
-                  form.prepend(
-                    Support::SafeStringHelpers.html_safe(
-                      "<input type=\"hidden\" name=\"#{app.config.security.csrf.param}\">"
-                    )
-                  )
-                end
               end
             end
+          end
 
-            attach do |presenter, app:|
-              presenter.render node: -> {
-                forms = self.forms
-                if !object.is_a?(StringDoc) && object.significant?(:form)
-                  forms << self
-                end
+          # @api private
+          def self.attach(presenter, app)
+            presenter.render node: -> {
+              forms = self.forms
+              if !object.is_a?(StringDoc) && object.significant?(:form)
+                forms << self
+              end
 
-                forms
-              } do
-                unless setup?
-                  if object = object_for_form
-                    if app.class.includes_framework?(:data) && object.is_a?(Data::Proxy)
-                      object = object.one
-                    end
+              forms
+            } do
+              unless setup?
+                if object = object_for_form
+                  if app.class.includes_framework?(:data) && object.is_a?(Data::Proxy)
+                    object = object.one
                   end
+                end
 
-                  if !object.nil?
-                    if labeled?(:endpoint)
-                      setup(object)
-                    else
-                      if object.key?(:id)
-                        update(object)
-                      else
-                        create(object)
-                      end
-                    end
-                  elsif labeled?(:binding)
-                    case presentables[:__endpoint_name]
-                    when :edit
-                      update(
-                        __endpoint.params.each_with_object({}) { |(key, _), passed_params|
-                          key = key.to_sym
-                          passed_params[key] = __params[key]
-                        }
-                      )
+                if !object.nil?
+                  if labeled?(:endpoint)
+                    setup(object)
+                  else
+                    if object.key?(:id)
+                      update(object)
                     else
-                      create
+                      create(object)
                     end
                   end
-                end
-
-                view.object.label(:form)[:origin] = presentables[:__origin]
-
-                node = view.object.each_significant_node(:field).find { |field_node|
-                  field_node.attributes[:name] == "pw-form"
-                }
-
-                unless node.nil?
-                  node.attributes[:value] = presentables[:__verifier].sign(
-                    label(:form).to_json
-                  )
+                elsif labeled?(:binding)
+                  case presentables[:__endpoint_name]
+                  when :edit
+                    update(
+                      __endpoint.params.each_with_object({}) { |(key, _), passed_params|
+                        key = key.to_sym
+                        passed_params[key] = __params[key]
+                      }
+                    )
+                  else
+                    create
+                  end
+                else
+                  # setup
                 end
               end
 
-              presenter.render node: -> {
-                stringified_param = app.config.security.csrf.param.to_s
-                node = object.each_significant_node(:field, descend: true).find { |field_node|
-                  field_node.attributes[:name] == stringified_param
-                }
+              view.object.label(:form)[:origin] = presentables[:__origin]
 
-                unless node.nil?
-                  View.from_object(node)
-                end
-              } do
-                attributes[:value] = presentables[:__verifier].sign(Support::MessageVerifier.key)
-              end
+              node = view.object.each_significant_node(:field).find { |field_node|
+                field_node.attributes[:name] == "pw-form"
+              }
 
-              presenter.render node: -> {
-                object.each_significant_node(:method_override, descend: true).map { |node|
-                  View.from_object(node)
-                }
-              } do
-                remove if attributes[:value].empty?
+              unless node.nil?
+                node.attributes[:value] = presentables[:__verifier].sign(
+                  label(:form).to_json
+                )
               end
             end
 
-            expose do |connection|
-              connection.set(:__params, connection.params)
-              connection.set(:__endpoint, connection.endpoint)
-              connection.set(:__verifier, connection.verifier)
+            presenter.render node: -> {
+              stringified_param = app.config.security.csrf.param.to_s
+              node = object.each_significant_node(:field, descend: true).find { |field_node|
+                field_node.attributes[:name] == stringified_param
+              }
 
-              origin = if connection.set?(:__form)
-                connection.get(:__form)[:origin]
-              else
-                connection.fullpath
+              unless node.nil?
+                View.from_object(node)
               end
+            } do
+              attributes[:value] = presentables[:__verifier].sign(Support::MessageVerifier.key)
+            end
 
-              connection.set(:__origin, origin)
+            presenter.render node: -> {
+              object.each_significant_node(:method_override, descend: true).map { |node|
+                View.from_object(node)
+              }
+            } do
+              remove if attributes[:value].empty?
             end
           end
         end

data/lib/pakyow/presenter/renderer.rb

@@ -90,6 +90,7 @@ module Pakyow
           end
 
           presenter.attach(presenter_view)
+          presenter_view.object.finalize_labels(keep: [:form, :endpoint_params])
           presenter_view.deep_freeze
 
           self.class.__presenter_views[presenter_view_key] = presenter_view

data/lib/pakyow/presenter/significant_nodes.rb

@@ -183,7 +183,7 @@ module Pakyow
       StringDoc.significant :form, self, descend: false
 
       def self.significant?(node)
-        node.is_a?(Oga::XML::Element) && node.attribute(:binding) && node.name == FORM_TAG
+        node.is_a?(Oga::XML::Element) && node.name == FORM_TAG
       end
 
       def self.decorate(node)

data/lib/pakyow/presenter/versioned_view.rb

@@ -12,33 +12,24 @@ module Pakyow
 
       attr_reader :names
 
-      def initialize(versions)
-        @versions = versions
-        @names = self.versions.map { |versioned_view| versioned_view.label(:version) }
-        determine_working_version
+      def initialize(view)
+        __setobj__(view)
+        @names = view.object.nodes.map { |node| node.label(:version) }
         @used = false
       end
 
       def initialize_dup(_)
         super
 
-        @versions = @versions.map(&:dup)
         @names = @names.map(&:dup)
-        determine_working_version
       end
 
       # @api private
       def soft_copy
         instance = self.class.allocate
-
-        instance.instance_variable_set(:@versions, @versions.map { |version|
-          version.soft_copy
-        })
-
+        instance.__setobj__(__getobj__.soft_copy)
         instance.instance_variable_set(:@names, @names)
         instance.instance_variable_set(:@used, @used)
-        instance.send(:determine_working_version)
-
         instance
       end
 
@@ -51,17 +42,8 @@ module Pakyow
       # Returns the view matching +version+.
       #
       def versioned(version)
-        if versioned = version_named(version.to_sym)
-          case versioned.object
-          when StringDoc::MetaNode
-            node = versioned.object.nodes.find { |n|
-              version == (n.label(:version) || DEFAULT_VERSION).to_sym
-            }
-
-            View.from_object(node)
-          else
-            versioned
-          end
+        if node = version_named(version.to_sym)
+          View.from_object(node)
         else
           nil
         end
@@ -72,67 +54,25 @@ module Pakyow
       def use(version)
         version = version.to_sym
 
-        tap do
-          if view = version_named(version)
-            case view.object
-            when StringDoc::MetaNode
-              versioned_node = view.object.internal_nodes.find { |node|
-                version == (node.label(:version) || DEFAULT_VERSION).to_sym
-              }
-
-              versioned_node.set_label(:versioned, true)
-            else
-              view.object.set_label(:versioned, true)
-            end
-
-            self.versioned_view = view
-
-            cleanup
-          else
-            cleanup(all: true)
-          end
-        end
-      end
-
-      def transform(object)
-        @versions.each do |version|
-          version.transform(object)
-        end
-
-        yield self, object if block_given?
-      end
-
-      def bind(object)
-        @versions.each do |version|
-          version.bind(object)
+        if node = version_named(version)
+          node.set_label(:versioned, true)
+          cleanup
+        else
+          cleanup(all: true)
         end
 
-        yield self, object if block_given?
+        self
       end
 
       def used?
-        @versions.any? { |versioned_view|
-          case versioned_view.object
-          when StringDoc::MetaNode
-            versioned_view.object.nodes.any? { |node|
-              node.labeled?(:versioned)
-            }
-          else
-            versioned_view.object.labeled?(:versioned)
-          end
+        __getobj__.object.internal_nodes.any? { |node|
+          node.labeled?(:versioned)
         }
       end
 
       def versions
-        @versions.each_with_object([]) { |versioned_view, versions|
-          case versioned_view.object
-          when StringDoc::MetaNode
-            versioned_view.object.nodes.each do |node|
-              versions << View.from_object(node)
-            end
-          else
-            versions << versioned_view
-          end
+        __getobj__.object.nodes.map { |node|
+          View.from_object(node)
         }
       end
 
@@ -146,65 +86,25 @@ module Pakyow
 
       def cleanup(all: false)
         if all
-          while version = @versions.shift
-            version.remove
-          end
+          remove
         else
-          versions_to_remove = []
-
-          @versions.each do |versioned_view|
-            case versioned_view.object
-            when StringDoc::MetaNode
-              nodes_to_remove = []
-
-              versioned_view.object.internal_nodes.each do |node|
-                if !node.is_a?(StringDoc::MetaNode) && !node.labeled?(:versioned)
-                  nodes_to_remove << node
-                end
-              end
-
-              nodes_to_remove.each(&:remove)
-            else
-              unless versioned_view.object.labeled?(:versioned)
-                versions_to_remove << versioned_view
-              end
+          nodes_to_remove = []
+
+          __getobj__.object.internal_nodes.each do |node|
+            unless node.is_a?(StringDoc::MetaNode) || node.labeled?(:versioned)
+              nodes_to_remove << node
             end
           end
 
-          versions_to_remove.each do |versioned_view|
-            versioned_view.remove; @versions.delete(versioned_view)
-          end
+          nodes_to_remove.each(&:remove)
         end
       end
 
-      def determine_working_version
-        self.versioned_view = default_version
-      end
-
-      def versioned_view=(view)
-        __setobj__(view)
-      end
-
-      def default_version
-        version_named(DEFAULT_VERSION) || first_version
-      end
-
       def version_named(version)
-        @versions.find { |view|
-          case view.object
-          when StringDoc::MetaNode
-            view.object.internal_nodes.any? { |node|
-              version == (node.label(:version) || DEFAULT_VERSION).to_sym
-            }
-          else
-            view.version == version
-          end
+        __getobj__.object.internal_nodes.find { |node|
+          version == (node.label(:version) || DEFAULT_VERSION).to_sym
         }
       end
-
-      def first_version
-        @versions[0]
-      end
     end
   end
 end

data/lib/pakyow/presenter/view.rb

@@ -122,15 +122,16 @@ module Pakyow
       def find(*names)
         if names.any?
           named = names.shift.to_sym
-
-          found = each_binding(named).map { |node|
-            View.from_object(node)
-          }
+          found = each_binding(named).map(&:itself)
 
           result = if names.empty? && !found.empty? # found everything; wrap it up
-            VersionedView.new(found)
+            if found[0].is_a?(StringDoc::MetaNode)
+              VersionedView.new(View.from_object(found[0]))
+            else
+              VersionedView.new(View.from_object(StringDoc::MetaNode.new(found)))
+            end
           elsif !found.empty? && names.count > 0 # descend further
-            found.first.find(*names)
+            View.from_object(found[0]).find(*names)
           else
             nil
           end
@@ -417,7 +418,10 @@ module Pakyow
       def to_html
         @object.to_html
       end
-      alias :to_s :to_html
+
+      def to_s
+        @object.to_s
+      end
 
       # @api private
       def binding_name

data/lib/string_doc/meta_attributes.rb

@@ -38,11 +38,9 @@ class StringDoc
     end
 
     # @api private
-    def wrap
+    def wrap(&block)
       @attributes.each do |attributes|
-        attributes.each do |key, value|
-          yield value, key
-        end
+        attributes.wrap(&block)
       end
     end
   end

data/lib/string_doc/meta_node.rb

@@ -11,12 +11,20 @@ class StringDoc
     attr_reader :doc, :transforms, :internal_nodes
 
     def initialize(nodes)
-      nodes.first.parent.replace_node(nodes.first, self)
-
-      nodes[1..-1].each do |node|
-        # Remove the node, but don't make it appear to have been removed for transforms.
+      # Reparent nodes that belong to the same parent.
+      #
+      nodes.group_by { |node| node.parent }.each_pair do |parent, children|
+        # If the children already belong to a meta node doc, don't reparent them again.
         #
-        node.remove; node.delete_label(:removed)
+        unless children.first.labeled?(:__meta_node)
+          parent.replace_node(children.first, self)
+        end
+
+        children[1..-1].each do |node|
+          # Remove the node, but don't make it appear to have been removed for transforms.
+          #
+          node.remove(false, false)
+        end
       end
 
       nodes.each do |node|
@@ -26,9 +34,7 @@ class StringDoc
       @doc = StringDoc.from_nodes(nodes)
       @transforms = { high: [], default: [], low: [] }
 
-      @internal_nodes = nodes.select { |node|
-        !node.is_a?(MetaNode) && node.labeled?(:__meta_node)
-      }
+      @internal_nodes = nodes.dup
 
       @pipeline = nil
     end
@@ -37,15 +43,23 @@ class StringDoc
     def initialize_copy(_)
       super
 
-      @doc = @doc.dup
+      nodes, internal_nodes = [], []
+      @doc.nodes.each do |current_node|
+        duped_node = current_node.dup
+        nodes << duped_node
+
+        if @internal_nodes.any? { |current_internal_node| current_internal_node.equal?(current_node) }
+          internal_nodes << duped_node
+        end
+      end
+
+      @doc = StringDoc.from_nodes(nodes)
 
       @transforms = @transforms.each_with_object({}) { |(key, value), hash|
         hash[key] = value.dup
       }
 
-      @internal_nodes = nodes.select { |node|
-        !node.is_a?(MetaNode) && node.labeled?(:__meta_node)
-      }
+      @internal_nodes = internal_nodes
 
       @pipeline = nil
     end
@@ -54,19 +68,32 @@ class StringDoc
     def soft_copy
       instance = self.class.allocate
 
-      new_doc = @doc.soft_copy
-      instance.instance_variable_set(:@doc, new_doc)
+      nodes, internal_nodes = [], []
+      @doc.nodes.each do |current_node|
+        duped_node = current_node.soft_copy
+        nodes << duped_node
+
+        if @internal_nodes.any? { |current_internal_node| current_internal_node.equal?(current_node) }
+          internal_nodes << duped_node
+        end
+      end
+
+      instance.instance_variable_set(:@doc, StringDoc.from_nodes(nodes))
       instance.instance_variable_set(:@transforms, @transforms)
 
-      instance.instance_variable_set(:@internal_nodes, new_doc.nodes.select { |node|
-        !node.is_a?(MetaNode) && node.labeled?(:__meta_node)
-      })
+      instance.instance_variable_set(:@internal_nodes, internal_nodes)
 
       instance.instance_variable_set(:@pipeline, @pipeline.dup)
 
       instance
     end
 
+    def finalize_labels(keep: [])
+      nodes.each do |node|
+        node.finalize_labels(keep: keep)
+      end
+    end
+
     def freeze(*)
       pipeline
       super
@@ -128,10 +155,16 @@ class StringDoc
       internal_nodes.each do |each_node|
         each_node.replace(replacement)
       end
+
+      @internal_nodes = StringDoc.nodes_from_doc_or_string(replacement)
     end
 
-    def remove
-      internal_nodes.each(&:remove)
+    def remove(label = true, descend = true)
+      internal_nodes.each do |node|
+        node.remove(label, descend)
+      end
+
+      @internal_nodes = []
     end
 
     def text
@@ -217,8 +250,23 @@ class StringDoc
     end
 
     def each(descend: false, &block)
-      internal_nodes.each do |node|
-        node.each(descend: descend, &block)
+      return enum_for(:each, descend: descend) unless block_given?
+
+      yield self
+
+      nodes.each do |node|
+        # Yield each node that isn't an internal node (e.g. added before/after).
+        #
+        unless @internal_nodes.any? { |internal_node| internal_node.equal?(node) }
+          case node
+          when MetaNode
+            node.each do |each_meta_node|
+              yield each_meta_node
+            end
+          else
+            yield node
+          end
+        end
       end
     end
 
@@ -268,6 +316,10 @@ class StringDoc
       }
     end
 
+    def removed?
+      internal_nodes.all?(&:removed?)
+    end
+
     # Converts the node to an xml string.
     #
     def render(output = String.new, context: nil)
@@ -278,6 +330,8 @@ class StringDoc
           each_node.render(output, context: context)
         end
       end
+
+      output
     end
     alias :to_html :render
     alias :to_xml :render
@@ -313,17 +367,17 @@ class StringDoc
         when StringDoc
           return_value.render(string, context: context); return
         when Node, MetaNode
-          current = return_value
+          if return_value.removed?
+            return
+          else
+            current = return_value
+          end
         else
           string << return_value.to_s; return
         end
       end
 
-      # Don't render if the node was removed during the transform.
-      #
-      if !current.is_a?(Node) || !current.labeled?(:removed)
-        current.render(string, context: context)
-      end
+      current.render(string, context: context)
     end
   end
 end

data/lib/string_doc/node.rb

@@ -35,7 +35,7 @@ class StringDoc
     attr_reader :attributes
 
     # @api private
-    attr_reader :node, :parent, :children, :tag_open_start, :tag_open_end, :tag_close, :transforms, :significance, :labels
+    attr_reader :node, :parent, :children, :tag_open_start, :tag_open_end, :tag_close, :transforms, :significance
 
     # @api private
     attr_writer :parent
@@ -50,6 +50,7 @@ class StringDoc
       @parent, @labels, @significance = parent, labels, significance
       @transforms = { high: [], default: [], low: [] }
       @pipeline = nil
+      @finalized_labels = {}
     end
 
     # @api private
@@ -57,6 +58,7 @@ class StringDoc
       super
 
       @labels = @labels.deep_dup
+      @finalized_labels = @finalized_labels.deep_dup
       @attributes = @attributes.dup
       @children = @children.dup
       @significance = @significance.dup
@@ -78,6 +80,7 @@ class StringDoc
       instance.instance_variable_set(:@parent, @parent)
       instance.instance_variable_set(:@significance, @significance)
       instance.instance_variable_set(:@transforms, @transforms)
+      instance.instance_variable_set(:@finalized_labels, @finalized_labels)
 
       instance.instance_variable_set(:@attributes, @attributes.dup)
       instance.instance_variable_set(:@children, @children.is_a?(StringDoc) ? @children.soft_copy : @children.dup)
@@ -87,6 +90,21 @@ class StringDoc
       instance
     end
 
+    def finalize_labels(keep: [])
+      @finalized_labels = @labels
+      @labels = keep.each_with_object({}) { |key, hash|
+        hash[key] = @finalized_labels.delete(key).deep_dup
+      }
+
+      if children.is_a?(StringDoc)
+        children.finalize_labels(keep: keep)
+      end
+    end
+
+    def labels
+      @labels.merge(@finalized_labels)
+    end
+
     def freeze(*)
       pipeline
       super
@@ -145,9 +163,18 @@ class StringDoc
 
     # Removes the node.
     #
-    def remove
-      set_label(:removed, true)
+    def remove(label = true, descend = true)
+      if label
+        set_label(:removed, true)
+      end
+
       @parent.remove_node(self)
+
+      if descend && children.is_a?(StringDoc)
+        children.each do |child|
+          child.remove(label, descend)
+        end
+      end
     end
 
     REGEX_TAGS = /<[^>]*>/
@@ -221,13 +248,18 @@ class StringDoc
     # Returns the value for label with +name+.
     #
     def label(name)
-      @labels[name.to_sym]
+      name = name.to_sym
+      if @labels.key?(name)
+        @labels[name.to_sym]
+      else
+        @finalized_labels[name.to_sym]
+      end
     end
 
     # Returns true if label exists with +name+.
     #
     def labeled?(name)
-      @labels.key?(name.to_sym)
+      @labels.key?(name.to_sym) || @finalized_labels.key?(name.to_sym)
     end
 
     # Sets the label with +name+ and +value+.
@@ -236,6 +268,10 @@ class StringDoc
       @labels[name.to_sym] = value
     end
 
+    def removed?
+      labeled?(:removed)
+    end
+
     # Delete the label with +name+.
     #
     def delete_label(name)
@@ -263,6 +299,8 @@ class StringDoc
 
         output << tag_close
       end
+
+      output
     end
     alias :to_html :render
     alias :to_xml :render
@@ -358,17 +396,17 @@ class StringDoc
         when StringDoc
           return_value.render(string, context: context); return
         when Node, MetaNode
-          current = return_value
+          if return_value.removed?
+            return
+          else
+            current = return_value
+          end
         else
           string << return_value.to_s; return
         end
       end
 
-      # Don't render if the node was removed during the transform.
-      #
-      if !current.is_a?(Node) || !current.labeled?(:removed)
-        current.render(string, context: context)
-      end
+      current.render(string, context: context)
     end
 
     def string_nodes

data/lib/string_doc.rb

@@ -171,13 +171,26 @@ class StringDoc
     instance
   end
 
+  def finalize_labels(keep: [])
+    @nodes.each do |node|
+      node.finalize_labels(keep: keep)
+    end
+  end
+
   include Enumerable
 
   def each(descend: false, &block)
     return enum_for(:each, descend: descend) unless block_given?
 
     @nodes.each do |node|
-      yield node
+      case node
+      when MetaNode
+        node.each do |each_meta_node|
+          yield each_meta_node
+        end
+      else
+        yield node
+      end
 
       if descend || node.label(:descend) != false
         if node.children.is_a?(StringDoc)
@@ -195,7 +208,18 @@ class StringDoc
     return enum_for(:each_significant_node, type, descend: descend) unless block_given?
 
     each(descend: descend) do |node|
-      yield node if (node.is_a?(Node) || node.is_a?(MetaNode)) && node.significant?(type)
+      case node
+      when MetaNode
+        if node.significant?(type)
+          node.each do |each_meta_node|
+            yield each_meta_node
+          end
+        end
+      when Node
+        if node.significant?(type)
+          yield node
+        end
+      end
     end
   end
 
@@ -207,7 +231,14 @@ class StringDoc
     @nodes.each do |node|
       if node.is_a?(Node) || node.is_a?(MetaNode)
         if node.significant?(type)
-          yield node
+          case node
+          when MetaNode
+            node.each do |each_meta_node|
+              yield each_meta_node
+            end
+          when Node
+            yield node
+          end
         else
           if descend || node.label(:descend) != false
             if node.children.is_a?(StringDoc)
@@ -367,7 +398,7 @@ class StringDoc
   def remove_node(node_to_delete)
     tap do
       @nodes.delete_if { |node|
-        node.object_id == node_to_delete.object_id
+        node.equal?(node_to_delete)
       }
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pakyow-presenter
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc3
+  version: 1.0.0.rc4
 platform: ruby
 authors:
 - Bryan Powell
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-09 00:00:00.000000000 Z
+date: 2019-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pakyow-core
@@ -17,42 +17,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc3
+        version: 1.0.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc3
+        version: 1.0.0.rc4
 - !ruby/object:Gem::Dependency
   name: pakyow-routing
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc3
+        version: 1.0.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc3
+        version: 1.0.0.rc4
 - !ruby/object:Gem::Dependency
   name: pakyow-support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc3
+        version: 1.0.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc3
+        version: 1.0.0.rc4
 - !ruby/object:Gem::Dependency
   name: oga
   requirement: !ruby/object:Gem::Requirement