retter 0.1.0 → 0.1.1

data/spec/command/rebind_spec.rb

@@ -9,7 +9,7 @@ describe 'Retter::Command#rebind', clean: :all do
   let(:date_html) { retter_config.entry_file(Date.parse(date_str)) }
 
   before do
-    command.stub!(:config) { retter_config }
+    Retter.stub!(:config) { retter_config }
   end
 
   context 'first post' do
@@ -41,14 +41,14 @@ describe 'Retter::Command#rebind', clean: :all do
       let(:index_html) { retter_config.index_file.read }
 
       it { texts_of(index_html, 'article p').should include('おはようございます') }
-      it { texts_of(index_html, 'article h1.date').should == %w(2011/01/01) }
-      it { texts_of(index_html, 'article h1').should == %w(2011/01/01 朝11時 夜1時) }
+      it { texts_of(index_html, 'article h1.date').should == %w(2011-01-01) }
+      it { texts_of(index_html, 'article h1').should == %w(2011-01-01 朝11時 夜1時) }
     end
 
     describe 'entries.html' do
       let(:entries_html) { retter_config.entries_file.read }
 
-      it { texts_of(entries_html, 'a.entry').first.should == '2011/01/01' }
+      it { texts_of(entries_html, 'a.entry').first.should == '2011-01-01' }
       it { texts_of(entries_html, 'a.title').should == %w(朝11時 夜1時) }
     end
 
@@ -56,8 +56,8 @@ describe 'Retter::Command#rebind', clean: :all do
       let(:entry_html) { retter_config.entry_file(Date.parse(date_str)).read }
 
       it { texts_of(entry_html, 'article p').should == %w(おはようございます おやすみなさい) }
-      it { texts_of(entry_html, 'article h1.date').should == %w(2011/01/01) }
-      it { texts_of(entry_html, 'article h1').should == %w(2011/01/01 朝11時 夜1時) }
+      it { texts_of(entry_html, 'article h1.date').should == %w(2011-01-01) }
+      it { texts_of(entry_html, 'article h1').should == %w(2011-01-01 朝11時 夜1時) }
     end
 
     describe 'entry part(first)' do
@@ -71,7 +71,7 @@ describe 'Retter::Command#rebind', clean: :all do
 
       describe 'date' do
         subject { texts_of(part_html, 'article h1.date') }
-        it { should == %w(2011/01/01) }
+        it { should == %w(2011-01-01) }
       end
 
       describe 'headings' do
@@ -92,7 +92,7 @@ describe 'Retter::Command#rebind', clean: :all do
 
       describe 'date' do
         subject { texts_of(part_html, 'article h1.date') }
-        it { should == %w(2011/01/01) }
+        it { should == %w(2011-01-01) }
       end
 
       describe 'headings' do

data/spec/spec_helper.rb

@@ -23,8 +23,10 @@ RSpec.configure do |config|
 
   config.after(:each, clean: :all) do
     FileUtils.rm_rf retter_home
+    Retter.reset_entries!
   end
 
   config.include Retter::ConfigSupport
   config.include Retter::HTMLSupport
+  config.include Retter::StreamSupport
 end

data/spec/support/stream_capture.rb

@@ -0,0 +1,16 @@
+# coding: utf-8
+
+module Retter::StreamSupport
+  def capture(stream)
+    begin
+      stream = stream.to_s
+      eval "$#{stream} = StringIO.new"
+      yield
+      result = eval("$#{stream}").string
+    ensure
+      eval("$#{stream} = #{stream.upcase}")
+    end
+
+    result
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: retter
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-11 00:00:00.000000000Z
+date: 2011-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70099608665480 !ruby/object:Gem::Requirement
+  requirement: &70200204506680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 0.14.6
   type: :runtime
   prerelease: false
-  version_requirements: *70099608665480
+  version_requirements: *70200204506680
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &70099608664900 !ruby/object:Gem::Requirement
+  requirement: &70200204506160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70099608664900
+  version_requirements: *70200204506160
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &70099608664340 !ruby/object:Gem::Requirement
+  requirement: &70200204505680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 2.0.0b3
   type: :runtime
   prerelease: false
-  version_requirements: *70099608664340
+  version_requirements: *70200204505680
 - !ruby/object:Gem::Dependency
   name: coderay
-  requirement: &70099608663780 !ruby/object:Gem::Requirement
+  requirement: &70200204505200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: 0.9.8
   type: :runtime
   prerelease: false
