RubyGems - webby - Versions diffs - 0.8.2 → 0.8.3 - Mend

webby 0.8.2 → 0.8.3

Files changed (123) hide show

data/History.txt +20 -0
data/Manifest.txt +46 -2
data/Rakefile +4 -3
data/bin/webby +1 -1
data/data/Rakefile +0 -1
data/data/content/css/blueprint/plugins/buttons/icons/cross.png +0 -0
data/data/content/css/blueprint/plugins/buttons/icons/key.png +0 -0
data/data/content/css/blueprint/plugins/buttons/icons/tick.png +0 -0
data/data/content/s5/blank.gif +0 -0
data/data/content/s5/bodybg.gif +0 -0
data/data/content/s5/framing.css +23 -0
data/data/content/s5/iepngfix.htc +42 -0
data/data/content/s5/opera.css +7 -0
data/data/content/s5/outline.css +15 -0
data/data/content/s5/pretty.css +86 -0
data/data/content/s5/print.css +1 -0
data/data/content/s5/s5-core.css +9 -0
data/data/content/s5/slides.css +3 -0
data/data/content/s5/slides.js +553 -0
data/data/lib/breadcrumbs.rb +0 -0
data/data/tasks/blog.rake +71 -0
data/data/tasks/build.rake +27 -0
data/data/tasks/create.rake +19 -1
data/data/tasks/deploy.rake +2 -2
data/data/tasks/setup.rb +4 -1
data/data/templates/atom_feed.erb +20 -13
data/data/templates/page.erb +1 -1
data/data/templates/presentation.erb +40 -0
data/examples/presentation/Rakefile +14 -0
data/examples/presentation/content/_sample_code.txt +10 -0
data/examples/presentation/content/css/uv/twilight.css +137 -0
data/examples/presentation/content/index.txt +63 -0
data/examples/presentation/content/s5/blank.gif +0 -0
data/examples/presentation/content/s5/bodybg.gif +0 -0
data/examples/presentation/content/s5/framing.css +23 -0
data/examples/presentation/content/s5/iepngfix.htc +42 -0
data/examples/presentation/content/s5/opera.css +7 -0
data/examples/presentation/content/s5/outline.css +15 -0
data/examples/presentation/content/s5/pretty.css +86 -0
data/examples/presentation/content/s5/print.css +1 -0
data/examples/presentation/content/s5/s5-core.css +9 -0
data/examples/presentation/content/s5/slides.css +3 -0
data/examples/presentation/content/s5/slides.js +553 -0
data/examples/presentation/layouts/presentation.rhtml +43 -0
data/examples/presentation/tasks/blog.rake +71 -0
data/examples/presentation/tasks/build.rake +27 -0
data/examples/presentation/tasks/create.rake +22 -0
data/examples/presentation/tasks/deploy.rake +22 -0
data/examples/presentation/tasks/growl.rake +12 -0
data/examples/presentation/tasks/heel.rake +28 -0
data/examples/presentation/tasks/setup.rb +17 -0
data/examples/presentation/tasks/validate.rake +19 -0
data/examples/presentation/templates/_partial.erb +13 -0
data/examples/presentation/templates/presentation.erb +40 -0
data/examples/webby/Rakefile +3 -2
data/examples/webby/content/css/blueprint/screen.css +1 -1
data/examples/webby/content/css/coderay.css +0 -15
data/examples/webby/content/css/site.css +18 -13
data/examples/webby/content/css/uv/twilight.css +137 -0
data/examples/webby/content/index.txt +6 -10
data/examples/webby/content/manual/index.txt +83 -122
data/examples/webby/content/reference/index.txt +161 -16
data/examples/webby/content/script/jquery.js +1 -1
data/examples/webby/content/tips_and_tricks/index.txt +1 -1
data/examples/webby/content/tutorial/index.txt +1 -1
data/examples/webby/layouts/default.rhtml +2 -7
data/examples/webby/tasks/blog.rake +71 -0
data/examples/webby/tasks/build.rake +27 -0
data/examples/webby/tasks/create.rake +19 -1
data/examples/webby/tasks/deploy.rake +2 -2
data/examples/webby/tasks/setup.rb +4 -20
data/examples/webby/templates/page.erb +1 -1
data/lib/webby.rb +30 -5
data/lib/webby/auto_builder.rb +0 -2
data/lib/webby/builder.rb +51 -5
data/lib/webby/filters.rb +3 -3
data/lib/webby/filters/basepath.rb +7 -7
data/lib/webby/filters/erb.rb +0 -2
data/lib/webby/filters/haml.rb +0 -2
data/lib/webby/filters/markdown.rb +0 -2
data/lib/webby/filters/outline.rb +43 -2
data/lib/webby/filters/sass.rb +0 -2
data/lib/webby/filters/slides.rb +56 -0
data/lib/webby/filters/textile.rb +0 -2
data/lib/webby/filters/tidy.rb +0 -2
data/lib/webby/helpers.rb +0 -2
data/lib/webby/helpers/capture_helper.rb +141 -0
data/lib/webby/helpers/coderay_helper.rb +5 -16
data/lib/webby/helpers/graphviz_helper.rb +6 -18
data/lib/webby/helpers/tag_helper.rb +0 -2
data/lib/webby/helpers/tex_img_helper.rb +5 -16
data/lib/webby/helpers/ultraviolet_helper.rb +11 -22
data/lib/webby/helpers/url_helper.rb +2 -4
data/lib/webby/link_validator.rb +0 -2
data/lib/webby/main.rb +0 -2
data/lib/webby/renderer.rb +163 -37
data/lib/webby/resources.rb +0 -2
data/lib/webby/resources/db.rb +37 -27
data/lib/webby/resources/file.rb +0 -2
data/lib/webby/resources/layout.rb +0 -2
data/lib/webby/resources/page.rb +4 -9
data/lib/webby/resources/partial.rb +1 -3
data/lib/webby/resources/resource.rb +10 -2
data/lib/webby/resources/static.rb +0 -2
data/lib/webby/stelan/mktemp.rb +0 -2
data/lib/webby/stelan/spawner.rb +0 -2
data/lib/webby/utils.rb +0 -2
data/spec/spec_helper.rb +1 -4
data/spec/webby/helpers/capture_helper_spec.rb +56 -0
data/spec/webby/resources/file_spec.rb +0 -1
data/tasks/ann.rake +7 -4
data/tasks/bones.rake +2 -2
data/tasks/gem.rake +26 -14
data/tasks/notes.rake +11 -5
data/tasks/post_load.rake +4 -2
data/tasks/rdoc.rake +4 -2
data/tasks/rubyforge.rake +3 -3
data/tasks/setup.rb +24 -9
data/tasks/spec.rake +1 -1
data/tasks/website.rake +1 -1
metadata +51 -7
data/lib/webby/webby_task.rb +0 -134
data/tasks/svn.rake +0 -45

