webby 0.9.0 → 0.9.1

data/lib/webby/resources/page.rb

@@ -9,22 +9,22 @@ module Webby::Resources
 #
 class Page < Resource
 
-  # Resource page number (if needed)
-  attr_reader :number
-
   # call-seq:
   #    Resource.new( path )
   #
   # Creates a new page object from the full path to the page file.
   #
-  def initialize( fn )
-    super
-    @number = nil
-
-    @mdata = ::Webby::Resources::File.meta_data(@path)
-    @mdata ||= {}
-    @mdata = ::Webby.site.page_defaults.merge(@mdata)
-    @mdata.sanitize!
+  def initialize( fn, meta_data = nil )
+    super(fn)
+
+    if meta_data.instance_of?(Hash)
+      @_meta_data = meta_data
+    else
+      @_meta_data = MetaFile.meta_data(@path)
+      @_meta_data ||= {}
+    end
+    @_meta_data = ::Webby.site.page_defaults.merge(@_meta_data)
+    @_meta_data.sanitize!
   end
 
   # call-seq:
@@ -46,51 +46,13 @@ class Page < Resource
   # is returned for layouts.
   #
   def url
-    return @url if defined? @url and @url
+    return @url unless @url.nil?
 
-    @url = destination.sub(::Webby.site.output_dir, '')
-    @url = File.dirname(@url) if filename == 'index' and number.nil?
+    @url = super
+    @url = File.dirname(@url) if filename == 'index'
     @url
   end
 
-  # call-seq:
-  #    page.number = Integer
-  #
-  # Sets the page number for the current resource to the given integer. This
-  # number is used to modify the output destination for resources that
-  # require pagination.
-  #
-  def number=( num )
-    @number = num
-    @url = @dest = nil
-  end
-
-  # call-seq:
-  #    destination    => string
-  #
-  # Returns the path in the output directory where the rendered page should
-  # be stored. This path is used to determine if the page is dirty and in
-  # need of rendering.
-  #
-  # The destination for a page can be overridden by explicitly setting
-  # the 'destination' property in the page's meta-data.
-  #
-  def destination
-    return @dest if defined? @dest and @dest
-
-    @dest = if @mdata.has_key? 'destination' then @mdata['destination']
-            else ::File.join(dir, filename) end
-
-    @dest = ::File.join(::Webby.site.output_dir, @dest)
-    @dest << @number.to_s if @number
-
-    ext = extension
-    unless ext.nil? or ext.empty?
-      @dest << '.' << ext
-    end
-    @dest
-  end
-
   # call-seq:
   #    extension    => string
   #
@@ -102,14 +64,15 @@ class Page < Resource
   # * the extension of this page file
   #
   def extension
-    return @mdata['extension'] if @mdata.has_key? 'extension'
+    return _meta_data['extension'] if _meta_data.has_key? 'extension'
 
-    if @mdata.has_key? 'layout'
-      lyt = ::Webby::Resources.find_layout(@mdata['layout'])
-      ext = lyt ? lyt.extension : nil
-      return ext if ext
+    if _meta_data.has_key? 'layout'
+      lyt = ::Webby::Resources.find_layout(_meta_data['layout'])
+      lyt_ext = lyt ? lyt.extension : nil
+      return lyt_ext if lyt_ext
     end
-    @ext
+
+    ext
   end
 
 end  # class Page

data/lib/webby/resources/partial.rb

@@ -24,9 +24,9 @@ class Partial < Resource
   def initialize( fn )
     super
 
-    @mdata = ::Webby::Resources::File.meta_data(@path)
-    @mdata ||= {}
-    @mdata.sanitize!
+    @_meta_data = MetaFile.meta_data(@path)
+    @_meta_data ||= {}
+    @_meta_data.sanitize!
   end
 
   # call-seq:
@@ -37,7 +37,7 @@ class Partial < Resource
   # copied (if a static file) to the output directory.
   #
   def dirty?
-    return @mdata['dirty'] if @mdata.has_key? 'dirty'
+    return _meta_data['dirty'] if _meta_data.has_key? 'dirty'
 
     # if the destination file does not exist, then we are dirty
     return true unless test(?e, destination)
@@ -73,6 +73,12 @@ class Partial < Resource
     nil
   end
 
+  # :stopdoc:
+  def _read
+    MetaFile.read(@path)
+  end
+  # :startdoc:
+
 end  # class Partial
 end  # module Webby::Resources
 

data/lib/webby/resources/resource.rb

@@ -16,31 +16,34 @@ class Resource
   # The full path to the resource file
   attr_reader :path
 
