fngtps-weblog 0.5.0 → 0.5.1

data/bin/weblog

@@ -13,9 +13,10 @@ def usage
   puts ""
   puts "Commands:"
   puts "  init:     Initialize a directory for use with the weblog tool"
-  puts "  generate: Convert all Markdown source to an HTML file"
+  puts "  generate: Convert all snippets to pages and generate indices"
   puts "  publish:  Move a draft directory into the public directory"
   puts "  info:     Print information about the current working directory"
+  puts "  preview:  Convert all snippets in the drafts directory"
   puts "Options:"
   puts "  -v, --verbose: Print informative messages"
 end
@@ -40,6 +41,8 @@ when 'publish'
   Weblog.publish(options, *args[1..-1])
 when 'info'
   Weblog.print_info(options)
+when 'preview'
+  Weblog.preview(options)
 when 'help'
   usage
 else

data/lib/weblog.rb

@@ -48,6 +48,7 @@ class Weblog
     unless @path = self.class.find_working_directory(cwd)
       puts "[!] Please use this tool from somewhere within the working directory"
     end
+    _load_metadata
   end
   
   def git
@@ -58,12 +59,22 @@ class Weblog
     @options[:verbose]
   end
   
+  def metadata_filename
+    File.join(path, 'config.json')
+  end
+  
+  def _load_metadata
+    JSON.parse(File.read(metadata_filename)).each do |key, value|
+      self.send("#{key}=", value)
+    end if File.exist?(metadata_filename)
+  end
+  
   # --- Attributes
   
-  attr_accessor :path
+  attr_accessor :title, :path
   
   def title
-    @path.split('/').last.gsub(/[_-]/, ' ').capitalize
+    @title || @path.split('/').last.gsub(/[_-]/, ' ').capitalize
   end
   
   def months
@@ -84,6 +95,20 @@ class Weblog
     end; @posts
   end
   
+  def drafts
+    if @drafts.nil?
+      paths       = Set.new
+      base_path   = File.join(@path, 'draft')
+      path_length = base_path.split('/').length
+      Dir.glob(File.join(base_path, '**/post.*')).each do |file|
+        paths << file.split('/')[path_length..-2].join('/')
+      end
+      @drafts = paths.map do |path|
+        Weblog::Post.new(self, path, :draft => true)
+      end
+    end; @drafts
+  end
+  
   def size
     posts.size
   end
@@ -127,6 +152,10 @@ class Weblog
     ].join("\n")
   end
   
+  def preview
+    drafts.each { |draft| draft.generate }
+  end
+  
   def self.init(options)
     DIRECTORIES.each { |path| FileUtils.mkdir_p(path) }
     unless File.exist?('templates')
@@ -152,4 +181,10 @@ class Weblog
     weblog.print_info
     weblog
   end
+  
+  def self.preview(options)
+    weblog = new(Dir.pwd, options)
+    weblog.preview
+    weblog
+  end
 end

data/lib/weblog/post.rb

@@ -2,17 +2,26 @@ class Weblog
   class Post
     attr_accessor :path
     
-    def initialize(weblog, path)
-      @weblog = weblog
-      @path   = path
-      @post   = self
+    def initialize(weblog, path, options={})
+      @weblog  = weblog
+      @path    = path
+      @post    = self
+      @options = options
       _load_metadata
     end
     
     # --- Metadata
     
+    def draft?
+      @options[:draft] == true
+    end
+    
+    def public_directory
+      draft? ? 'draft' : 'public'
+    end
+    
     def metadata_filename
-      File.join(@weblog.path, 'public', @path, 'post.json')
+      File.join(@weblog.path, public_directory, @path, 'post.json')
     end
     
     attr_writer :author
@@ -102,19 +111,19 @@ class Weblog
     end
     
     def stylesheets
-      Dir.glob(File.join(@weblog.path, 'public', path, '*.css')).map do |path|
-        File.basename(path)
+      Dir.glob(File.join(@weblog.path, public_directory, path, '*.css')).map do |stylesheet_path|
+        File.join(path, File.basename(stylesheet_path))
       end
     end
     
     def javascripts
-      Dir.glob(File.join(@weblog.path, 'public', path, '*.js')).map do |path|
-        File.basename(path)
+      Dir.glob(File.join(@weblog.path, public_directory, path, '*.js')).map do |javascript_path|
+        File.join(path, File.basename(javascript_path))
       end
     end
     
     def snippet
-      @snippet ||= Snippet.new(@weblog, self, File.join('public', path))
+      @snippet ||= Snippet.new(@weblog, self, File.join(public_directory, path))
     end
     
     def title
@@ -140,7 +149,7 @@ class Weblog
     end
     
     def index_filename
-      File.join(@weblog.path, 'public', @path, 'index.html')
+      File.join(@weblog.path, public_directory, @path, 'index.html')
     end
     
     def generate

data/lib/weblog/snippet.rb

@@ -25,7 +25,7 @@ class Weblog
     end
     
     def read
-      @read ||= File.read(filename).split("\n")
+      @read ||= File.read(@filename).split("\n")
     end
     
     def title

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fngtps-weblog
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - Manfred Stienstra
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-18 00:00:00 +01:00
+date: 2010-11-22 00:00:00 +01:00
 default_executable: weblog
 dependencies: 
 - !ruby/object:Gem::Dependency