pakyow-presenter 0.10.2 → 0.11.0

data/pakyow-presenter/lib/{presenter → pakyow/presenter}/presenter.rb

@@ -18,7 +18,11 @@ module Pakyow
             return contents
           end
 
-          return processor.call(contents)
+          processed = processor.call(contents)
+
+          # reprocess html content unless we just did that
+          return processed if format == :html
+          process(processed, :html)
         end
       end
 
@@ -33,11 +37,15 @@ module Pakyow
       }
 
       Pakyow::App.after(:route) {
-        if @presenter.presented?
-          @found = true
-          @context.response.body = [@presenter.content]
+        if Config.presenter.require_route && !found?
+          @found 
         else
-          @found = false unless found?
+          if @presenter.presented?
+            @found = true
+            @context.response.body = [@presenter.content]
+          else
+            @found = false unless found?
+          end
         end
       }
 
@@ -163,10 +171,7 @@ module Pakyow
       end
 
       def compose_at(path, opts = {}, &block)
-        composer = ViewComposer.from_path(store, path, opts, &block)
-        return composer unless opts.empty? || block_given?
-
-        @composer = composer
+        @composer = ViewComposer.from_path(store, path, opts, &block)
       end
 
       def has_path?

data/pakyow-presenter/lib/{presenter → pakyow/presenter}/string_doc.rb

@@ -51,6 +51,10 @@ module Pakyow
         end
       end
 
+      def attribute?(name)
+        attributes.key?(name.to_sym)
+      end
+
       def set_attribute(name, value)
         return if attributes.nil?
         attributes[name.to_sym] = value
@@ -65,9 +69,24 @@ module Pakyow
         attributes.delete(name.to_sym)
       end
 
+      def has_attribute?(name)
+        attributes.key?(name)
+      end
+
       def remove
         @structure.delete_if { |n| n.equal?(node) }
-        @node = ['', {}, [['', {}, []]]]
+
+        if @node.nil?
+          @node = ['', {}, [['', {}, []]]]
+        else
+          @node[0] = ''
+          @node[1] = {}
+          @node[2][0][0] = ''
+          @node[2][0][1] = {}
+          @node[2][0][2] = []
+          @node[2].slice!(1..-1)
+        end
+
         @removed = true
       end
 
@@ -184,6 +203,7 @@ module Pakyow
       end
 
       def to_html
+        StringDocRenderer.render((@node && !@removed) ? [@node] : @structure)
         StringDocRenderer.render(@node ? [@node] : @structure)
       end
       alias :to_s :to_html
@@ -195,7 +215,7 @@ module Pakyow
       end
 
       def node
-        return @structure if @structure.empty?
+        return @structure if @structure.empty? && !@removed
         return @node || @structure[0]
       end
 
@@ -241,12 +261,8 @@ module Pakyow
         node[1]
       end
 
-      def has_attribute?(name)
-        attributes.key?(name)
-      end
-
       def children
-        if @structure.empty?
+        if @structure.empty? && !@removed
           @structure
         else
           node[2][0][2]
