pakyow-presenter 0.8.rc4 → 0.8.0

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

@@ -3,6 +3,8 @@ module Pakyow
     class ViewCollection
       include Enumerable
 
+      attr_accessor :context, :composer
+
       def initialize
         @views = []
       end
@@ -67,14 +69,27 @@ module Pakyow
 
       alias :render :append
 
+      def prepend(content)
+        self.each {|e| e.prepend(content)}
+      end
+
       def <<(val)
         if val.is_a? View
           @views << val
         end
       end
 
+      def concat(views)
+        @views.concat(views)
+      end
+
       def [](i)
-        @views[i]
+        view = @views[i]
+        return if view.nil?
+
+        view.context = @context
+        view.composer = @composer
+        return view
       end
 
       def length
@@ -83,9 +98,15 @@ module Pakyow
 
       def scope(name)
         views = ViewCollection.new
+        views.context = @context
+        views.composer = @composer
         self.each{|v|
           next unless svs = v.scope(name)
-          svs.each{|sv| views << sv}
+          svs.each{ |sv|
+            sv.context = @context
+            sv.composer = @composer
+            views << sv
+          }
         }
 
         views
@@ -93,9 +114,15 @@ module Pakyow
 
       def prop(name)
         views = ViewCollection.new
+        views.context = @context
+        views.composer = @composer
         self.each{|v|
           next unless svs = v.prop(name)
-          svs.each{|sv| views << sv}
+          svs.each{ |sv|
+            sv.context = @context
+            sv.composer = @composer
+            views << sv
+          }
         }
 
         views
@@ -106,11 +133,13 @@ module Pakyow
       #
       # Creates a context in which view manipulations can be performed.
       #
-      # Unlike previous versions, the context can only be referenced by the
-      # block argument. No `context` method will be available.s
-      #
-      def with
-        yield(self)
+      def with(&block)
+        if block.arity == 0
+          self.instance_exec(&block)
+        else
+          yield(self)
+        end
+
         self
       end
 
@@ -129,10 +158,35 @@ module Pakyow
 
         self.each_with_index { |v,i|
           break unless datum = data[i]
-          block.call(v, datum, i) if block_given?
+
+          if block.arity == 1
+            v.instance_exec(data[i], &block)
+          else
+            block.call(v, data[i])
+          end
         }
       end
 
+      # call-seq:
+      #   for_with_index {|view, datum, i| block}
+      #
+      # Yields a view, its matching datum, and index. Datums are yielded until
+      # no more views or data is available. For the ViewCollection case, this
+      # means the block will be yielded self.length times.
+      #
+      def for_with_index(data, &block)
+        i = 0
+        self.for(data) do |ctx, datum|
+          if block.arity == 2
+            ctx.instance_exec(datum, i, &block)
+          else
+            block.call(ctx, datum, i)
+          end
+
+          i += 1
+        end
+      end
+
       # call-seq:
       #   match(data) => ViewCollection
       #
@@ -145,6 +199,8 @@ module Pakyow
         data = [data] if (!data.is_a?(Enumerable) || data.is_a?(Hash))
 
         views = ViewCollection.new
+        views.context = @context
+        views.composer = @composer
         data.each_with_index {|datum,i|
           unless v = self[i]
 
@@ -154,18 +210,25 @@ module Pakyow
 
           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| v.doc.remove}
+        self.each {|v|
+          next if v.doc.parent.nil?
+          v.doc.remove
+        }
+        
         views
       end
 
@@ -178,18 +241,51 @@ module Pakyow
         self.match(data).for(data, &block)
       end
 
+      # call-seq:
+      #   repeat_with_index(data) {|view, datum, i| block}
+      #
+      # 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)
+      end
+
       # call-seq:
       #   bind(data)
       #
       # Binds data across existing scopes.
       #
       def bind(data, bindings = {}, &block)
