woody 0.3.4 → 0.4.0

data/bin/woody

@@ -10,12 +10,17 @@ program :description, 'Podcast static site generator'
 
 default_command :compile
 
+$dir = "."
+global_option '--dir', '--dir path/to/site', "Specifies path to Woody site directory, if not the current directory" do |dir|
+  $dir = dir
+end
+
 command :compile do |c|
   c.description = "Compiles the site"
   c.option "--no-add", "Don't ask to add new metadata"
   c.action do |args, options|
-    Woody.init
-    Woody::Compiler.compile(options)
+    site = Woody.new($dir)
+    site.compile(options)
   end
 end
 alias_command :c, :compile
@@ -23,8 +28,8 @@ alias_command :c, :compile
 command :deploy do |c|
   c.description = "Deploys the site"
   c.action do |args, options|
-    Woody.init
-    Woody::Deployer.deploy
+    site = Woody.new($dir)
+    site.deploy
   end
 end
 alias_command :d, :deploy
@@ -33,9 +38,9 @@ command :cd do |c|
   c.description = "Compiles then deploys the site"
   c.option "--no-add", "Don't ask to add new metadata"
   c.action do |args, options|
-    Woody.init
-    Woody::Compiler.compile(options)
-    Woody::Deployer.deploy
+    site = Woody.new($dir)
+    site.compile(options)
+    site.deploy
   end
 end
 
@@ -54,8 +59,8 @@ end
 command :'update templates' do |c|
   c.description = "Sets template files to current default. DESTRUCTIVE!"
   c.action do |args, options|
-    Woody.init
-    Woody::Generator.update_templates
+    site = Woody.new($dir)
+    site.update_templates
   end
 end
 alias_command :'templates update', :'update templates'

data/lib/woody/compiler.rb

@@ -1,38 +1,48 @@
-module Woody
+require 'preamble'
+
+class Woody
   # Handles functions related to compiling the Woody site
   module Compiler
-    @@touchedfiles = []
 
     # Compiles the Woody site
-    def self.compile(options = [])
+    def compile(options = nil)
       puts "Compiling..."
-      meta = YAML.load_file("content/metadata.yml")
+      meta = YAML.load_file(dir("content/metadata.yml"))
 		
   		# instantiate the metadata hash so shit doesn't explode in our faces
-  		# WEIRD SHIT: used .empty? here before but fails if used on hash seemingly
-      if meta == false
-        meta = Hash.new
-      end
+      meta = Hash.new if meta == false
 
-      episodes     = Array.new
-      filesfound   = Array.new
-      Dir.glob('content/*.mp3') do |file|
-        filename = file[8..-1]
+      posts      = Array.new
+      filesfound = Array.new
+      Dir.glob(dir('content/*.mp3')) do |file|
+        filename = undir(file)[8..-1]
         unless meta == false or meta[filename].nil?
           # Episode metadata already stored
-          episodes   << Episode.new_from_meta(filename, meta[filename])
+          posts      << Episode.new_from_meta(self, filename, meta[filename])
           filesfound << filename
         else
           # No episode metadata stored for this yet
-          unless options.no_add == false # Seemingly backwards, I know...
-            prompt_metadata(meta, episodes, filesfound, filename)
+          unless options.nil? or options.no_add == false # Seemingly backwards, I know...
+            prompt_metadata(meta, posts, filesfound, filename)
           else
             puts "Warning: found media file #{filename} but no metadata. Will not be published."
           end
         end
       end
 
-      episodes.sort!
+      # Process blog posts
+      Dir.glob(dir('content/posts/*')) do |file|
+        filename = undir(file)[8..-1]
+        data = Preamble.load(file)
+        m = data[0]
+        body = data[1]
+
+        posts << Post.new(self, filename, m['title'], m['subtitle'], body, Date.parse(m['date'].to_s), m['tags'])
+      end
+
+      posts.sort_by! do |post|
+        post.date
+      end.reverse!
 
       # Check for files in meta but not found
       unless meta.empty?
@@ -43,40 +53,41 @@ module Woody
       end
 
       # Make sure necessary directories exist
