webby 0.6.0 → 0.7.0

data/lib/webby/resource.rb

@@ -1,4 +1,4 @@
-# $Id: resource.rb 61 2007-12-04 05:48:23Z tim_pease $
+# $Id: resource.rb 86 2008-01-01 22:14:55Z tim_pease $
 
 module Webby
 
@@ -21,6 +21,11 @@ module Webby
 #
 class Resource
 
+  instance_methods.each do |m|
+      undef_method(m) unless m =~ %r/\A__/ ||
+                             m == 'class'
+  end
+
   class << self
     # Returns the pages hash object.
     def pages
@@ -64,9 +69,9 @@ class Resource
   #
   def initialize( fn )
     @path     = fn.sub(%r/\A(?:\.\/|\/)/o, '').freeze
-    @dir      = ::File.dirname(@path).sub(%r/\A[^\/]+\/?/o, '')
-    @filename = ::File.basename(@path).sub(%r/\.\w+\z/o, '')
-    @ext      = ::File.extname(@path).sub(%r/\A\.?/o, '')
+    @dir      = Webby::File.dirname(@path)
+    @filename = Webby::File.basename(@path)
+    @ext      = Webby::File.extname(@path)
     @mtime    = ::File.mtime @path
 
     @number = nil
@@ -124,10 +129,11 @@ class Resource
 
     if @mdata.has_key? 'layout'
       lyt = self.class.layouts.find :filename => @mdata['layout']
-      return lyt.extension if lyt
+      ext = lyt ? lyt.extension : nil
+      return ext if ext
     end
 
-    @ext
+    return (is_layout? ? nil : @ext)
   end
 
   # call-seq:
@@ -165,6 +171,7 @@ class Resource
     return @url if defined? @url and @url
 
     @url = destination.sub(::Webby.site.output_dir, '')
+    @url = File.dirname(@url) if filename == 'index'
     @url
   end
 

data/lib/webby/utils.rb

@@ -1,4 +1,4 @@
-# $Id: utils.rb 51 2007-11-29 06:01:26Z tim_pease $
+# $Id: utils.rb 67 2007-12-09 00:49:26Z tim_pease $
 
 module Enumerable
   def injecting( initial )
@@ -19,6 +19,18 @@ class Hash
         end
     self.replace h
   end
+
+  def stringify_keys
+    h = {}
+    self.each {|k,v| h[k.to_s] = v}
+    return h
+  end
+
+  def symbolize_keys
+    h = {}
+    self.each {|k,v| h[k.to_sym] = v}
+    return h
+  end
 end
 
 # EOF

data/lib/webby/webby_task.rb

@@ -1,4 +1,4 @@
-# $Id: webby_task.rb 60 2007-12-04 05:05:50Z tim_pease $
+# $Id: webby_task.rb 86 2008-01-01 22:14:55Z tim_pease $
 
 begin
   require 'rake'
@@ -68,6 +68,12 @@ class WebbyTask < TaskLib
     task :autobuild 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
   end
 
   # Scans the templates directory for any files, and creats a corresponding

data/lib/webby.rb

@@ -1,20 +1,20 @@
-# $Id: webby.rb 60 2007-12-04 05:05:50Z tim_pease $
+# $Id: webby.rb 86 2008-01-01 22:14:55Z tim_pease $
 
 require 'logging'
 require 'ostruct'
 
 # Configure Webby to log to STDOUT at the 'info' level
+Logging::Logger['Webby'].level = :info
+Logging::Logger['Webby'].add(Logging::Appender.stdout)
 Logging::Appender.stdout.layout = Logging::Layouts::Pattern.new(
     :pattern      => "[%d] %5l: %m\n",    # [date] LEVEL: message
     :date_pattern => "%H:%M:%S"           # date == HH:MM:SS
 )
-Logging::Logger['Webby'].add(Logging::Appender.stdout)
-Logging::Logger['Webby'].level = :info
 
 
 module Webby
 