-        self.for(data) {|view, datum, i|
+        self.for(data) {|view, datum|
           view.bind(datum, bindings)
-          yield(view, datum, i) if block_given?
+          next if block.nil?
+
+          if block.arity == 1
+            view.instance_exec(datum, &block)
+          else
+            block.call(view, datum)
+          end
         }
       end
 
+      # call-seq:
+      #   bind_with_index(data)
+      #
+      # Binds data across existing scopes, yielding a view/datum pair with index.
+      #
+      def bind_with_index(data, bindings = {}, &block)
+        i = 0
+        self.bind(data) do |ctx, datum|
+          if block.arity == 2
+            ctx.instance_exec(datum, i, &block)
+          else
+            block.call(ctx, datum, i)
+          end
+
+          i += 1
+        end
+      end
+
       # call-seq:
       #   apply(data)
       #

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

@@ -0,0 +1,194 @@
+module Pakyow
+  module Presenter
+    class ViewComposer
+      class << self
+        def from_path(store, path, opts = {}, &block)
+          ViewComposer.new(store, path, opts, &block)
+        end
+      end
+
+      extend Forwardable
+
+      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)
+        @store = store
+        @path = path
+
+        self.page = opts.fetch(:page) {
+          path
+        }
+
+        self.template = opts.fetch(:template) {
+          (@page.is_a?(Page) && @page.info(:template)) || path
+        }
+
+        @partials = {}
+
+        begin
+          @partials = includes(opts.fetch(:includes))
+        rescue
+          @partials = store.partials(path) unless path.nil?
+        end
+
+        @partials.each do |name, partial|
+          partial.composer = self
+        end
+
+        instance_exec(&block) if block_given?
+      end
+
+      def initialize_copy(original)
+        super
+
+        %w[store path page template partials view].each do |ivar|
+          value = original.instance_variable_get("@#{ivar}")
+
+          if value.is_a?(Hash)
+            dup_value = {}
+            value.each_pair { |key, value| dup_value[key] = value.dup }
+          else
+            dup_value = value.dup
+          end
+
+          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
+      end
+      alias_method :composed, :view
+
+      def template(template = nil)
+        if template.nil?
+          @template.context = context
+          return @template
+        end
+
+        self.template = template
+        return self
+      end
+
+      def template=(template)
+        unless template.is_a?(Template)
+          # get template by name
+          template = @store.template(template)
+        end
+
+        @template = template
+        dirty!
+
+        return self
+      end
+
+      def page=(page)
+        unless page.is_a?(Page)
+          # get page by name
+          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
+        return parts
+      end
+
+      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?
+
+        view = @template.dup.build(@page).includes(@partials)
+
+        # set title
+        title = @page.info(:title)
+        view.title = title unless title.nil?
+
+        return view
+      end
+
+      def remap_partials(partials)
+        Hash[partials.map { |name, partial_or_path|
+          if partial_or_path.is_a?(Partial)
+            partial = partial_or_path
+          else
+            partial = Partial.load(@store.expand_partial_path(path))
+          end
+
+          [name, partial]
+        }]
+      end
+
+    end
+  end
+end

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

@@ -1,6 +1,6 @@
 module Pakyow
   class ViewStore
-    attr_reader :name
+    attr_reader :name, :store_path, :templates
 
     def initialize(store_path, name = :default)
       @name = name
@@ -20,6 +20,8 @@ module Pakyow
     end
 
     def template(name_or_path)
+      return name_or_path if name_or_path.is_a?(Template)
+
       if name_or_path.is_a?(Symbol)
         return template_with_name(name_or_path)
       else
@@ -28,24 +30,62 @@ module Pakyow
     end
 
     def page(view_path)
+      return view_path if view_path.is_a?(Page)
+
+      raise ArgumentError, "Cannot build page for nil path" if view_path.nil?
       return at_path(view_path, :page).dup
     end
 
     def view(view_path)
-      return at_path(view_path, :view).dup
+      return at_path(view_path, :composer).view.dup
+    end
+
+    def partials(view_path)
+      return at_path(view_path, :partials) || {}
     end
 
     def partial(view_path, name)
-      return at_path(view_path, :partials)[name.to_sym]
+      return partials(view_path)[name.to_sym]
+    end
+
+    def composer(view_path)
+      return at_path(view_path, :composer).dup
     end
 
     # iterations through known views, yielding each
     def views
       @path_info.each_pair do |path, info|
-        yield(info[:view], path)
+        yield(info[:composer].view, path)
+      end
+    end
+
+    def infos
+      @path_info.each_pair do |path, info|
+        yield(info, path)
       end
     end
 
+    def expand_path(view_path)
+      File.join(@store_path, view_path)
+    end
+
+    # Builds the full path to a partial.
+    #
+    #   expand_partial_path('path/to/partial')
+    #   # => '{store_path}/path/to/_partial.html'
+    def expand_partial_path(path)
+      parts = path.split('/')
+
+      # add underscore
+      expanded_path = expand_path((parts[0..-2] << "_#{parts[-1]}").join('/'))
+
+      # attempt to find extension
+      matches = Dir.glob(expanded_path + '.*')
+      raise MissingPartial, "Could not find partial with any extension at #{expanded_path}" if matches.empty?
+
+      return expanded_path + File.extname(matches[0])
+    end
+
     private
 
     def at_path(view_path, obj = nil)
@@ -55,7 +95,7 @@ module Pakyow
       if info.nil?
         raise MissingView, "No view at path '#{view_path}'"
       else
-        return obj ? info[obj.to_sym] : info
+        return (obj ? info[obj.to_sym] : info).dup
       end
     end
 
@@ -64,7 +104,7 @@ module Pakyow
         raise MissingTemplate, "No template named '#{name}'"
       end
 
