retter 0.1.0 → 0.1.1

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

@@ -1,11 +1,21 @@
-#entries
-  - entries[0..5].each do |entry|
+#entries.autopagerize_page_element
+  - recent_entries = entries[0..4]
+  - recent_entries.each do |entry|
     %article
       %h1.date
-        %a{href: entry_path(entry.date)}= entry.date.strftime('%Y/%m/%d')
+        %a{href: entry_path(entry)}= entry.date
+
       - unless entry.lede.empty?
         = entry.lede
+
       - entry.articles.each do |article|
         %h1{id: article.id}
-          %a{href: article_path(entry.date, article.id)}= article.title
+          %a{href: article_path(article)}= article.title
         = article
+
+  .nav
+    .next
+      - if next_entry = recent_entries.last.next
+        %link{href: entry_path(next_entry), rel: :next}
+
+  .autopagerize_insert_before

data/lib/retter/generator/skel/stylesheets/base.css

@@ -4,5 +4,5 @@ dl dd {
 }
 
 pre {
-  overflow: scroll;
+  overflow: hidden;
 }

data/lib/retter/generator/skel/stylesheets/orange.css

@@ -11,6 +11,7 @@ body {
   background: #EEE;
   background-image:url("../images/orange/bg_body.jpg");
   height: 100%;
+  line-height:1.4;
 }
 
 ul {
@@ -22,6 +23,10 @@ a {
   color: rgb(25,30,10);
 }
 
+code{
+  padding:0 5px;
+}
+
 #header {
   padding: 0;
   margin: 0;
@@ -84,6 +89,18 @@ article {
   position:relative;
 }
 
+article ul li {
+  list-style-image:url("../images/orange/ic_li01.gif");
+}
+
+article p a {
+  color:#F30;
+}
+
+article p a:hover {
+  color:#F93;
+}
+
 article .date {
   font-size: 1em;
   text-align: center;
@@ -91,7 +108,6 @@ article .date {
   padding:10px;
   width:100px;
   float:right;
-
   position:absolute;
   top:-24px;
   left:650px;
@@ -151,4 +167,3 @@ pre {
 #footer a:hover {
   color: #669;
 }
-

data/lib/retter/page/view_helper.rb

@@ -0,0 +1,33 @@
+# coding: utf-8
+
+module Retter::Page
+  module ViewHelper
+    include Retter::Stationery
+
+    def entry_path(*args)
+      case args.first
+      when Date, Time
+        date, id = *args
+        date.strftime('/entries/%Y%m%d.html') + (id ? "##{id}" : '')
+      when Retter::Entry
+        entry = args.first
+        entry_path(entry.date)
+      else
+        raise TypeError, "wrong argument type #{args.first.class} (expected Date, Time or Retter::Entry)"
+      end
+    end
+
+    def article_path(*args)
+      case args.first
+      when Date, Time
+        date, id = *args
+        date.strftime("/entries/%Y%m%d/#{id}.html")
+      when Retter::Entry::Article
+        article = args.first
+        article_path(article.entry.date, article.id)
+      else
+        raise TypeError, "wrong argument type #{args.first.class} (expected Date, Time or Retter::Entry::Article)"
+      end
+    end
+  end
+end

data/lib/retter/page.rb

@@ -0,0 +1,86 @@
+# coding: utf-8
+
+module Retter
+  module Page
+    require 'retter/page/view_helper'
+
+    include Retter::Stationery
+
+    attr_reader :path_prefix, :title
+
+    def initialize
+      @path_prefix = './'
+      @title       = config.title
+    end
+
+    def print
+      part = Haml::Engine.new(part_layout_pathname.read, ugly: true).render(view_scope)
+
+      print_with_layout part
+    end
+
+    def pathname
+      raise NotImplementedError
+    end
+
+    def path
+      pathname.to_s
+    end
+
+    def part_layout_pathname
+      raise NotImplementedError
+    end
+
+    private
+
+    def print_with_layout(content)
+      draft = layout_renderer.render(view_scope, content: content, title: title)
+      path_fixed = fix_path(draft, path_prefix)
+
+      pathname.open('w') {|f| f.puts path_fixed }
+    end
+
+    def layout_renderer
+      @layout_renderer ||= Haml::Engine.new(config.layout_file.read, ugly: true)
+    end
+
+    def fix_path(html, prefix='./')
+      elements = Nokogiri::HTML(html)
+
+      fix_href_path(fix_src_path(elements, prefix), prefix).to_s
+    end
+
+    def fix_src_path(elements, prefix = './')
+      elements.search("[src!=''][src!='']").each do |el|
+        src = el.attr('src').scan(/[^\.\/]{3}.*/).first
+        next if src =~ /^(?:http|https):\/\//
+
+        el.set_attribute 'src', [prefix, src].join
+      end
+
+      elements
+    end
+
+    def fix_href_path(elements, prefix = './')
+      elements.search("[href][href!='#']").each do |el|
+        href = el.attr('href')
+        next if href =~ /^(?:http|https):\/\//
+
+        if href == '/'
+          el.set_attribute 'href', [prefix, 'index.html'].join
+        else
+          el.set_attribute 'href', [prefix, href.scan(/[^\.\/]{3}.*/).first].join
+        end
+      end
+
+      elements
+    end
+
+    view_scope = Object.new
+    view_scope.extend ViewHelper
+
+    define_method :view_scope do
+      view_scope
+    end
+  end
+end

data/lib/retter/pages/archive.rb

@@ -0,0 +1,13 @@
+# coding: utf-8
+
+class Retter::Pages::Archive
+  include Retter::Page
+
+  def pathname
+    config.entries_file
+  end
+
+  def part_layout_pathname
+    config.entries_layout_file
+  end
+end

data/lib/retter/pages/article.rb

@@ -0,0 +1,35 @@
+# 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).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?
+  end
+end

data/lib/retter/pages/entry.rb

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

data/lib/retter/pages/feed.rb

@@ -0,0 +1,46 @@
+# coding: utf-8
+
+class Retter::Pages::Feed
+  include Retter::Page
+
+  def pathname
+    config.feed_file
+  end
+
+  def print
+    pathname.open('w') {|f| f.puts rss }
+  end
+
+  private
+
+  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
+
+      entries.each do |entry|
+        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
+end

data/lib/retter/pages/index.rb

@@ -0,0 +1,13 @@
+# coding: utf-8
+
+class Retter::Pages::Index
+  include Retter::Page
+
+  def pathname
+    config.index_file
+  end
+
+  def part_layout_pathname
+    config.index_layout_file
+  end
+end

data/lib/retter/pages/profile.rb

@@ -0,0 +1,13 @@
+# coding: utf-8
+
+class Retter::Pages::Profile
+  include Retter::Page
+
+  def pathname
+    config.profile_file
+  end
+
+  def part_layout_pathname
+    config.profile_layout_file
+  end
+end

data/lib/retter/pages.rb

@@ -0,0 +1,40 @@
+# 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'
+
+    include Retter::Stationery
+
+    attr_reader :index, :profile, :archive, :feed, :singleton_pages
+
+    def initialize
+      @singleton_pages = [Index, Profile, Archive, Feed].map(&:new)
+      @index, @profile, @archive, @feed = *singleton_pages
+    end
+
+    def bind!
+      print_entries
+
+      singleton_pages.each(&:print)
+    end
+
+
+    def print_entries
+      entries.each do |entry|
+        entry_page = Entry.new(entry)
+        entry_page.print
+
+        entry.articles.each do |article|
+          article_page = Article.new(article)
+          article_page.print
+        end
+      end
+    end
+  end
+end

data/lib/retter/preprint.rb

@@ -0,0 +1,21 @@
+# coding: utf-8
+
+module Retter
+  class Preprint
+    include Retter::Page
+
+    def pathname
+      config.retter_home.join '.preview.html'
+    end
+
+    def part_layout_pathname
+      config.entry_layout_file
+    end
+
+    def print(entry)
+      part = Haml::Engine.new(part_layout_pathname.read, ugly: true).render(view_scope, entry: entry)
+
+      print_with_layout part
+    end
+  end
+end

data/lib/retter/{stationery/renderer.rb → renderer.rb}

@@ -1,6 +1,6 @@
 # coding: utf-8
 
-module Retter::Stationery
+module Retter
   class Renderer < ::Redcarpet::Render::HTML
     def block_code(code, lang)
       ::CodeRay.scan(code, lang ? lang.intern : :plain).div

data/lib/retter/repository.rb

@@ -0,0 +1,21 @@
+# coding: utf-8
+
+module Retter
+  class Repository
+    include Retter::Stationery
+
+    def initialize
+      working_dir = config.retter_home.to_s
+      @repo = Grit::Repo.new(working_dir)
+    end
+
+    def open
+      pwd = Dir.pwd
+      Dir.chdir @repo.working_dir
+
+      yield @repo
+
+      Dir.chdir pwd
+    end
+  end
+end

data/lib/retter/version.rb

@@ -1,3 +1,3 @@
 module Retter
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/lib/retter.rb

@@ -4,7 +4,34 @@ here = File.dirname(__FILE__)
 $LOAD_PATH.unshift here unless $LOAD_PATH.include?(here)
 
 module Retter
-  class EnvError < RuntimeError; end
+  module Stationery
+    [:config, :entries, :preprint, :pages, :repository].each do |meth|
+      define_method meth do
+        Retter.send meth
+      end
+    end
+  end
+
+  class << self
+    def load_config(env)
+      @config = Config.new(env)
+    end
+
+    def config
+      @config
+    end
+
+    def reset_entries!
+      @entries = nil
+    end
+
+    singletons = [:entries, :preprint, :pages, :repository]
+    singletons.each do |sym|
+      define_method sym do
+        eval "@#{sym} ||= #{sym.capitalize}.new"
+      end
+    end
+  end
 
   autoload :Generator, 'retter/generator'
 end
@@ -22,8 +49,14 @@ require 'haml'
 require 'uri'
 require 'forwardable'
 require 'grit'
+
 require 'retter/version'
-require 'retter/entry'
 require 'retter/config'
-require 'retter/stationery'
+require 'retter/renderer'
+require 'retter/entry'
+require 'retter/entries'
+require 'retter/page'
+require 'retter/pages'
+require 'retter/preprint'
+require 'retter/repository'
 require 'retter/command'

data/retter.gemspec

@@ -11,6 +11,35 @@ Gem::Specification.new do |s|
   s.summary     = %q{Flyweight diary workflow}
   s.description = %q{Flyweight diary workflow. ruby-1.9.2 or later is required.}
 
+
+  s.post_install_message = <<-EOM
+    **Important** Some features were added or updated.
+
+    * Article has Permlink in retter-0.1.0 or later.
+      If error occured, try overwrite templates by `retter gen $RETTER_HOME`. (overwrite layouts/*.html.haml)
+
+    * Relative date is now available in `--date` option.
+      Examples:
+        $ retter edit yesterday
+        $ retter edit today
+        $ retter edit tomorrow
+        $ retter preview 2.days.ago
+
+    * `--key` option is now available in edit (and preview).
+      Examples:
+        $ retter list
+        [e0] 2011-10-12  article3, article4
+        [e1] 2011-10-10  article1, article2
+        $ retter edit --key e0
+          ... or ...
+        $ retter edit e0
+
+    * Default date format has changed.
+      2011/01/01 -> 2011-01-01
+
+    -- Thanks for flying Retter :-> --
+  EOM
+
   #s.rubyforge_project = "retter"
 
   s.files         = `git ls-files`.split("\n")
@@ -27,6 +56,8 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'haml', ['>= 3.1.3']
   s.add_runtime_dependency 'bundler', ['>= 1.0']
   s.add_runtime_dependency 'grit', ['>= 2.4.1']
+  s.add_runtime_dependency 'activesupport', ['>= 3.1.0']
+  s.add_runtime_dependency 'i18n', ['>= 0.6.0']
 
   s.add_development_dependency 'rake', ['>= 0.9.2']
   s.add_development_dependency 'ir_b', ['>= 1.4.0']

data/spec/command/callback_spec.rb

@@ -6,7 +6,7 @@ describe 'Retter::Command#callback', clean: :all do
   let(:command) { Retter::Command.new }
 
   before do
-    command.stub!(:config) { retter_config }
+    Retter.stub!(:config) { retter_config }
 
     retter_config.after(:edit) { commit }
     command.should_receive(:commit).and_return(true)

data/spec/command/commit_spec.rb

@@ -11,7 +11,7 @@ describe 'Retter::Command#commit', clean: :all do
   before do
     Grit::Repo.init retter_config.retter_home.to_s
 
-    command.stub!(:config) { retter_config }
+    Retter.stub!(:config) { retter_config }
     command.stub!(:say) { true }
     wip_file.open('w') {|f| f.puts article }
     command.rebind

data/spec/command/edit_spec.rb

@@ -7,7 +7,7 @@ describe 'Retter::Command#edit', clean: :all do
   let(:wip_file) { retter_config.wip_file }
 
   before do
-    command.stub!(:config) { retter_config }
+    Retter.stub!(:config) { retter_config }
   end
 
   context 'no options' do

data/spec/command/invoke_after_spec.rb

@@ -7,7 +7,7 @@ describe 'Retter::Command#invoke_after', clean: :all do
 
   context 'invoke with proc' do
     before do
-      command.stub!(:config) { retter_config }
+      Retter.stub!(:config) { retter_config }
 
       retter_config.after(:edit) { commit }
       command.should_receive(:commit).and_return(true)
@@ -18,7 +18,7 @@ describe 'Retter::Command#invoke_after', clean: :all do
 
   context 'invoke with symbol' do
     before do
-      command.stub!(:config) { retter_config }
+      Retter.stub!(:config) { retter_config }
 
       retter_config.after(:edit, :commit)
       command.should_receive(:invoke).with(:commit).and_return(true)

data/spec/command/list_spec.rb

@@ -0,0 +1,47 @@
+# coding: utf-8
+
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe 'Retter::Command#list', clean: :all do
+  let(:command) { Retter::Command.new }
+  let(:wip_file) { retter_config.wip_file }
+
+  before do
+    Retter.stub!(:config) { retter_config }
+  end
+
+  context 'happy case' do
+    before do
+      retter_config.retter_file(Date.parse('20110101')).open('w') do |f|
+        f.puts <<-EOM
+# 朝11時
+
+おはようございます
+
+# 夜1時
+
+おやすみなさい
+        EOM
+      end
+
+      retter_config.retter_file(Date.parse('20110222')).open('w') do |f|
+        f.puts <<-EOM
+# 朝11時30分
+
+おはようございます
+
+# 夜1時30分
+
+おやすみなさい
+        EOM
+      end
+    end
+
+    subject { capture(:stdout) { command.list }.split(/\n+/) }
+
+    its([0]) { should match /\[e0\]\s+2011\-02\-22/ }
+    its([1]) { should match /朝11時30分, 夜1時30分/ }
+    its([2]) { should match /\[e1\]\s+2011\-01\-01/ }
+    its([3]) { should match /朝11時, 夜1時/ }
+  end
+end

data/spec/command/open_spec.rb

@@ -7,7 +7,7 @@ describe 'Retter::Command#open', clean: :all do
   let(:wip_file) { retter_config.wip_file }
 
   before do
-    command.stub!(:config) { retter_config }
+    Retter.stub!(:config) { retter_config }
   end
 
   it 'should be open application' do

data/spec/command/preview_spec.rb

@@ -9,7 +9,7 @@ describe 'Retter::Command#preview', clean: :all do
   let(:date_file) { retter_config.retter_file(Date.parse(date_str)) }
 
   before do
-    command.stub!(:config) { retter_config }
+    Retter.stub!(:config) { retter_config }
   end
 
   context 'no options' do