retter 0.1.3 → 0.2.0

data/lib/retter.rb

@@ -35,30 +35,20 @@ module Retter
     end
   end
 
-  autoload :Generator, 'retter/generator'
+  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'
 end
 
 require 'date'
 require 'time'
-require 'builder'
 require 'pathname'
-require 'thor'
-require 'redcarpet'
-require 'coderay'
-require 'nokogiri'
-require 'launchy'
-require 'haml'
-require 'uri'
-require 'forwardable'
-require 'grit'
-
-require 'retter/version'
-require 'retter/config'
-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/lib/retter/command.rb

@@ -1,5 +1,8 @@
 # coding: utf-8
 
+require 'thor'
+require 'launchy'
+
 class Retter::Command < Thor
   include Retter::Stationery
 
@@ -144,11 +147,10 @@ Usage:
   cd $RETTER_HOME
   git push [remote] [branch] # or sftp, rsync, etc...
 
-  # Specific date
+  # Command options
   retter edit 20110101
   retter preview 20110101
 
-  # Specific file
   retter edit today.md
   retter edit 20110101.md
   retter preview 20110101.md

data/lib/retter/config.rb

@@ -1,5 +1,7 @@
 # coding: utf-8
 
+require 'active_support/cache'
+
 module Retter
   class EnvError < RetterError; end
 
@@ -7,6 +9,8 @@ module Retter
     ATTRIBUTES = [
       :editor,
       :shell,
+      :renderer,
+      :cache,
       :title,
       :description,
       :url,
@@ -51,15 +55,18 @@ module Retter
       @retter_home = Pathname.new(@env['RETTER_HOME'])
       load_defaults
       load_retterfile_if_exists
-      rescue Retter::EnvError
-        $stderr.puts 'Set $RETTER_HOME and $EDITOR, first.'
-        say Retter::Command.usage, :green
-        exit 1
+    rescue Retter::EnvError
+      $stderr.puts 'Set $RETTER_HOME and $EDITOR, first.'
+      say Retter::Command.usage, :green
+
+      exit 1
     end
 
     def load_defaults
       editor              @env['EDITOR']
       shell               @env['SHELL']
+      renderer            Retter::Renderers::CodeRayRenderer
+      cache               ActiveSupport::Cache::FileStore.new(retter_home.join('tmp/cache').to_s)
       url                 'http://example.com'
       retters_dir         retter_home.join('retters/')
       wip_file            retters_dir.join('today.md')
@@ -99,10 +106,6 @@ module Retter
       entries_dir.join date.strftime('%Y%m%d')
     end
 
-    def self.delegatables
-      ATTRIBUTES + [:retter_file, :entry_file, :entry_dir]
-    end
-
     def after(name, sym = nil, &block)
       if callback = sym || block
         @after_callbacks[name] = callback

data/lib/retter/entries.rb

@@ -1,6 +1,8 @@
 # coding: utf-8
 
 require 'active_support/core_ext/object'
+require 'digest/sha1'
+require 'redcarpet'
 
 module Retter
   class EntryLoadError < RetterError; end
@@ -13,18 +15,19 @@ module Retter
     end
 
     def detect_by_string(str)
-      entry = case str
-              when nil, ''
-                detect_by_today || wip_entry
-              when /^e([0-9]+)$/
-                index = $1.to_i
-                self[index]
-              when /^([0-9a-z]+\.md)$/
-                detect_by_filename($1)
-              else
-                date = parse_date_string(str)
-                detect_by_date(date) || wip_entry(date)
-              end
+      entry =
+        case str
+        when nil, ''
+          detect_by_today || wip_entry
+        when /^e([0-9]+)$/
+          index = $1.to_i
+          self[index]
+        when /^([0-9a-z]+\.md)$/
+          detect_by_filename($1)
+        else
+          date = parse_date_string(str)
+          detect_by_date(date) || wip_entry(date)
+        end
 
       raise EntryLoadError, "Entry not found with keyword '#{str}'" unless entry
 
@@ -65,7 +68,7 @@ module Retter
       wip_date = date || Date.today
       wip_body = wip_file.exist? ? wip_file.read : ''
 
-      Retter::Entry.new date: wip_date, body: markupper.render(wip_body), pathname: wip_file
+      Retter::Entry.new date: wip_date, body: rendered_body(wip_body), pathname: wip_file
     end
 
     def commit_wip_entry!
@@ -85,7 +88,7 @@ module Retter
       }.sort_by(&:first)
 
       date_files.reverse_each {|date, file|
-        self << Retter::Entry.new(date: date, body: markupper.render(file.read))
+        self << Retter::Entry.new(date: date, body: rendered_body(file.read))
       }
     end
 