-      FileUtils.mkdir_p('output/assets') unless File.directory?('output/assets')
-      FileUtils.mkdir_p('output/assets/mp3') unless File.directory?('output/assets/mp3')
-      FileUtils.mkdir_p('output/episode') unless File.directory?('output/episode')
+      FileUtils.mkdir_p(dir 'output/assets') unless File.directory?(dir 'output/assets')
+      FileUtils.mkdir_p(dir 'output/assets/mp3') unless File.directory?(dir 'output/assets/mp3')
+      FileUtils.mkdir_p(dir 'output/post') unless File.directory?(dir 'output/post')
 
       # Copy over (TODO: and process) MP3 files
-      episodes.each do |episode|
-        copy_file_to_output File.join("content", episode.filename), File.join("assets/mp3", episode.compiledname)
+      posts.each do |post|
+        next unless post.has_file?
+        copy_file_to_output dir(File.join("content", post.filename)), File.join("assets/mp3", post.compiledname)
       end
 
       # Copy over assets
       copy_assets
 
       # Update index.html
-      layout = File.read('templates/layout.html')
+      layout = File.read(dir 'templates/layout.html')
       layout = Erubis::Eruby.new(layout)
 
-      index_compiled = layout.result(config: $config, episodes: episodes) do
-        index = Erubis::Eruby.new(File.read('templates/index.html'))
-        index.result(config: $config, episodes: episodes, test: "hello, world") do |episode|
-          ep = Erubis::Eruby.new(File.read('templates/episode.html'))
-          ep.result(config: $config, episodes: episodes, episode: episode)
+      index_compiled = layout.result(config: @config) do
+        index = Erubis::Eruby.new(File.read(dir 'templates/index.html'))
+        index.result(config: @config, posts: posts) do |post|
+          ep = Erubis::Eruby.new(File.read(dir 'templates/post.html'))
+          ep.result(config: @config, posts: posts, post: post)
         end
       end
       write_output_file('index.html') {|f| f.write(index_compiled) }
 
-      # Update episode pages
-      episodes.each do |episode|
-        layout = File.read('templates/layout.html')
+      # Update post pages
+      posts.each do |post|
+        layout = File.read(dir 'templates/layout.html')
         layout = Erubis::Eruby.new(layout)
-        episode_compiled = layout.result(config: $config, episodes: episodes) do
-          ep = Erubis::Eruby.new(File.read('templates/episode.html'))
-          ep.result(config: $config, episodes: episodes, episode: episode)
+        post_compiled = layout.result(config: @config) do
+          ep = Erubis::Eruby.new(File.read(dir 'templates/post.html'))
+          ep.result(config: @config, posts: posts, post: post)
         end
-        write_output_file(episode.path!) {|f| f.write(episode_compiled) }
+        write_output_file(post.path!) {|f| f.write(post_compiled) }
       end
 
       # Copy over iTunes.png
@@ -87,44 +98,24 @@ module Woody
       end
 
       # Update (iTunes) RSS
-      $config['itunes']['explicit'] = "no" if $config['itunes']['explicit'].nil?
+      @config['itunes']['explicit'] = "no" if @config['itunes']['explicit'].nil?
       feedxml = File.read File.join($source_root, "feed.xml") # Use feed.xml template in gem, not in site's template folder.
       feed = Erubis::Eruby.new(feedxml)
-      feed_compiled = feed.result(config: $config, episodes: episodes)
+      feed_compiled = feed.result(config: @config, posts: posts)
       write_output_file("feed.xml") {|f| f.write(feed_compiled) }
 
 
-
-      # TODO: Update General RSS
-
-
       # Purge left over files
       purge_output
 
       # Remove all empty directories from the output
-      Dir['output/**/*'].select { |d| File.directory? d }.select { |d| (Dir.entries(d) - %w[ . .. ]).empty? }.each { |d| Dir.rmdir d }
+      Dir[dir 'output/**/*'].select { |d| File.directory? d }.select { |d| (Dir.entries(d) - %w[ . .. ]).empty? }.each { |d| Dir.rmdir d }
     end
 
     private
 
