diary 0.1.4 → 0.1.5

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/bin/diary

@@ -21,20 +21,20 @@ when 1
 when 2
   case ARGV[0]
   when "draft"
-    Diary::Draft.new(ARGV[1])
+    Draft.new(ARGV[1])
   when "page"
-    Diary::Page.new(ARGV[1])
+    Page.new(ARGV[1])
   when "post"
-    Diary::Post.new(ARGV[1])
+    Post.new(ARGV[1])
   when "publish"
-    Diary::Draft.publish(ARGV[1])
+    Draft.new(ARGV[1]).publish
   else
     puts "Invalid option. Run `diary --help`."
   end
 when 3
   case ARGV[0]
   when "publish"
-    Diary::Draft.publish(ARGV[1], ARGV[2])
+    Draft.new(ARGV[1]).publish(ARGV[2])
   else
     puts "Invalid option. Run `diary --help`."
   end

data/diary.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{diary}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Robin Clart"]
-  s.date = %q{2010-06-28}
+  s.date = %q{2010-07-02}
   s.default_executable = %q{diary}
   s.email = %q{robin@clart.me}
   s.executables = ["diary"]
@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
      "lib/diary/draft.rb",
      "lib/diary/item.rb",
      "lib/diary/message.rb",
+     "lib/diary/output.rb",
      "lib/diary/page.rb",
      "lib/diary/post.rb",
      "lib/diary/site.rb",

data/lib/diary.rb

@@ -17,6 +17,7 @@ require 'bluecloth'
 require 'diary/message'
 require 'diary/site'
 require 'diary/template'
+require 'diary/output'
 require 'diary/item'
 require 'diary/draft'
 require 'diary/page'

data/lib/diary/draft.rb

@@ -1,27 +1,14 @@
-module Diary
-  class Draft < Item
-    include Message
+class Draft < Diary::Item
+  @@base_directory = 'drafts'
+  
+  def publish(date = Date.today)
+    to   = File.join(Post.class_variable_get(:@@base_directory), *date.to_s.split('-'))
 
-    def initialize(title, not_used = nil)
-      super(title, "")
-    end
-    
-    def self.publish(title, date = Date.today)
-      from = [base_directory, "#{title}.md"].join('/')
-      to   = [Post.base_directory, date.to_s.split('-').join('/')].join('/')
-      
-      FileUtils.mkdir_p to
-      FileUtils.mv      from, to
+    FileUtils.mkpath  to
+    FileUtils.mv      path, to
 
-      puts "#{Published} #{to}/#{title}.md"
-    rescue Errno::ENOENT
-      puts "#{Error} No draft found"
-    end
-    
-    private
-    
-    def self.base_directory
-      'drafts'
-    end
+    say Publish, File.join(to, "#{slug}.md")
+  rescue Errno::ENOENT
+    say Error, "No draft found"
   end
-end
+end

data/lib/diary/item.rb

@@ -3,7 +3,7 @@
 module Diary
   class Item
     include Message
-
+    
     ACCENTS = { 
 		  ['á','à','â','ä','ã'] => 'a',
 		  ['Ã','Ä','Â','À','�?'] => 'A',
@@ -19,113 +19,73 @@ module Diary
 		  ['ñ'] => 'n', ['Ñ'] => 'N'
     }
     
-    attr_reader :file_name
-    attr_reader :dir_path
-    
-    def initialize(title, directory)
-      @file_name = title
-      @dir_path  = directory.eql?("") ? nil : directory 
-      @file_path = file_path
-      
-      self.class.create(file_name, file_path, dir_path) unless file_exists?
-    end
-        
-    def output(force = false)
-      if changed? or force
-        FileUtils.mkdir_p ["output", dir_path].compact.join('/')
-        output_file = File.new(output_file_path, 'w+')
-        output_file.puts render
-        output_file.close
+    attr_reader :file
         
-        puts "#{Updated} #{output_file_path}"
+    def initialize(title_or_file, attributes = {})
+      case title_or_file
+      when File
+        @new_file   = false
+        @file       = title_or_file
       else
-        puts "#{Identical} #{output_file_path}"
+        @new_file   = true
+        @attributes = attributes
+        @directory  = extract_directory!
+        @title      = title_or_file
+        @slug       = nice_slug
+        
+        create!
       end
     end
     
-    def template
-      Template.lookup(self)
-    end
-    
-    def file
-      File.new(file_path)
-    end
-    
-    def content
-      file.read.split(/---\n/).slice(-1)
-    end
-    
-    def data
-      ydoc.is_a?(Hash) ? OpenStruct.new(ydoc) : OpenStruct.new
-    end
-    
-    def ydoc
-      YAML.parse_file(file_path).transform if YAML.parse_file(file_path)
-    end
-    
     def slug
