pakyow-presenter 0.8.0 → 0.9.0

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

@@ -3,8 +3,6 @@ module Pakyow
     class ViewCollection
       include Enumerable
 
-      attr_accessor :context, :composer
-
       def initialize
         @views = []
       end
@@ -13,70 +11,60 @@ module Pakyow
         @views.each { |v| yield(v) }
       end
 
-      def attributes(attrs = {})
-        collection = AttributesCollection.new
-        self.each{|v| collection << v.attributes(attrs)}
-        return collection
+      def attrs(attrs = {})
+        inject(AttributesCollection.new) { |coll, view|
+          coll << view.attrs(attrs)
+        }
       end
 
-      alias :attrs :attributes
-
       def remove
-        self.each {|e| e.remove}
+        each {|e| e.remove}
       end
 
-      alias :delete :remove
-
-      # SEE COMMENT IN VIEW
-      # def add_class(val)
-      #   self.each {|e| e.add_class(val)}
-      # end
-
-      # SEE COMMENT IN VIEW
-      # def remove_class(val)
-      #   self.each {|e| e.remove_class(val)}
-      # end
-
       def clear
-        self.each {|e| e.clear}
+        each {|e| e.clear}
       end
 
       def text
-        self.map { |v| v.text }
+        map { |v| v.text }
       end
 
       def text=(text)
-        self.each {|e| e.text = text}
+        each {|e| e.text = text}
       end
 
       def html
-        self.map { |v| v.html }
+        map { |v| v.html }
       end
 
       def html=(html)
-        self.each {|e| e.html = html}
+        each {|e| e.html = html}
       end
 
       def to_html
-        self.map { |v| v.to_html }.join('')
+        map { |v| v.to_html }.join('')
       end
 
       alias :to_s :to_html
 
       def append(content)
-        self.each {|e| e.append(content)}
+        each do |view|
+          view.append(content)
+        end
       end
 
-      alias :render :append
-
       def prepend(content)
-        self.each {|e| e.prepend(content)}
+        each do |view|
+          view.prepend(content)
+        end
       end
 
       def <<(val)
         if val.is_a? View
           @views << val
         end
+
+        self
       end
 
       def concat(views)
@@ -84,12 +72,7 @@ module Pakyow
       end
 
       def [](i)
-        view = @views[i]
-        return if view.nil?
-
-        view.context = @context
-        view.composer = @composer
-        return view
+        @views[i]
       end
 
       def length
@@ -97,35 +80,25 @@ module Pakyow
       end
 
       def scope(name)