@@ -94,17 +97,21 @@ module Retter
       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 }
     end
 
-    def markupper
-      @markupper ||= ::Redcarpet::Markdown.new(
-        Renderer,
-        autolink: true,
-        space_after_headers: true,
-        fenced_code_blocks: true,
-        strikethrough: true,
-        superscript: true,
-        fenced_code_blocks: true,
-        tables: true
-      )
+    def rendered_body(body)
+      key = Digest::SHA1.hexdigest('entry_' + body)
+
+      config.cache.fetch(key) do
+        Redcarpet::Markdown.new(
+          config.renderer,
+          autolink: true,
+          space_after_headers: true,
+          fenced_code_blocks: true,
+          strikethrough: true,
+          superscript: true,
+          fenced_code_blocks: true,
+          tables: true
+        ).render(body)
+      end
     end
   end
 end

data/lib/retter/entry.rb

@@ -1,5 +1,7 @@
 # coding: utf-8
 
+require 'nokogiri'
+
 class Retter::Entry
   class Article
     attr_accessor :entry, :id, :title, :body

data/lib/retter/generator/base.rb

@@ -25,9 +25,11 @@ class Retter::Generator::Base < Thor::Group
     retters/.gitkeep
     images/.gitkeep
     entries/.gitkeep
+    tmp/cache/.gitkeep
     javascripts/.gitkeep
     stylesheets/base.css
     stylesheets/retter.css
+    stylesheets/pygments.css
 
     stylesheets/orange.css
     images/orange/bg_body.jpg

data/lib/retter/generator/skel/Retterfile

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

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

@@ -3,9 +3,11 @@
   %head
     %title= title
     %meta{:'http-equiv' => 'Content-Type', content: 'text/html', charset: 'utf-8'}
+    %meta{name: 'author',  content: config.author}
     %link{rel: 'icon', type: 'image/png', href: '/favicon.png'}
     %link{href: '/stylesheets/base.css', media: 'screen', rel: 'stylesheet', type: 'text/css'}
     %link{href: '/stylesheets/retter.css', media: 'screen', rel: 'stylesheet', type: 'text/css'}
+    %link{href: '/stylesheets/pygments.css', media: 'screen', rel: 'stylesheet', type: 'text/css'}
     %link{rel: 'alternate', type: 'application/rss+xml', title: 'RSS', href: '/entries.rss'}
   %body
     #header

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

@@ -47,7 +47,7 @@ code{
 }
 
 #header ul#menu {
-  margin: 0.5em 0 3em 0;
+  margin: 0.5em 0 6em 0;
   padding: 0 0 0 2em;
 }
 
@@ -83,11 +83,10 @@ article {
   border: 3px #FFC solid;
   -moz-border-radius: 10px;
   -webkit-border-radius: 10px;
-  padding: 1em 1.5em 1em 1.5em;
-  margin: 1em 0 1em 0;
-  width: 100%;
+  padding: 2em 3em;
   background-image: url("../images/orange/bg_entry.jpg");
   position: relative;
+  margin-top:60px;
 }
 
 article ul li {
@@ -134,6 +133,10 @@ article ul#entries {
   line-height: 1.5em;
 }
 
+article img{
+	max-width: 100%
+}
+
 #entries {
   width: 100%;
 }
@@ -144,9 +147,8 @@ article ul#entries {
   border: 3px #FFC solid;
   -moz-border-radius: 10px;
   -webkit-border-radius: 10px;
-  padding: 1em 1.5em 1em 1.5em;
+  padding: 2em 3em;
   margin: 1em 0 1em 0;
-  width: 100%;
   background-image: url("../images/orange/bg_entry.jpg");
   position: relative;
 }

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