-    # Safely copies files to the output directory
-    def self.copy_file_to_output(source, destination)
-      d = File.join("output", destination)
-      FileUtils.copy source, d
-      @@touchedfiles << d
-    end
-
-    # Safely writes files to the output directory
-    def self.write_output_file(filename, &block)
-      file = File.join("output", filename)
-      File.open(file, 'w') do |f|
-        yield f
-      end
-      @@touchedfiles << file
-    end
-
     # Prompts for metadata for new media files
-    def self.prompt_metadata(meta, episodes, filesfound, filename)
+    def prompt_metadata(meta, posts, filesfound, filename)
       puts "Found new media file: #{filename}"
       if agree("Add metadata for this file? ")
         m = Hash.new
@@ -136,7 +127,7 @@ module Woody
         m['explicit'] = agree "Explicit content?: "
         
         meta[filename] = m
-        episodes << Episode.new(filename,  m['title'], Date.parse(m['date'].to_s), m['synopsis'], m['subtitle'], m['tags'], m['explicit'])
+        posts << Episode.new(self, filename,  m['title'], Date.parse(m['date'].to_s), m['synopsis'], m['subtitle'], m['tags'], m['explicit'])
         filesfound << filename
 
         write_meta meta
@@ -146,27 +137,44 @@ module Woody
     end
 
     # Writes the metadata file
-    def self.write_meta(meta)
-      File.open( 'content/metadata.yml', 'w' ) do |out|
+    def write_meta(meta)
+      File.open(dir('content/metadata.yml'), 'w' ) do |out|
         YAML.dump meta, out
       end
     end
 
+    # Safely copies files to the output directory
+    def copy_file_to_output(source, destination)
+      d = dir(File.join("output", destination))
+      FileUtils.copy source, d
+      @touchedfiles << undir(d)
+    end
+
+    # Safely writes files to the output directory
+    def write_output_file(filename, &block)
+      file = dir(File.join("output", filename))
+      File.open(file, 'w') do |f|
+        yield f
+      end
+      @touchedfiles << undir(file)
+    end
+
+
     # Copies custom assets to output
-    def self.copy_assets
-      Dir.glob "templates/assets/**/*" do |item|
+    def copy_assets
+      Dir.glob dir("templates/assets/**/*") do |item|
         next if File.directory? item
-        d = item[10..-1] # Cut off "templates/" at beginning
+        d = undir item
+        d = d[10..-1] # Cut off "templates/" at beginning
         copy_file_to_output item, d
       end
     end
 
-
     # Deletes old files from the site's output directory
-    def self.purge_output
-      Dir.glob "output/**/*" do |item|
+    def purge_output
+      Dir.glob dir("output/**/*") do |item|
         next if File.directory? item
-        File.delete item unless @@touchedfiles.include? item
+        File.delete item unless @touchedfiles.include? undir(item)
       end
     end
 

data/lib/woody/deployer.rb

@@ -1,13 +1,13 @@
-module Woody
+class Woody
   # Handles functions relating to deploying the Woody site
   module Deployer
-    @@touchedfiles = []
     # Deploys the Woody site to S3
-    def self.deploy
+    def deploy
       puts "Deploying..."
 
-      Dir.glob "output/**/*" do |item|
+      Dir.glob dir("output/**/*") do |item|
         next if File.directory? item
+        item = undir item
         name = item[7..-1] # Remove "output/"
         next if name == "index.html" # These *must* be left until last
         next if name == "feed.xml"
@@ -26,17 +26,17 @@ module Woody
 
     # Deletes old objects from the S3 bucket
     # @param [Array] touchedfiles specifies the S3 objects to keep
-    def self.purge_bucket
-      bucket = AWS::S3::Bucket.find $bucketname
-      prefix = $config['s3']['prefix']
+    def purge_bucket
+      bucket = AWS::S3::Bucket.find @bucketname
+      prefix = @config['s3']['prefix']
       if prefix.nil?
         bucket.objects.each do |object|
-          object.delete unless @@touchedfiles.include? object.key
+          object.delete unless @s3touchedobjects.include? object.key
         end
       else
         bucket.objects.each do |object|
           if object.key.start_with? prefix # If using a prefix, don't delete anything outside of that 'subdirectory'