-  version_requirements: *70099608663780
+  version_requirements: *70200204505200
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70099608663200 !ruby/object:Gem::Requirement
+  requirement: &70200204504720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70099608663200
+  version_requirements: *70200204504720
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70099608662620 !ruby/object:Gem::Requirement
+  requirement: &70200204504240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: 2.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *70099608662620
+  version_requirements: *70200204504240
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70099608662020 !ruby/object:Gem::Requirement
+  requirement: &70200204503760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: 3.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70099608662020
+  version_requirements: *70200204503760
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70099608661500 !ruby/object:Gem::Requirement
+  requirement: &70200204503280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70099608661500
+  version_requirements: *70200204503280
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &70099608660900 !ruby/object:Gem::Requirement
+  requirement: &70200204502800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,32 @@ dependencies:
         version: 2.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *70099608660900
+  version_requirements: *70200204502800
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &70200204502320 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *70200204502320
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: &70200204501840 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *70200204501840
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70099608660380 !ruby/object:Gem::Requirement
+  requirement: &70200204501360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +143,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70099608660380
+  version_requirements: *70200204501360
 - !ruby/object:Gem::Dependency
   name: ir_b
-  requirement: &70099608659820 !ruby/object:Gem::Requirement
+  requirement: &70200204500880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +154,10 @@ dependencies:
         version: 1.4.0
   type: :development
   prerelease: false
-  version_requirements: *70099608659820
+  version_requirements: *70200204500880
 - !ruby/object:Gem::Dependency
   name: tapp
-  requirement: &70099608659240 !ruby/object:Gem::Requirement
+  requirement: &70200204500400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +165,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *70099608659240
+  version_requirements: *70200204500400
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70099608658740 !ruby/object:Gem::Requirement
+  requirement: &70200204499920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +176,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70099608658740
+  version_requirements: *70200204499920
 - !ruby/object:Gem::Dependency
   name: fuubar
-  requirement: &70099608658160 !ruby/object:Gem::Requirement
+  requirement: &70200204499440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,10 +187,10 @@ dependencies:
         version: 0.0.6
   type: :development
   prerelease: false
-  version_requirements: *70099608658160
+  version_requirements: *70200204499440
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70099608657600 !ruby/object:Gem::Requirement
+  requirement: &70200204498960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -176,7 +198,7 @@ dependencies:
         version: 0.5.3
   type: :development
   prerelease: false
-  version_requirements: *70099608657600
+  version_requirements: *70200204498960
 description: Flyweight diary workflow. ruby-1.9.2 or later is required.
 email:
 - celluloid.key@gmail.com
@@ -195,6 +217,7 @@ files:
 - lib/retter.rb
 - lib/retter/command.rb
 - lib/retter/config.rb
+- lib/retter/entries.rb
 - lib/retter/entry.rb
 - lib/retter/generator.rb
 - lib/retter/generator/base.rb
@@ -208,6 +231,7 @@ files:
 - lib/retter/generator/skel/images/orange/bg_body.jpg
 - lib/retter/generator/skel/images/orange/bg_entry.jpg
 - lib/retter/generator/skel/images/orange/bg_header.png
+- lib/retter/generator/skel/images/orange/ic_li01.gif
 - lib/retter/generator/skel/index.html
 - lib/retter/generator/skel/javascripts/.gitkeep
 - lib/retter/generator/skel/layouts/article.html.haml
@@ -221,17 +245,25 @@ files:
 - lib/retter/generator/skel/stylesheets/orange.css
 - lib/retter/generator/skel/stylesheets/retter.css
 - lib/retter/generator/updator.rb
-- lib/retter/stationery.rb
-- lib/retter/stationery/binder.rb
-- lib/retter/stationery/previewer.rb
-- lib/retter/stationery/renderer.rb
-- lib/retter/stationery/view.rb
+- lib/retter/page.rb
+- lib/retter/page/view_helper.rb
+- lib/retter/pages.rb
+- lib/retter/pages/archive.rb
+- lib/retter/pages/article.rb
+- lib/retter/pages/entry.rb
+- lib/retter/pages/feed.rb
+- lib/retter/pages/index.rb
+- lib/retter/pages/profile.rb
+- lib/retter/preprint.rb
+- lib/retter/renderer.rb
+- lib/retter/repository.rb
 - lib/retter/version.rb
 - retter.gemspec
 - spec/command/callback_spec.rb
 - spec/command/commit_spec.rb
 - spec/command/edit_spec.rb
 - spec/command/invoke_after_spec.rb
