retter 0.2.2 → 0.2.3

data/.travis.yml

@@ -1,2 +1,2 @@
 rvm:
-  - '1.9.3-p125'
+  - '1.9.3-p194'

data/ChangeLog.md

@@ -1,3 +1,13 @@
+# 0.2.3
+
+## clean sub command
+
+clean sub command wraps cache clear method.
+
+```
+retter clean
+```
+
 # 0.2.2
 
 Sidebar added to built-in themes.

data/README.md

@@ -242,11 +242,9 @@ renderer Retter::Renderers::PygmentsRenderer
 # Remove caches
 
 When change the renderer, you have to remove cache files.
-Cache files is in `tmp/cache`.
-Please remove these files manually.
 
 ```
-  $ rm -rf tmp/cache/*
+  $ retter clean
 ```
 
 # Built-in themes

data/bin/retter

@@ -3,20 +3,24 @@
 
 $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
 
+trap :INT do
+  print "\r"
+  exit
+end
+
 require 'retter'
 
-Retter.load ENV
+Retter::Site.load ENV
 
 case ARGV[0]
 when 'new'
   Retter::Generator::Creator.start ARGV[1..-1]
-when 'gen'
-  Retter::Generator::Updator.start ARGV[1..-1]
 else
   begin
     Retter::Command.start
   rescue Errno::ENOENT
-    $stderr.puts "Some files might be broken. run `retter gen $RETTER_HOME`"
+    $stderr.puts "Some files might be broken. Please re-generate site: `retter new site-name`"
+
     raise
   end
 end

data/lib/retter/binder.rb

@@ -0,0 +1,50 @@
+# coding: utf-8
+
+module Retter
+  class Binder
+    extend Configurable
+
+    configurable :allow_binding
+
+    def initialize(entries)
+      @entries         = entries
+      @singleton_pages = find_singleton_pages
+    end
+
+    def bind!
+      bind_entries
+
+      @singleton_pages.each(&:bind)
+    end
+
+    def bind_entries
+      @entries.each do |entry|
+        entry_page = Page::Entry.new(entry)
+        entry_page.bind
+
+        entry.articles.each do |article|
+          article_page = Page::Article.new(article)
+          article_page.bind
+        end
+      end
+    end
+
+    private
+
+    def find_singleton_pages
+      available_singleton_page_names.map {|name|
+        Page.const_get(name.capitalize).new
+      }
+    end
+
+    def available_singleton_page_names
+      availables = [:index]
+
+      unless allow_binding == :none
+        availables += allow_binding || [:profile, :entries, :feed]
+      end
+
+      availables.map(&:downcase).uniq
+    end
+  end
+end

data/lib/retter/command.rb

@@ -2,10 +2,11 @@
 
 require 'thor'
 require 'launchy'
+require 'pathname'
 
 module Retter
   class Command < Thor
-    include Stationery
+    include Site
 
     map '-v' => :version,
         '-e' => :edit,
@@ -14,54 +15,52 @@ module Retter
         '-r' => :rebind,
         '-b' => :bind
 
-    desc 'edit', 'Open $EDITOR. Write an article with Markdown.'
+    desc :edit,    %(Open $EDITOR. Write an article with Markdown.)
     method_options date: :string, key: :string, silent: :boolean
     def edit(identifier = options[:date] || options[:key])
       entry = entries.detect_by_string(identifier)
 
-      system config.editor, entry.path
+      system config.editor, entry.path.to_path
 
-      invoke_after :edit unless silent?
+      invoke_after :edit
     end
 
     default_task :edit
 
-    desc 'preview', 'Preview the draft article (browser will open).'
+    desc :preview, %(Preview the draft article (browser will open).)
     method_options date: :string, key: :string
     def preview(identifier = options[:date] || options[:key])
       preprint = Preprint.new
-      entry = entries.detect_by_string(identifier)
+      entry    = entries.detect_by_string(identifier)
 