-            object.delete unless @@touchedfiles.include? object.key
+            object.delete unless @s3touchedobjects.include? object.key
           end
         end
       end
@@ -49,18 +49,20 @@ module Woody
     # Prints notices to STDOUT
     # @param [String] objectname specifies the S3 object's key/name
     # @param [String] filepath specifies the path to the file to upload
-    def self.upload(objectname, filepath)
-      prefix = $config['s3']['prefix']
+    def upload(objectname, filepath)
+      prefix = @config['s3']['prefix']
       unless prefix.nil?
         objectname = File.join(prefix, objectname)
       end
 
+      filepath = dir(filepath)
+
       # Generate hash of file
       hash = filehash filepath
-      @@touchedfiles << objectname
+      @s3touchedobjects << objectname
       # Get hash of version already uploaded, if available.
       begin
-        object = AWS::S3::S3Object.find objectname, $bucketname
+        object = AWS::S3::S3Object.find objectname, @bucketname
         oldhash = object.metadata['hash']
       rescue AWS::S3::NoSuchKey
         # File not uploaded yet
@@ -69,7 +71,7 @@ module Woody
       unless hash == oldhash
         # Don't reupload if file hasn't changed
         puts "#{objectname}: Uploading"
-        AWS::S3::S3Object.store(objectname, open(filepath), $bucketname, access: :public_read, 'x-amz-meta-hash' => hash)
+        AWS::S3::S3Object.store(objectname, open(filepath), @bucketname, access: :public_read, 'x-amz-meta-hash' => hash)
       else
         puts "#{objectname}: Not uploading, hasn't changed since last time."
       end
@@ -80,7 +82,7 @@ module Woody
     # Stored in S3 object metadata (x-amz-meta-hash) and used to avoid re-uploading unchanged files
     # @param  [String] filepath path to file
     # @return [String] hash of file
-    def self.filehash(filepath)
+    def filehash(filepath)
       sha1 = Digest::SHA1.new
       File.open(filepath) do|file|
         buffer = ''

data/lib/woody/episode.rb

@@ -1,57 +1,36 @@
-module Woody
-  # Represents an episode of the podcast
-  class Episode
+require "woody/post"
+
+class Woody
+  # Represents an episode of the podcast. Inherits from Post.
+  class Episode < Post
     # Creates a new Episode object from segment of metadata.yml
     # @param  [String] filename specifies the name of the MP3 file
     # @param  [Hash] meta is the relevant part of metadata.yml
     # @return [Episode] the new Episode object
-    def self.new_from_meta(filename, meta)
-      return Episode.new(filename, meta['title'], Date.parse(meta['date'].to_s), meta['synopsis'], meta['subtitle'], meta['tags'], meta['explicit'])
+    def self.new_from_meta(site, filename, meta)
+      return Episode.new(site, filename, meta['title'], Date.parse(meta['date'].to_s), meta['synopsis'], meta['subtitle'], meta['tags'], meta['explicit'])
     end
 
     # Creates a new Episode object
     # @param  [String] filename specifies the name of the MP3 file
     # @param  [String] title specifies the episode's title
     # @param  [Date]   date specifies the episode's published date
-    # @param  [String] synopsis specifies the episode's synopsis
+    # @param  [String] body specifies the episode's synopsis/body
     # @param  [String] subtitle specifies the episode's subtitle
     # @param  [Array]  tags specifies the episode's tags - each element is a String
     # @return [Episode] the new Episode object
-    def initialize(filename, title, date, synopsis, subtitle = nil, tags = [], explicit = false)
-      @filename = filename
-      @title = title
-      @date = date
-      @synopsis = synopsis
-      @subtitle = subtitle
-      @tags = tags
+    def initialize(site, filename, title, date, raw_body, subtitle = nil, tags = [], explicit = false)
+      super site, filename, title, subtitle, raw_body, date, tags
       @explicit = explicit
-      @compiledname = @filename.gsub(/[^0-9A-Za-z .]/, '').gsub(' ', '_')
+      @compiledname = @filename.gsub(/[^0-9A-Za-z ._]/, '').gsub(' ', '_')
     end
 