-        views = ViewCollection.new
-        views.context = @context
-        views.composer = @composer
-        self.each{|v|
-          next unless svs = v.scope(name)
-          svs.each{ |sv|
-            sv.context = @context
-            sv.composer = @composer
-            views << sv
+        inject(ViewCollection.new) { |coll, view|
+          scopes = view.scope(name)
+          next if scopes.nil?
+
+          scopes.inject(coll) { |coll, scoped_view|
+            coll << scoped_view
           }
         }
-
-        views
       end
 
       def prop(name)
-        views = ViewCollection.new
-        views.context = @context
-        views.composer = @composer
-        self.each{|v|
-          next unless svs = v.prop(name)
-          svs.each{ |sv|
-            sv.context = @context
-            sv.composer = @composer
-            views << sv
+        inject(ViewCollection.new) { |coll, view|
+          scopes = view.prop(name)
+          next if scopes.nil?
+
+          scopes.inject(coll) { |coll, scoped_view|
+            coll << scoped_view
           }
         }
-
-        views
       end
 
       # call-seq:
@@ -135,7 +108,7 @@ module Pakyow
       #
       def with(&block)
         if block.arity == 0
-          self.instance_exec(&block)
+          instance_exec(&block)
         else
           yield(self)
         end
@@ -153,18 +126,17 @@ module Pakyow
       # (this is basically Bret's `map` function)
       #
       def for(data, &block)
-        data = data.to_a if data.is_a?(Enumerator)
-        data = [data] if (!data.is_a?(Enumerable) || data.is_a?(Hash))
-
-        self.each_with_index { |v,i|
-          break unless datum = data[i]
+        data = Array.ensure(data)
+        each_with_index do |view, i|
+          datum = data[i]
+          break if datum.nil?
 
           if block.arity == 1
-            v.instance_exec(data[i], &block)
+            view.instance_exec(data[i], &block)
           else
-            block.call(v, data[i])
+            block.call(view, data[i])
           end
-        }
+        end
       end
 
       # call-seq:
@@ -190,46 +162,32 @@ module Pakyow
       # call-seq:
       #   match(data) => ViewCollection
       #
-      # Returns a ViewCollection object that has been manipulated to match the data.
-      # For the ViewCollection case, the returned ViewCollection collection will consist n copies
-      # of self[data index] || self[-1], where n = data.length.
+      # Manipulates the current collection to match the data. The final ViewCollection object
+      # will consist n copies of self[data index] || self[-1], where n = data.length.
       #
       def match(data)
-        data = data.to_a if data.is_a?(Enumerator)
-        data = [data] if (!data.is_a?(Enumerable) || data.is_a?(Hash))
+        data = Array.ensure(data)
 
-        views = ViewCollection.new
-        views.context = @context
-        views.composer = @composer
-        data.each_with_index {|datum,i|
-          unless v = self[i]
+        # an empty set always means an empty view
+        if data.empty?
+          remove
+        else
+          original_view = self[-1].soft_copy if data.length > length
 
-            # we're out of views, so use the last one
-            v = self[-1]
+          if length > data.length
+            self[data.length..-1].each do |view|
+              view.remove
+            end
+          else
+            data[length..-1].each do
+              duped_view = original_view.soft_copy
+              self[-1].after(duped_view)
+              self << duped_view
+            end
           end
+        end
 
-          d_v = v.doc.dup
-          v.doc.before(d_v)
-          v.invalidate!(true)
-
-          new_v = View.from_doc(d_v)
-
-          # find binding subset (keeps us from refinding)
-          new_v.bindings = v.bindings.dup
-          new_v.scoped_as = v.scoped_as
-          new_v.context = @context
-          new_v.composer = @composer
-
-          views << new_v
-        }
-
-        # do not use self.remove since that refinds bindings
-        self.each {|v|
-          next if v.doc.parent.nil?
-          v.doc.remove
-        }
-        
-        views
+        self
       end
 
       # call-seq:
@@ -238,7 +196,7 @@ module Pakyow
       # Matches self to data and yields a view/datum pair.
       #
       def repeat(data, &block)
-        self.match(data).for(data, &block)
+        match(data).for(data, &block)
       end
 
       # call-seq:
@@ -247,7 +205,7 @@ module Pakyow
       # Matches self with data and yields a view/datum pair with index.
       #
       def repeat_with_index(data, &block)
-        self.match(data).for_with_index(data, &block)
+        match(data).for_with_index(data, &block)
       end
 
       # call-seq:
@@ -255,9 +213,9 @@ module Pakyow
       #
       # Binds data across existing scopes.
       #
-      def bind(data, bindings = {}, &block)
-        self.for(data) {|view, datum|
-          view.bind(datum, bindings)
+      def bind(data, bindings: {}, context: nil, &block)
+        self.for(data) do |view, datum|
+          view.bind(datum, bindings: bindings, context: context)
           next if block.nil?
 
           if block.arity == 1
@@ -265,7 +223,7 @@ module Pakyow
           else
             block.call(view, datum)
           end
-        }
+        end
       end
 
       # call-seq:
@@ -273,9 +231,9 @@ module Pakyow
       #
       # Binds data across existing scopes, yielding a view/datum pair with index.
       #
-      def bind_with_index(data, bindings = {}, &block)
+      def bind_with_index(*a, **k, &block)
         i = 0
-        self.bind(data) do |ctx, datum|
+        bind(*a, **k) do |ctx, datum|
           if block.arity == 2
             ctx.instance_exec(datum, i, &block)
           else
@@ -291,8 +249,8 @@ module Pakyow
       #
       # Matches self to data then binds data to the view.
       #
-      def apply(data, bindings = {}, &block)
-        self.match(data).bind(data, bindings, &block)
+      def apply(data, bindings: {}, context: nil, &block)
+        match(data).bind(data, bindings: bindings, context: context, &block)
       end
     end
   end

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

@@ -12,7 +12,6 @@ module Pakyow
       def_delegators :template, :title, :title=
       def_delegators :parts, :scope, :prop
 
-      attr_accessor :context
       attr_reader :store, :path, :page, :partials
 
       def initialize(store, path = nil, opts = {}, &block)
@@ -35,10 +34,6 @@ module Pakyow
           @partials = store.partials(path) unless path.nil?
         end
 
-        @partials.each do |name, partial|
-          partial.composer = self
-        end
-
         instance_exec(&block) if block_given?
       end
 
@@ -47,6 +42,7 @@ module Pakyow
 
         %w[store path page template partials view].each do |ivar|
           value = original.instance_variable_get("@#{ivar}")
+          next if value.nil?
 
           if value.is_a?(Hash)
             dup_value = {}
@@ -57,34 +53,15 @@ module Pakyow
 
           self.instance_variable_set("@#{ivar}", dup_value)
         end
-
-        # update composer reference for partials
-        @partials.each do |name, partial|
-          partial.composer = self
-        end
-
-        # update composer reference for page
-        @page.composer = self
-      end
-
-      def precompose!
-        @view = build_view
-        clean!
       end
 
       def view
-        if dirty?
-          @view = build_view
-          clean!
-        end
-
-        return @view
+        build_view
       end
       alias_method :composed, :view
 
       def template(template = nil)
         if template.nil?
-          @template.context = context
           return @template
         end
 
@@ -99,7 +76,6 @@ module Pakyow
         end
 
         @template = template
-        dirty!
 
         return self
       end
@@ -110,48 +86,31 @@ module Pakyow
           page = @store.page(page)
         end
 
-        page.composer = self
         @page = page
-        dirty!
 
         return self
       end
 
       def includes(partial_map)
-        dirty!
-
         @partials.merge!(remap_partials(partial_map))
       end
 
       def partials=(partial_map)
-        dirty!
         @partials.merge!(remap_partials(partial_map))
       end
 
       def partial(name)
         partial = @partials[name]
-        partial.context = context
         return partial
       end
 
       def container(name)
         container = @page.container(name)
-        container.context = context
         return container
       end
 
-      def dirty?
-        @dirty
-      end
-
-      def dirty!
-        @dirty = true
-      end
-
       def parts
         parts = ViewCollection.new
-        parts.context = @context
-        parts.composer = self
         parts << @template
         @page.each_container do |name, container| parts << container end
         partials.each_pair do |name, partial| parts << partial end
@@ -160,10 +119,6 @@ module Pakyow
 
       private
 
-      def clean!
-        @dirty = false
-      end
-
       def build_view
         raise MissingTemplate, "No template provided to view composer" if @template.nil?
         raise MissingPage, "No page provided to view composer" if @page.nil?

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

@@ -0,0 +1,89 @@
+module Pakyow
+  module Presenter
+    # This is a wrapper for View / ViewCollection that passes the current
+    # AppContext to all binding methods. This object is expected to only
+    # be used from the app, not internally.
+    #
+    class ViewContext
+      include Helpers
+      VIEW_CLASSES = [View, ViewCollection, Partial, Template, Container]
+
+      # The arities of misc view methods that switch the behavior from
+      # instance_exec to yield.
+      #
+      EXEC_ARITIES = { with: 0, for: 1, for_with_index: 2, repeat: 1,
+        repeat_with_index: 2, bind: 1, bind_with_index: 2, apply: 1 }
+
+      def initialize(view, context)
+        @view = view
+        @context = context
+      end
+
+      # View methods that expect context, so it can be mixed in.
+      #
+      %i[bind bind_with_index apply].each do |method|
+        define_method(method) do |data, **kargs, &block|
+          kargs[:context] ||= @context
+          ret = @view.send(method, data, **kargs, &wrap(method, &block))
+          handle_return_value(ret)
+        end
+      end
+
+      # View methods that return views, but don't expect context.
+      #
+      %i[with for for_with_index repeat repeat_with_index].each do |method|
+        define_method(method) do |*args, &block|
+          ret = @view.send(method, *args, &wrap(method, &block))
+          handle_return_value(ret)
+        end
+      end
+
+      # Pass these through, handling the return value.
+      #
+      def method_missing(method, *args, &block)
+        ret = @view.send(method, *args, &block)
+        handle_return_value(ret)
+      end
+
+      private
+
+      def view?(obj)
+        VIEW_CLASSES.include?(obj.class)
+      end
+
+      # Returns a new context for returned views, or the return value.
+      #
+      def handle_return_value(value)
+        if view?(value)
+          return ViewContext.new(value, @context)
+        end
+
+        value
+      end
+
+      # Wrap the block, substituting the view with the current view context.
+      #
+      def wrap(method, &block)
+        return if block.nil?
+
+        Proc.new do |*args|
+          ctx = args.map! { |arg|
+            view?(arg) ? ViewContext.new(arg, @context) : arg
+          }.find { |arg| arg.is_a?(ViewContext) }
+
+          case block.arity
+          when EXEC_ARITIES[method]
+            # Rejecting ViewContext handles the edge cases around the order of
+            # arguments from view methods (since view is not present in some
+            # situations and when it is present, is always the first arg).
+            ctx.instance_exec(*args.reject { |arg|
+              arg.is_a?(ViewContext)
+            }, &block)
+          else
+            block.call(*args)
+          end
+        end
+      end
+    end
+  end
+end