TwP-webby 0.9.0 → 0.9.1

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/resources.rb

@@ -44,25 +44,36 @@ module Webby::Resources
       end
 
       # see if we are dealing with a partial
-      filename = ::Webby::Resources::File.basename(fn)
+      filename = self.basename(fn)
       if %r/\A_/o =~ filename
         r = ::Webby::Resources::Partial.new(fn)
         self.partials << r
         return r
       end
 
-      # see if we are dealing with a static resource
-      meta = ::Webby::Resources::File.meta_data(fn)
-      if meta.nil?
-        r = ::Webby::Resources::Static.new(fn)
-        self.pages << r
-        return r
+      begin
+        fd = ::File.open(fn, 'r')
+        mf = MetaFile.new fd
+
+        # see if we are dealing with a static resource
+        unless mf.meta_data?
+          r = ::Webby::Resources::Static.new(fn)
+          self.pages << r
+          return r
+        end
+
+        # this is a renderable page
+        mf.each do |meta_data|
+          r = ::Webby::Resources::Page.new(fn, meta_data)
+          self.pages << r
+          r
+        end
+      rescue MetaFile::Error => err
+        logger.error "error loading file #{fn.inspect}"
+        logger.error err
+      ensure
+        fd.close if fd
       end
-
-      # this is a renderable page
-      r = ::Webby::Resources::Page.new(fn)
-      self.pages << r
-      return r
     end
 
     # Returns a normalized path for the given filename.
@@ -77,7 +88,7 @@ module Webby::Resources
     def find_layout( filename )
       return if filename.nil?
 
-      fn  = ::Webby::Resources::File.basename(filename)
+      fn  = self.basename(filename)
       dir = ::File.dirname(filename)
       dir = '.' == dir ? '' : dir
 
@@ -87,8 +98,37 @@ module Webby::Resources
       raise Webby::Error, "could not find layout #{filename.inspect}"
     end
 