-    attr_accessor :filename, :title, :date, :synopsis, :tags, :subtitle, :explicit, :compiledname
-
-    # @return the episode's page URL where possible, otherwise false
-    def url
-      return "#{$config['urlbase']}#{path!}" unless path! == false
-      return false
-    end
+    attr_accessor :explicit
 
-    # @return the episode's page path! where possible, otherwise false. Does not take prefix in to account.
-    def path!(leader=true)
-      return "#{leader ? "/" : ""}episode/#{@compiledname[0..-5]}.html" unless @compiledname.nil?
-      return false
-    end
-
-    # @return the episode's page path! where possible, otherwise false. Includes the site prefix if enabled.
-    def path(leader=true)
-      prefix = $config['s3']['prefix']
-      return "#{leader ? "/" : ""}#{prefix.nil? ? "" : prefix + "/" }episode/#{@compiledname[0..-5]}.html" unless @compiledname.nil?
-      return false
-    end
 
     # @return the episode's media file URL where possible, otherwise false
     def file_url
-      return "#{$config['urlbase']}#{file_path!}" unless file_path! == false
+      return "#{@site.config['urlbase']}#{file_path!}" unless file_path! == false
       return false
     end
 
@@ -63,23 +42,19 @@ module Woody
 
     # @return the episode's media file path! where possible, otherwise false. Includes site prefix if enabled.
     def file_path(leader=true)
-      prefix = $config['s3']['prefix']
+      prefix = @site.config['s3']['prefix']
       return "#{leader ? "/" : ""}#{prefix.nil? ? "" : prefix + "/" }assets/mp3/#{@compiledname}" unless @compiledname.nil?
       return false
     end
 
 
-    # @return [String] a comma separated list of tags, or nil if no tags
-    def keywords
-      @tags.join ', ' unless @tags.nil? or @tags.empty?
-    end
 
     # @return [Integer] the size of the episodes media file in bytes
     def size
-      File.size File.join("content", filename)
+      File.size @site.dir(File.join("content", filename))
     end
    
-    # @return [String] 'yes' if explicit content, otherwise n'o'
+    # @return [String] 'yes' if explicit content, otherwise 'no'
     def explicit_string 
       @explicit ? 'yes' : 'no'
     end
@@ -88,7 +63,7 @@ module Woody
     def duration
       return @duration unless @duration.nil?
       length = 0
-      Mp3Info.open(File.join("content", filename)) do |mp3|
+      Mp3Info.open(@site.dir(File.join("content", filename))) do |mp3|
         length = mp3.length
       end
       @duration = Time.at(length).gmtime.strftime('%R:%S') # Should work up to 24 hours
@@ -97,8 +72,9 @@ module Woody
       end
     end
 
-    def <=> (other)
-      other.date <=> self.date
+
+    def has_file?
+      true
     end
 
   end

data/lib/woody/generator.rb

@@ -1,4 +1,4 @@
-module Woody
+class Woody
   # Handles functions related to generating Woody sites and updating them and their data stores
   module Generator
     # Generates a blank skeleton Woody site
@@ -17,7 +17,7 @@ module Woody
       cdir_p("#{name}/templates")
       cpy_t("layout.html", "#{name}/templates/layout.html")
       cpy_t("index.html", "#{name}/templates/index.html")
-      cpy_t("episode.html", "#{name}/templates/episode.html")
+      cpy_t("post.html", "#{name}/templates/post.html")
 
       cdir_p("#{name}/templates/assets")
       cpy_t("stylesheet.css", "#{name}/templates/assets/stylesheet.css")
@@ -25,23 +25,24 @@ module Woody
       cdir_p("#{name}/content")
       cpy_t("metadata.yml", "#{name}/content/metadata.yml")
       cpy_t("iTunes.png", "#{name}/content/iTunes.png")
+      cdir_p("#{name}/content/posts")
 
       cdir_p("#{name}/output")
       cdir_p("#{name}/output/assets")
       cdir_p("#{name}/output/assets/mp3")
