retter 0.2.0 → 0.2.1

data/lib/retter/pages/profile.rb

@@ -1,13 +1,15 @@
 # coding: utf-8
 
-class Retter::Pages::Profile
-  include Retter::Page
+module Retter
+  class Pages::Profile
+    include Page
 
-  def pathname
-    config.profile_file
-  end
+    def pathname
+      config.retter_home.join('profile.html')
+    end
 
-  def part_layout_pathname
-    config.profile_layout_file
+    def part_layout_pathname
+      Pages.find_layout_path('profile')
+    end
   end
 end

data/lib/retter/pages.rb

@@ -1,30 +1,49 @@
 # coding: utf-8
 
 module Retter
-  class Pages
-    require 'retter/pages/index'
-    require 'retter/pages/profile'
-    require 'retter/pages/archive'
-    require 'retter/pages/feed'
-    require 'retter/pages/entry'
-    require 'retter/pages/article'
+  class Pages # XXX 名前が気に食わない
+    autoload :Index,   'retter/pages/index'
+    autoload :Profile, 'retter/pages/profile'
+    autoload :Entries, 'retter/pages/entries'
+    autoload :Feed,    'retter/pages/feed'
+    autoload :Entry,   'retter/pages/entry'
+    autoload :Article, 'retter/pages/article'
 
-    include Retter::Stationery
+    include Stationery
+    extend Configurable
 
-    attr_reader :index, :profile, :archive, :feed, :singleton_pages
+    configurable :layouts_dir, :entries_dir, :allow_binding
+
+    class << self
+      def find_layout_path(name)
+        detected = Dir.glob(layouts_dir.join("#{name}.*.*")).first
+
+        Pathname.new(detected)
+      end
+
+      def layout_file
+        @layout_file ||= find_layout_path('retter')
+      end
+
+      def entry_file(date)
+        entries_dir.join date.strftime('%Y%m%d.html')
+      end
+
+      def entry_dir(date)
+        entries_dir.join date.strftime('%Y%m%d')
+      end
+    end
 
     def initialize
-      @singleton_pages = [Index, Profile, Archive, Feed].map(&:new)
-      @index, @profile, @archive, @feed = *singleton_pages
+      load_singleton_pages
     end
 
     def bind!
       print_entries
 
-      singleton_pages.each(&:print)
+      @singleton_pages.each(&:print)
     end
 
-
     def print_entries
       entries.each do |entry|
         entry_page = Entry.new(entry)
@@ -36,5 +55,23 @@ module Retter
         end
       end
     end
+
+    private
+
+    def load_singleton_pages
+      @singleton_pages = available_singleton_page_names.map {|name|
+        Pages.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/preprint.rb

@@ -2,21 +2,21 @@
 
 module Retter
   class Preprint
-    include Retter::Page
+    include Page
 
     def pathname
       config.retter_home.join '.preview.html'
     end
 
     def part_layout_pathname
-      config.entry_layout_file
+      Pages.find_layout_path('entry')
     end
 
     def print(entry)
-      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, entry: entry)
 
       print_with_layout part

data/lib/retter/renderers.rb

@@ -3,7 +3,6 @@
 require 'redcarpet'
 require 'pygments'
 require 'coderay'
-require 'digest/sha1'
 require 'set'
 
 module Retter

data/lib/retter/repository.rb

@@ -4,11 +4,12 @@ require 'grit'
 
 module Retter
   class Repository
-    include Retter::Stationery
+    def self.open(working_dir, &block)
+      new(working_dir).open(&block)
+    end
 
-    def initialize
-      working_dir = config.retter_home.to_s
-      @repo = Grit::Repo.new(working_dir)
+    def initialize(working_dir)
+      @repo = Grit::Repo.new(working_dir.to_s)
     end
 
     def open

data/lib/retter/version.rb

@@ -1,3 +1,3 @@
 module Retter
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/lib/retter.rb

@@ -7,7 +7,7 @@ module Retter
   class RetterError < RuntimeError; end
 
   module Stationery
-    [:config, :entries, :preprint, :pages, :repository].each do |meth|
+    [:config, :entries].each do |meth|
       define_method meth do
         Retter.send meth
       end
@@ -15,38 +15,34 @@ module Retter
   end
 
   class << self
-    def load_config(env)
-      @config = Config.new(env)
-    end
+    attr_reader :config
 
-    def config
-      @config
+    def load(env)
+      @config = Config.new(env)
     end
 
-    def reset_entries!
+    def reset!
       @entries = nil
     end
 
-    singletons = [:entries, :preprint, :pages, :repository]
-    singletons.each do |sym|
-      define_method sym do
-        eval "@#{sym} ||= #{sym.capitalize}.new"
-      end
+    def entries
+      @entries ||= Entries.new
     end
   end
 
