webby 0.8.3 → 0.8.4

data/History.txt

@@ -1,3 +1,10 @@
+== 0.8.4 / 2008-06-03
+
+* 1 minor improvement
+  - Global defaults for HAML and SASS [Dag Odenhall]
+* 1 bug fix
+  - Added the blog templates to the package
+
 == 0.8.3 / 2008-06-02
 
 * 2 major enhancements

data/Manifest.txt

@@ -52,6 +52,9 @@ data/tasks/setup.rb
 data/tasks/validate.rake
 data/templates/_partial.erb
 data/templates/atom_feed.erb
+data/templates/blog/month.erb
+data/templates/blog/post.erb
+data/templates/blog/year.erb
 data/templates/page.erb
 data/templates/presentation.erb
 examples/presentation/Rakefile

data/Rakefile

@@ -15,7 +15,7 @@ PROJ.url = 'http://webby.rubyforge.org/'
 PROJ.description = paragraphs_of('README.txt', 3).join("\n\n")
 PROJ.rubyforge.name = 'webby'
 PROJ.version = Webby::VERSION
-PROJ.release_name = 'Teetering Toddler'
+PROJ.release_name = 'Forgetful Foobar'
 
 PROJ.ruby_opts = %w[-W0]
 PROJ.exclude << %w(^examples/[^/]+/output ^tasks/archive ^tags$)
@@ -32,11 +32,6 @@ PROJ.ann.email[:server] = 'smtp.gmail.com'
 PROJ.ann.email[:port] = 587
 
 PROJ.ann.text = <<-ANN
-== FUN FACT
-
-La Paz, the capital city of Bolivia, is the highest capital in the
-world at over 17,000 feet (5,181 m).
- 
 == POST SCRIPT
 
 Visit the Webby forum to chat with other Webby-Heads:

data/data/templates/blog/month.erb

@@ -0,0 +1,22 @@
+---
+title:      <%= title %>
+created_at: <%= Time.now.to_y %>
+filter:     erb
+dirty:      true
+---
+<h2><%%= h(@page.title) %></h2>
+
+<%%
+  articles = @pages.find(:all, :in_directory => @page.dir, :recursive => true,
+    :sort_by => "created_at", :reverse => true)
+  articles.delete(@page)
+  paginate(articles, 10) do |page|
+-%>
+<div class="article">
+  <h1><%%= link_to_page(page) %><span class="date">(<%%= page.created_at.strftime('%Y-%m-%d') %>)</span></h1>
+
+  <div class="body">
+    <%%= render(page) %>
+  </div>
+</div>
+<%% end -%>

data/data/templates/blog/post.erb

@@ -0,0 +1,15 @@
+--- 
+title:      <%= title %>
+created_at: <%= Time.now.to_y %>
+filter:
+  - textile
+--- 
+Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nunc congue ipsum vestibulum libero. Aenean vitae justo. Nam eget tellus. Etiam convallis, est eu lobortis mattis, lectus tellus tempus felis, a ultricies erat ipsum at metus.
+
+h3. Litora Sociis
+
+Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi et risus. Aliquam nisl. Nulla facilisi. Cras accumsan vestibulum ante. Vestibulum sed tortor. Praesent tempus fringilla elit. Ut elit diam, sagittis in, nonummy in, gravida non, nunc. Ut orci. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Nam egestas, orci eu imperdiet malesuada, nisl purus fringilla odio, quis commodo est orci vitae justo. Aliquam placerat odio tincidunt nulla. Cras in libero. Aenean rutrum, magna non tristique posuere, erat odio eleifend nisl, non convallis est tortor blandit ligula. Nulla id augue.
+
+bq. Nullam mattis, odio ut tempus facilisis, metus nisl facilisis metus, auctor consectetuer felis ligula nec mauris. Vestibulum odio erat, fermentum at, commodo vitae, ultrices et, urna. Mauris vulputate, mi pulvinar sagittis condimentum, sem nulla aliquam velit, sed imperdiet mi purus eu magna. Nulla varius metus ut eros. Aenean aliquet magna eget orci. Class aptent taciti sociosqu ad litora.
+
+Vivamus euismod. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Suspendisse vel nibh ut turpis dictum sagittis. Aliquam vel velit a elit auctor sollicitudin. Nam vel dui vel neque lacinia pretium. Quisque nunc erat, venenatis id, volutpat ut, scelerisque sed, diam. Mauris ante. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Donec mattis. Morbi dignissim sollicitudin libero. Nulla lorem.

data/data/templates/blog/year.erb

@@ -0,0 +1,22 @@
+---
+title:      <%= title %>
+created_at: <%= Time.now.to_y %>
+filter:     erb
+dirty:      true
+---
+<h2><%%= h(@page.title) %></h2>
+
+<%%
+  articles = @pages.find(:all, :in_directory => @page.dir, :recursive => true,
+                         :sort_by => "created_at", :reverse => true)
+  articles.delete(@page)
+  paginate(articles, 10) do |page|
+-%>
+<div class="article">
+  <h1><%%= link_to_page(page) %><span class="date">(<%%= page.created_at.strftime('%Y-%m-%d') %>)</span></h1>
+
+  <div class="body">
+    <%%= render(page) %>
+  </div>
+</div>
+<%% end -%>

data/lib/webby/filters/haml.rb

@@ -2,7 +2,7 @@ try_require 'haml'
 
 # Render text via the Haml library
 Webby::Filters.register :haml do |input, cursor|
-  opts = cursor.page.haml_options || {}
+  opts = ::Webby.site.haml_options.merge(cursor.page.haml_options || {})
   b = cursor.renderer.get_binding
   Haml::Engine.new(input, opts).to_html(b)
 end

data/lib/webby/filters/sass.rb

@@ -2,7 +2,7 @@ try_require 'sass'
 
 # Render text via the Sass library (part of Haml)
 Webby::Filters.register :sass do |input, cursor|
-  opts = cursor.page.sass_options || {}
+  opts = ::Webby.site.sass_options.merge(cursor.page.sass_options || {})
   Sass::Engine.new(input, opts).render
 end
 

data/lib/webby.rb

@@ -18,7 +18,7 @@ Logging::Appender.stdout.layout = Logging::Layouts::Pattern.new(
 module Webby
 
   # :stopdoc:
-  VERSION = '0.8.3'   # :nodoc:
+  VERSION = '0.8.4'   # :nodoc:
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   # :startdoc:
@@ -57,6 +57,10 @@ module Webby
       :remote_dir => '/not/a/valid/dir',
       :rsync_args => %w(-av),
 
+      # Global options for HAML and SASS
+      :haml_options => {},
+      :sass_options => {},
+
       # Options passed to the 'tidy' program when the tidy filter is used
       :tidy_options => '-indent -wrap 80',
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: webby
 version: !ruby/object:Gem::Version 
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors: 
 - Tim Pease
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-02 00:00:00 -06:00
+date: 2008-06-03 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -131,6 +131,9 @@ files:
 - data/tasks/validate.rake
 - data/templates/_partial.erb
 - data/templates/atom_feed.erb
+- data/templates/blog/month.erb
+- data/templates/blog/post.erb
+- data/templates/blog/year.erb
 - data/templates/page.erb
 - data/templates/presentation.erb
 - examples/presentation/Rakefile