-      preprint.print entry
+      preprint.bind entry
 
-      Launchy.open preprint.path
+      Launchy.open preprint.path.to_path
     end
 
-    desc 'open', 'Open your (static) site top page (browser will open).'
+    desc :open, %(Open your (static) site top page (browser will open).)
     def open
-      index_page = Pages::Index.new
+      index_page = Page::Index.new
 
-      Launchy.open index_page.path
+      Launchy.open index_page.path.to_path
     end
 
-    desc 'rebind', 'Bind the draft article, re-generate all html pages.'
+    desc :rebind,  %(Bind the draft article, re-generate all html pages.)
     method_options silent: :boolean
     def rebind
       entries.commit_wip_entry!
 
-      pages.bind!
+      Binder.new(entries).bind!
 
-      unless silent?
-        invoke_after :bind
-        invoke_after :rebind
-      end
+      invoke_after :bind
+      invoke_after :rebind
     end
 
-    desc 'bind', 'Alias of rebind'
+    desc 'bind',   %(Alias of rebind)
     method_options silent: :boolean
-    alias_method :bind, :rebind
+    alias_method   :bind, :rebind
 
-    desc 'commit', "cd $RETTER_HOME && git add . && git commit -m 'Retter commit'"
+    desc :commit,  %(cd $RETTER_HOME && git add . && git commit -m 'Retter commit')
     method_options silent: :boolean
     def commit
       Repository.open config.retter_home do |git|
@@ -69,10 +68,10 @@ module Retter
         say git.commit_all('Retter commit'), :green
       end
 
-      invoke_after :commit unless silent?
+      invoke_after :commit
     end
 
-    desc 'list', 'List retters'
+    desc :list, %(List retters)
     def list
       entries.each_with_index do |entry, n|
         say "[e#{n}] #{entry.date}"
@@ -81,7 +80,14 @@ module Retter
       end
     end
 
-    desc 'home', 'Open a new shell in $RETTER_HOME'
+    desc :clean, %(Clear all caches)
+    def clean
+      return unless config.cache.respond_to?(:clear)
+
+      config.cache.clear
+    end
+
+    desc :home, %(Open a new shell in $RETTER_HOME)
     def home
       Dir.chdir config.retter_home.to_path
 
@@ -90,51 +96,48 @@ module Retter
       say 'bye', :green
     end
 
-    desc 'callback', 'Call a callback process only'
-    method_options after: :string
+    desc :callback, %(Call a callback process only)
+    method_options  after: :string
     def callback
       invoke_after options[:after].intern
     end
 
-    desc 'new', 'Create a new site'
+    desc :new, %(Create a new site)
     def new; end
 
-    desc 'gen', 'Generate initial files'
-    def gen; end
-
-    desc 'usage', 'Show usage.'
+    desc :usage, %(Show usage.)
     def usage
       say Command.usage, :green
     end
 
-    desc 'version', 'Show version.'
+    desc :version, %(Show version.)
     def version
       say "Retter version #{VERSION}"
     end
 
     private
 
-    def pages
-      @pages ||= Pages.new
-    end
-
     def silent?
       !options[:silent].nil?
     end
 
     def invoke_after(name)
-      callback = config.after_callback(name)
+      return if silent?
 
-      case callback
+      case callback = after_callback(name)
       when Proc
         instance_eval &callback
-      when Symbol
-        invoke callback
+      when Symbol, String
+        __send__ callback
       else
         # noop
       end
     end
 
+    def after_callback(name)
+      config.after_callback(name)
+    end
+
     def self.usage
       <<-EOM
 Usage:

data/lib/retter/config.rb

@@ -10,10 +10,12 @@ module Retter
   class Config
     extend Forwardable
 