-      nice_slug
+      @slug || basename
     end
     
-    def file_path
-      @file_path ||= [self.class.base_directory, @dir_path, "#{file_name}.md"].compact.join('/')
+    def title
+      @title || data.title
     end
-    
-    def output_file_path
-      @output_file_path ||= ["output", @dir_path, "#{slug}.html"].compact.join('/')
+        
+    def path
+      file ? file.path : File.join(base_directory, directory, "#{slug}.md")
     end
     
-    def class_name
-      self.class.name.split('::').slice(-1)
+    def directory
+      @directory || File.dirname(path).gsub("#{base_directory}/", "")
     end
         
-    def changed?
-      file.mtime > File.new(output_file_path).ctime
-    rescue Errno::ENOENT
-      true
+    def data
+      OpenStruct.new(YAML.load_file(path))
+    end
+        
+    def self.all
+      Dir[File.join(self.class_variable_get(:@@base_directory), "**", "*.md")].map do |p|
+        self.new File.new(p, 'r')
+      end
     end
     
     def self.first
       all.first
     end
-
+    
     def self.last
       all.last
     end
     
-    def self.all
-      Dir[File.join(base_directory, "**", "*.md")].map do |path|
-        self.new resolve_file_name(path), resolve_directory(path)
-      end
-    end
-    
-    def self.compile(force = false)
-      all.each { |p| p.output(force) }
-    end
-    
     private
     
-    def file_exists?
-      File.exists?(file_path)
+    def base_directory
+      self.class.class_variable_get(:@@base_directory)
     end
     
-    def render
-      liquidize.render('yield' => markdownize)
+    def basename
+      File.basename(file, '.md')
     end
     
-    def liquidize
-      Liquid::Template.parse(template.read)
-    end
-    
-    def markdownize
-      BlueCloth.new(content).to_html
-    end
-        
     def nice_slug
       str = ""
       ACCENTS.each do |ac,rep|
         ac.each do |s|
-          str = file_name.gsub(s, rep)
+          str = @title.gsub(s, rep)
         end
       end
       str.gsub(/[^a-zA-Z0-9 ]/, "")
@@ -134,24 +94,45 @@ module Diary
          .downcase
     end
     
-    def self.resolve_directory(path)
-      ary = path.split('/')
-      ary.pop
-      ary.shift
-      ary.join('/')
+    def extract_directory!
+      @attributes.delete(:directory) { |el| "" }
     end
     
-    def self.resolve_file_name(path)
-      path.gsub(/.md/, '').split('/').slice(-1)
+    def create!
+      if new_file?
+        ensure_directories_exists
+        @file = File.new(path, "w+")
+        write!
+                
+        say Create, path
+      else
+        @file     = File.new(path)
+        @new_file = false
+        
+        say Exist, path
+      end
+      
+      remove_instance_variable(:@attributes)
+      remove_instance_variable(:@title)
+      remove_instance_variable(:@slug)
     end
     
-    def self.create(title, path, directory)
-      FileUtils.mkdir_p("#{base_directory}/#{directory}")
-      file = File.new(path, "w+")
-      file.puts("---\ntitle: #{title}\n---\n")
+    def new_file?
+      @new_file and not File.exists?(path)
+    end
+    
+    def write!
+      file.puts "---\n"
+      file.puts "title: #{@title}"
+      @attributes.each do |key, value|
+        file.puts "#{key}: #{value}\n"
+      end
+      file.puts "\n---\n"
       file.close
-      
-      puts "#{Created} #{path}"
+    end
+        
+    def ensure_directories_exists
+      FileUtils.mkpath(File.dirname(path))
     end
   end
-end
+end

data/lib/diary/message.rb

@@ -5,9 +5,9 @@ module Diary
     Skip      = "          \e[1;31mskip\e[0m"
     
     # Green
-    Published = "     \e[1;32mpublished\e[0m"
-    Created   = "       \e[1;32mcreated\e[0m"
-    Updated   = "       \e[1;32mupdated\e[0m"
+    Publish   = "       \e[1;32mpublish\e[0m"
+    Create    = "        \e[1;32mcreate\e[0m"
+    Update    = "        \e[1;32mupdate\e[0m"
     
     # Yellow
     Identical = "     \e[1;33midentical\e[0m"
@@ -15,5 +15,9 @@ module Diary
     
     # Cyan
     Invoke   = "        \e[1;36minvoke\e[0m"
+    
+    def say(const, message)
+      puts "#{const} #{message}"
+    end
   end
 end

data/lib/diary/output.rb

