diary 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/diary.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{diary}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Robin Clart"]
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
      "lib/diary/cli.rb",
      "lib/diary/draft.rb",
      "lib/diary/item.rb",
+     "lib/diary/message.rb",
      "lib/diary/page.rb",
      "lib/diary/post.rb",
      "lib/diary/site.rb",

data/lib/diary.rb

@@ -13,35 +13,17 @@ require 'ostruct'
 require 'liquid'
 require 'bluecloth'
 
-module Diary
-  module Message
-    # Red
-    Error     = "         \e[1;31merror\e[0m"
-    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"
-    
-    # Yellow
-    Identical = "     \e[1;33midentical\e[0m"
-    Exist     = "         \e[1;33mexist\e[0m"
-    
-    # Cyan
-    Invoke   = "        \e[1;36minvoke\e[0m"
-  end
-    
-  def self.version
-    File.read(File.expand_path("../../VERSION", __FILE__))
-  end
-end
-
-
 # internals
+require 'diary/message'
 require 'diary/site'
 require 'diary/template'
 require 'diary/item'
 require 'diary/draft'
 require 'diary/page'
 require 'diary/post'
+
+module Diary
+  def self.version
+    File.read(File.expand_path("../../VERSION", __FILE__))
+  end
+end

data/lib/diary/item.rb

@@ -37,7 +37,6 @@ module Diary
         output_file.puts render
         output_file.close
         
-        puts "#{Invoke} #{template.path}"
         puts "#{Updated} #{output_file_path}"
       else
         puts "#{Identical} #{output_file_path}"
@@ -45,7 +44,7 @@ module Diary
     end
     
     def template
-      @template ||= Template.lookup(self, options.template)
+      Template.lookup(self)
     end
     
     def file
@@ -56,12 +55,8 @@ module Diary
       file.read.split(/---\n/).slice(-1)
     end
     
-    def options
-      if ydoc.is_a?(Hash)
-        @options ||= OpenStruct.new(ydoc)
-      else
-        OpenStruct.new
-      end
+    def data
+      ydoc.is_a?(Hash) ? OpenStruct.new(ydoc) : OpenStruct.new
     end
     
     def ydoc
@@ -119,7 +114,7 @@ module Diary
     end
     
     def liquidize
-      Liquid::Template.parse(template.file.read)
+      Liquid::Template.parse(template.read)
     end
     
     def markdownize

data/lib/diary/message.rb

@@ -0,0 +1,19 @@
+module Diary
+  module Message
+    # Red
+    Error     = "         \e[1;31merror\e[0m"
+    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"
+    
+    # Yellow
+    Identical = "     \e[1;33midentical\e[0m"
+    Exist     = "         \e[1;33mexist\e[0m"
+    
+    # Cyan
+    Invoke   = "        \e[1;36minvoke\e[0m"
+  end
+end

data/lib/diary/template.rb

@@ -1,35 +1,28 @@
 module Diary
   class Template
-    attr_reader :path
-  
-    def initialize(path)
-      @path = path
-    end
-    
-    def file
-      File.new(@path)
-    end
+    include Message
     
-    def self.all
-      Dir[File.join("templates", "*.html")].map { |t| Template.new(t) }
+    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")
     end
     
-    def self.lookup(page_or_post, template_name = nil)
-      Template.new resolve_path(page_or_post, template_name)
-    end
-
     private
     
-    def self.resolve_path(page_or_post, template_name)
-      if template_name and File.exists?("templates/#{template_name}.html")
-        "templates/#{template_name}.html"
-      elsif File.exists?("templates/#{page_or_post.slug}.html")
-        "templates/#{page_or_post.slug}.html"
-      elsif File.exists?("templates/#{page_or_post.class_name.downcase}.html")
-        "templates/#{page_or_post.class_name.downcase}.html"
-      else
-        'templates/index.html'
+    def self.file(name)
+      File.new(resolve(name)).tap do |file|
+        puts "#{Invoke} #{file.path}"
       end
     end
+        
+    def self.exists?(name)
+      File.exists?(resolve(name))
+    end
+    
+    def self.resolve(name)
+      File.join("templates", "#{name}.html")
+    end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Robin Clart
@@ -66,6 +66,7 @@ files:
 - lib/diary/cli.rb
 - lib/diary/draft.rb
 - lib/diary/item.rb
+- lib/diary/message.rb
 - lib/diary/page.rb
 - lib/diary/post.rb
 - lib/diary/site.rb