-      cdir_p("#{name}/output/episode")
+      cdir_p("#{name}/output/post")
 
       puts "Done!"
       puts "Now, do `cd #{name}` then edit the config file, woody-config.yml."
     end
 
     # Replaces the templates in the Woody site with the gem's current default ones
-    def self.update_templates
+    def self.update_templates(site)
       puts "Updating templates..."
-      cpy_t("layout.html", "templates/layout.html")
-      cpy_t("index.html", "templates/index.html")
-      cpy_t("episode.html", "templates/episode.html")
-      cpy_t("stylesheet.css", "templates/assets/stylesheet.css")
+      cpy_t("layout.html", site.dir("templates/layout.html"))
+      cpy_t("index.html", site.dir("templates/index.html"))
+      cpy_t("post.html", site.dir("templates/post.html"))
+      cpy_t("stylesheet.css", site.dir("templates/assets/stylesheet.css"))
       puts "Done! Thanks for updating :)"
     end
 

data/lib/woody/post.rb

@@ -0,0 +1,63 @@
+require 'kramdown'
+
+class Woody
+  # Represents a post
+  class Post
+    # Creates a new Post object
+    # @param  [String] filename specifies the name of the post file
+    # @param  [String] title specifies the Post's title
+    # @param  [String] subtitle specifies the Post's subtitle
+    # @param  [String] body specifies the Post's body
+    # @param  [Date]   date specifies the Post's published date
+    # @param  [Array]  tags specifies the Post's tags - each element is a String
+    # @return [Post] the new Post object
+    def initialize(site, filename, title, subtitle, raw_body, date, tags = [], compiledname = nil)
+      @site = site
+      @filename = filename
+      @title = title
+      @subtitle = subtitle
+      @raw_body = raw_body
+      @date = date
+      @tags = tags.nil? ? [] : tags
+      @compiledname = @filename[6..-1].gsub(/[^0-9A-Za-z ._]/, '').gsub(' ', '_')
+    end
+    attr_accessor :filename, :title, :subtitle, :raw_body, :date, :tags, :compiledname
+
+    def body(regenerate = false)
+      return @body unless @body.nil? or regenerate
+      return @body = Kramdown::Document.new(@raw_body).to_html
+    end
+
+    # @return the Page's page URL where possible, otherwise false
+    def url
+      return "#{@site.config['urlbase']}#{path!}" unless path! == false
+      return false
+    end
+
+    # @return the Page's page path where possible, otherwise false. Does not take prefix in to account.
+    def path!(leader=true)
+      return "#{leader ? "/" : ""}post/#{@compiledname.chomp(File.extname(@compiledname))}.html" unless @compiledname.nil?
+      return false
+    end
+
+    # @return the Page's page path where possible, otherwise false. Includes the site prefix if enabled.
+    def path(leader=true)
+      prefix = @site.config['s3']['prefix']
+      return "#{leader ? "/" : ""}#{prefix.nil? ? "" : prefix + "/" }post/#{@compiledname.chomp(File.extname(@compiledname))}.html" unless @compiledname.nil?
+      return false
+    end
+
+    # @return [String] a comma separated list of tags, or nil if no tags
+    def keywords
+      @tags.join ', ' unless @tags.nil? or @tags.empty?
+    end
+
+    def has_file?
+      false
+    end
+
+    def <=> (other)
+      other.date <=> self.date
+    end
+  end
+end

data/lib/woody/version.rb

@@ -1,4 +1,4 @@
-module Woody
+class Woody
   # Specifies Woody gem version
-  VERSION = "0.3.4"
+  VERSION = "0.4.0"
 end

data/lib/woody.rb

@@ -1,4 +1,5 @@
 require "woody/version"
+require "woody/post"
 require "woody/episode"
 require "woody/compiler"
 require "woody/deployer"
@@ -19,34 +20,45 @@ require 'mp3info'
 $VERBOSE = oldverbosity
 
 # Woody podcast static site generator
-module Woody
+class Woody
+  include Generator
+  include Compiler
+  include Deployer
+
+
   # Path of template directory inside gem
   $source_root = File.expand_path("../../templates", __FILE__)
 
   # Load configuration and connect to S3