+  # The name of the file excluding the directory and extension
+  attr_reader :name
+
   # The directory of the resource excluding the content directory
   attr_reader :dir
 
-  # The resource filename excluding path and extension
-  attr_reader :filename
-
   # Extesion of the resource file
   attr_reader :ext
 
   # Resource file modification time
   attr_reader :mtime
 
+  attr_reader :_meta_data  #:nodoc:
+
   # call-seq:
   #    Resource.new( filename )    => resource
   #
   # Creates a new resource object given the _filename_.
   #
   def initialize( fn )
-    @path     = fn
-    @dir      = ::Webby::Resources::File.dirname(@path)
-    @filename = ::Webby::Resources::File.basename(@path)
-    @ext      = ::Webby::Resources::File.extname(@path)
-    @mtime    = ::File.mtime @path
-
-    @mdata = @@mdata ||= {}
+    @path  = fn
+    @dir   = ::Webby::Resources.dirname(@path)
+    @name  = ::Webby::Resources.basename(@path)
+    @ext   = ::Webby::Resources.extname(@path)
+    @mtime = ::File.mtime @path
+
+    @_meta_data =  {}
+    self._reset
   end
 
   # call-seq:
@@ -51,7 +54,7 @@ class Resource
   #
   def equal?( other )
     return false unless other.kind_of? ::Webby::Resources::Resource
-    @path == other.path
+    self.destination == other.destination
   end
   alias :== :equal?
   alias :eql? :equal?
@@ -65,7 +68,7 @@ class Resource
   #
   def <=>( other )
     return unless other.kind_of? ::Webby::Resources::Resource
-    @path <=> other.path
+    self.destination <=> other.destination
   end
 
   # call-seq:
@@ -75,7 +78,7 @@ class Resource
   # converted into a string.
   #
   def []( key )
-    @mdata[key.to_s]
+    _meta_data[key.to_s]
   end
 
   # call-seq:
@@ -85,7 +88,7 @@ class Resource
   # string.
   #
   def []=( key, value )
-    @mdata[key.to_s] = value
+    _meta_data[key.to_s] = value
   end
 
   # call-seq:
@@ -97,7 +100,7 @@ class Resource
   # meta-data item is returned; otherwise, +nil+ is returned.
   #
   def method_missing( name, *a, &b )
-    @mdata[name.to_s]
+    _meta_data[name.to_s]
   end
 
   # call-seq:
@@ -108,7 +111,7 @@ class Resource
   # copied (if a static file) to the output directory.
   #
   def dirty?
-    return @mdata['dirty'] if @mdata.has_key? 'dirty'
+    return _meta_data['dirty'] if _meta_data.has_key? 'dirty'
 
     # if the destination file does not exist, then we are dirty
     return true unless test(?e, destination)
@@ -120,8 +123,8 @@ class Resource
 
     # check to see if the layout is dirty, and if it is then we
     # are dirty, too
-    if @mdata.has_key? 'layout'
-      lyt = ::Webby::Resources.find_layout(@mdata['layout'])
+    if _meta_data.has_key? 'layout'
+      lyt = ::Webby::Resources.find_layout(_meta_data['layout'])
       unless lyt.nil?
         return true if lyt.dirty?
       end
@@ -131,24 +134,62 @@ class Resource
     false
   end
 
-  # call-seq
-  #    url    => string or nil
+  # The resource filename excluding path and extension. This will either be
+  # the name of the file or the 'filename' attribute from the meta-data if
+  # present.
   #
-  # Returns a string suitable for use as a URL linking to this page. Nil
-  # is returned for layouts.
+  def filename
+    return _meta_data['filename'] if _meta_data.has_key? 'filename'
+    name
+  end
+
+  # The resource file extension. This will either be the extension of the
+  # file or the 'extension' attribute from the meta-data if present.
+  #
+  def extension
+    return _meta_data['extension'] if _meta_data.has_key? 'extension'
+    ext
+  end
+
+  # The location of this resource in the directory structure. This directory
+  # does not include the content folder or the output folder.
+  #
+  def directory
+    return _meta_data['directory'] if _meta_data.has_key? 'directory'
+    dir
+  end
+
+  # Returns the path in the output directory where the resource will be
+  # generated. This path is used to determine if the resource is dirty
+  # and in need of generating.
+  #
+  def destination
+    return @destination unless @destination.nil?
+
+    @destination = ::File.join(::Webby.site.output_dir, directory, filename)
+    ext = extension
+    unless ext.nil? or ext.empty?
+      @destination << '.' << ext
+    end
+    @destination
+  end
+
+  # Returns a string suitable for use as a URL linking to this resource.
   #
   def url
