pakyow-presenter 0.9.1 → 0.10.0

data/pakyow-presenter/lib/presenter/string_doc_parser.rb

@@ -32,11 +32,11 @@ module Pakyow
 
           children = node.children.reject {|n| n.is_a?(Nokogiri::XML::Text)}
           attributes = node.attributes
-          if children.empty? && !significant?(node)
+          if !structure.empty? && children.empty? && !significant?(node)
             structure << [node.to_html, {}, []]
           else
             if significant?(node)
-              if scope?(node) || prop?(node) || option?(node)
+              if scope?(node) || prop?(node) || option?(node) || component?(node)
                 attr_structure = attributes.inject({}) do |attrs, attr|
                   attrs[attr[1].name.to_sym] = attr[1].value
                   attrs
@@ -55,10 +55,14 @@ module Pakyow
                 structure << [node.to_html, { partial: name }, []]
               end
             else
-              attr_s = attributes.inject('') { |s, a| s << " #{a[1].name}=\"#{a[1].value}\""; s }
-              closing = [['>', {}, parse(node)]]
-              closing << ['</' + node.name + '>', {}, []] unless self_closing?(node.name)
-              structure << ['<' + node.name + attr_s, {}, closing]
+              if node.is_a?(Nokogiri::XML::Text)
+                structure << [node.text, {}, []]
+              else
+                attr_s = attributes.inject('') { |s, a| s << " #{a[1].name}=\"#{a[1].value}\""; s }
+                closing = [['>', {}, parse(node)]]
+                closing << ['</' + node.name + '>', {}, []] unless self_closing?(node.name)
+                structure << ['<' + node.name + attr_s, {}, closing]
+              end
             end
           end
         end
@@ -67,7 +71,7 @@ module Pakyow
       end
 
       def significant?(node)
-        scope?(node) || prop?(node) || container?(node) || partial?(node) || option?(node)
+        scope?(node) || prop?(node) || container?(node) || partial?(node) || option?(node) || component?(node)
       end
 
       def scope?(node)
@@ -96,6 +100,11 @@ module Pakyow
         node.name == 'option'
       end
 
+      def component?(node)
+        return false unless node['data-ui']
+        return true
+      end
+
       def breadth_first(doc)
         queue = [doc]
         until queue.empty?

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

@@ -5,7 +5,7 @@ module Pakyow
     class View
       extend Forwardable
 
-      def_delegators :@doc, :title=, :title, :remove, :clear, :text, :html
+      def_delegators :@doc, :title=, :title, :remove, :clear, :text, :html, :exists?
 
       # The object responsible for parsing, manipulating, and rendering
       # the underlying HTML document for the view.
@@ -103,7 +103,7 @@ module Pakyow
 
       def scope(name)
         name = name.to_sym
-        @doc.scope(name).inject(ViewCollection.new) do |coll, scope|
+        @doc.scope(name).inject(ViewCollection.new(name)) do |coll, scope|
           view = View.from_doc(scope[:doc])
           view.scoped_as = name
           coll << view
@@ -112,13 +112,31 @@ module Pakyow
 
       def prop(name)
         name = name.to_sym
-        @doc.prop(scoped_as, name).inject(ViewCollection.new) do |coll, prop|
+        @doc.prop(scoped_as, name).inject(ViewCollection.new(scoped_as)) do |coll, prop|
           view = View.from_doc(prop[:doc])
           view.scoped_as = scoped_as
           coll << view
         end
       end
 
+      def version
+        return unless versioned?
+        @doc.get_attribute(:'data-version').to_sym
+      end
+
+      def versioned?
+        !@doc.get_attribute(:'data-version').nil?
+      end
+
+      def component(name)
+        name = name.to_sym
+        @doc.component(name).inject(ViewCollection.new(scoped_as)) do |coll, component|
+          view = View.from_doc(component[:doc])
+          view.scoped_as = scoped_as
+          coll << view
+        end
+      end
+
       # call-seq:
       #   with {|view| block}
       #
@@ -176,22 +194,22 @@ module Pakyow
       #
       def match(data)
         data = Array.ensure(data)
-        coll = ViewCollection.new
+        coll = ViewCollection.new(scoped_as)
 
         # an empty set always means an empty view
         if data.empty?
           remove
         else
-          # dup for later
-          original_view = dup if data.length > 1
-
           # the original view match the first datum
           coll << self
 
+          working = self
+
           # create views for the other datums
           data[1..-1].inject(coll) { |coll|
-            duped_view = original_view.dup
-            after(duped_view)
+            duped_view = working.soft_copy
+            working.after(duped_view)
+            working = duped_view
             coll << duped_view
           }
         end