-  autoload :Generator,  'retter/generator'
-
-  autoload :VERSION,    'retter/version'
-  autoload :Config,     'retter/config'
-  autoload :Renderers,  'retter/renderers'
-  autoload :Entry,      'retter/entry'
-  autoload :Entries,    'retter/entries'
-  autoload :Page,       'retter/page'
-  autoload :Pages,      'retter/pages'
-  autoload :Preprint,   'retter/preprint'
-  autoload :Repository, 'retter/repository'
-  autoload :Command,    'retter/command'
+  autoload :Generator,    'retter/generator'
+
+  autoload :VERSION,      'retter/version'
+  autoload :Configurable, 'retter/configurable'
+  autoload :Config,       'retter/config'
+  autoload :Renderers,    'retter/renderers'
+  autoload :Entry,        'retter/entry'
+  autoload :Entries,      'retter/entries'
+  autoload :Page,         'retter/page'
+  autoload :Pages,        'retter/pages'
+  autoload :Preprint,     'retter/preprint'
+  autoload :Repository,   'retter/repository'
+  autoload :Command,      'retter/command'
 end
 
 require 'date'

data/retter.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
 
     Pygments syntax highlight is now available.
     To use, add a following line to Retterfile.
-    
+
     ```ruby
     renderer Retter::Renderers::PygmentsRenderer
     ```
@@ -36,8 +36,10 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'nokogiri', ['>= 1.5.0']
   s.add_runtime_dependency 'launchy', ['>= 2.0.5']
   s.add_runtime_dependency 'haml', ['>= 3.1.3']
+  s.add_runtime_dependency 'tilt', ['>= 1.1.3']
   s.add_runtime_dependency 'bundler', ['>= 1.0']
   s.add_runtime_dependency 'grit', ['>= 2.4.1']
+  s.add_runtime_dependency 'chronic', ['>= 0.6.7']
   s.add_runtime_dependency 'activesupport', ['>= 3.1.0']
 
   # XXX for ActiveSupport dependency

data/spec/bin/fake_editor

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+
+File.open(ARGV.first, 'w') {|f| f.puts 'written' }

data/spec/command/callback_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 
 describe 'Retter::Command#callback', clean: :all do
   before do
-    retter_config.after(:edit) { commit }
+    Retter.config.after(:edit) { commit }
 
     command.stub!(:options) { {after: :edit} }
   end

data/spec/command/commit_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 require 'grit'
 
 describe 'Retter::Command#commit', clean: :all do
-  let(:repo) { Grit::Repo.new(retter_config.retter_home.to_s) }
+  let(:repo) { Grit::Repo.new(Retter.config.retter_home) }
   let(:article) { '今日の記事' }
 
   before do
@@ -12,7 +12,7 @@ describe 'Retter::Command#commit', clean: :all do
     wip_file.open('w') {|f| f.puts article }
     command.rebind
 
-    Grit::Repo.init retter_config.retter_home.to_s
+    Grit::Repo.init Retter.config.retter_home.to_path
   end
 
   context 'with no options' do

data/spec/command/edit_spec.rb

@@ -40,7 +40,7 @@ describe 'Retter::Command#edit', clean: :all do
     it { wip_file.should_not written }
 
     describe 'date file' do
-      subject { retter_config.retter_file(date) }
+      subject { Retter.entries.retter_file(date) }
 
       it { should written }
     end
@@ -56,7 +56,7 @@ describe 'Retter::Command#edit', clean: :all do
     describe 'target date file' do
       let(:one_day_ago) { Date.parse('2011/04/01') }
 
-      subject { retter_config.retter_file(one_day_ago) }
+      subject { Retter.entries.retter_file(one_day_ago) }
 
       it { should written }
     end
@@ -72,7 +72,7 @@ describe 'Retter::Command#edit', clean: :all do
     describe 'target date file' do
       let(:yesterday) { Date.parse('2011/04/01') }
 
-      subject { retter_config.retter_file(yesterday) }
+      subject { Retter.entries.retter_file(yesterday) }
 
       it { should written }
     end
@@ -82,13 +82,15 @@ describe 'Retter::Command#edit', clean: :all do
     let(:a_day) { Date.parse('20110401') }
 
     before do
-      FileUtils.touch retter_config.retter_file(a_day)
+      FileUtils.touch Retter.entries.retter_file(a_day)
+
+      Retter.reset! # XXX
 
       command.edit '20110401.md'
     end
 
     describe 'target date file' do
-      subject { retter_config.retter_file(a_day) }
+      subject { Retter.entries.retter_file(a_day) }
 
       it { should written }
     end
@@ -102,13 +104,13 @@ describe 'Retter::Command#edit', clean: :all do
 
   context 'with filename (today.md) option' do
     before do
-      FileUtils.touch retter_config.wip_file.to_s
+      FileUtils.touch Retter.config.wip_file.to_path
 
       command.edit 'today.md'
     end
 
     describe 'target file' do