-  VERSION = '0.6.0'   # :nodoc:
+  VERSION = '0.7.0'   # :nodoc:
 
   # Path to the Webby package
   PATH = ::File.expand_path(::File.join(::File.dirname(__FILE__), '..'))
@@ -46,19 +46,23 @@ module Webby
   #
   def self.site
     return @site if defined? @site
-
-    @site = OpenStruct.new
-    @site.output_dir    = 'output'
-    @site.content_dir   = 'content'
-    @site.layout_dir    = 'layouts'
-    @site.template_dir  = 'templates'
-    @site.exclude       = %w(tmp$ bak$ ~$ CVS \.svn)
-    @site.page_defaults = {
-      'extension' => 'html',
-      'layout'    => 'default'
-    }
-
-    @site
+    @site = OpenStruct.new(
+      :output_dir    => 'output',
+      :content_dir   => 'content',
+      :layout_dir    => 'layouts',
+      :template_dir  => 'templates',
+      :exclude       => %w(tmp$ bak$ ~$ CVS \.svn),
+      :page_defaults => {
+        'layout'     => 'default'
+      },
+      :find_by       => 'title',
+      # Items used to deploy the webiste
+      :host       => 'user@hostname.tld',
+      :remote_dir => '/not/a/valid/dir',
+      :rsync_args => %w(-av --delete),
+      # Options passed to the 'tidy' program when the tidy filter is used
+      :tidy_options => '-indent -wrap 80'
+    )
   end
 
   # call-seq

data/spec/spec_helper.rb

@@ -1,12 +1,6 @@
-# $Id: spec_helper.rb 1 2007-08-18 21:39:50Z tim_pease $
+# $Id: spec_helper.rb 83 2007-12-30 02:22:02Z tim_pease $
 
-begin
-  require 'webby'
-rescue LoadError
-  path = File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
-  raise if $:.include? path
-  $: << path
-  retry
-end
+require File.expand_path(
+    File.join(File.dirname(__FILE__), '..', 'lib', 'webby'))
 
 # EOF

data/tasks/annotations.rake

@@ -0,0 +1,30 @@
+# $Id: annotations.rake 85 2008-01-01 20:37:31Z tim_pease $
+
+if HAVE_BONES
+
+desc "Enumerate all annotations"
+task :notes do
+  Bones::AnnotationExtractor.enumerate(
+      PROJ, "OPTIMIZE|FIXME|TODO", :tag => true)
+end
+
+namespace :notes do
+  desc "Enumerate all OPTIMIZE annotations"
+  task :optimize do
+    Bones::AnnotationExtractor.enumerate(PROJ, "OPTIMIZE")
+  end
+
+  desc "Enumerate all FIXME annotations"
+  task :fixme do
+    Bones::AnnotationExtractor.enumerate(PROJ, "FIXME")
+  end
+
+  desc "Enumerate all TODO annotations"
+  task :todo do
+    Bones::AnnotationExtractor.enumerate(PROJ, "TODO")
+  end
+end
+
+end  # if HAVE_BONES
+
+# EOF

data/tasks/doc.rake

@@ -1,4 +1,4 @@
-# $Id: doc.rake 51 2007-11-29 06:01:26Z tim_pease $
+# $Id: doc.rake 85 2008-01-01 20:37:31Z tim_pease $
 
 require 'rake/rdoctask'
 
@@ -38,6 +38,12 @@ namespace :doc do
 
 end  # namespace :doc
 
+desc 'Alias to doc:rdoc'
+task :doc => 'doc:rdoc'
+
+desc 'Remove all build products'
 task :clobber => %w(doc:clobber_rdoc doc:clobber_ri)
 
+remove_desc_for_task %w(doc:clobber_rdoc doc:clobber_ri)
+
 # EOF

data/tasks/gem.rake

@@ -1,4 +1,4 @@
-# $Id: gem.rake 52 2007-11-29 18:51:26Z tim_pease $
+# $Id: gem.rake 85 2008-01-01 20:37:31Z tim_pease $
 
 require 'rake/gempackagetask'
 