@@ -226,6 +244,15 @@ module Pakyow
       def bind(data, bindings: {}, context: nil, &block)
         datum = Array.ensure(data).first
         bind_data_to_scope(datum, doc.scopes.first, bindings, context)
+
+        id = nil
+        if data.is_a?(Hash)
+          id = data[:id]
+        elsif data.respond_to?(:id)
+          id = data.id
+        end
+
+        attrs.send(:'data-id=', data[:id]) unless id.nil?
         return if block.nil?
 
         if block.arity == 1
@@ -233,6 +260,8 @@ module Pakyow
         else
           block.call(self, datum)
         end
+
+        self
       end
 
       # call-seq:
@@ -286,6 +315,15 @@ module Pakyow
 			end
       alias :to_s :to_html
 
+      def component?
+        !attrs.send(:'data-ui').value.empty?
+      end
+
+      def component_name
+        return unless component?
+        attrs.send(:'data-ui').value
+      end
+
       private
 
       def bind_data_to_scope(data, scope_info, bindings, ctx)
@@ -305,7 +343,7 @@ module Pakyow
             end
 
             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 = Binder.instance.value_for_scoped_prop(scope, prop, data, bindings, ctx)
 
               if DocHelpers.form_field?(doc.tagname)
                 bind_to_form_field(doc, scope, prop, value, data, ctx)
@@ -436,18 +474,18 @@ module Pakyow
         attrs.each do |attr, v|
           case attr
           when :content
-            v = v.call(doc.inner_html) if v.is_a?(Proc)
+            v = v.to_proc.call(doc.html) if v.respond_to?(:to_proc)
             bind_value_to_doc(v, doc)
-            next
           when :view
-            v.call(self)
-            next
+            v.call(View.from_doc(doc))
           else
-            attr = attr.to_s
+            attr  = attr.to_s
             attrs = Attributes.new(doc)
-            v = v.call(attrs.send(attr)) if v.is_a?(Proc)
 
-            if v.nil?
+            if v.respond_to?(:to_proc)
+              # Evaluating the proc will set the value in the doc
+              v.to_proc.call(attrs.send(attr)) 
+            elsif v.nil?
               doc.remove_attribute(attr)
             else
               attrs.send(:"#{attr}=", v)

data/pakyow-presenter/lib/presenter/view_collection.rb

@@ -3,8 +3,19 @@ module Pakyow
     class ViewCollection
       include Enumerable
 
-      def initialize
+      attr_reader :views, :scoped_as
+
+      def initialize(scope = nil)
         @views = []
+        @scoped_as = scope
+      end
+
+      def ==(other)
+        @views.each_with_index do |view, i|
+          return false if view != other.views[i]
+        end
+
+        return true
       end
 
       def each
@@ -80,7 +91,7 @@ module Pakyow
       end
 
       def scope(name)
-        inject(ViewCollection.new) { |coll, view|
+        collection = inject(ViewCollection.new(name)) { |coll, view|
           scopes = view.scope(name)
           next if scopes.nil?
 
@@ -88,10 +99,16 @@ module Pakyow
             coll << scoped_view
           }
         }
+
+        if collection.versioned?
+          ViewVersion.new(collection.views)
+        else
+          collection
+        end
       end
 
       def prop(name)
