retter 0.1.3 → 0.2.0

data/lib/retter/page.rb

@@ -1,5 +1,8 @@
 # coding: utf-8
 
+require 'haml'
+require 'nokogiri'
+
 module Retter
   module Page
     require 'retter/page/view_helper'

data/lib/retter/pages/feed.rb

@@ -1,5 +1,8 @@
 # coding: utf-8
 
+require 'builder'
+require 'uri'
+
 class Retter::Pages::Feed
   include Retter::Page
 
@@ -32,7 +35,7 @@ class Retter::Pages::Feed
         xml.items { xml.rdf(:Seq) { entries.each {|e| xml.rdf:li, :'rdf:resource' => entry_url(e.date) } } }
       end
 
-      entries.each do |entry|
+      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 }

data/lib/retter/renderers.rb

@@ -0,0 +1,27 @@
+# coding: utf-8
+
+require 'redcarpet'
+require 'pygments'
+require 'coderay'
+require 'digest/sha1'
+require 'set'
+
+module Retter
+  module Renderers
+    class CodeRayRenderer < Redcarpet::Render::HTML
+      def block_code(code, lang)
+        CodeRay.scan(code, lang ? lang.intern : :plain).div
+      end
+    end
+
+    class PygmentsRenderer < Redcarpet::Render::HTML
+      LANGUAGES = Set.new(Pygments.lexers.map {|_, l| l[:aliases] }.flatten)
+
+      def block_code(code, lang)
+        lang = LANGUAGES.include?(lang) ? lang : 'text'
+
+        Pygments.highlight(code, lexer: lang, formatter: 'html', options: {encoding: 'utf-8'})
+      end
+    end
+  end
+end

data/lib/retter/repository.rb

@@ -1,5 +1,7 @@
 # coding: utf-8
 
+require 'grit'
+
 module Retter
   class Repository
     include Retter::Stationery

data/lib/retter/version.rb

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

data/retter.gemspec

@@ -13,26 +13,14 @@ Gem::Specification.new do |s|
 
 
   s.post_install_message = <<-EOM
-    **Important** Some features were added or updated.
-
-    * DISQUS (comment system) support is now available.
-      First, Add your `disqus_shortname` to Retterfile.
-
-      in Retterfile:
-        disqus_shortname 'your_disqus_shortname'
-
-      Second, Edit templete and paste `render_disqus_comment_form`.
-
-      in layouts/article.html.haml:
-        #comments= render_disqus_comment_form
-
-    * Filename is now specificable.
-      Examples:
-        $ retter edit today.md
-        $ retter edit 20110101.md
-        $ retter preview 20110101.md
-
     -- Thanks for flying Retter :-> --
+
+    Pygments syntax highlight is now available.
+    To use, add a following line to Retterfile.
+    
+    ```ruby
+    renderer Retter::Renderers::PygmentsRenderer
+    ```
   EOM
 
   s.files         = `git ls-files`.split("\n")
@@ -44,12 +32,16 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'builder', ['>= 3.0.0']
   s.add_runtime_dependency 'redcarpet', ['>= 2.0.0b3']
   s.add_runtime_dependency 'coderay', ['>= 0.9.8']
+  s.add_runtime_dependency 'pygments.rb', ['>= 0.2.7']
   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 'bundler', ['>= 1.0']
   s.add_runtime_dependency 'grit', ['>= 2.4.1']
   s.add_runtime_dependency 'activesupport', ['>= 3.1.0']
+
+  # XXX for ActiveSupport dependency
+  s.add_runtime_dependency 'rack', ['>= 1.4.1']
   s.add_runtime_dependency 'i18n', ['>= 0.6.0']
 
   s.add_development_dependency 'rake', ['>= 0.9.2']

data/spec/command/callback_spec.rb

@@ -1,18 +1,17 @@
 # coding: utf-8
 
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe 'Retter::Command#callback', clean: :all do
-  let(:command) { Retter::Command.new }
-
   before do
-    Retter.stub!(:config) { retter_config }
-
     retter_config.after(:edit) { commit }
-    command.should_receive(:commit).and_return(true)
 
     command.stub!(:options) { {after: :edit} }
   end
 
-  it { command.callback.should }
+  specify 'callback should called' do
+    command.should_receive(:commit)
+
+    command.callback
+  end
 end

data/spec/command/commit_spec.rb

@@ -1,37 +1,41 @@
 # coding: utf-8
 
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
+require 'grit'
 
 describe 'Retter::Command#commit', clean: :all do