+- spec/command/list_spec.rb
 - spec/command/open_spec.rb
 - spec/command/preview_spec.rb
 - spec/command/rebind_spec.rb
@@ -239,10 +271,21 @@ files:
 - spec/support/config_support.rb
 - spec/support/html_support.rb
 - spec/support/matchers.rb
+- spec/support/stream_capture.rb
 - tmp/.gitkeep
 homepage: https://github.com/hibariya/retter
 licenses: []
-post_install_message: 
+post_install_message: ! "    **Important** Some features were added or updated.\n\n
+  \   * Article has Permlink in retter-0.1.0 or later.\n      If error occured, try
+  overwrite templates by `retter gen $RETTER_HOME`. (overwrite layouts/*.html.haml)\n\n
+  \   * Relative date is now available in `--date` option.\n      Examples:\n        $
+  retter edit yesterday\n        $ retter edit today\n        $ retter edit tomorrow\n
+  \       $ retter preview 2.days.ago\n\n    * `--key` option is now available in
+  edit (and preview).\n      Examples:\n        $ retter list\n        [e0] 2011-10-12
+  \ article3, article4\n        [e1] 2011-10-10  article1, article2\n        $ retter
+  edit --key e0\n          ... or ...\n        $ retter edit e0\n\n    * Default date
+  format has changed.\n      2011/01/01 -> 2011-01-01\n\n    -- Thanks for flying
+  Retter :-> --\n"
 rdoc_options: []
 require_paths:
 - lib
@@ -260,7 +303,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Flyweight diary workflow
@@ -269,6 +312,7 @@ test_files:
 - spec/command/commit_spec.rb
 - spec/command/edit_spec.rb
 - spec/command/invoke_after_spec.rb
+- spec/command/list_spec.rb
 - spec/command/open_spec.rb
 - spec/command/preview_spec.rb
 - spec/command/rebind_spec.rb
@@ -276,3 +320,4 @@ test_files:
 - spec/support/config_support.rb
 - spec/support/html_support.rb
 - spec/support/matchers.rb
+- spec/support/stream_capture.rb

data/lib/retter/stationery/binder.rb

@@ -1,150 +0,0 @@
-# coding: utf-8
-
-module Retter::Stationery
-  class Binder
-    attr_reader :config, :entries
-
-    extend Forwardable
-
-    def_delegators :@config, *Retter::Config.delegatables
-
-    def initialize(config)
-      @config = config
-    end
-
-    def rebind!
-      commit_wip_file
-
-      @entries = Retter::Stationery.scan(retters_dir)
-
-      bind_entries
-      print_index
-      print_profile
-      print_rss
-    end
-
-    def commit_wip_file
-      if wip_file.exist?
-        html = wip_file.read
-        retter_file(Date.today).open('a') {|f| f.puts html }
-        wip_file.unlink
-      end
-    end
-
-    def bind_entries
-      @entries.each do |entry|
-        print_entry entry
-        print_articles entry
-      end
-
-      print_toc
-    end
-
-    def print_entry(entry)
-      title = "#{entry.date.strftime('%Y/%m/%d')} - #{config.title}"
-      part = entry_renderer.render(view_scope, entry: entry)
-      html = layout_renderer.render(view_scope, content: part, title: title)
-
-      entry_file(entry.date).open('w') do |f|
-        f.puts View::Helper.fix_path(html, '../')
-      end
-    end
-
-    def print_articles(entry)
-      return if entry.articles.empty?
-
-      entry_dir = config.entry_dir(entry.date)
-      entry_dir.mkdir unless entry_dir.directory?
-
-      entry.articles.each do |article|
-        title = "#{article.title} - #{config.title}"
-        part = article_renderer.render(view_scope, entry: entry, article: article)
-        html = layout_renderer.render(view_scope, content: part, title: title)
-
-        entry_dir.join("#{article.id}.html").open('w') do |f|
-          f.puts View::Helper.fix_path(html, '../../')
-        end
-      end
-    end
-
-    def print_index
-      part = Haml::Engine.new(index_layout_file.read, ugly: true).render(view_scope)
-      html = layout_renderer.render(view_scope, content: part, title: config.title)
-
-      index_file.open('w') do |f|
-        f.puts  View::Helper.fix_path(html, './')
-      end
-    end
-
-    def print_profile
-      part = Haml::Engine.new(profile_layout_file.read, ugly: true).render(view_scope)
-      html = layout_renderer.render(view_scope, content: part, title: config.title)
-
-      profile_file.open('w') do |f|
-        f.puts  View::Helper.fix_path(html, './')
-      end
-    end
-
-    def print_toc
-      part = Haml::Engine.new(entries_layout_file.read, ugly: true).render(view_scope)
-      html = layout_renderer.render(view_scope, content: part, title: config.title)
-
-      entries_file.open('w') do |f|
-        f.puts  View::Helper.fix_path(html, './')
-      end
-    end
-
-    def print_rss
-      feed_file.open('w') {|f| f.puts rss }
-    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' => url do
-          xml.title title
-          xml.link url
-          xml.dc:date, entries.first.date
-          xml.description 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   author
-          end
-        end
-      end
-    end
-
-    def entry_url(date, id = nil)
-      (URI.parse(url) + date.strftime('/entries/%Y%m%d.html')).to_s
-    end
-
-    private
-
-    def view_scope
-      @view_scope ||= View::Scope.new(config, entries: entries)
-    end
-
-    def layout_renderer
-      @layout_renderer ||= Haml::Engine.new(layout_file.read, ugly: true)
-    end
-
-    def entry_renderer
-      @entry_renderer ||= Haml::Engine.new(entry_layout_file.read, ugly: true)
-    end
-
-    def article_renderer
-      @article_renderer ||= Haml::Engine.new(article_layout_file.read, ugly: true)
-    end
-  end
-end

data/lib/retter/stationery/previewer.rb

@@ -1,64 +0,0 @@
-# coding: utf-8
-
-module Retter::Stationery
-  class Previewer
-    attr_reader :config
-
-    extend Forwardable
-
-    def_delegators :@config, *Retter::Config.delegatables
-
-    def initialize(config, date)
-      @config, @date = config, date
-      @body, @entry  = *nil
-
-      load_retter_file
-      load_wip_entry_if_needed
-    end
-
-    def print
-      build_entry
-      print_html 
-    end
-
-    def file_path
-      config.retter_home.join '.preview.html'
-    end
-
-    private
-
-    def load_retter_file
-      retter_file = retter_file(@date)
-      @body = retter_file.exist? ? retter_file.read : ''
-    end
-
-    def load_wip_entry_if_needed
-      if @date == Date.today && wip_file.exist?
-        @body = [@body, wip_file.read].join("\n")
-      end
-    end
-
-    def build_entry
-      body_html = Retter::Stationery.markupper.render(@body)
-      @entry    = Retter::Entry.new(date: @date, body: body_html)
-    end
-
-    def print_html
-      scope = View::Scope.new(config)
-      part = entry_renderer.render(scope, entry: @entry)
-      html = renderer.render(scope, content: part, title: config.title, entries: [@entry])
-
-      file_path.open('w') do |file|
-        file.puts View::Helper.fix_path(html, './')
-      end
-    end
-
-    def renderer
-      Haml::Engine.new(layout_file.read, ugly: true)
-    end
-
-    def entry_renderer
-      Haml::Engine.new(entry_layout_file.read, ugly: true)
-    end
-  end
-end

data/lib/retter/stationery/view.rb

@@ -1,68 +0,0 @@
-# coding: utf-8
-
-module Retter::Stationery::View
-  module Helper
-    extend self
-
-    def fix_path(html, prefix='./')
-      elements = Nokogiri::HTML(html)
-
-      fix_href_path(fix_src_path(elements, prefix), prefix).to_s
-    end
-
-    def entry_path(date, id = nil)
-      date.strftime('/entries/%Y%m%d.html') + (id ? "##{id}" : '')
-    end
-
-    def article_path(date, id)
-      date.strftime("/entries/%Y%m%d/#{id}.html")
-    end
-
-    private
-
-    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
-
-  end
-
-  class Scope
-    attr_reader :config
-    attr_accessor :assigns
-
-    include Helper
-    extend Forwardable
-
-    def_delegators :@config, *Retter::Config.delegatables
-
-    [:entries].each do |meth|
-      define_method(meth) { @assigns[meth] }
-    end
-
-    def initialize(config, assigns = {})
-      @config, @assigns = config, assigns
-    end
-  end
-end