-        inject(ViewCollection.new) { |coll, view|
+        inject(ViewCollection.new(scoped_as)) { |coll, view|
           scopes = view.prop(name)
           next if scopes.nil?
 
@@ -101,6 +118,53 @@ module Pakyow
         }
       end
 
+      def versioned?
+        each do |view|
+          return true if view.versioned?
+        end
+
+        false
+      end
+
+      def exists?
+        each do |view|
+          return true if view.exists?
+        end
+
+        false
+      end
+
+      def component(name)
+        collection = inject(ViewCollection.new(scoped_as)) { |coll, view|
+          scopes = view.component(name)
+          next if scopes.nil?
+
+          scopes.inject(coll) { |coll, scoped_view|
+            coll << scoped_view
+          }
+        }
+
+        if collection.versioned?
+          ViewVersion.new(collection.views)
+        else
+          collection
+        end
+      end
+
+      def component?
+        each do |view|
+          return true if view.component?
+        end
+
+        false
+      end
+
+      def component_name
+        each do |view|
+          return view.component_name if view.component?
+        end
+      end
+
       # call-seq:
       #   with {|view| block}
       #
@@ -137,6 +201,8 @@ module Pakyow
             block.call(view, data[i])
           end
         end
+
+        self
       end
 
       # call-seq:
@@ -166,22 +232,23 @@ module Pakyow
       # will consist n copies of self[data index] || self[-1], where n = data.length.
       #
       def match(data)
+        return self if length == 0
         data = Array.ensure(data)
 
         # an empty set always means an empty view
         if data.empty?
           remove
         else
-          original_view = self[-1].soft_copy if data.length > length
-
           if length > data.length
             self[data.length..-1].each do |view|
               view.remove
             end
           else
+            working = self[-1]
             data[length..-1].each do
-              duped_view = original_view.soft_copy
-              self[-1].after(duped_view)
+              duped_view = working.soft_copy
+              working.after(duped_view)
+              working = duped_view
               self << duped_view
             end
           end

data/pakyow-presenter/lib/presenter/view_composer.rb

@@ -10,7 +10,8 @@ module Pakyow
       extend Forwardable
 
       def_delegators :template, :title, :title=
-      def_delegators :parts, :scope, :prop
+      def_delegators :parts, :prop, :component
+      def_delegators :view, :to_html
 
       attr_reader :store, :path, :page, :partials
 
@@ -72,7 +73,7 @@ module Pakyow
       def template=(template)
         unless template.is_a?(Template)
           # get template by name
-          template = @store.template(template)
+          template = @store.template(template.to_sym)
         end
 
         @template = template
@@ -110,17 +111,43 @@ module Pakyow
       end
 
       def parts
+        # create an array to hold the parts
         parts = ViewCollection.new
+
+        # add the current template
         parts << @template
-        @page.each_container { |name, container| parts << container }
 
-        # only include available partials as parts
-        available_partials = parts.inject([]) { |sum, part| sum.concat(part.doc.partials.keys) }
-        partials.select { |name, partial| available_partials.include?(name) }.each_pair { |name, partial| parts << partial }
-        
+        # add each page container
+        @page.each_container do |_, container|
+          parts << container
+        end
+
+        parts.concat(partials_for_parts(parts))
+
         return parts
       end
 
+      def scope(name)
+        collection = parts.scope(name)
+
+        if collection.is_a?(ViewVersion)
+          collection = collection.versions.inject(ViewCollection.new) { |c, v| c << v; c }
+        end
+
+        # include partials so nested scopes/props can be bound to
+        collection.each do |view|
+          view.includes(partials)
+        end
+
+        #TODO make sure anytime we return a collection it tries to version
+        # make this a class level helper method on ViewVersion
+        if !collection.is_a?(ViewVersion) && collection.versioned?
+          ViewVersion.new(collection.views)
+        else
+          collection
+        end
+      end
+
       private
 
       def build_view
@@ -141,13 +168,30 @@ module Pakyow
           if partial_or_path.is_a?(Partial)
             partial = partial_or_path
           else
-            partial = Partial.load(@store.expand_partial_path(path))
+            partial = Partial.load(@store.expand_partial_path(partial_or_path))
           end
 
           [name, partial]
         }]
       end
 
+      def partials_for_parts(parts, acc = [])
+        # determine the partials to be included
+        available_partials = parts.inject([]) { |sum, part|
+          sum.concat(part.doc.partials.keys)
+        }
+
+        # add available partials as parts
+        partials.select { |name|
+          available_partials.include?(name)
+        }.each_pair { |_, partial|
+          acc << partial
+          partials_for_parts([partial], acc)
+        }
+
+        return acc
+      end
+
     end
   end
 end

data/pakyow-presenter/lib/presenter/view_context.rb

@@ -6,7 +6,7 @@ module Pakyow
     #
     class ViewContext
       include Helpers
-      VIEW_CLASSES = [View, ViewCollection, Partial, Template, Container]
+      VIEW_CLASSES = [View, ViewCollection, Partial, Template, Container, ViewVersion]
 
       # The arities of misc view methods that switch the behavior from
       # instance_exec to yield.
@@ -14,11 +14,17 @@ module Pakyow
       EXEC_ARITIES = { with: 0, for: 1, for_with_index: 2, repeat: 1,
         repeat_with_index: 2, bind: 1, bind_with_index: 2, apply: 1 }
 
+      attr_reader :context
+
       def initialize(view, context)
         @view = view
         @context = context
       end
 
+      def subject
+        @view
+      end
+
       # View methods that expect context, so it can be mixed in.
       #
       %i[bind bind_with_index apply].each do |method|
@@ -38,6 +44,18 @@ module Pakyow
         end
       end
 
+      def scope(name)
+        collection = @view.scope(name)
+
+        if !collection.is_a?(ViewVersion) && collection.versioned?
+          ret = ViewVersion.new(collection.views)
+        else
+          ret = collection
+        end
+
+        handle_return_value(ret)
+      end
+
       # Pass these through, handling the return value.
       #
       def method_missing(method, *args, &block)