-    return @url if defined? @url and @url
+    return @url unless @url.nil?
     @url = destination.sub(::Webby.site.output_dir, '')
   end
 
   # :stopdoc:
-  def destination
-    raise NotImplementedError
+  def _read
+    MetaFile.read(@path)
   end
 
-  def extension
-    raise NotImplementedError
+  def _reset( meta_data = nil )
+    _meta_data.replace(meta_data) if meta_data.instance_of?(Hash)
+    @url = nil
+    @destination = nil
   end
   # :startdoc:
 

data/lib/webby/resources/static.rb

@@ -9,18 +9,13 @@ module Webby::Resources
 #
 class Static < Resource
 
-  # call-seq:
-  #    render   => string
-  #
   # Returns the contents of the file.
   #
   def render
-    ::File.read(path)
+    Webby.deprecated "render", "it is being replaced by the Renderer#render() method"
+    self._read
   end
 
-  # call-seq:
-  #    dirty?    => true or false
-  #
   # Returns +true+ if this static file is newer than its corresponding output
   # product. The static file needs to be copied to the output directory.
   #
@@ -29,22 +24,11 @@ class Static < Resource
     @mtime > ::File.mtime(destination)
   end
 
-  # call-seq:
-  #    destination    => string
-  #
-  # Returns the path in the output directory where the static file should
-  # be copied. This path is used to determine if the static file is dirty
-  # and in need of copying to the output file.
-  #
-  def destination
-    return @dest if defined? @dest and @dest
-
-    @dest = ::File.join(::Webby.site.output_dir, dir, filename)
-    @dest << '.' << @ext if @ext and !@ext.empty?
-    @dest
+  # :stopdoc:
+  def _read
+    ::File.read(path)
   end
-
-  alias :extension :ext
+  # :startdoc:
 
 end  # class Layout
 end  # module Webby::Resources

data/lib/webby/stelan/paginator.rb

@@ -18,7 +18,7 @@ class Paginator
   class MissingCountError < ArgumentError; end
   class MissingSelectError < ArgumentError; end  
   
-  attr_reader :per_page, :count, :resource
+  attr_reader :per_page, :count, :resource, :filename, :directory
   
   # Instantiate a new Paginator object
   #
@@ -31,6 +31,9 @@ class Paginator
   #     convenience, if the arity is 2)
   def initialize(count, per_page, resource, &select)
     @count, @per_page, @resource = count, per_page, resource
+    @meta_data = @resource._meta_data.dup
+    @filename = @resource.filename
+    @directory = @resource.directory
     unless select
       raise MissingSelectError, "Must provide block to select data for each page"
     end
@@ -68,6 +71,11 @@ class Paginator
       @select.call(*args)
     })
   end
+
+  # Finalizer method that should be called when the paginator is finished
+  def done
+    resource._reset(@meta_data)
+  end
   
   # Page object
   #
@@ -84,7 +92,14 @@ class Paginator
       @offset = (number - 1) * pager.per_page
       @select = select
 
-      @pager.resource.number = (number == 1 ? nil : number)
+      @pager.resource._reset
+      if number > 1
+        if ::Webby.site.create_mode == 'directory'
+          @pager.resource['directory'] = File.join(@pager.directory, number.to_s)
+        else
+          @pager.resource['filename'] = @pager.filename + number.to_s
+        end
+      end
       @url = @pager.resource.url
     end
 

data/spec/data/Sitefile

@@ -0,0 +1,9 @@
+
+task :default => :build
+
+desc 'deploy the site to the webserver'
+task :deploy => [:build, 'deploy:rsync']
+
+SITE.create_mode = 'directory'
+
+# EOF

data/spec/data/content/_partial.txt

@@ -0,0 +1,10 @@
+---
+filter: erb
+---
+A partial has access to the page from which it was called. The title below will be the title of the page in which this partial is rendered.
+
+<%%= h(@page.title) %>
+
+A partial does not have access to it's own meta-data. The partial meta-data is used primarily for finding partials or for use in other pages. The filter(s) specified in the meta-data will be applied to the partial text when it is rendered.
+
+A partial does not require meta-data at all. They can contain just text.

data/spec/data/content/css/coderay.css

