retter 0.2.0 → 0.2.1

data/lib/retter/entries.rb

@@ -1,17 +1,25 @@
 # coding: utf-8
 
-require 'active_support/core_ext/object'
+require 'active_support/cache'
 require 'digest/sha1'
 require 'redcarpet'
+require 'chronic'
 
 module Retter
   class EntryLoadError < RetterError; end
 
   class Entries < Array
-    include Retter::Stationery
+    include Stationery
+    extend Configurable
+
+    configurable :renderer, :retters_dir, :wip_file
 
     def initialize
-      load_entries config.retters_dir
+      load_entries retters_dir
+    end
+
+    def retter_file(date)
+      retters_dir.join(date ? date.strftime('%Y%m%d.md') : 'today.md')
     end
 
     def detect_by_string(str)
@@ -36,10 +44,10 @@ module Retter
 
     def detect_by_filename(filename)
       case filename
-      when config.wip_file.basename.to_s
+      when wip_file.basename.to_path
         wip_entry
       else
-        detect {|e| e.pathname.basename.to_s == filename }
+        detect {|e| e.pathname.basename.to_path == filename }
       end
     end
 
@@ -52,43 +60,37 @@ module Retter
     end
 
     def parse_date_string(date_str)
-      case date_str
-      when /^yesterday$/i then 1.day.ago
-      when /^today$/i     then 0.day.ago
-      when /^tomorrow$/i  then 1.day.since
-      when /^[0-9]+[\.\s](?:days?|weeks?|months?|years?)[\.\s](?:ago|since)$/i
-        eval(date_str.gsub(/\s+/, '.')).to_date
-      else
-        Date.parse(date_str)
-      end
+      normalized = date_str.gsub(/\./, ' ')
+
+      (Chronic.parse(normalized) || Date.parse(normalized)).to_date
     end
 
     def wip_entry(date = nil)
-      wip_file = config.retter_file(date)
-      wip_date = date || Date.today
-      wip_body = wip_file.exist? ? wip_file.read : ''
+      file = retter_file(date)
+      date = date || Date.today
+      body = file.exist? ? file.read : ''
 
-      Retter::Entry.new date: wip_date, body: rendered_body(wip_body), pathname: wip_file
+      Entry.new date: date, body: rendered_body(body), pathname: file
     end
 
     def commit_wip_entry!
-      if config.wip_file.exist?
-        copy = config.wip_file.read
-        config.retter_file(Date.today).open('a') {|f| f.puts copy }
-        config.wip_file.unlink
+      if wip_file.exist?
+        copy = wip_file.read
+        retter_file(Date.today).open('a') {|f| f.puts copy }
+        wip_file.unlink
       end
 
-      Retter.reset_entries!
+      Retter.reset!
     end
 
     def load_entries(path)
       date_files = find_markup_files(path).map {|file|
-        date_str = file.basename('.*').to_s
+        date_str = file.basename('.*').to_path
         [Date.parse(date_str), file]
       }.sort_by(&:first)
 
       date_files.reverse_each {|date, file|
-        self << Retter::Entry.new(date: date, body: rendered_body(file.read))
+        self << Entry.new(date: date, body: rendered_body(file.read))
       }
     end
 