-    def_delegators Entries, :renderer, :retters_dir, :wip_file
-    def_delegators Pages,   :layouts_dir, :entries_dir, :allow_binding
-
-    attr_reader :retter_home
+    def_delegators Entries,      :retters_dir, :wip_file, :markup, :cache
+    def_delegators Markdown,     :renderer
+    def_delegators Binder,       :allow_binding
+    def_delegators Page,         :layouts_dir, :entries_dir
+    def_delegators Retter::Site, :title, :description, :url, :author
+    def_delegator  Retter::Site, :home, :retter_home
 
     def initialize(env)
       @env             = env
@@ -23,13 +25,10 @@ module Retter
       detect_retter_home
       environments_required
 
-      @retter_home = Pathname.new(@env['RETTER_HOME'])
       load_defaults
-      load_retterfile_if_exists
+      load_retterfile
     rescue EnvError => e
-      $stderr.puts e.message
-
-      say Command.usage, :green
+      $stderr.puts e.message, Command.usage
 
       exit 1
     end
@@ -45,7 +44,7 @@ module Retter
     alias_method :after, :after_callback
 
     [ # base
-      :editor, :shell, :cache, :title, :description, :url, :author,
+      :editor, :shell,
       # extra
       :disqus_shortname
     ].each do |att|
@@ -62,12 +61,26 @@ module Retter
       @env['RETTER_HOME'] = Dir.pwd if File.exist? 'Retterfile'
     end
 
+    def load_retterfile
+      retterfile = retter_home.join('Retterfile')
+
+      instance_eval retterfile.read, retterfile.to_path if retterfile.exist?
+    end
+
+    def environments_required
+      unless @env.values_at('EDITOR', 'RETTER_HOME').all?
+        raise EnvError, 'Set $RETTER_HOME and $EDITOR, first.'
+      end
+    end
+
     def load_defaults
+      retter_home Pathname.new(@env['RETTER_HOME'])
+
       editor @env['EDITOR']
       shell  @env['SHELL']
       url    'http://example.com'
 
-      renderer    Retter::Renderers::CodeRayRenderer
+      renderer    Retter::Markdown::CodeRayRenderer
       retters_dir retter_home.join('retters/')
       wip_file    retters_dir.join('today.md')
 
@@ -79,17 +92,5 @@ module Retter
 
       FileUtils.mkdir_p cache_dir.to_path unless cache_dir.directory? # for old versions
     end
-
-    def load_retterfile_if_exists
-      retterfile = retter_home.join('Retterfile')
-
-      instance_eval retterfile.read, retterfile.to_path if retterfile.exist?
-    end
-
-    def environments_required
-      unless @env.values_at('EDITOR', 'RETTER_HOME').all?
-        raise EnvError, 'Set $RETTER_HOME and $EDITOR, first.'
-      end
-    end
   end
 end

data/lib/retter/entries.rb

@@ -9,10 +9,9 @@ module Retter
   class EntryLoadError < RetterError; end
 
   class Entries < Array
-    include Stationery
     extend Configurable
 
-    configurable :renderer, :retters_dir, :wip_file
+    configurable :retters_dir, :wip_file, :markup, :cache
 
     def initialize
       load_entries retters_dir
@@ -47,7 +46,7 @@ module Retter
       when wip_file.basename.to_path
         wip_entry
       else
-        detect {|e| e.pathname.basename.to_path == filename }
+        detect {|e| e.path.basename.to_path == filename }
       end
     end
 
@@ -70,7 +69,7 @@ module Retter
       date = date || Date.today
       body = file.exist? ? file.read : ''
 
-      Entry.new date: date, body: rendered_body(body), pathname: file
+      Entry.new date: date, body: rendered_body(body), path: file, entries: self
     end
 
     def commit_wip_entry!
@@ -80,7 +79,7 @@ module Retter
         wip_file.unlink
       end
 
-      Retter.reset!
+      reload
     end
 
     def load_entries(path)
@@ -90,29 +89,26 @@ module Retter
       }.sort_by(&:first)
 
       date_files.reverse_each {|date, file|
-        self << Entry.new(date: date, body: rendered_body(file.read))
+        self << Entry.new(date: date, body: rendered_body(file.read), entries: self)
       }
     end
 