-  let(:command) { Retter::Command.new }
-  let(:wip_file) { retter_config.wip_file }
   let(:repo) { Grit::Repo.new(retter_config.retter_home.to_s) }
   let(:article) { '今日の記事' }
 
   before do
-    Grit::Repo.init retter_config.retter_home.to_s
-
-    Retter.stub!(:config) { retter_config }
     command.stub!(:say) { true }
     wip_file.open('w') {|f| f.puts article }
     command.rebind
+
+    Grit::Repo.init retter_config.retter_home.to_s
   end
 
   context 'with no options' do
     before do
       command.should_receive(:invoke_after).with(:commit)
+
       command.commit
     end
 
-    it { repo.commits.first.message.should == 'Retter commit' }
+    subject { repo.commits.first }
+
+    its(:message) { should == 'Retter commit' }
   end
 
   context 'with silent option' do
     before do
       command.stub!(:options) { {silent: true} }
-      command.should_not_receive(:invoke_after)
     end
 
-    it { command.commit.should }
+    specify 'callback should not called' do
+      command.should_not_receive(:invoke_after)
+
+      command.commit
+    end
   end
 end

data/spec/command/edit_spec.rb

@@ -1,15 +1,8 @@
 # coding: utf-8
 
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe 'Retter::Command#edit', clean: :all do
-  let(:command) { Retter::Command.new }
-  let(:wip_file) { retter_config.wip_file }
-
-  before do
-    Retter.stub!(:config) { retter_config }
-  end
-
   context 'no options' do
     before do
       command.should_receive(:invoke_after).with(:edit)
@@ -19,38 +12,35 @@ describe 'Retter::Command#edit', clean: :all do
     it { wip_file.should written }
   end
 
-  context 'no options after rebind' do
-    let(:date_str) { '20110101' }
+  context 'after edit and rebind (no options)' do
+    let(:today) { '20110101' }
+    let(:today_entry) { Retter.entries.detect_by_string(today) }
 
     before do
-      Date.stub!(:today).and_return(Date.parse(date_str))
+      stub_time today
+      today_entry.pathname.open('w') { |f| f.puts 'written' }
+      command.rebind
 
       command.edit
-      command.bind
-      command.edit
     end
 
-    it { wip_file.should_not be_exist }
-
-    describe "today's file" do
-      subject { retter_config.retters_dir.join("#{date_str}.md") }
-
-      it { should written }
+    specify 'wip file should not be written' do
+      wip_file.should_not be_exist
     end
   end
 
   context 'with date (YYYYMMDD) option' do
     let(:date_str) { '20110101' }
+    let(:date) { Date.parse(date_str) }
 
     before do
-      command.should_receive(:invoke_after).with(:edit)
       command.edit date_str
     end
 
-    it { wip_file.should_not be_exist }
+    it { wip_file.should_not written }
 
-    describe 'target date file' do
-      subject { retter_config.retter_file(Date.parse(date_str)) }
+    describe 'date file' do
+      subject { retter_config.retter_file(date) }
 
       it { should written }
     end
@@ -58,14 +48,15 @@ describe 'Retter::Command#edit', clean: :all do
 
   context 'with date (1.day.ago) option' do
     before do
-      Time.stub!(:now).and_return(Time.parse('2011/04/02'))
+      stub_time '2011/04/02'
 
-      command.should_receive(:invoke_after).with(:edit)
       command.edit '1.day.ago'
     end
 
     describe 'target date file' do
-      subject { retter_config.retter_file(Date.parse('2011/04/01')) }
+      let(:one_day_ago) { Date.parse('2011/04/01') }
+
+      subject { retter_config.retter_file(one_day_ago) }
 
       it { should written }
     end
@@ -73,29 +64,31 @@ describe 'Retter::Command#edit', clean: :all do
 
   context 'with date (yesterday) option' do
     before do
-      Time.stub!(:now).and_return(Time.parse('2011/04/02'))
+      stub_time '2011/04/02'
 
-      command.should_receive(:invoke_after).with(:edit)
       command.edit 'yesterday'
     end
 
     describe 'target date file' do
-      subject { retter_config.retter_file(Date.parse('2011/04/01')) }
+      let(:yesterday) { Date.parse('2011/04/01') }
+
+      subject { retter_config.retter_file(yesterday) }
 
       it { should written }
     end
   end
 
   context 'with filename (20110401.md) option' do
+    let(:a_day) { Date.parse('20110401') }
+
     before do