@@ -18,7 +18,6 @@ namespace :gem do
     PROJ.dependencies.each do |dep|
       s.add_dependency(*dep)
     end
-    s.add_dependency('rake', ">= #{RAKEVERSION}")
 
     s.files = PROJ.files
     s.executables = PROJ.executables.map {|fn| File.basename(fn)}
@@ -80,6 +79,11 @@ namespace :gem do
 
 end  # namespace :gem
 
+desc 'Alias to gem:package'
+task :gem => 'gem:package'
+
 task :clobber => 'gem:clobber_package'
 
+remove_desc_for_task %w(gem:clobber_package)
+
 # EOF

data/tasks/manifest.rake

@@ -1,18 +1,19 @@
-# $Id: manifest.rake 11 2007-08-23 15:45:16Z tim_pease $
+# $Id: manifest.rake 85 2008-01-01 20:37:31Z tim_pease $
 
 require 'find'
 
 namespace :manifest do
 
-  desc 'Verify the manfiest'
+  desc 'Verify the manifest'
   task :check do
     fn = 'Manifest.tmp'
     files = []
     exclude = Regexp.new(PROJ.exclude.join('|'))
     Find.find '.' do |path|
+      path.sub! %r/^(\.\/|\/)/o, ''
       next unless test ?f, path
       next if path =~ exclude
-      files << path[2..-1]
+      files << path
     end
 
     File.open(fn, 'w') {|fp| fp.puts files.sort}
@@ -26,9 +27,10 @@ namespace :manifest do
     files = []
     exclude = Regexp.new(PROJ.exclude.join('|'))
     Find.find '.' do |path|
+      path.sub! %r/^(\.\/|\/)/o, ''
       next unless test ?f, path
       next if path =~ exclude
-      files << path[2..-1]
+      files << path
     end
 
     files << fn unless test ?f, fn

data/tasks/rubyforge.rake

@@ -1,4 +1,4 @@
-# $Id: rubyforge.rake 11 2007-08-23 15:45:16Z tim_pease $
+# $Id$
 
 if PROJ.rubyforge_name && HAVE_RUBYFORGE
 

data/tasks/setup.rb

@@ -1,4 +1,4 @@
-# $Id: setup.rb 26 2007-09-18 17:40:42Z tim_pease $
+# $Id: setup.rb 85 2008-01-01 20:37:31Z tim_pease $
 
 require 'rubygems'
 require 'rake'
@@ -16,7 +16,7 @@ PROJ.email = nil
 PROJ.url = nil
 PROJ.version = ENV['VERSION'] || '0.0.0'
 PROJ.rubyforge_name = nil
-PROJ.exclude = %w(tmp$ bak$ ~$ CVS \.svn)
+PROJ.exclude = %w(tmp$ bak$ ~$ CVS \.svn ^pkg ^doc)
 
 # Rspec
 PROJ.specs = FileList['spec/**/*_spec.rb']
@@ -56,8 +56,12 @@ PROJ.dependencies = []
 PROJ.need_tar = true
 PROJ.need_zip = false
 
-# Import the rake tasks
-FileList['tasks/*.rake'].each {|task| import task}
+# File Annotations
+PROJ.annotation_exclude = []
+PROJ.annotation_extensions = %w(.txt .rb .erb) << ''
+
+# Load the other rake files in the tasks folder
+Dir.glob('tasks/*.rake').sort.each {|fn| import fn}
 
 # Setup some constants
 WIN32 = %r/win32/ =~ RUBY_PLATFORM unless defined? WIN32
@@ -89,12 +93,12 @@ SUDO = if WIN32 then ''
 RCOV = WIN32 ? 'rcov.cmd'  : 'rcov'
 GEM  = WIN32 ? 'gem.cmd'   : 'gem'
 
-%w(rcov spec rubyforge).each do |lib|
+%w(rcov spec/rake/spectask rubyforge bones).each do |lib|
   begin
     require lib
-    Object.instance_eval {const_set "HAVE_#{lib.upcase}", true}
+    Object.instance_eval {const_set "HAVE_#{lib.tr('/','_').upcase}", true}
   rescue LoadError