-  end  # class << self
+    # Returns the directory component of the _filename_ with the content
+    # directory removed from the beginning if it is present.
+    #
+    def dirname( filename )
+      rgxp = %r/\A(?:#{::Webby.site.content_dir}|#{::Webby.site.layout_dir})\//o
+      dirname = ::File.dirname(filename)
+      dirname << '/' if dirname.index(?/) == nil
+      dirname.sub(rgxp, '')
+    end
+
+    # Returns the last component of the _filename_ with any extension
+    # information removed.
+    #
+    def basename( filename )
+      ::File.basename(filename, '.*')
+    end
+
+    # Returns the extension (the portion of file name in path after the
+    # period). This method excludes the period from the extension name.
+    #
+    def extname( filename )
+      ::File.extname(filename).tr('.', '')
+    end
 
+    # :stopdoc:
+    def logger
+      @logger ||= ::Logging::Logger[self]
+    end
+    # :startdoc:
+
+  end  # class << self
 end  # module Webby::Resources
 
 Webby.require_all_libs_relative_to(__FILE__)

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/lib/webby.rb

@@ -18,9 +18,10 @@ Logging::Appender.stdout.layout = Logging::Layouts::Pattern.new(
 module Webby
 
   # :stopdoc:
-  VERSION = '0.9.0'   # :nodoc:
+  VERSION = '0.9.1'   # :nodoc:
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
+  YAML_SEP = '---'
   # :startdoc:
 
   class Error < StandardError; end  # :nodoc:

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 }

data/spec/data/content/css/site.css

@@ -0,0 +1,67 @@
+---
+extension: css
+filter:    erb
+layout:    nil   # no layout
+
+color:
+  border:      "#ddd"
+  header:      "#111"
+  link:        "#125AA7"
+  link-hover:  "#000"
+  blockquote:  "#666"
+  box-bg:      "#eee"
+  highlight:   "#B2CCFF"
+  quiet:       "#666"
+  alt:         "#666"
+---
+
+body {
+  font-family: Verdana, "Bitstream Vera Sans", sans-serif;
+}
+
+/* Headings
+ * --------------------------------------------------------------------- */
+h1,h2,h3,h4,h5,h6 { color: <%= @page.color['header'] %>; }
+
+/* Text Elements
+ * --------------------------------------------------------------------- */
+a                 { color: <%= @page.color['link'] %>; }
+a:hover           { color: <%= @page.color['link-hover'] %>; }
+blockquote        { color: <%= @page.color['blockquote'] %>; }
+
+pre {
+  background: <%= @page.color['box-bg'] %>;
+  border:     1px solid <%= @page.color['border'] %>;
+}
+
+hr {
+  background: <%= @page.color['highlight'] %>;
+  color:      <%= @page.color['highlight'] %>;
+}
+
+/* Tables
+ * --------------------------------------------------------------------- */
+table {
+  border-top:     1px solid <%= @page.color['border'] %>;
+  border-left:    1px solid <%= @page.color['border'] %>;
+}
+th,td {
+  border-bottom:  1px solid <%= @page.color['border'] %>;
+  border-right:   1px solid <%= @page.color['border'] %>;
+}
+
+/* Default Classes
+ * --------------------------------------------------------------------- */
+p.quiet { color: <%= @page.color['quiet'] %>; }
+.alt    { color: <%= @page.color['alt'] %>; }
+
+p.title {
+  color: #111;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 2em;
+  margin-bottom: 0.75em;
+}
+
+#header p.title { font-size: 3em; line-height: 1; margin-bottom: 0.5em; }
+
+/* EOF */

data/spec/data/content/css/tumblog.css

@@ -0,0 +1,308 @@
+---
+extension: css
+filter:    sass
+layout:    nil   # no layout
+sass_options:
+  :style: :expanded
+---
+!background  = #FFF
+!text        = #000
+!border      = #CCC
+!header      = #6498CC
+!link        = #6498CC
+!link_hover  = #000
+!blockquote  = #666
+!code        = #000
+!box_bg      = #EEE
+!highlight   = #6498CC
+!quiet       = #666
+!alt         = #666
+
+!title       = #444
+!description = #777
+!date        = #CCC
+!date_brick  = #BBD5F1
+
+body
+  :margin                  0px
+  :background-color =      !background
+  :font-family             Verdana, Geneva, Arial, sans-serif
+
+a
+  :color =                 !link
+  :text-decoration         none
+  &:hover
+    :text-decoration       underline
+
+h1
+  :width                   600px
+  :padding                 0px 100px 20px 100px
+  :margin                  50px auto 40px auto
+  :border-bottom =         solid 1px !border
+  :text-align              center
+  :font                    Bold 55px 'Trebuchet MS', Geneva, Arial, sans-serif
+  :letter-spacing          -2px
+  :line-height             50px
+  :position                relative
+
+  a
+    :color =               !title
+    :text-decoration       none
+    &:hover
+      :text-decoration     none
+
+  img
+    :border-width          0px
+    :position              absolute
+    :right                 0px
+    :bottom                10px
+    :width                 43px
+    :height                23px
+
+
+div#content
+  :width                   420px
+  :margin                  auto
+  :position                relative
+
+div#description
+  :position                absolute
+  :right                   -170px
+  :width                   160px
+  :text-align              right
+  :font                    Normal 17px Verdana, Geneva, Arial, sans-serif
+  :line-height             20px
+  :color =                 !description
+
+  a
+    :color =               !description
+    :text-decoration       underline
+
+div.post
+  :position                relative
+  :margin-bottom           40px
+  :padding-right           20px
+
+  div.date
+    :position              absolute
+    :left                  -260px
+    :text-align            right
+    :width                 230px
+    :white-space           nowrap
+    :font                  Normal 34px Verdana, Geneva, Arial, sans-serif
+    :letter-spacing        -2px
+    :color =               !date
+    :text-transform        uppercase
+    :line-height           35px
+
+    div.date_brick
+      :float               right
+      :height              30px
+      :width               45px
+      :background-color =  !highlight
+      :color =             !date_brick
+      :font                Bold 12px Verdana, Geneva, Arial, sans-serif
+      :text-align          center
+      :line-height         12px
+      :margin-left         10px
+      :padding-top         5px
+      :letter-spacing      0px
+      :overflow            hidden
+
+  img.permalink
+    :width                 14px
+    :height                13px
+    :border-width          0px
+    :background-color      #000
+    :display               none
+    :position              absolute
+    :right                 0px
+    :top                   0px
+    :z-index               10
+   
+  &:hover
+    img.permalink
+      :display             inline
+
+  h2
+    :font                  Bold 18px 'Trebuchet MS', Geneva, Arial, sans-serif
+    :color                 #6498CC
+    :letter-spacing        -1px
+    :margin                0px 0px 5px 0px
+
+    a
+      :color               #6498CC
+      :text-decoration     none
+  
+  div.caption
+    :font-size             14px
+    :font-weight           bold
+    :color                 #444
+    :margin-top            10px
+    :padding               0px 20px 0px 20px
+
+    a
+      :color               #444
+
+// Regular Post
+            
+  div.regular
+    :font-size             12px
+    :color                 #444
+    :line-height           17px
+
+    h2
+      :font-size           36px
+      :line-height         34px
+  
+    blockquote
+      :font-style          italic
+      :border-left         solid 2px #444
+      :padding-left        10px
+                        
+// Quote Post
+
+  div.quote
+    h2
+      :font-size           36px
+      :line-height         34px
+      a
+        :color             #6498CC
+
+    p
+      :font                Bold 28px Helvetica, sans-serif
+      :letter-spacing      -1px
+      :color               #666
+
+    a
+      :color               #666
+
+    big
+      :font                Bold 60px Georgia, serif
+      :line-height         8px
+      :vertical-align      -20px
+
+    span.source
+      :font                Bold 16px Verdana, Geneva, Arial, sans-serif
+      :color               #444
+      :letter-spacing      -1px
+
+      a
+        :color             #444
+  
+  div.source
+    :font-size             16px
+    :font-weight           Bold
+    :color                 #555
+    :margin-top            5px
+  
+    a
+      :color               #555
+
+// Link Post
+            
+  div.link
+    h2
+      :font-size           36px
+      :line-height         34px
+
+    a.link
+      :font                Bold 20px Verdana, Geneva, Arial, sans-serif
+      :letter-spacing      -1px
+      :color               #C00
+  
+    span.description
+      :font-size           13px
+      :font-weight         normal
+      :letter-spacing      -1px
+      :color               #444
+            
+// Conversation Post
+                        
+  div.conversation
+    ul
+      :list-style-type     none
+      :margin              0px
+      :padding             0px 0px 0px 1px
+  
+      li
+        :font-size         12px
+        :padding           4px 10px 4px 8px
+        :color             #444
+        :margin-bottom     1px
+  
+        span.label
+          :font-weight     bold
+          
+        span.user_1
+          :color           #C00
+              
+        span.user_2
+          :color           #00C
+              
+        span.user_3
+          :color           #0A0
+          
+      li.odd
+        :background-color  #F4F4F4
+  
+      li.even
+        :background-color  #E8E8E8
+
+    h2
+      :font-size           36px
+      :line-height         34px
+      :position            relative
+      :top                 -4px
+      :margin-top          0px
+      :padding-top         0px
+
+// Photo Post
+
+  div.photo
+    h2
+      :font-size           36px
+      :line-height         34px
+
+    p.caption
+      :font-size           11px
+      :color               #444
+      :margin-top          5px
+      a
+        :color             #444
+
+// Video Post
+            
+  div.video
+    :width                 400px
+    :margin                auto
+
+    h2
+      :font-size           36px
+      :line-height         40px
+      :letter-spacing      -1px
+      :font-weight         Bold
+      :font-family         'Trebuchet MS', Geneva, Arial, sans-serif
+      :margin              0px 0px 5px 0px
+
+// Footer
+            
+div#footer
+  :margin                  40px 0px 30px 0px
+  :text-align              center
+  :font-size               15px
+  :font-weight             bold
+  :color                   #444
+
+  a
+    :text-decoration       none
+    :color                 #444
+
+    &:hover
+      :text-decoration     underline
+    
+  div#credit
+    :font                  Normal 13px Verdana, Geneva, Arial, sans-serif
+    :margin-top            15px
+
+// EOF