-  def self.init
+  def initialize(directory = ".")
+    @directory = directory
+    @touchedfiles = []
+    @s3touchedobjects = []
+
+
+
     begin
-      $config = YAML.load_file("woody-config.yml")
+      @config = YAML.load_file(dir("woody-config.yml"))
     rescue Errno::ENOENT
       puts "This doesn't look like a valid Woody site directory!"
       exit!
     end
 
     # Strip trailing slash from urlbase, if present.
-    if $config['urlbase'].end_with? "/"
-      $config['urlbase'] = $config['urlbase'][0..-2]
+    if @config['urlbase'].end_with? "/"
+      @config['urlbase'] = @config['urlbase'][0..-2]
     end
 
-    if $config['distributiontype'] == "s3"
-      prefix = $config['s3']['prefix']
+    if @config['distributiontype'] == "s3"
+      prefix = @config['s3']['prefix']
       unless prefix.nil?
-        $config['urlbase'] = $config['urlbase'] + "/" + prefix
+        @config['urlbase'] = @config['urlbase'] + "/" + prefix
       end
     end
 
-    options = { 
-      :access_key_id     => $config['s3']['accesskey']['id'], 
-      :secret_access_key => $config['s3']['accesskey']['secret']
+    s3options = {
+      :access_key_id     => @config['s3']['accesskey']['id'],
+      :secret_access_key => @config['s3']['accesskey']['secret']
     }
     
     unless ENV['http_proxy'].nil?
@@ -56,14 +68,28 @@ module Woody
       p[:port]     = uri.port
       p[:user]     = uri.user     unless uri.user.nil?
       p[:password] = uri.password unless uri.password.nil?
-      options[:proxy] = p 
+      s3options[:proxy] = p
     end
     
-    AWS::S3::Base.establish_connection!(options)
-    AWS::S3::DEFAULT_HOST.replace $config['s3']['hostname']
-    $bucketname = $config['s3']['bucket']  
+    AWS::S3::Base.establish_connection!(s3options)
+    AWS::S3::DEFAULT_HOST.replace @config['s3']['hostname']
+    @bucketname = @config['s3']['bucket']
   end
 
+  attr_accessor :config
+  attr_reader :directory
+
+  def dir(dir="")
+    File.expand_path(File.join(@directory, dir))
+  end
+
+  def undir(string)
+    string[dir.length+1..-1]
+  end
+
+  def update_templates
+    Generator::update_templates(self)
+  end
 end
 
 

data/templates/feed.xml

@@ -17,27 +17,28 @@
         <itunes:email><%= config['itunes']['owner']['email'] %></itunes:email>
     </itunes:owner>
    
-    <itunes:image href="<%= $config['urlbase'] + "/assets/iTunes.png" %>"/>
-    <itunes:category text="<%= $config['itunes']['category'] %>"/>
+    <itunes:image href="<%= config['urlbase'] + "/assets/iTunes.png" %>"/>
+    <itunes:category text="<%= config['itunes']['category'] %>"/>
 
-    <atom:link href="<%= $config['urlbase'] %>/feed.xml" rel="self" type="application/rss+xml" />
+    <atom:link href="<%= config['urlbase'] %>/feed.xml" rel="self" type="application/rss+xml" />
 
 
-  <%- episodes.each do |episode| %>
+  <%- posts.each do |post| %>
+    <%- next unless post.has_file? %>
     <item>
-      <title><%= episode.title %></title>
-      <itunes:subtitle><%= episode.subtitle %></itunes:subtitle>
-      <itunes:summary><%= episode.synopsis %></itunes:summary>
-      <pubDate><%= episode.date.rfc2822 %></pubDate>
-      <itunes:duration><%= episode.duration %></itunes:duration>
-      <itunes:keywords><%= episode.keywords %></itunes:keywords>
-      <itunes:explicit><%= episode.explicit_string %></itunes:explicit>
-      <description><%= episode.synopsis %></description>
-  		<enclosure url="<%= episode.file_url %>" length="<%= episode.size %>" type="audio/mpeg"/>
-      <guid><%= episode.url %></guid>
+      <title><%= post.title %></title>
+      <itunes:subtitle><%= post.subtitle %></itunes:subtitle>
+      <itunes:summary><%= post.body %></itunes:summary>
+      <pubDate><%= post.date.rfc2822 %></pubDate>
+      <itunes:duration><%= post.duration %></itunes:duration>
+      <itunes:keywords><%= post.keywords %></itunes:keywords>
+      <itunes:explicit><%= post.explicit_string %></itunes:explicit>
+      <description><%= post.body %></description>
+  		<enclosure url="<%= post.file_url %>" length="<%= post.size %>" type="audio/mpeg"/>
+      <guid><%= post.url %></guid>
       <category>Podcasts</category>
     </item>
-    <% end %>
+  <% end %>
 
 </channel>
 </rss>

data/templates/index.html

@@ -1,7 +1,7 @@
 <h2>Episodes:</h2>
-<%= link_to "RSS Feed", "#{$config['urlbase']}/feed.xml" %>
-<% episodes.each do |episode| %>
+<%= link_to "RSS Feed", "#{ config['urlbase'] }/feed.xml" %>
+<% posts.each do |post| %>
   <div class="episode">
-  <%= yield episode %>
+  <%= yield post %>
   </div>
 <% end %>

data/templates/layout.html

@@ -1,13 +1,14 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title><%= $config['title'] %></title>
+    <meta charset="UTF-8" />
+    <title><%= config['title'] %></title>
     <%= generator_meta_tag %>
     <link rel="stylesheet" type="text/css" href="/assets/stylesheet.css" />
   </head>
   <body>
-    <h1><%= link_to $config['title'], $config['urlbase'] %></h1>
-    <h2><%= $config['subtitle'] %></h2>
+    <h1><%= link_to config['title'], config['urlbase'] %></h1>
+    <h2><%= config['subtitle'] %></h2>
     <hr />
     <%= yield %>
   </body>

data/templates/post.html

@@ -0,0 +1,19 @@
+<h3><%= link_to post.title, post.path %></h3>
+<h4><%= post.subtitle %></h4>
+
+<%- if post.has_file? %>
+Player goes here
+
+<a href="<%= post.file_path %>">Download MP3</a>
+<% end %>
+
+<div class="synopsis body">
+  <%= post.body %>
+</div>
+
+<div class="tags">
+  <strong>Tags:</strong>
+  <% post.tags.each do |tag| %>
+    <span class="tag"><%= tag %> </span>
+  <% end %>
+</div>

data/woody.gemspec

@@ -22,6 +22,8 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'aws-s3'
   gem.add_runtime_dependency 'commander'
   gem.add_runtime_dependency 'highline'
+  gem.add_runtime_dependency 'preamble'
+  gem.add_runtime_dependency 'kramdown'
 
   # gem.post_install_message = "This update modifies default templates. Please run `woody update templates` in your site directory to update them. Warning: this will destroy any modifications to your templates."
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: woody
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-12 00:00:00.000000000 Z
+date: 2012-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
@@ -91,6 +91,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: preamble
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: kramdown
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Woody
 email:
 - david@davidr.me
@@ -110,13 +142,14 @@ files:
 - lib/woody/deployer.rb
 - lib/woody/episode.rb
 - lib/woody/generator.rb
+- lib/woody/post.rb
 - lib/woody/version.rb
-- templates/episode.html
 - templates/feed.xml
 - templates/iTunes.png
 - templates/index.html
 - templates/layout.html
 - templates/metadata.yml
+- templates/post.html
 - templates/stylesheet.css
 - templates/woody-config.yml
 - woody.gemspec

data/templates/episode.html

@@ -1,16 +0,0 @@
-<h3><%= link_to episode.title, episode.path %></h3>
-<h4><%= episode.subtitle %></h4>
-Player goes here
-
-<a href="<%= episode.file_path %>">Download MP3</a>
-
-<div class="synopsis">
-  <%= episode.synopsis %>
-</div>
-
-<div class="tags">
-  <strong>Tags:</strong>
-  <% episode.tags.each do |tag| %>
-    <span class="tag"><%= tag %> </span>
-  <% end %>
-</div>