@@ -102,7 +104,7 @@ module Retter
 
       config.cache.fetch(key) do
         Redcarpet::Markdown.new(
-          config.renderer,
+          renderer,
           autolink: true,
           space_after_headers: true,
           fenced_code_blocks: true,

data/lib/retter/entry.rb

@@ -2,103 +2,105 @@
 
 require 'nokogiri'
 
-class Retter::Entry
-  class Article
-    attr_accessor :entry, :id, :title, :body
+module Retter
+  class Entry
+    class Article
+      attr_accessor :entry, :id, :title, :body
 
-    def initialize(attrs = {})
-      @id, @entry, @title, @body = attrs.values_at(:id, :entry, :title, :body)
-    end
+      def initialize(attrs = {})
+        @id, @entry, @title, @body = attrs.values_at(:id, :entry, :title, :body)
+      end
 
-    def to_s
-      body
-    end
+      def to_s
+        body
+      end
 
-    def next
-      articles[index.next] || (entry.next && entry.next.articles.first)
-    end
+      def next
+        articles[index.next] || (entry.next && entry.next.articles.first)
+      end
 
-    def prev
-      index.pred < 0 ? (entry.prev && entry.prev.articles.last) : articles[index.pred]
-    end
+      def prev
+        index.pred < 0 ? (entry.prev && entry.prev.articles.last) : articles[index.pred]
+      end
 
-    def index
-      articles.index(self)
-    end
+      def index
+        articles.index(self)
+      end
 
-    def articles
-      @articles ||= entry.articles
+      def articles
+        @articles ||= entry.articles
+      end
     end
-  end
 
-  include Retter::Stationery
+    include Stationery
 
-  attr_accessor :date, :lede, :body, :articles
-  attr_reader :pathname
+    attr_accessor :date, :lede, :body, :articles
+    attr_reader :pathname
 
-  def initialize(attrs={})
-    @date, @body = attrs.values_at(:date, :body)
+    def initialize(attrs={})
+      @date, @body = attrs.values_at(:date, :body)
 
-    pathname_by_date = Retter.config.retters_dir.join(date.strftime('%Y%m%d.md'))
-    @pathname = attrs[:pathname] || pathname_by_date
+      pathname_by_date = Entries.retters_dir.join(date.strftime('%Y%m%d.md'))
+      @pathname = attrs[:pathname] || pathname_by_date
 
-    attach_titles
-    extract_articles
-    load_lede
-  end
-
-  def path
-    pathname.to_s
-  end
+      attach_titles
+      extract_articles
+      load_lede
+    end
 
-  def to_s
-    body
-  end
+    def path
+      pathname.to_path
+    end
 
-  def next
-    entries[index.next]
-  end
+    def to_s
+      body
+    end
 
-  def prev
-    entries[index.pred] unless index.pred < 0
-  end
+    def next
+      entries[index.next]
+    end
 
-  def index
-    entries.index(self) || 0
-  end
+    def prev
+      entries[index.pred] unless index.pred < 0
+    end
 
-  private
+    def index
+      entries.index(self) || 0
+    end
 
-  def body_elements
-    Nokogiri::HTML(body)
-  end
+    private
 
-  def attach_titles
-    html = body_elements
-    html.search('//h1').each_with_index do |h1, seq|
-      h1.set_attribute 'id', "a#{seq}"
+    def body_elements
+      Nokogiri::HTML(body)
     end
 
-    @body = html.search('//body/*').to_s
-  end
+    def attach_titles
+      html = body_elements
+      html.search('//h1').each_with_index do |h1, seq|
+        h1.set_attribute 'id', "a#{seq}"
+      end
 
-  def extract_articles
-    @articles = body_elements.search('body > *').each_with_object([]) {|c, r|
-      if c.name == 'h1'
-        r << Article.new(entry: self, id: c.attr('id'), title: c.text, body: '')
-      else
-        next if r.empty?
+      @body = html.search('//body/*').to_s
+    end
 
-        article = r.last
-        article.body += c.to_s
-      end
-    } || []
-  end
+    def extract_articles
+      @articles = body_elements.search('body > *').each_with_object([]) {|c, r|
+        if c.name == 'h1'
+          r << Article.new(entry: self, id: c.attr('id'), title: c.text, body: '')
+        else
+          next if r.empty?
+
+          article = r.last
+          article.body += c.to_s
+        end
+      } || []
+    end
 
-  def load_lede
-    @lede = body_elements.search('body > *').each_with_object('') {|c, r|
-      break r if c.name == 'h1'
-      r << c.to_s
-    }
+    def load_lede
+      @lede = body_elements.search('body > *').each_with_object('') {|c, r|
+        break r if c.name == 'h1'
+        r << c.to_s
+      }
+    end
   end
 end

data/lib/retter/generator/skel/Retterfile

@@ -7,23 +7,32 @@ description '<%= name %>'
 author      '<%= ENV["USER"] %>'
 renderer    Retter::Renderers::PygmentsRenderer
 
-## Callbacks for retter sub-command: edit, rebind, commit
-##
-## Syntax:
-##   after [command], [invoke command or proc]
+# Callbacks for retter sub-command: edit, rebind, commit
 #
-## Using symbol example:
-#    after :rebind, :commit
+#   Syntax:
+#     after [command], [invoke command or proc]
 #
-## Using proc example:
-#    after :commit do
-#      if yes?("Deploy now? [yes/no]")
-#        system "cd #{config.retter_home}"
-#        system 'git push origin master'
-#      end
-#    end
+#   Using symbol example:
+#     after :rebind, :commit
 #
-#    after :edit do
-#      ident = ARGV.pop || 'today'
-#      preview ident if yes?("Preview now? [yes/no]")
-#    end
+#   Using proc example:
+#     after :commit do
+#       if yes?("Deploy now? [yes/no]")
+#         system "cd #{config.retter_home}"
+#         system 'git push origin master'
+#       end
+#     end
+#
+#     after :edit do
+#       Retter.reset!
+#       ident = ARGV.pop || 'today'
+#
+#       preview ident if yes?("Preview now? [yes/no]")
+#     end
+#
+# Skip binding:
+#  examples:
+#    allow_binding :none
+#    allow_binding [:profile, :entries, :feed]
+#
+#  Anyway index page will be bound.

data/lib/retter/page/view_helper.rb

@@ -1,14 +1,14 @@
 # coding: utf-8
 
-module Retter::Page
-  module ViewHelper
-    include Retter::Stationery
+module Retter
+  module Page::ViewHelper
+    include Stationery
 
     def entry_path(*args)
       case args.first
       when Date, Time
         entry_path_by_date(*args)
-      when Retter::Entry
+      when Entry
         entry_path_by_entry(args.first)
       else
         raise TypeError, "wrong argument type #{args.first.class} (expected Date, Time or Retter::Entry)"
@@ -19,7 +19,7 @@ module Retter::Page
       case args.first
       when Date, Time
         article_path_by_date_and_id(*args)
-      when Retter::Entry::Article
+      when Entry::Article
         article_path_by_article(args.first)
       else
         raise TypeError, "wrong argument type #{args.first.class} (expected Date, Time or Retter::Entry::Article)"

data/lib/retter/page.rb

@@ -1,5 +1,6 @@
 # coding: utf-8
 
+require 'tilt'
 require 'haml'
 require 'nokogiri'
 
@@ -7,7 +8,7 @@ module Retter
   module Page
     require 'retter/page/view_helper'
 
-    include Retter::Stationery
+    include Stationery
 
     attr_reader :path_prefix, :title
 
@@ -17,10 +18,10 @@ module Retter
     end
 
     def print
-      part = Haml::Engine.new(
-        part_layout_pathname.read,
+      part = Tilt.new(
+        part_layout_pathname.to_path,
         ugly: true,
-        filename: part_layout_pathname.to_s
+        filename: part_layout_pathname.to_path
       ).render(view_scope)
 
       print_with_layout part
@@ -31,7 +32,7 @@ module Retter
     end
 
     def path
-      pathname.to_s
+      pathname.to_path
     end
 
     def part_layout_pathname
@@ -48,7 +49,8 @@ module Retter
     end
 
     def layout_renderer
-      @layout_renderer ||= Haml::Engine.new(config.layout_file.read, ugly: true, filename: config.layout_file.to_s)
+      layout_file = Pages.layout_file.to_path
+      @layout_renderer ||= Tilt.new(layout_file, ugly: true, filename: layout_file)
     end
 
     def fix_path(html, prefix='./')

data/lib/retter/pages/article.rb

@@ -1,39 +1,41 @@
 # coding: utf-8
 
-class Retter::Pages::Article
-  include Retter::Page
-
-  attr_reader :article
-
-  def initialize(article)
-    super()
-    @path_prefix = '../../'
-    @article     = article
-    @title       = "#{article.title} - #{config.title}"
-  end
-
-  def pathname
-    config.entry_dir(article.entry.date).join("#{article.id}.html")
-  end
-
-  def part_layout_pathname
-    config.article_layout_file
-  end
-
-  def print
-    options = {entry: article.entry, article: article}
-    part = Haml::Engine.new(
-      part_layout_pathname.read,
-      ugly: true,
-      filename: part_layout_pathname.to_s
-    ).render(view_scope, options)
-
-    mkdir
-    print_with_layout part
-  end
-
-  def mkdir
-    entry_dir = config.entry_dir(article.entry.date)
-    entry_dir.mkdir unless entry_dir.directory?
+module Retter
+  class Pages::Article
+    include Page
+
+    attr_reader :article
+
+    def initialize(article)
+      super()
+      @path_prefix = '../../'
+      @article     = article
+      @title       = "#{article.title} - #{config.title}"
+    end
+
+    def pathname
+      Pages.entry_dir(article.entry.date).join("#{article.id}.html")
+    end
+
+    def part_layout_pathname
+      Pages.find_layout_path('article')
+    end
+
+    def print
+      options = {entry: article.entry, article: article}
+      part = Tilt.new(
+        part_layout_pathname.to_path,
+        ugly: true,
+        filename: part_layout_pathname.to_path
+      ).render(view_scope, options)
+
+      mkdir
+      print_with_layout part
+    end
+
+    def mkdir
+      entry_dir = Pages.entry_dir(article.entry.date)
+      entry_dir.mkdir unless entry_dir.directory?
+    end
   end
 end

data/lib/retter/pages/entries.rb

@@ -0,0 +1,15 @@
+# coding: utf-8
+
+module Retter
+  class Pages::Entries
+    include Page
+
+    def pathname
+      config.retter_home.join('entries.html')
+    end
+
+    def part_layout_pathname
+      Pages.find_layout_path('entries')
+    end
+  end
+end

data/lib/retter/pages/entry.rb

@@ -1,32 +1,35 @@
 # coding: utf-8
 
-class Retter::Pages::Entry
-  include Retter::Page
+module Retter
+  class Pages::Entry
+    include Page
 
-  attr_reader :entry
+    attr_reader :entry
 
-  def initialize(entry)
-    super()
-    @path_prefix = '../'
-    @entry       = entry
-    @title       = "#{entry.date} - #{config.title}"
-  end
+    def initialize(entry)
+      super()
 
-  def pathname
-    config.entry_file(entry.date)
-  end
+      @path_prefix = '../'
+      @entry       = entry
+      @title       = "#{entry.date} - #{config.title}"
+    end
 
-  def part_layout_pathname
-    config.entry_layout_file
-  end
+    def pathname
+      Pages.entry_file(entry.date)
+    end
+
+    def part_layout_pathname
+      Pages.find_layout_path('entry')
+    end
 
-  def print
-    part = Haml::Engine.new(
-      part_layout_pathname.read,
-      ugly: true,
-      filename: part_layout_pathname.to_s
-    ).render(view_scope, entry: entry)
+    def print
+      part = Tilt.new(
+        part_layout_pathname.to_path,
+        ugly: true,
+        filename: part_layout_pathname.to_path
+      ).render(view_scope, entry: entry)
 
-    print_with_layout part
+      print_with_layout part
+    end
   end
 end

data/lib/retter/pages/feed.rb

@@ -3,45 +3,47 @@
 require 'builder'
 require 'uri'
 
-class Retter::Pages::Feed
-  include Retter::Page
+module Retter
+  class Pages::Feed
+    include Page
 
-  def pathname
-    config.feed_file
-  end
+    def pathname
+      config.retter_home.join('entries.rss')
+    end
 
-  def print
-    pathname.open('w') {|f| f.puts rss }
-  end
+    def print
+      pathname.open('w') {|f| f.puts rss }
+    end
 
-  private
+    private
 
-  def entry_url(date, id = nil)
-    (URI.parse(config.url) + date.strftime('/entries/%Y%m%d.html')).to_s
-  end
+    def entry_url(date, id = nil)
+      (URI.parse(config.url) + date.strftime('/entries/%Y%m%d.html')).to_s
+    end
 
-  def rss
-    xml = Builder::XmlMarkup.new
-    xml.instruct!
-    xml.rdf:RDF, :xmlns        => 'http://purl.org/rss/1.0/',
-                 :'xmlns:rdf'  => 'http://www.w3.org/1999/02/22-rdf-syntax-ns#',
-                 :'xmlns:dc'   => 'http://purl.org/dc/elements/1.1/',
-                 :'xml:lang'   => 'ja' do
-      xml.channel :'rdf:about' => config.url do
-        xml.title config.title
-        xml.link config.url
-        xml.dc:date, entries.empty? ? nil : entries.first.date
-        xml.description config.description
-        xml.items { xml.rdf(:Seq) { entries.each {|e| xml.rdf:li, :'rdf:resource' => entry_url(e.date) } } }
-      end
+    def rss
+      xml = Builder::XmlMarkup.new
+      xml.instruct!
+      xml.rdf:RDF, :xmlns        => 'http://purl.org/rss/1.0/',
+                   :'xmlns:rdf'  => 'http://www.w3.org/1999/02/22-rdf-syntax-ns#',
+                   :'xmlns:dc'   => 'http://purl.org/dc/elements/1.1/',
+                   :'xml:lang'   => 'ja' do
+        xml.channel :'rdf:about' => config.url do
+          xml.title config.title
+          xml.link config.url
+          xml.dc:date, entries.empty? ? nil : entries.first.date
+          xml.description config.description
+          xml.items { xml.rdf(:Seq) { entries.each {|e| xml.rdf:li, :'rdf:resource' => entry_url(e.date) } } }
+        end
 
-      entries[0...20].each do |entry| # XXX hardcoding
-        xml.item about: entry_url(entry.date) do
-          xml.title entry.date.strftime('%Y/%m/%d')
-          xml.description { xml.cdata! entry.body }
-          xml.dc:date, entry.date
-          xml.link     entry_url(entry.date)
-          xml.author   config.author
+        entries[0...20].each do |entry| # XXX hardcoding
+          xml.item about: entry_url(entry.date) do
+            xml.title entry.date.strftime('%Y/%m/%d')
+            xml.description { xml.cdata! entry.body }
+            xml.dc:date, entry.date
+            xml.link     entry_url(entry.date)
+            xml.author   config.author
+          end
         end
       end
     end

data/lib/retter/pages/index.rb

@@ -1,13 +1,15 @@
 # coding: utf-8
 
-class Retter::Pages::Index
-  include Retter::Page
+module Retter
+  class Pages::Index
+    include Page
 
-  def pathname
-    config.index_file
-  end
+    def pathname
+      config.retter_home.join('index.html')
+    end
 
-  def part_layout_pathname
-    config.index_layout_file
+    def part_layout_pathname
+      Pages.find_layout_path('index')
+    end
   end
 end