-    Object.instance_eval {const_set "HAVE_#{lib.upcase}", false}
+    Object.instance_eval {const_set "HAVE_#{lib.tr('/','_').upcase}", false}
   end
 end
 
@@ -119,4 +123,22 @@ def depend_on( name, version = nil )
   PROJ.dependencies << (version.nil? ? [name] : [name, ">= #{version}"])
 end
 
+# Adds the given _path_ to the include path if it is not already there
+#
+def ensure_in_path( path )
+  path = File.expand_path(path)
+  $:.unshift(path) if test(?d, path) and not $:.include?(path)
+end
+
+# Find a rake task using the task name and remove any description text. This
+# will prevent the task from being displayed in the list of available tasks.
+#
+def remove_desc_for_task( names )
+  Array(names).each do |task_name|
+    task = Rake.application.tasks.find {|t| t.name == task_name}
+    next if task.nil?
+    task.instance_variable_set :@comment, nil
+  end
+end
+
 # EOF

data/tasks/spec.rake

@@ -1,8 +1,6 @@
-# $Id: spec.rake 13 2007-08-23 22:18:00Z tim_pease $
+# $Id: spec.rake 85 2008-01-01 20:37:31Z tim_pease $
 
-if HAVE_SPEC
-
-require 'spec/rake/spectask'
+if HAVE_SPEC_RAKE_SPECTASK
 
 namespace :spec do
 
@@ -30,8 +28,13 @@ namespace :spec do
 
 end  # namespace :spec
 
+desc 'Alias to spec:run'
+task :spec => 'spec:run'
+
 task :clobber => 'spec:clobber_rcov' if HAVE_RCOV
 
-end  # if HAVE_SPEC
+remove_desc_for_task %w(spec:clobber_rcov)
+
+end  # if HAVE_SPEC_RAKE_SPECTASK
 
 # EOF

data/tasks/website.rake

@@ -1,4 +1,4 @@
-# $Id: website.rake 12 2007-08-23 16:43:11Z tim_pease $
+# $Id: website.rake 81 2007-12-29 20:51:29Z tim_pease $
 
 namespace :website do
 
@@ -6,7 +6,7 @@ namespace :website do
   task :build do
     begin
       olddir = pwd
-      chdir 'website'
+      chdir 'examples/webby'
       sh 'rake build'
       cp_r 'output/.', olddir + '/doc'
     ensure

metadata

@@ -1,33 +1,72 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: webby
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
-date: 2007-12-04 00:00:00 -07:00
-summary: static website creation and management
-require_paths: 
-- lib
-email: tim.pease@gmail.com
-homepage: http://webby.rubyforge.org/
-rubyforge_project: webby
-description: Webby is a super fantastic little website management system. It would be called a _content management system_ if it were a bigger kid. But, it's just a runt with a special knack for transforming text. And that's really all it does - manages the legwork of turning text into something else, an *ASCII Alchemist* if you will.
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.7.0
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Tim Pease
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-01-01 00:00:00 -07:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: directory_watcher
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.1.1
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: heel
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.6.0
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: hpricot
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0.6"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: logging
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.6.1
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.1.1
+    version: 
+description: Webby is a super fantastic little website management system. It would be called a _content management system_ if it were a bigger kid. But, it's just a runt with a special knack for transforming text. And that's really all it does - manages the legwork of turning text into something else, an *ASCII Alchemist* if you will.
+email: tim.pease@gmail.com
+executables: 
+- webby
+extensions: []
+
+extra_rdoc_files: 
+- History.txt
+- README.txt
+- bin/webby
 files: 
 - History.txt
 - Manifest.txt
@@ -58,13 +97,48 @@ files:
 - data/tasks/heel.rake
 - data/tasks/setup.rb
 - data/templates/page.erb