-      subject { retter_config.wip_file }
+      subject { Retter.config.wip_file }
 
       it { should written }
     end

data/spec/command/invoke_after_spec.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 describe 'Retter::Command#invoke_after', clean: :all do
   context 'invoke with proc' do
     before do
-      retter_config.after(:edit) { commit }
+      Retter.config.after(:edit) { commit }
     end
 
     specify 'callback should called' do
@@ -17,7 +17,7 @@ describe 'Retter::Command#invoke_after', clean: :all do
 
   context 'invoke with symbol' do
     before do
-      retter_config.after(:edit, :commit)
+      Retter.config.after(:edit, :commit)
     end
 
     specify 'callback should called' do

data/spec/command/list_spec.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 describe 'Retter::Command#list', clean: :all do
   context 'happy case' do
     before do
-      retter_config.retter_file(Date.parse('20110101')).open('w') do |f|
+      Retter.entries.retter_file(Date.parse('20110101')).open('w') do |f|
         f.puts <<-EOM
 # 朝11時
 
@@ -17,7 +17,7 @@ describe 'Retter::Command#list', clean: :all do
         EOM
       end
 
-      retter_config.retter_file(Date.parse('20110222')).open('w') do |f|
+      Retter.entries.retter_file(Date.parse('20110222')).open('w') do |f|
         f.puts <<-EOM
 # 朝11時30分
 
@@ -28,6 +28,8 @@ describe 'Retter::Command#list', clean: :all do
 おやすみなさい
         EOM
       end
+
+      Retter.reset! # XXX
     end
 
     subject { capture(:stdout) { command.list }.split(/\n+/) }

data/spec/command/open_spec.rb

@@ -5,7 +5,7 @@ require 'launchy'
 
 describe 'Retter::Command#open', clean: :all do
   specify 'should be open application' do
-    Launchy.should_receive(:open).with(retter_config.index_file.to_s)
+    Launchy.should_receive(:open).with(Retter.config.retter_home.join('index.html').to_path)
 
     command.open
   end

data/spec/command/preview_spec.rb

@@ -5,7 +5,7 @@ require 'launchy'
 
 describe 'Retter::Command#preview', clean: :all do
   def preview_html
-    retter_config.retter_home.join('.preview.html').read
+    Retter.config.retter_home.join('.preview.html').read
   end
 
   before do
@@ -26,7 +26,7 @@ describe 'Retter::Command#preview', clean: :all do
 
   context 'with date option' do
     let(:date_str) { '20110101' }
-    let(:date_file) { retter_config.retter_file(Date.parse(date_str)) }
+    let(:date_file) { Retter.entries.retter_file(Date.parse(date_str)) }
 
     before do
       wip_file.open('w') {|f| f.puts 'w00t!' }

data/spec/command/rebind_spec.rb

@@ -6,8 +6,8 @@ describe 'Retter::Command#rebind', clean: :all do
   context 'first post' do
     let(:date_str) { '20110101' }
     let(:date) { Date.parse(date_str) }
-    let(:date_file) { retter_config.retter_file(date) }
-    let(:date_html) { retter_config.entry_file(date) }
+    let(:date_file) { Retter.entries.retter_file(date) }
+    let(:date_html) { Retter::Pages.entry_file(date) }
     let(:article) { <<-EOM }
 # 朝11時
 
@@ -35,7 +35,7 @@ describe 'Retter::Command#rebind', clean: :all do
     end
 
     describe 'index.html' do
-      let(:index_html) { retter_config.index_file.read }
+      let(:index_html) { Retter.config.retter_home.join('index.html').read }
 
       it { texts_of(index_html, 'article p').should include('おはようございます') }
       it { texts_of(index_html, 'article h1.date').should == %w(2011-01-01) }
@@ -43,14 +43,14 @@ describe 'Retter::Command#rebind', clean: :all do
     end
 
     describe 'entries.html' do
-      let(:entries_html) { retter_config.entries_file.read }
+      let(:entries_html) { Retter.config.retter_home.join('entries.html').read }
 
       it { texts_of(entries_html, 'a.entry').first.should == '2011-01-01' }
       it { texts_of(entries_html, 'a.title').should == %w(朝11時 夜1時) }
     end
 
     describe 'entry.html' do
-      let(:entry_html) { retter_config.entry_file(date).read }
+      let(:entry_html) { Retter::Pages.entry_file(date).read }
 
       it { texts_of(entry_html, 'article p').should == %w(おはようございます おやすみなさい) }
       it { texts_of(entry_html, 'article h1.date').should == %w(2011-01-01) }
@@ -58,7 +58,7 @@ describe 'Retter::Command#rebind', clean: :all do
     end
 
     describe 'entry part(first)' do