@@ -267,7 +283,7 @@ module Pakyow
       def find_partials(structure, primary_structure = @structure, partials = {})
         structure.inject(partials) { |s, e|
           if e[1].has_key?(:partial)
-            s[e[1][:partial]] = StringDoc.from_structure(primary_structure, node: e)
+            (s[e[1][:partial]] ||= []) << StringDoc.from_structure(primary_structure, node: e)
           end
           find_partials(e[2], e[2], s)
           s
@@ -308,10 +324,20 @@ module Pakyow
 
       def find_node_props(node, primary_structure = @structure, props = [])
         if node[1].has_key?(:'data-prop')
-          props << {
+          prop = {
               doc: StringDoc.from_structure(primary_structure, node: node),
               prop: node[1][:'data-prop'].to_sym,
+              parts: {},
           }
+
+          if node[1].has_key?(:'data-parts')
+            prop[:parts][:include] = node[1][:'data-parts'].split(/\s+/).map(&:to_sym)
+          end
+
+          if node[1].has_key?(:'data-parts-exclude')
+            prop[:parts][:exclude] = node[1][:'data-parts-exclude'].split(/\s+/).map(&:to_sym)
+          end
+          props << prop
         end
 
         unless node[1].has_key?(:'data-scope')

data/pakyow-presenter/lib/{presenter → pakyow/presenter}/string_doc_parser.rb

@@ -3,6 +3,7 @@ module Pakyow
     class StringDocParser
       PARTIAL_REGEX = /<!--\s*@include\s*([a-zA-Z0-9\-_]*)\s*-->/
       CONTAINER_REGEX = /@container( ([a-zA-Z0-9\-_]*))*/
+      SIGNIFICANT = [:scope?, :prop?, :container?, :partial?, :option?, :component?]
 
       def initialize(html)
         @html = html
@@ -20,45 +21,51 @@ module Pakyow
       def parse(doc)
         structure = []
 
-        if doc.is_a?(Nokogiri::HTML::Document)
+        unless doc.is_a?(Oga::XML::Element) || !doc.respond_to?(:doctype) || doc.doctype.nil?
           structure << ['<!DOCTYPE html>', {}, []]
         end
 
         breadth_first(doc) do |node, queue|
           if node == doc
-            queue.concat(node.children)
+            queue.concat(node.children.to_a)
             next
           end
 
-          children = node.children.reject {|n| n.is_a?(Nokogiri::XML::Text)}
-          attributes = node.attributes
+          children = node.children.reject {|n| n.is_a?(Oga::XML::Text)}
+
+          if node.is_a?(Oga::XML::Element)
+            attributes = node.attributes
+          else
+            attributes = []
+          end
+
           if !structure.empty? && children.empty? && !significant?(node)
-            structure << [node.to_html, {}, []]
+            structure << [node.to_xml, {}, []]
           else
             if significant?(node)
-              if scope?(node) || prop?(node) || option?(node) || component?(node)
+              if container?(node)
+                match = node.text.strip.match(CONTAINER_REGEX)
+                name = (match[2] || :default).to_sym
+                structure << [node.to_xml, { container: name }, []]
+              elsif partial?(node)
+                next unless match = node.to_xml.strip.match(PARTIAL_REGEX)
+                name = match[1].to_sym
+                structure << [node.to_xml, { partial: name }, []]
+              else
                 attr_structure = attributes.inject({}) do |attrs, attr|
-                  attrs[attr[1].name.to_sym] = attr[1].value
+                  attrs[attr.name.to_sym] = attr.value
                   attrs
                 end
 
                 closing = [['>', {}, parse(node)]]
                 closing << ["</#{node.name}>", {}, []] unless self_closing?(node.name)
                 structure << ["<#{node.name} ", attr_structure, closing]
-              elsif container?(node)
-                match = node.text.strip.match(CONTAINER_REGEX)
-                name = (match[2] || :default).to_sym
-                structure << [node.to_html, { container: name }, []]
-              elsif partial?(node)
-                next unless match = node.to_html.strip.match(PARTIAL_REGEX)
-                name = match[1].to_sym
-                structure << [node.to_html, { partial: name }, []]
               end
             else
-              if node.is_a?(Nokogiri::XML::Text)
-                structure << [node.text, {}, []]
+              if node.is_a?(Oga::XML::Text) || node.is_a?(Oga::XML::Comment)
+                structure << [node.to_xml, {}, []]
               else
-                attr_s = attributes.inject('') { |s, a| s << " #{a[1].name}=\"#{a[1].value}\""; s }
+                attr_s = attributes.inject('') { |s, a| s << " #{a.name}=\"#{a.value}\""; s }
                 closing = [['>', {}, parse(node)]]
                 closing << ['</' + node.name + '>', {}, []] unless self_closing?(node.name)
                 structure << ['<' + node.name + attr_s, {}, closing]
@@ -71,37 +78,45 @@ module Pakyow
       end
 
       def significant?(node)
-        scope?(node) || prop?(node) || container?(node) || partial?(node) || option?(node) || component?(node)
+        SIGNIFICANT.each do |method|
+          return true if send(method, node)
+        end
+
+        false
       end
 
       def scope?(node)
-        return false unless node['data-scope']
+        return false unless node.is_a?(Oga::XML::Element)
+        return false unless node.attribute('data-scope')
         return true
       end
 
       def prop?(node)
-        return false unless node['data-prop']
+        return false unless node.is_a?(Oga::XML::Element)
+        return false unless node.attribute('data-prop')
         return true
       end
 
       def container?(node)
-        return false unless node.is_a?(Nokogiri::XML::Comment)
+        return false unless node.is_a?(Oga::XML::Comment)
         return false unless node.text.strip.match(CONTAINER_REGEX)
         return true
       end
 
       def partial?(node)
-        return false unless node.is_a?(Nokogiri::XML::Comment)
-        return false unless node.to_html.strip.match(PARTIAL_REGEX)
+        return false unless node.is_a?(Oga::XML::Comment)
+        return false unless node.to_xml.strip.match(PARTIAL_REGEX)
         return true
       end
 
       def option?(node)
+        return false unless node.is_a?(Oga::XML::Element)
         node.name == 'option'
       end
 
       def component?(node)
-        return false unless node['data-ui']
+        return false unless node.is_a?(Oga::XML::Element)
+        return false unless node.attribute('data-ui')
         return true
       end
 
@@ -116,11 +131,7 @@ module Pakyow
       end
 
       def doc_from_string(string)
-        if string.match(/<html.*>/)
-          Nokogiri::HTML::Document.parse(string)
-        else
-          Nokogiri::HTML.fragment(string)
-        end
+        Oga.parse_html(string)
       end
 
       SELF_CLOSING = %w[area base basefont br hr input img link meta]

data/pakyow-presenter/lib/{presenter → pakyow/presenter}/view.rb

@@ -43,7 +43,6 @@ module Pakyow
       # Creates a view from a doc.
       #
       # @see StringDoc
-      # @see NokogiriDoc
       #
       def self.from_doc(doc)
         view = new
@@ -289,21 +288,31 @@ module Pakyow
       end
 
       def includes(partial_map)
-        partials = @doc.partials
+        doc_partials = @doc.partials
         partial_map = partial_map.dup
 
         # mixin all the partials
-        partials.each do |partial_info|
-          partial = partial_map[partial_info[0]]
-					next if partial.nil?
-          partial_info[1].replace(partial.doc.dup)
+        doc_partials.each do |partial_name, partial_docs|
+          partials = Array.ensure(partial_map[partial_name])
+
+          partial_docs.each_with_index do |partial_doc, i|
+            replacement = partials[i]
+            next if replacement.nil?
+
+            if replacement.is_a?(ViewCollection)
+              partial_doc.replace(replacement.views.first.doc.dup)
+              partials = replacement.views
+            else
+              partial_doc.replace(replacement.doc)
+            end
+          end
         end
 
         # refind the partials
-				partials = @doc.partials
+				doc_partials = @doc.partials
 
         # if mixed in partials included partials, we want to run includes again with a new map
-				if partials.count > 0 && (partial_map.keys - partials.keys).count < partial_map.keys.count
+				if doc_partials.count > 0 && (partial_map.keys - doc_partials.keys).count < partial_map.keys.count
 					includes(partial_map)
 				end
 
@@ -324,8 +333,29 @@ module Pakyow
         attrs.send(:'data-ui').value
       end
 
+      # Convenience method for parity with Presenter::ViewCollection.
+      #
+      def length
+        1
+      end
+
+      # Convenience method for parity with Presenter::ViewCollection.
+      #
+      def first
+        self
+      end
+
       private
 
+      def adjust_value_parts(value, parts)
+        return value unless value.is_a?(Hash)
+
+        parts_to_keep = parts.fetch(:include, value.keys)
+        parts_to_keep -= parts.fetch(:exclude, [])
+
+        value.keep_if { |part, _| parts_to_keep.include?(part) }
+      end
+
       def bind_data_to_scope(data, scope_info, bindings, ctx)
         return unless data
         return unless scope_info
@@ -335,8 +365,9 @@ module Pakyow
 
         scope_info[:props].each do |prop_info|
           catch(:unbound) do
-            prop = prop_info[:prop]
-            doc  = prop_info[:doc]
+            prop  = prop_info[:prop]
+            doc   = prop_info[:doc]
+            parts = prop_info[:parts]
 
             if DocHelpers.form_field?(doc.tagname)
               set_form_field_name(doc, scope, prop)
@@ -344,6 +375,7 @@ module Pakyow
 
             if data_has_prop?(data, prop) || Binder.instance.has_scoped_prop?(scope, prop, bindings)
               value = Binder.instance.value_for_scoped_prop(scope, prop, data, bindings, ctx)
+              value = adjust_value_parts(value, parts)
 
               if DocHelpers.form_field?(doc.tagname)
                 bind_to_form_field(doc, scope, prop, value, data, ctx)
@@ -423,30 +455,38 @@ module Pakyow
         options = Binder.instance.options_for_scoped_prop(scope, prop, bindable, ctx)
         return if options.nil?
 
-        option_nodes = Nokogiri::HTML::DocumentFragment.parse('')
-        Nokogiri::HTML::Builder.with(option_nodes) do |h|
-          until options.length == 0
-            catch :optgroup do
-              o = options.first
+        nodes = Oga::XML::Document.new
+
+        until options.length == 0
+          catch :optgroup do
+            o = options.first
+
+            # an array containing value/content
+            if o.is_a?(Array)
+              node = Oga::XML::Element.new(name: 'option')
+              node.inner_text = o[1].to_s
+              node.set('value', o[0].to_s)
+              nodes.children << node
+              options.shift
+            else # likely an object (e.g. string); start a group
+              node_group = Oga::XML::Element.new(name: 'optgroup')
+              node_group.set('label', o.to_s)
+              nodes.children << node_group
 
-              # an array containing value/content
-              if o.is_a?(Array)
-                h.option o[1], value: o[0]
+              options.shift
+
+              options[0..-1].each_with_index { |o2,i2|
+                # starting a new group
+                throw :optgroup unless o2.is_a?(Array)
+
+                h.option o2[1].to_s, value: o2[0].to_s
+
+                node = Oga::XML::Element.new(name: 'option')
+                node.inner_text = o2[1].to_s
+                node.set('value', o2[0].to_s)
+                node_group.children << node
                 options.shift
-                # likely an object (e.g. string); start a group
-              else
-                h.optgroup(label: o) {
-                  options.shift
-
-                  options[0..-1].each_with_index { |o2,i2|
-                    # starting a new group
-                    throw :optgroup unless o2.is_a?(Array)
-
-                    h.option o2[1], value: o2[0]
-                    options.shift
-                  }
-                }
-              end
+              }
             end
           end
         end
@@ -455,7 +495,7 @@ module Pakyow
         doc.clear
 
         # add generated options
-        doc.append(option_nodes.to_html)
+        doc.append(nodes.to_xml)
       end
 
       def select_option_with_value(doc, value)
@@ -483,12 +523,15 @@ module Pakyow
             attrs = Attributes.new(doc)
 
             if v.respond_to?(:to_proc)
-              # Evaluating the proc will set the value in the doc
-              v.to_proc.call(attrs.send(attr)) 
+              attribute = attrs.send(attr)
+              ret = v.to_proc.call(attribute)
+              value = ret.respond_to?(:value) ? ret.value : ret
+
+              attrs.send("#{attr}=", value)
             elsif v.nil?
               doc.remove_attribute(attr)
             else
-              attrs.send(:"#{attr}=", v)
+              attrs.send("#{attr}=", v)
             end
           end
         end