+- examples/webby/Rakefile
+- examples/webby/content/css/blueprint/lib/buttons.css
+- examples/webby/content/css/blueprint/lib/compressed.css
+- examples/webby/content/css/blueprint/lib/grid.css
+- examples/webby/content/css/blueprint/lib/img/grid.png
+- examples/webby/content/css/blueprint/lib/img/icons/cross.png
+- examples/webby/content/css/blueprint/lib/img/icons/textfield_key.png
+- examples/webby/content/css/blueprint/lib/img/icons/tick.png
+- examples/webby/content/css/blueprint/lib/reset.css
+- examples/webby/content/css/blueprint/lib/typography.css
+- examples/webby/content/css/blueprint/print.css
+- examples/webby/content/css/blueprint/screen.css
+- examples/webby/content/css/coderay.css
+- examples/webby/content/css/site.css
+- examples/webby/content/download.txt
+- examples/webby/content/index.txt
+- examples/webby/content/manual.txt
+- examples/webby/content/robots.txt
+- examples/webby/content/tips_and_tricks.txt
+- examples/webby/content/tutorial.txt
+- examples/webby/layouts/default.rhtml
+- examples/webby/tasks/create.rake
+- examples/webby/tasks/deploy.rake
+- examples/webby/tasks/growl.rake
+- examples/webby/tasks/heel.rake
+- examples/webby/tasks/setup.rb
+- examples/webby/templates/page.erb
 - lib/webby.rb
 - lib/webby/auto_builder.rb
 - lib/webby/builder.rb
 - lib/webby/file.rb
+- lib/webby/filters.rb
 - lib/webby/filters/coderay.rb
+- lib/webby/filters/erb.rb
 - lib/webby/filters/graphviz.rb
+- lib/webby/filters/haml.rb
+- lib/webby/filters/markdown.rb
+- lib/webby/filters/sass.rb
+- lib/webby/filters/textile.rb
 - lib/webby/filters/tidy.rb
+- lib/webby/helpers/tag_helper.rb
+- lib/webby/helpers/url_helper.rb
 - lib/webby/main.rb
 - lib/webby/pages_db.rb
 - lib/webby/renderer.rb
@@ -76,6 +150,7 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/webby/file_spec.rb
+- tasks/annotations.rake
 - tasks/doc.rake
 - tasks/gem.rake
 - tasks/manifest.rake
@@ -83,100 +158,32 @@ files:
 - tasks/setup.rb
 - tasks/spec.rake
 - tasks/website.rake
-- website/Rakefile
-- website/content/css/blueprint/lib/buttons.css
-- website/content/css/blueprint/lib/compressed.css
-- website/content/css/blueprint/lib/grid.css
-- website/content/css/blueprint/lib/img/grid.png
-- website/content/css/blueprint/lib/img/icons/cross.png
-- website/content/css/blueprint/lib/img/icons/textfield_key.png
-- website/content/css/blueprint/lib/img/icons/tick.png
-- website/content/css/blueprint/lib/reset.css
-- website/content/css/blueprint/lib/typography.css
-- website/content/css/blueprint/print.css
-- website/content/css/blueprint/screen.css
-- website/content/css/coderay.css
-- website/content/css/site.css
-- website/content/download.txt
-- website/content/index.txt
-- website/content/manual.txt
-- website/content/robots.txt
-- website/content/tips_and_tricks.txt
-- website/content/tutorial.txt
-- website/layouts/default.rhtml
-- website/tasks/create.rake
-- website/tasks/deploy.rake
-- website/tasks/growl.rake
-- website/tasks/heel.rake
-- website/tasks/setup.rb
-- website/templates/page.erb
-test_files: []
-
+has_rdoc: true
+homepage: http://webby.rubyforge.org/
+post_install_message: 
 rdoc_options: 
 - --main
 - README.txt
-extra_rdoc_files: 
-- History.txt
-- README.txt
-- bin/webby
-executables: 
-- webby
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: directory_watcher
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.1.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: heel
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.6.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: hpricot
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0.6"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: logging
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.5.2
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.0.8
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: rake
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.7.3
-    version: 
+rubyforge_project: webby
+rubygems_version: 1.0.1
+signing_key: 
+specification_version: 2
+summary: static website creation and management
+test_files: []
+