-      let(:part_html) { retter_config.entry_dir(date).join('a0.html').read }
+      let(:part_html) { Retter::Pages.entry_dir(date).join('a0.html').read }
 
       describe 'body' do
         subject { texts_of(part_html, 'article p') }
@@ -82,7 +82,7 @@ describe 'Retter::Command#rebind', clean: :all do
     end
 
     describe 'entry part(last)' do
-      let(:part_html) { retter_config.entry_dir(date).join('a1.html').read }
+      let(:part_html) { Retter::Pages.entry_dir(date).join('a1.html').read }
 
       describe 'body' do
         subject { texts_of(part_html, 'article p') }
@@ -107,7 +107,7 @@ describe 'Retter::Command#rebind', clean: :all do
   end
 
   context 'includes code block' do
-    let(:index_html) { retter_config.index_file.read }
+    let(:index_html) { Retter.config.retter_home.join('index.html').read }
     let(:article) { <<-EOM }
 # コードを書きました
 
@@ -122,7 +122,7 @@ sleep 1000
 
     context 'use Pygments' do
       before do
-        retter_config.stub!(:renderer).and_return(Retter::Renderers::PygmentsRenderer)
+        Retter.config.renderer Retter::Renderers::PygmentsRenderer
         command.rebind
       end
 
@@ -133,7 +133,7 @@ sleep 1000
 
     context 'use CodeRay' do
       before do
-        retter_config.stub!(:renderer).and_return(Retter::Renderers::CodeRayRenderer)
+        Retter.config.renderer Retter::Renderers::CodeRayRenderer
         command.rebind
       end
 
@@ -156,4 +156,44 @@ sleep 1000
       command.rebind
     end
   end
+
+  context 'skipping some singleton pages binding' do
+    let(:retter_home) { Retter.config.retter_home }
+    let(:index_html) { retter_home.join('index.html') }
+    let(:profile_html) { retter_home.join('profile.html') }
+    let(:entries_html) { retter_home.join('entries.html') }
+    let(:feed_file) { retter_home.join('feed.rss') }
+
+    before do
+      index_html.unlink
+
+      command.edit
+    end
+
+    context 'skipping all' do
+      before do
+        Retter::Pages.allow_binding :none
+
+        command.rebind
+      end
+
+      it { profile_html.should_not be_exist }
+      it { entries_html.should_not be_exist }
+      it { feed_file.should_not be_exist }
+      it { index_html.should be_exist }
+    end
+
+    context 'skipping only :feed' do
+      before do
+        Retter::Pages.allow_binding [:profile, :entries]
+
+        command.rebind
+      end
+
+      it { profile_html.should be_exist }
+      it { entries_html.should be_exist }
+      it { feed_file.should_not be_exist }
+      it { index_html.should be_exist }
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,9 +1,11 @@
 # coding: utf-8
 
 require 'tapp'
-require 'simplecov'
 
-SimpleCov.start
+if ENV['COVERAGE']
+  require 'simplecov'
+  SimpleCov.start
+end
 
 RETTER_ROOT = Pathname.new(File.dirname(__FILE__) + '/../').realpath
 require RETTER_ROOT.join('lib', 'retter')
@@ -14,8 +16,9 @@ RSpec.configure do |config|
   config.filter_run focus: true
   config.run_all_when_everything_filtered = true
 
-  retter_home = RETTER_ROOT.join('tmp', 'test')
-  skel        = RETTER_ROOT.join('lib', 'retter', 'generator', 'skel')
+  retter_home = RETTER_ROOT.join('tmp/test')
+  skel        = RETTER_ROOT.join('lib/retter/generator/skel')
+  fake_editor = RETTER_ROOT.join('spec/bin/fake_editor')
 
   config.before :each, clean: :all do
     FileUtils.cp_r skel, retter_home.dirname.join('test')
@@ -23,11 +26,13 @@ RSpec.configure do |config|
 
   config.after :each, clean: :all do
     FileUtils.rm_rf retter_home
-    Retter.reset_entries!
+    Retter.reset!
   end
 
   config.before do
-    Retter.stub!(:config) { retter_config }
+    env = {'EDITOR' => fake_editor.to_path, 'RETTER_HOME' => RETTER_ROOT.join('tmp', 'test').to_s}
+
+    Retter.load env
   end
 
   config.include ExampleGroupHelper

data/spec/support/example_group_helper.rb

@@ -9,16 +9,8 @@ module ExampleGroupHelper
       @command ||= Retter::Command.new
     end
 
-    def retter_config
-      return @config if @config
-
-      env = {'EDITOR' => 'echo written >', 'RETTER_HOME' => RETTER_ROOT.join('tmp', 'test').to_s}
-
-      @config = Retter::Config.new(env)
-    end
-
     def wip_file
-      retter_config.wip_file
+      Retter.entries.wip_file
     end
   end