@@ -0,0 +1,111 @@
+.CodeRay {
+  padding: 0.5em;
+  margin-bottom: 1.3em;
+  background-color: #eee;
+  border: 1px solid #aaa;
+  font: 1.1em Monaco, 'Courier New', 'Terminal', monospace;
+  color: #100;
+}
+.CodeRay pre {
+  padding: 0px;
+  margin: 0px;
+  overflow: auto;
+  background-color: transparent;
+  border: none;
+}
+
+div.CodeRay { }
+
+span.CodeRay { white-space: pre; border: 0px; padding: 2px }
+
+table.CodeRay { border-collapse: collapse; width: 100%; padding: 2px }
+table.CodeRay td { padding: 2px 4px; vertical-align: top }
+
+.CodeRay .line_numbers, .CodeRay .no {
+  background-color: #def;
+  color: gray;
+  text-align: right;
+}
+.CodeRay .line_numbers tt { font-weight: bold }
+.CodeRay .no { padding: 0px 4px }
+
+ol.CodeRay { font-size: 10pt }
+ol.CodeRay li { white-space: pre }
+
+.CodeRay .debug { color:white ! important; background:blue ! important; }
+
+.CodeRay .af { color:#00C }
+.CodeRay .an { color:#007 }
+.CodeRay .av { color:#700 }
+.CodeRay .aw { color:#C00 }
+.CodeRay .bi { color:#509; font-weight:bold }
+.CodeRay .c  { color:#666; }
+
+.CodeRay .ch { color:#04D }
+.CodeRay .ch .k { color:#04D }
+.CodeRay .ch .dl { color:#039 }
+
+.CodeRay .cl { color:#B06; font-weight:bold }
+.CodeRay .co { color:#036; font-weight:bold }
+.CodeRay .cr { color:#0A0 }
+.CodeRay .cv { color:#369 }
+.CodeRay .df { color:#099; font-weight:bold }
+.CodeRay .di { color:#088; font-weight:bold }
+.CodeRay .dl { color:black }
+.CodeRay .do { color:#970 }
+.CodeRay .ds { color:#D42; font-weight:bold }
+.CodeRay .e  { color:#666; font-weight:bold }
+.CodeRay .en { color:#800; font-weight:bold }
+.CodeRay .er { color:#F00; background-color:#FAA }
+.CodeRay .ex { color:#F00; font-weight:bold }
+.CodeRay .fl { color:#60E; font-weight:bold }
+.CodeRay .fu { color:#06B; font-weight:bold }
+.CodeRay .gv { color:#d70; font-weight:bold }
+.CodeRay .hx { color:#058; font-weight:bold }
+.CodeRay .i  { color:#00D; font-weight:bold }
+.CodeRay .ic { color:#B44; font-weight:bold }
+
+.CodeRay .il { background: #eee }
+.CodeRay .il .il { background: #ddd }
+.CodeRay .il .il .il { background: #ccc }
+.CodeRay .il .idl { font-weight: bold; color: #888 }
+
+.CodeRay .in { color:#B2B; font-weight:bold }
+.CodeRay .iv { color:#33B }
+.CodeRay .la { color:#970; font-weight:bold }
+.CodeRay .lv { color:#963 }
+.CodeRay .oc { color:#40E; font-weight:bold }
+.CodeRay .of { color:#000; font-weight:bold }
+.CodeRay .op { }
+.CodeRay .pc { color:#038; font-weight:bold }
+.CodeRay .pd { color:#369; font-weight:bold }
+.CodeRay .pp { color:#579 }
+.CodeRay .pt { color:#339; font-weight:bold }
+.CodeRay .r  { color:#080; font-weight:bold }
+
+.CodeRay .rx { background-color:#fff0ff }
+.CodeRay .rx .k { color:#808 }
+.CodeRay .rx .dl { color:#404 }
+.CodeRay .rx .mod { color:#C2C }
+.CodeRay .rx .fu  { color:#404; font-weight: bold }
+
+.CodeRay .s  { background-color:#fff0f0 }
+.CodeRay .s  .s { background-color:#ffe0e0 }
+.CodeRay .s  .s  .s { background-color:#ffd0d0 }
+.CodeRay .s  .k { color:#D20 }
+.CodeRay .s  .dl { color:#710 }
+
+.CodeRay .sh { background-color:#f0fff0 }
+.CodeRay .sh .k { color:#2B2 }
+.CodeRay .sh .dl { color:#161 }
+
+.CodeRay .sy { color:#A60 }
+.CodeRay .sy .k { color:#A60 }
+.CodeRay .sy .dl { color:#630 }
+
+.CodeRay .ta { color:#070 }
+.CodeRay .tf { color:#070; font-weight:bold }
+.CodeRay .ts { color:#D70; font-weight:bold }
+.CodeRay .ty { color:#339; font-weight:bold }
+.CodeRay .v  { color:#036 }
+.CodeRay .xt { color:#444 }