data/examples/webby/content/script/jquery.js CHANGED

@@ -5,7 +5,7 @@
  * Dual licensed under the MIT (MIT-LICENSE.txt)
  * and GPL (GPL-LICENSE.txt) licenses.
  *
- * $Date: 2008-01-26 20:30:10 -0700 (Sat, 26 Jan 2008) $
+ * $Date$
  * $Rev: 4454 $
  */
 (function(){if(window.jQuery)var _jQuery=window.jQuery;var jQuery=window.jQuery=function(selector,context){return new jQuery.prototype.init(selector,context);};if(window.$)var _$=window.$;window.$=jQuery;var quickExpr=/^[^<]*(<(.|\s)+>)[^>]*$|^#(\w+)$/;var isSimple=/^.[^:#\[\.]*$/;jQuery.fn=jQuery.prototype={init:function(selector,context){selector=selector||document;if(selector.nodeType){this[0]=selector;this.length=1;return this;}else if(typeof selector=="string"){var match=quickExpr.exec(selector);if(match&&(match[1]||!context)){if(match[1])selector=jQuery.clean([match[1]],context);else{var elem=document.getElementById(match[3]);if(elem)if(elem.id!=match[3])return jQuery().find(selector);else{this[0]=elem;this.length=1;return this;}else

data/examples/webby/content/tips_and_tricks/index.txt CHANGED

@@ -28,7 +28,7 @@ filter:
 h2. <%= h(@page.title) %>
 <%
-  articles = @pages.find(:limit => :all, :in_directory => "articles",
+  articles = @pages.find(:all, :in_directory => "articles",
                          :sort_by => "mtime", :reverse => true)
   paginate(articles, 10) do |page|
 %>

data/examples/webby/content/tutorial/index.txt CHANGED

@@ -72,7 +72,7 @@ The content of this page is not HTML, but it ends up that way. How? Webby uses _
 The erb filter (erb stands for "embedded Ruby") allows Webby to process Ruby statements found in the page text and to substitute the output of those Ruby statements back into the page text. The Ruby statements appear between @<%= ruby_code %>@ delimiters. The meta-data found at the top of the page is made available through the @@page@ object. You can see from the index.txt file that the page title, "Home Page", will be substituted on the first line.
-The textile filter operates on all page text. It is a human readable markup that gets converted into HTML. For example, the line <notextile><code>h3.&nbsp;Litora&nbsp;Sociis</code></notextile> will be converted into @<h3>Litora Sociis</h3>@ by the textile filter. It is a powerful markup language that simplifies web publishing.
+The textile filter operates on all page text. It is a human readable markup that gets converted into HTML. For example, the line <notextile><code>h2.&nbsp;Litora&nbsp;Sociis</code></notextile> will be converted into @<h2>Litora Sociis</h2>@ by the textile filter. It is a powerful markup language that simplifies web publishing.
 Okay, back to our regularly scheduled page changes. Go ahead and change the title of the page in the meta-data. Then run rake again.

data/examples/webby/layouts/default.rhtml CHANGED

@@ -14,18 +14,13 @@ filter:
    <title>Webby :: <%= h(@page.title) %></title>
    <meta name="author" content="<%= h(@page.author) %>" />
-   <!--- Blueprint CSS Framework -->
-   <link rel="stylesheet" href="/css/blueprint/screen.css" type="text/css" media="screen, projection" />
    <link rel="stylesheet" href="/css/blueprint/print.css" type="text/css" media="print" />
-   <!-- Coderay -->
-   <link rel="stylesheet" href="/css/coderay.css" type="text/css" media="screen, projection" />
-   <!-- Homepage CSS -->
    <link rel="stylesheet" href="/css/site.css" type="text/css" media="screen, projection" />
    <script type="text/javascript" src="/script/jquery.js"></script>
    <script type="text/javascript" src="/script/jquery.corner.js"></script>
+   <%= @page.content_for_head %>
 </head>
 <body>

data/examples/webby/tasks/blog.rake ADDED

@@ -0,0 +1,71 @@
+namespace :blog do
+  # iterate over all the files in the "templates/blog" folder and create a
+  # rake task corresponding to each file found
+  FileList["#{Webby.site.template_dir}/blog/*"].each do |template|
+    next unless test(?f, template)
+    name = template.pathmap('%n')
+    next if name =~ %r/^(month|year)$/  # skip month/year blog entries
+    desc "Create a new blog #{name}"
+    task name => [:create_year_index, :create_month_index] do |t|
+      page, title, dir = Webby::Builder.new_page_info(t)
+      # if no directory was given use the default blog directory (underneath
+      # the content directory)
+      dir = Webby.site.blog_dir if dir.empty?
+      dir = File.join(dir, Time.now.strftime('%Y/%m/%d'))
+      page = File.join(dir, File.basename(page))
+      page = Webby::Builder.create(page, :from => template,
+                 :locals => {:title => title, :directory => dir})
+      exec(::Webby.editor, page) unless ::Webby.editor.nil?
+    end
+  end  # each
+  # this task is used to create the year index file (blog/2008/index.txt)
+  task :create_year_index do |t|
+    # parse out information about the page to create
+    _, _, dir = Webby::Builder.new_page_info(t)
+    year = Time.now.strftime '%Y'
+    # if no directory was given use the default blog directory (underneath
+    # the content directory)
+    dir = Webby.site.blog_dir if dir.empty?
+    dir = File.join(dir, year)
+    # determine the filename and template name
+    fn = File.join(dir, 'index.txt')
+    tmpl = Dir.glob(File.join(Webby.site.template_dir, 'blog/year.*')).first.to_s
+    if test(?f, tmpl) and not test(?f, File.join(Webby.site.content_dir, fn))
+      Webby::Builder.create(fn, :from => tmpl,
+          :locals => {:title => year, :directory => dir})
+    end
+  end
+  # this task is used to create the month index file (blog/2008/04/index.txt)
+  task :create_month_index do |t|
+    # parse out information about the page to create
+    _, _, dir = Webby::Builder.new_page_info(t)
+    now = Time.now
+    # if no directory was given use the default blog directory (underneath
+    # the content directory)
+    dir = Webby.site.blog_dir if dir.empty?
+    dir = File.join(dir, now.strftime('%Y/%m'))
+    # determine the filename and template name
+    fn = File.join(dir, 'index.txt')
+    tmpl = Dir.glob(File.join(Webby.site.template_dir, 'blog/month.*')).first.to_s
+    if test(?f, tmpl) and not test(?f, File.join(Webby.site.content_dir, fn))
+      Webby::Builder.create(fn, :from => tmpl,
+          :locals => {:title => year, :directory => dir})
+    end
+  end
+end  # namespace :blog
+# EOF

data/examples/webby/tasks/build.rake ADDED

@@ -0,0 +1,27 @@
+task :configure_basepath do
+  Webby.site.base = ENV['BASE'] if ENV.has_key?('BASE')
+end
+desc "Build the website"
+task :build => :configure_basepath do |t|
+  Webby::Builder.run
+end
+desc "Rebuild the website"
+task :rebuild => :configure_basepath do |t|
+  Webby::Builder.run :rebuild => true
+end
+desc "Continuously build the website"
+task :autobuild => :configure_basepath do |t|
+  Webby::AutoBuilder.run
+end
+desc "Delete the website"
+task :clobber do |t|
+  rm_rf Webby.site.output_dir
+  mkdir Webby.site.output_dir
+end
+# EOF

data/examples/webby/tasks/create.rake CHANGED

@@ -1,4 +1,22 @@
-Rake::WebbyTask.new
+namespace :create do
+  FileList["#{Webby.site.template_dir}/*"].each do |template|
+    next unless test(?f, template)
+    name = template.pathmap '%n'
+    # if the file is a partial template
+    name = $1 if name =~ %r/^_(.*)/
+    desc "Create a new #{name}"
+    task name do |t|
+      page, title, dir = Webby::Builder.new_page_info(t)
+      page = Webby::Builder.create(page, :from => template,
+                 :locals => {:title => title, :directory => dir})
+      exec(::Webby.editor, page) unless ::Webby.editor.nil?
+    end
+  end  # each
+end  # namespace :create
 # EOF

data/examples/webby/tasks/deploy.rake CHANGED

@@ -6,14 +6,14 @@ namespace :deploy do
   desc 'Deploy to the server using rsync'
   task :rsync do
     cmd = "rsync #{SITE.rsync_args.join(' ')} "
-    cmd << "#{SITE.output_dir}/ #{SITE.host}:#{SITE.remote_dir}"
+    cmd << "#{SITE.output_dir}/ #{SITE.user}@#{SITE.host}:#{SITE.remote_dir}"
     sh cmd
   end
   desc 'Deploy to the server using ssh'
   task :ssh do
     Rake::SshDirPublisher.new(
-        SITE.host, SITE.remote_dir, SITE.output_dir
+        "#{SITE.user}@#{SITE.host}", SITE.remote_dir, SITE.output_dir
     ).upload
   end

data/examples/webby/tasks/setup.rb CHANGED

@@ -8,26 +8,10 @@ end
 SITE = Webby.site
-# Webby defaults
-SITE.content_dir   = 'content'
-SITE.output_dir    = 'output'
-SITE.layout_dir    = 'layouts'
-SITE.template_dir  = 'templates'
-SITE.exclude       = %w[tmp$ bak$ ~$ CVS \.svn]
-SITE.page_defaults = {
-  'layout' => 'default'
-}
-# Items used to deploy the webiste
-SITE.host       = 'user@hostname.tld'
-SITE.remote_dir = '/not/a/valid/dir'
-SITE.rsync_args = %w(-av --delete)
-# Options passed to the 'tidy' program when the tidy filter is used
-SITE.tidy_options = '-indent -wrap 80'
 # Load the other rake files in the tasks folder
-Dir.glob('tasks/*.rake').sort.each {|fn| import fn}
+Dir.glob(::File.join(%w[tasks *.rake])).sort.each {|fn| import fn}
+# Load all the ruby files in the lib folder
+Dir.glob(::File.join(%w[lib ** *.rb])).sort.each {|fn| require fn}
 # EOF

data/examples/webby/templates/page.erb CHANGED

@@ -1,5 +1,5 @@
 ---
-title:      New Page
+title:      <%= title %>
 created_at: <%= Time.now.to_y %>
 filter:
   - erb

data/lib/webby.rb CHANGED

@@ -1,5 +1,3 @@
-# $Id: webby.rb 198 2008-03-10 15:25:55Z tim_pease $
 # Equivalent to a header guard in C/C++
 # Used to prevent the spec helper from being loaded more than once
 unless defined? ::Webby
@@ -20,7 +18,7 @@ Logging::Appender.stdout.layout = Logging::Layouts::Pattern.new(
 module Webby
   # :stopdoc:
-  VERSION = '0.8.2'   # :nodoc:
+  VERSION = '0.8.3'   # :nodoc:
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   # :startdoc:
@@ -48,14 +46,16 @@ module Webby
       :find_by       => 'title',
       :base          => nil,
       :create_mode   => 'page',
+      :blog_dir      => 'blog',
       # Items for running the heel webserver
       :heel_port => 4331,
       # Items used to deploy the website
-      :host       => 'user@hostname.tld',
+      :user       => ENV['USER'] || ENV['USERNAME'],
+      :host       => 'example.com',
       :remote_dir => '/not/a/valid/dir',
-      :rsync_args => %w(-av --delete),
+      :rsync_args => %w(-av),
       # Options passed to the 'tidy' program when the tidy filter is used
       :tidy_options => '-indent -wrap 80',
@@ -126,6 +126,19 @@ module Webby
     @exclude ||= Regexp.new(site.exclude.join('|'))
   end
+  # call-seq:
+  #    Webby.editor    => string or nil
+  #
+  # Returns the default editor to use when creating new pages. This editor
+  # will be spawned to allow the user to edit the newly created page.
+  #
+  def self.editor
+    return @editor if defined? @editor
+    @editor = if ENV['EDITOR'].nil? or ENV['EDITOR'].empty? then nil
+              else ENV['EDITOR'] end
+  end
   # call-seq:
   #    cairn    => filename
   #
@@ -168,6 +181,18 @@ module Webby
     Dir.glob(search_me).sort.each {|rb| require rb}
   end
+  # Prints a deprecation warning using the logger. The message states that
+  # the given method is being deprecated. An optional message can be give to
+  # -- somthing nice and fuzzy about a new method or why this one has to go
+  # away; sniff, we'll miss you little buddy.
+  #
+  def self.deprecated( method, message = nil )
+    msg = "'#{method}' has been deprecated"
+    msg << "\n\t#{message}" unless message.nil?
+    Logging::Logger['Webby'].warn msg
+  end
 end  # module Webby

data/lib/webby/auto_builder.rb CHANGED

@@ -1,5 +1,3 @@
-# $Id: auto_builder.rb 167 2008-02-24 00:59:54Z tim_pease $
 require 'directory_watcher'
 module Webby

data/lib/webby/builder.rb CHANGED

@@ -1,5 +1,3 @@
-# $Id: builder.rb 192 2008-03-08 16:27:29Z tim_pease $
 require 'find'
 require 'fileutils'
 require 'erb'
@@ -26,7 +24,7 @@ class Builder
     end
     # call-seq:
-    #    Builder.create( page, :from => template )
+    #    Builder.create( page, :from => template, :locals => {} )
     #
     # This mehod is used to create a new _page_ in the content folder based
     # on the specified template. _page_ is the relative path to the new page
@@ -36,15 +34,63 @@ class Builder
     def create( page, opts = {} )
       tmpl = opts[:from]
       raise Error, "template not given" unless tmpl
+      name = ::Webby::Resources::File.basename(page)
+      ext  = ::Webby::Resources::File.extname(page)
+      dir  = ::File.dirname(page)
+      dir  = '' if dir == '.'
+      if tmpl.pathmap('%n') =~ %r/^_/
+        page = ::File.join(::Webby.site.content_dir, dir, '_'+name)
+        page << '.' << (ext.empty? ? 'txt' : ext)
+      elsif ::Webby.site.create_mode == 'directory' and name != 'index'
+        page = ::File.join(::Webby.site.content_dir, dir, name, 'index')
+        page << '.' << (ext.empty? ? 'txt' : ext)
+      else
+        page = ::File.join(::Webby.site.content_dir, page)
+        page << '.txt' if ext.empty?
+      end
       raise Error, "#{page} already exists" if test ?e, page
       Logging::Logger[self].info "creating #{page}"
       FileUtils.mkdir_p ::File.dirname(page)
-      str = ERB.new(::File.read(tmpl), nil, '-').result
+      context = scope
+      opts[:locals].each do |k,v|
+        Thread.current[:value] = v
+        definition = "#{k} = Thread.current[:value]"
+        eval(definition, context)
+      end if opts.has_key?(:locals)
+      str = ERB.new(::File.read(tmpl), nil, '-').result(context)
       ::File.open(page, 'w') {|fd| fd.write str}
-      return nil
+      page
+    end
+    # call-seq:
+    #    Builder.new_page_info( task )    => [page, title, directory]
+    #
+    def new_page_info( task )
+      return @new_page_info if defined? @new_page_info
+      raise "Usage:  rake #{ARGV.first} path" unless ARGV.length > 1
+      page  = task.application.top_level_tasks.slice!(1..-1).join('-')
+      title = ::Webby::Resources::File.basename(page).
+                  split('-').map {|w| w.capitalize}.join(' ')
+      dir = ::File.dirname(page)
+      dir = '' if dir == '.'
+      @new_page_info = [page, title, dir]
     end
+    private
+    # Returns the binding in the scope of the Builder class object.
+    #
+    def scope() binding end
   end  # class << self
   # call-seq:

data/lib/webby/filters.rb CHANGED

@@ -1,5 +1,3 @@
-# $Id: filters.rb 179 2008-02-29 04:47:19Z tim_pease $
 module Webby
 module Filters
@@ -44,9 +42,11 @@ module Filters
         @filters = Array(page.filter)
         @log = Logging::Logger[Webby::Renderer]
         @processed = 0
+        @prev_cursor = nil
       end
       def start_for(input)
+        @prev_cursor = @renderer.instance_variable_get(:@_cursor)
         @renderer.instance_variable_set(:@_cursor, self)
         filters.inject(input) do |result, filter|
           handler = Filters[filter]
@@ -54,7 +54,7 @@ module Filters
           handle(filter, handler, *args)
         end
       ensure
-        @renderer.instance_variable_set(:@_cursor, nil)
+        @renderer.instance_variable_set(:@_cursor, @prev_cursor)
       end
       # The list of filters yet to be processed

data/lib/webby/filters/basepath.rb CHANGED

@@ -1,5 +1,3 @@
-# $Id: basepath.rb 99 2008-01-13 02:38:23Z tim_pease $
 require 'hpricot'
 module Webby
@@ -37,13 +35,15 @@ module Filters
 class BasePath
   # call-seq:
-  #    BasePath.new( html )
+  #    BasePath.new( html, mode )
   #
   # Creates a new BasePath filter that will operate on the given _html_
-  # string.
+  # string. The _mode_ is either 'xml' or 'html' and determines how Hpricot
+  # will handle the parsing of the input string.
   #
-  def initialize( str )
+  def initialize( str, mode )
     @str = str
+    @mode = mode.downcase.to_sym
   end
   # call-seq:
@@ -64,7 +64,7 @@ class BasePath
   #     <a href="/some/other/directory/link/to/another/page.html">Page</a>
   #
   def filter
-    doc = Hpricot(@str)
+    doc = @mode == :xml ? Hpricot.XML(@str) : Hpricot(@str)
     base_path = ::Webby.site.base
     attr_rgxp = %r/\[@(\w+)\]$/o
     sub_rgxp = %r/\A(?=\/)/o
@@ -87,7 +87,7 @@ end  # class BasePath
 # Rewrite base URIs in the input HTML text.
 #
 register :basepath do |input, cursor|
-  if ::Webby.site.base then BasePath.new(input).filter
+  if ::Webby.site.base then BasePath.new(input, cursor.page.extension).filter
   else input end
 end