pakyow-presenter 0.8.rc4 → 0.8.0

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

@@ -1,12 +1,14 @@
 module Pakyow
   module Presenter
-    class Template
+    class Template < View
       include DocHelpers
+      include TitleHelpers
+
       attr_accessor :name, :doc
 
       class << self
         def load(path)
-          format    = StringUtils.split_at_last_dot(path)[-1]
+          format    = Utils::String.split_at_last_dot(path)[-1]
           contents  = File.read(path)
           name      = File.basename(path, '.*').to_sym
 
@@ -14,17 +16,9 @@ module Pakyow
         end
       end
 
-      def initialize(name, contents, format = :html)
+      def initialize(name, contents = '', format = :html)
         @name = name
-
-        if contents.is_a?(Nokogiri::HTML::Document)
-          @doc = contents
-        else
-          processed = Presenter.process(contents, format)
-          @doc = Nokogiri::HTML::Document.parse(processed)
-        end
-
-        containers
+        super(contents, format)
       end
 
       def initialize_copy(original_template)
@@ -32,6 +26,8 @@ module Pakyow
 
         # copy doc
         @doc = original_template.doc.dup
+        @context = original_template.context
+        @composer = original_template.composer
       end
 
       def container(name = :default)
@@ -48,9 +44,9 @@ module Pakyow
         containers.each do |container|
           name = container[0]
 
-          if content = page.content(name)
-            container(name).replace(content)
-          else
+          begin
+            container(name).replace(page.content(name))
+          rescue MissingContainer
             Pakyow.logger.debug "No content for '#{name}' in page '#{page.path}'"
           end
         end

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

@@ -0,0 +1,21 @@
+module Pakyow
+  module Presenter
+    module TitleHelpers
+      def title=(title)
+        return if @doc.nil?
+
+        if o = @doc.css('title').first
+          o.inner_html = Nokogiri::HTML::fragment(title.to_s)
+        elsif o = @doc.css('head').first
+          o.add_child(Nokogiri::HTML::fragment("<title>#{title}</title>"))
+        end
+      end
+
+      def title
+        return unless o = @doc.css('title').first
+        o.inner_text
+      end
+    end
+  end
+end
+