-      return template
+      return template.dup
     end
 
     def load_templates
@@ -89,7 +129,10 @@ module Pakyow
     def load_path_info
       @path_info = {}
 
-      DirUtils.walk_dir(@store_path) do |path|
+      # for keeping up with pages for previous paths
+      pages = {}
+
+      Utils::Dir.walk_dir(@store_path) do |path|
         # skip root
         next if path == @store_path
 
@@ -110,26 +153,30 @@ module Pakyow
         # page is used
         if File.directory?(path)
           # gets the path for the previous page
-          prev_path = normalized_path.split('/')[0..-2].join("")
-          page = @path_info[prev_path][:page]
+          prev_path = normalized_path
+          until page = pages[prev_path]
+            prev_path = prev_path.split('/')[0..-2].join("/")
+          end
+          page = page
         else
           page = Page.load(path)
+          pages[normalized_path] = page
         end
 
-        template = template_with_name(page.template).dup
+        template = template_with_name(page.info(:template))
 
-        #TODO more efficient way of doing this? lot
-        # of redundant calls here
+        #TODO more efficient way of doing this? lot of redundant calls here
         partials = partials_at_path(path)
 
-        # construct view
-        view = template.build(page.dup.build(partials))
+        # compose template/page/partials
+        composer = ViewComposer.from_path(self, normalized_path, template: template, page: page, includes: partials)
+        composer.precompose!
 
         info = {
-          view: view,
           page: page,
           template: template,
           partials: partials,
+          composer: composer,
         }
 
         @path_info[normalized_path] = info
@@ -140,7 +187,7 @@ module Pakyow
       relative_path = path.gsub(@store_path, '')
       relative_path = relative_path.gsub(File.extname(relative_path), '')
       relative_path = relative_path.gsub('index', '')
-      relative_path = StringUtils.normalize_path(relative_path)
+      relative_path = Utils::String.normalize_path(relative_path)
 
       return relative_path
     end
@@ -149,7 +196,7 @@ module Pakyow
       view_path = File.dirname(view_path) unless File.directory?(view_path)
 
       partials = {}
-      DirUtils.walk_dir(@store_path) do |path|
+      Utils::Dir.walk_dir(@store_path) do |path|
         # skip non-partials
         next unless File.basename(path)[0,1] == '_'
 
@@ -157,7 +204,7 @@ module Pakyow
         next if File.directory?(path)
 
         # skip files not within `view_path`
-        next unless DirUtils.dir_within_dir?(File.dirname(path), view_path)
+        next unless Utils::Dir.dir_within_dir?(File.dirname(path), view_path)
 
         name = File.basename(path.split('/')[-1], '.*')[1..-1]
         partials[name.to_sym] = path

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pakyow-presenter
 version: !ruby/object:Gem::Version
-  version: 0.8.rc4
+  version: 0.8.0
 platform: ruby
 authors:
 - Bryan Powell
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-26 00:00:00.000000000 Z
+date: 2014-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pakyow-core
@@ -17,54 +17,54 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.rc4
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.rc4
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
 description: A library for building a frontend for Pakyow applications, including
@@ -75,14 +75,15 @@ extensions: []
 extra_rdoc_files: []
 files:
 - pakyow-presenter/CHANGES
-- pakyow-presenter/README
 - pakyow-presenter/MIT-LICENSE
+- pakyow-presenter/README
 - pakyow-presenter/lib/pakyow-presenter.rb
 - pakyow-presenter/lib/presenter/attributes.rb
 - pakyow-presenter/lib/presenter/base.rb
 - pakyow-presenter/lib/presenter/binder.rb
 - pakyow-presenter/lib/presenter/binder_set.rb
 - pakyow-presenter/lib/presenter/config/presenter.rb
+- pakyow-presenter/lib/presenter/container.rb
 - pakyow-presenter/lib/presenter/doc_helpers.rb
 - pakyow-presenter/lib/presenter/exceptions.rb
 - pakyow-presenter/lib/presenter/ext/app.rb
@@ -91,8 +92,10 @@ files:
 - pakyow-presenter/lib/presenter/partial.rb
 - pakyow-presenter/lib/presenter/presenter.rb
 - pakyow-presenter/lib/presenter/template.rb
+- pakyow-presenter/lib/presenter/title_helpers.rb
 - pakyow-presenter/lib/presenter/view.rb
 - pakyow-presenter/lib/presenter/view_collection.rb
+- pakyow-presenter/lib/presenter/view_composer.rb
 - pakyow-presenter/lib/presenter/view_store.rb
 homepage: http://pakyow.com
 licenses:
@@ -104,17 +107,17 @@ require_paths:
 - pakyow-presenter/lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: pakyow-presenter
-rubygems_version: 2.0.0
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: A library for building a frontend for Pakyow applications.