@@ -0,0 +1,57 @@
+module Diary
+  module Output    
+    include Message
+
+    @@output_base_directory = 'output'
+    
+    def output(force = false)
+      if changed? or force
+        FileUtils.mkpath output_directory
+        f = File.new(output_path, 'w+')
+        f.puts render
+        f.close
+        
+        say Update, output_path
+      else
+        say Identical, output_path
+      end
+    end
+    
+    def content
+      file.rewind
+      file.read.split(/---\n/).slice(-1).strip
+    end
+    
+    def render
+      Liquid::Template.parse(template.read).render('yield' => html)
+    end
+    
+    private
+    
+    def changed?
+      file.mtime > output_file.ctime
+    rescue Errno::ENOENT
+      true
+    end
+    
+    def html
+      BlueCloth.new(content).to_html
+    end
+    
+    def output_path
+      path.gsub(base_directory, output_base_directory).gsub('.md', '.html')
+    end
+    
+    def output_directory
+      File.dirname(output_path)
+    end
+    
+    def output_file
+      File.new(output_path)
+    end
+    
+    def output_base_directory
+      self.class.class_variable_get(:@@output_base_directory)
+    end
+  end
+end

data/lib/diary/page.rb

@@ -1,13 +1,6 @@
-module Diary
-  class Page < Item
-    def initialize(title, path = "")
-      super(title, path)
-    end
-        
-    private
-    
-    def self.base_directory
-      'pages'
-    end
-  end
+class Page < Diary::Item
+  @@base_directory = 'pages'
+
+  include Diary::Template
+  include Diary::Output
 end

data/lib/diary/post.rb

@@ -1,25 +1,22 @@
-module Diary
-  class Post < Item
-    def initialize(title, date_or_path = Date.today)
-      super(title, date_or_path.to_s.split('-').join('/'))
-    end
-    
-    def date
-      @date ||= Date.parse(@dir_path)
-    end
-    
-    def output(force = false)
-      if date <= Date.today
-        super(force)
-      else
-        puts "#{Skip} #{file_path}"
-      end
-    end
-        
-    private
-        
-    def self.base_directory
-      'posts'
+class Post < Diary::Item
+  @@base_directory = 'posts'
+  
+  include Diary::Template
+  include Diary::Output
+  
+  def initialize(title_or_file)
+    super(title_or_file)
+  end
+  
+  def date
+    Date.parse(directory)
+  end
+  
+  def output(force = false)
+    if date <= Date.today
+      super(force)
+    else
+      say Skip, path
     end
   end
 end

data/lib/diary/site.rb

@@ -16,8 +16,8 @@ module Diary
         
     def self.compile(force = false)
       unless (Post.all.size == 0) and (Page.all.size == 0)
-        Post.compile(force)
-        Page.compile(force)
+        Post.all.each { |p| p.output(force) }
+        Page.all.each { |p| p.output(force) }
         return self
       else
         puts "#{Error} Nothing to compile"
@@ -34,9 +34,9 @@ module Diary
       unless File.exists?(path)
         FileUtils.mkdir_p(path)
         
-        puts "#{Created} #{path}"
+        say Create, path
       else
-        puts "#{Exist} #{path}"
+        say Exist, path
       end
     end
     
@@ -46,9 +46,9 @@ module Diary
         f.puts(content)
         f.close
 
-        puts "#{Created} #{path}"
+        say Create, path
       else
-        puts "#{Exist} #{path}"
+        say Exist, path
       end
     end
   end

data/lib/diary/template.rb

@@ -1,28 +1,27 @@
 module Diary
-  class Template
+  module Template
     include Message
-    
-    def self.lookup(item)
-      return file(item.data.template)       if exists?(item.data.template)
-      return file(item.file_name)           if exists?(item.file_name)
-      return file(item.class_name.downcase) if exists?(item.class_name.downcase)
-      return file("index")
+        
+    def template
+      File.new(template_lookup).tap do |file|
+        say Invoke, file.path
+      end
     end
     
     private
     
-    def self.file(name)
-      File.new(resolve(name)).tap do |file|
-        puts "#{Invoke} #{file.path}"
+    def template_lookup
+      template_names.each do |name|
+        return template_path(name) if File.exists?(template_path(name))
       end
     end
-        
-    def self.exists?(name)
-      File.exists?(resolve(name))
-    end
     
-    def self.resolve(name)
+    def template_path(name)
       File.join("templates", "#{name}.html")
     end
+    
+    def template_names
+      [data.template, slug, self.class.name.downcase, 'index'].compact
+    end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Robin Clart
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-28 00:00:00 +02:00
+date: 2010-07-02 00:00:00 +02:00
 default_executable: diary
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -67,6 +67,7 @@ files:
 - lib/diary/draft.rb
 - lib/diary/item.rb
 - lib/diary/message.rb
+- lib/diary/output.rb
 - lib/diary/page.rb
 - lib/diary/post.rb
 - lib/diary/site.rb