+    def reload
+      clear
+
+      load_entries retters_dir
+    end
+
     def find_markup_files(path)
       path = Pathname.new(path).realpath
-      Dir.open(path, &:to_a).grep(/^\d{4}(?:0[1-9]|1[012])(?:0[1-9]|[12][0-9]|3[01])\.(md)$/).map {|f| path.join f }
+      Dir.open(path, &:to_a).grep(/^\d{4}(?:0[1-9]|1[012])(?:0[1-9]|[12][0-9]|3[01])\..*$/).map {|f| path.join f }
     end
 
     def rendered_body(body)
       key = Digest::SHA1.hexdigest('entry_' + body)
 
-      config.cache.fetch(key) do
-        Redcarpet::Markdown.new(
-          renderer,
-          autolink: true,
-          space_after_headers: true,
-          fenced_code_blocks: true,
-          strikethrough: true,
-          superscript: true,
-          fenced_code_blocks: true,
-          tables: true
-        ).render(body)
+      cache.fetch(key) do
+        (markup || Markdown.instance).render(body)
       end
     end
   end

data/lib/retter/entry.rb

@@ -8,7 +8,14 @@ module Retter
       attr_accessor :entry, :id, :title, :body
 
       def initialize(attrs = {})
-        @id, @entry, @title, @body = attrs.values_at(:id, :entry, :title, :body)
+        attrs = {actual: true}.merge(attrs)
+
+        @id, @entry, @title, @body, @actual = attrs.values_at(:id, :entry, :title, :body, :actual)
+      end
+
+      # XXX return false if generated by Entry#to_article
+      def actual?
+        @actual
       end
 
       def to_s
@@ -24,32 +31,35 @@ module Retter
       end
 
       def index
-        articles.index(self)
+        articles.index(self).to_i
       end
 
       def articles
         @articles ||= entry.articles
       end
-    end
 
-    include Stationery
+      def snippet(length = 200)
+        snip = tags_stripped_body[0, length]
+
+        tags_stripped_body.length > length ? "#{snip}..." : snip
+      end
+
+      def tags_stripped_body
+        @tags_stripped_body ||= body.gsub(/<\/?\s?[^>]+>/, '')
+      end
+    end
 
     attr_accessor :date, :lede, :body, :articles
-    attr_reader :pathname
+    attr_reader :path
 
-    def initialize(attrs={})
-      @date, @body = attrs.values_at(:date, :body)
+    def initialize(attrs = {})
+      @entries, @date, @body = attrs.values_at(:entries, :date, :body)
 
-      pathname_by_date = Entries.retters_dir.join(date.strftime('%Y%m%d.md'))
-      @pathname = attrs[:pathname] || pathname_by_date
+      path_by_date = Entries.retters_dir.join(date.strftime('%Y%m%d.md'))
+      @path = attrs[:path] || path_by_date
 
-      attach_titles
       extract_articles
-      load_lede
-    end
-
-    def path
-      pathname.to_path
+      assign_lede
     end
 
     def to_s
@@ -57,15 +67,19 @@ module Retter
     end
 
     def next
-      entries[index.next]
+      @entries[index.next]
     end
 
     def prev
-      entries[index.pred] unless index.pred < 0
+      @entries[index.pred] unless index.pred < 0
     end
 
     def index
-      entries.index(self) || 0
+      @entries.index(self) || 0
+    end
+
+    def to_article
+      Article.new(entry: self, id: 'a0', title: date.to_s, body: body, actual: false)
     end
 
     private
@@ -74,7 +88,7 @@ module Retter
       Nokogiri::HTML(body)
     end
 
-    def attach_titles
+    def assign_ids
       html = body_elements
       html.search('//h1').each_with_index do |h1, seq|
         h1.set_attribute 'id', "a#{seq}"