@@ -0,0 +1,288 @@
+.highlight {
+  background: #fff;
+}
+
+.highlight .c {
+  color: #998;
+  font-style: italic;
+}
+
+.highlight .err {
+  color: #a61717;
+  background-color: #e3d2d2;
+}
+
+.highlight .k {
+  font-weight: bold;
+}
+
+.highlight .o {
+  font-weight: bold;
+}
+
+.highlight .cm {
+  color: #998;
+  font-style: italic;
+}
+
+.highlight .cp {
+  color: #999;
+  font-weight: bold;
+}
+
+.highlight .c1 {
+  color: #998;
+  font-style: italic;
+}
+
+.highlight .cs {
+  color: #999;
+  font-weight: bold;
+  font-style: italic;
+}
+
+.highlight .gd {
+  color: #000;
+  background-color: #fdd;
+}
+
+.highlight .gd .x {
+  color: #000;
+  background-color: #faa;
+}
+
+.highlight .ge {
+  font-style: italic;
+}
+
+.highlight .gr {
+  color: #a00;
+}
+
+.highlight .gh {
+  color: #999;
+}
+
+.highlight .gi {
+  color: #000;
+  background-color: #dfd;
+}
+
+.highlight .gi .x {
+  color: #000;
+  background-color: #afa;
+}
+
+.highlight .go {
+  color: #888;
+}
+
+.highlight .gp {
+  color: #555;
+}
+
+.highlight .gs {
+  font-weight: bold;
+}
+
+.highlight .gu {
+  color: #800080;
+  font-weight: bold;
+}
+
+.highlight .gt {
+  color: #a00;
+}
+
+.highlight .kc {
+  font-weight: bold;
+}
+
+.highlight .kd {
+  font-weight: bold;
+}
+
+.highlight .kn {
+  font-weight: bold;
+}
+
+.highlight .kp {
+  font-weight: bold;
+}
+
+.highlight .kr {
+  font-weight: bold;
+}
+
+.highlight .kt {
+  color: #458;
+  font-weight: bold;
+}
+
+.highlight .m {
+  color: #099;
+}
+
+.highlight .s {
+  color: #d14;
+}
+
+.highlight .na {
+  color: #008080;
+}
+
+.highlight .nb {
+  color: #0086B3;
+}
+
+.highlight .nc {
+  color: #458;
+  font-weight: bold;
+}
+
+.highlight .no {
+  color: #008080;
+}
+
+.highlight .ni {
+  color: #800080;
+}
+
+.highlight .ne {
+  color: #900;
+  font-weight: bold;
+}
+
+.highlight .nf {
+  color: #900;
+  font-weight: bold;
+}
+
+.highlight .nn {
+  color: #555;
+}
+
+.highlight .nt {
+  color: #000080;
+}
+
+.highlight .nv {
+  color: #008080;
+}
+
+.highlight .ow {
+  font-weight: bold;
+}
+
+.highlight .w {
+  color: #bbb;
+}
+
+.highlight .mf {
+  color: #099;
+}
+
+.highlight .mh {
+  color: #099;
+}
+
+.highlight .mi {
+  color: #099;
+}
+
+.highlight .mo {
+  color: #099;
+}
+
+.highlight .sb {
+  color: #d14;
+}
+
+.highlight .sc {
+  color: #d14;
+}
+
+.highlight .sd {
+  color: #d14;
+}
+
+.highlight .s2 {
+  color: #d14;
+}
+
+.highlight .se {
+  color: #d14;
+}
+
+.highlight .sh {
+  color: #d14;
+}
+
+.highlight .si {
+  color: #d14;
+}
+
+.highlight .sx {
+  color: #d14;
+}
+
+.highlight .sr {
+  color: #009926;
+}
+
+.highlight .s1 {
+  color: #d14;
+}
+
+.highlight .ss {
+  color: #990073;
+}
+
+.highlight .bp {
+  color: #999;
+}
+
+.highlight .vc {
+  color: #008080;
+}
+
+.highlight .vg {
+  color: #008080;
+}
+
+.highlight .vi {
+  color: #008080;
+}
+
+.highlight .il {
+  color: #099;
+}
+
+.type-csharp .highlight .k {
+  color: #00F;
+}
+
+.type-csharp .highlight .kt {
+  color: #00F;
+}
+
+.type-csharp .highlight .nf {
+  color: #000;
+  font-weight: normal;
+}
+
+.type-csharp .highlight .nc {
+  color: #2B91AF;
+}
+
+.type-csharp .highlight .nn {
+  color: #000;
+}
+
+.type-csharp .highlight .s {
+  color: #A31515;
+}
+
+.type-csharp .highlight .sc {
+  color: #A31515;
+}