-      FileUtils.touch retter_config.retter_file(Date.parse('20110401'))
+      FileUtils.touch retter_config.retter_file(a_day)
 
-      command.should_receive(:invoke_after).with(:edit)
       command.edit '20110401.md'
     end
 
     describe 'target date file' do
-      subject { retter_config.retter_file(Date.parse('2011/04/01')) }
+      subject { retter_config.retter_file(a_day) }
 
       it { should written }
     end
@@ -111,7 +104,6 @@ describe 'Retter::Command#edit', clean: :all do
     before do
       FileUtils.touch retter_config.wip_file.to_s
 
-      command.should_receive(:invoke_after).with(:edit)
       command.edit 'today.md'
     end
 

data/spec/command/invoke_after_spec.rb

@@ -1,29 +1,29 @@
 # coding: utf-8
 
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe 'Retter::Command#invoke_after', clean: :all do
-  let(:command) { Retter::Command.new }
-
   context 'invoke with proc' do
     before do
-      Retter.stub!(:config) { retter_config }
-
       retter_config.after(:edit) { commit }
-      command.should_receive(:commit).and_return(true)
     end
 
-    it { command.edit.should }
+    specify 'callback should called' do
+      command.should_receive(:commit)
+
+      command.edit
+    end
   end
 
   context 'invoke with symbol' do
     before do
-      Retter.stub!(:config) { retter_config }
-
       retter_config.after(:edit, :commit)
-      command.should_receive(:invoke).with(:commit).and_return(true)
     end
 
-    it { command.edit.should }
+    specify 'callback should called' do
+      command.should_receive(:invoke).with(:commit)
+
+      command.edit
+    end
   end
 end

data/spec/command/list_spec.rb

@@ -1,15 +1,8 @@
 # coding: utf-8
 
-require File.dirname(__FILE__) + '/../spec_helper'
+require '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|

data/spec/command/open_spec.rb

@@ -1,17 +1,12 @@
 # coding: utf-8
 
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
+require 'launchy'
 
 describe 'Retter::Command#open', clean: :all do
-  let(:command) { Retter::Command.new }
-  let(:wip_file) { retter_config.wip_file }
-
-  before do
-    Retter.stub!(:config) { retter_config }
-  end
-
-  it 'should be open application' do
+  specify 'should be open application' do
     Launchy.should_receive(:open).with(retter_config.index_file.to_s)
+
     command.open
   end
 end

data/spec/command/preview_spec.rb

@@ -1,50 +1,45 @@
 # coding: utf-8
 
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
+require 'launchy'
 
 describe 'Retter::Command#preview', clean: :all do
-  let(:command) { Retter::Command.new }
-  let(:preview) { retter_config.retter_home.join('.preview.html').read }
-  let(:wip_file) { retter_config.wip_file }
-  let(:date_file) { retter_config.retter_file(Date.parse(date_str)) }
+  def preview_html
+    retter_config.retter_home.join('.preview.html').read
+  end
 
   before do
-    Retter.stub!(:config) { retter_config }
+    Launchy.should_receive(:open).with(anything)
   end
 
   context 'no options' do
-    let(:article) { 'w00t!' }
-
     before do
-      wip_file.open('w') {|f| f.puts article }
-
-      Launchy.stub!(:open).with(anything)
+      wip_file.open('w') {|f| f.puts 'w00t!' }
 
       command.preview
     end
 
-    subject { texts_of(preview, 'article p') }
+    subject { texts_of(preview_html, 'article p') }
 
-    it { should == [article] }
+    it { should include 'w00t!' }
   end
 
-  context 'with date' do
-    let(:article) { 'おはようございます' }
+  context 'with date option' do
     let(:date_str) { '20110101' }
+    let(:date_file) { retter_config.retter_file(Date.parse(date_str)) }
 
     before do
-      wip_file.open('w') {|f| f.puts 'おやすみなさい' }
-      date_file.open('w') {|f| f.puts article }
+      wip_file.open('w') {|f| f.puts 'w00t!' }
+      date_file.open('w') {|f| f.puts 'preview me' }
 
-      Launchy.stub!(:open).with(anything)
       command.stub!(:options) { {date: date_str} }
 
       command.preview
     end
 
-    subject { texts_of(preview, 'article p') }
+    subject { texts_of(preview_html, 'article p') }
 
-    it { should_not be_include('おやすみなさい') }
-    it { should be_include(article) }
+    it { should_not include 'w00t!' }
+    it { should include 'preview me' }
   end
 end