@@ -84,23 +98,32 @@ module Retter
     end
 
     def extract_articles
-      @articles = body_elements.search('body > *').each_with_object([]) {|c, r|
+      assign_ids
+
+      @articles = body_elements.search('body > *').each_with_object([]) {|c, articles|
         if c.name == 'h1'
-          r << Article.new(entry: self, id: c.attr('id'), title: c.text, body: '')
+          articles << Article.new(entry: self, id: c.attr('id'), title: c.text, body: '')
         else
-          next if r.empty?
+          next if articles.empty?
 
-          article = r.last
+          article = articles.last
           article.body += c.to_s
         end
-      } || []
+      }
+
+      @articles = [to_article] if @articles.empty?
     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 assign_lede
+      @lede =
+        if articles.any?(&:actual?)
+          body_elements.search('body > *').each_with_object('') {|c, r|
+            break r if c.name == 'h1'
+            r << c.to_s
+          }
+        else
+          ''
+        end
     end
   end
 end

data/lib/retter/generator/base.rb

@@ -47,20 +47,19 @@ class Retter::Generator::Base < Thor::Group
 
   def create_files
     FILES.each do |file|
-      copy_file("skel/#{file}", "#{name}/#{file}")
+      copy_file %(skel/#{file}), %(#{name}/#{file})
     end
 
     TEMPLATES.each do |file|
-      template("skel/#{file}", "#{name}/#{file}")
+      template %(skel/#{file}), %(#{name}/#{file})
     end
   end
 
   def bundle_install
-    pwd = Dir.pwd
-    FileUtils.cd name
+    Dir.chdir name do
+      cli = Bundler::CLI.new
 
-    Bundler::CLI.new.install
-
-    FileUtils.cd pwd
+      cli.install
+    end
   end
 end

data/lib/retter/generator/skel/Gemfile

@@ -1,6 +1,5 @@
 source :rubygems
 
+gem 'retter', '~> 0.2.3'
 gem 'rack'
 gem 'thin' # for heroku
-gem 'retter'
-

data/lib/retter/generator/skel/Retterfile

@@ -5,7 +5,7 @@ url         'http://retter.example.com/'
 title       '<%= name %>'
 description '<%= name %>'
 author      '<%= ENV["USER"] %>'
-renderer    Retter::Renderers::PygmentsRenderer
+renderer    Retter::Markdown::PygmentsRenderer
 
 # Callbacks for retter sub-command: edit, rebind, commit
 #
@@ -24,7 +24,7 @@ renderer    Retter::Renderers::PygmentsRenderer
 #     end
 #
 #     after :edit do
-#       Retter.reset!
+#       Retter::Site.reset!
 #       ident = ARGV.pop
 #
 #       preview ident if yes?("Preview now? [yes/no]")

data/lib/retter/generator/skel/layouts/article.html.haml

@@ -2,8 +2,9 @@
   %h1.date
     %a{href: entry_path(entry)}= entry.date
 
-  %h1{id: article.id}
-    %a{href: article_path(article)}= article.title
+  - if article.actual?
+    %h1{id: article.id}
+      %a{href: article_path(article)}= article.title
 
   = article
 

data/lib/retter/generator/skel/layouts/entry.html.haml

@@ -6,8 +6,9 @@
     = entry.lede
 
   - entry.articles.each do |article|
-    %h1{id: article.id}
-      %a{href: article_path(article)}= article.title
+    - if article.actual?
+      %h1{id: article.id}
+        %a{href: article_path(article)}= article.title
 
     = article
 

data/lib/retter/generator/skel/layouts/index.html.haml

@@ -9,8 +9,10 @@
         = entry.lede
 
       - entry.articles.each do |article|
-        %h1{id: article.id}
-          %a{href: article_path(article)}= article.title
+        - if article.actual?
+          %h1{id: article.id}
+            %a{href: article_path(article)}= article.title
+
         = article
 
   .nav