tdiary-style-emptdiary 0.0.2

data/README.md

@@ -0,0 +1,50 @@
+# Tdiary::Style::Emptdiary
+
+This style is an extension to the tDiary style which allows plug-in
+arguments to have empty lines. In short, this style preserves empty
+lines between <% and %> when splltting the input into sections.
+
+The latest version of this file can be downloaded from [http://zunda.freeshell.org/d/misc/style/emptdiary/emptdiary_style.rb](http://zunda.freeshell.org/d/misc/style/emptdiary/emptdiary_style.rb)
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'tdiary-style-emptdiary'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install tdiary-style-emptdiary
+
+## Usage
+
+if you want to use this style, add the following line into tdiary.conf:
+
+    @style = 'emptdiary'
+
+Please see  README.rd or README.rd.en for further explanation.
+
+## Acknowledgements
+
+This style is realized using TdiarySection and TdiaryDiary as super-classes. I thank the authors of tdiary\_style.rb for providing such flexible classes.
+
+```EmptdiaryDiary::to_html4``` and ```EmptdiaryDiary::to_chtml``` are copied from tdiary_style.rb and slightly edited as follows:
+
+ * split_unless_plugin() is inserted before each collect()
+ * Regexp is chanegd from ^ to \A
+
+## Contributing
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request
+
+## Copyright
+
+ * Copyright 2003 zunda <zunda at freeshell.org>

data/README.rd

@@ -0,0 +1,83 @@
+=begin
+= emptDiaryスタイル((-$Id: README.rd,v 1.6 2008-03-02 09:01:20 kazuhiko Exp $-))
+
+== 概要
+((:emptDiaryスタイル:))((-emptDiaryは'empty line permitted tDiary style'
+を省略したものです。長いねぇ。-))は、((:tDiaryス タイル:))に加えて、プラ
+グインの引数に空白行を許すスタイルです。このスタイルを使うと、日記をセク
+ションに分ける際に、<%と%>の間の空白行を無視してもらえます。
+
+日記にプログラムリストなどを書く場合に、リストが空白行を含むと、
+((:tDiaryス タイル:))ではリストの途中から次のセクションになってしまいま 
+す。((:emptDiaryスタイル:))では、プラグインの引数の中の空白を無視するの
+で、例えばpre.rbプラグインのヒアドキュメントとしてプログラムリストを記述
+することで、プログラムリストに何の変更もなく、日記にリストを書くことがで
+きます。
+
+((:emptDiaryスタイル:))の最新版は、
+((<URL:http://zunda.freeshell.org/d/misc/style/emptdiary/emptdiary_style.rb>))から、
+このファイルの最新版は、
+((<URL:http://zunda.freeshell.org/d/misc/style/emptdiary/README.rd>))か
+ら、 入手できるでしょう。
+
+また、pre.rbの最新版は、
+((<URL:http://zunda.freeshell.org/d/plugin/pre.rb>))から入手できるはずで
+す。
+
+== Usage
+このスタイルを使うには、
+(1) emptdiary_style.rb ファイルを、tdiary/ ディレクトリにコピーしてくだ
+    さい。tdiary/ ディレクトリは、tdiary.rb ファイルのあるトップディレク
+    トリの下にあります。
+(2) tdiary.confに以下の行を書いてください。
+      @style = 'emptDiary'
+
+日記は、((:tDiaryスタイル:))とほとんど同じように書くことができます。
+HOWTO-write-tDiary.htmlに書かれている通り、
+* 空白無しで始まる行は、((:セクションタイトル:))になります。この行には、
+  ((:セクションアンカー:))が付きます。
+* ((:セクションタイトル:))に続く行は、その((:セクション:))の内容になりま
+  す。
+* 空白行によって、次の((:セクション:))と分かれます。
+* ((:セクション:))の最初の行を空白や<で始めることによって、
+  ((:セクションタイトル:))の無い((:セクション:))を作ることができます。
+
+((:emptDiaryスタイル:))では、上記のルールに加えて、
+* <%と%>に囲まれた空白行は、セクションを分割する際に無視されます。つまり、
+  あるセクションに、<%と%>に囲まれた空白行を含めることができます。
+* 副作用として、日記には、<%と%>が同数、それぞれペアになって含まれていな
+  いといけません。
+
+つまり、pre.rbを使って、
+  セクションタイトル
+  <p>セクションの内容</p>
+  <%=pre <<'_PRE'
+  #include <stdio.h>
+
+  /* 上記は空白行 */
+  int
+  main (int argc, char *argv[])
+  {
+    puts ("Hello world.");
+  }
+  _PRE
+  %>
+などというセクションを作ることができます。不等号やアンパーサンドの実体参
+照への変換は、pre.rbで行われることに注意してください。
+
+== 謝辞
+このスタイルは、((:tDiaryスタイル:))のTdiarySectionとTdiaryDiaryをsuper
+classとして実装されています。このようなフレキシブルなクラスを提供されて
+いる、tdiary_style.rbの著者の方々に感謝します。
+
+== 著作権
+Copyright 2003 zunda <zunda at freeshell.org>
+
+Permission is granted for use, copying, modification, distribution,
+and distribution of modified versions of this work under the terms
+of GPL version 2 or later.                                                  
+=end
+=begin ChangeLog
+* Mon Feb 17, 2003 zunda <zunda at freeshell.org>
+- first draft
+=end

data/README.rd.en

@@ -0,0 +1,78 @@
+=begin
+= emptDiary style((-$Id: README.rd.en,v 1.5 2003-11-06 09:43:46 zunda Exp $-))
+
+== Summary
+((:emptDiary style:))((-emptDiary is an abbreviation for 'empty line
+permitted tDiary style'. Very long, isn't it?-)) is an extension to the
+((:tDiary style:)) which allows plug-in arguments to have empty lines.
+In short, this style preserves empty lines between <% and %> when
+splltting the input into sections.
+
+Sometimes, you would want to include your program list in your diary. In
+the case, the ((:tDiary style:)) rule gets in the way: an empty line in
+the program list makes a second section. ((:emptDiary style:)) permits
+empty lines in the arguments of plug-ins. Thus, using e.g. pre.rb
+plugin, you can show your program list without modifying your it.
+
+
+The latest version of this style can be downloaded from
+((<URL:http://zunda.freeshell.org/d/misc/style/emptdiary/emptdiary_style.rb>)),
+and the latest version of this document can be downloaded from
+((<URL:http://zunda.freeshell.org/d/misc/style/emptdiary/README.rd.en>)).
+
+== Usage
+If you want to use this style
+(1) copy the file emptdiary_style.rb into the tdiary/ directory under
+    the top directory where tdiary.rb sits.
+(2) add the following line into tdiary.conf:
+      @style = 'emptDiary'
+
+You can write your diaries in almost the same manner as you have done
+with the tDiary style as described in the file HOWTO-write-tDiary.html.
+In short:
+* A line beginning without a space becomes a ((:section title:)) with a
+  ((:section anchor:)),
+* Lines following the ((:section title:)) become the body of the
+  ((:section:)),
+* An empty line changes ((:section:))s, but
+* You can create a ((:section:)) with a ((:section anchor:)) but a
+  ((:section title:)) with the first line beginning with a space.
+
+((:emptDiary style:)) adds the follwing rules:
+* Empty lines between <% and %> are ignored when parsing your text into
+  sections. Thus, you can include empty lines between <% and %>.
+As a side effect
+* You have to keep <% and %>'s in the pairs.
+
+Thus, using pre.rb plugin, you can write ((*A*)) section like:
+  title of the section
+  <p>Descriptino of the program</p>
+  <%=pre <<'_PRE'
+  #include <stdio.h>
+
+  /* above is an empty line */
+  int
+  main (int argc, char *argv[])
+  {
+    puts ("Hello world.");
+  }
+  _PRE
+  %>
+Please note that the <, >, and & charactors are escaped by the pre plugin.
+
+== Acknowledgements
+This style is realized using TdiarySection and TdiaryDiary as
+super-classes. I thank the authors of tdiary_style.rb for providing such
+flexible classes.
+
+== Copyright
+Copyright 2003 zunda <zunda at freeshell.org>
+
+Permission is granted for use, copying, modification, distribution,
+and distribution of modified versions of this work under the terms
+of GPL version 2 or later.                                                  
+=end
+=begin ChangeLog
+* Mon Feb 17, 2003 zunda <zunda at freeshell.org>
+- first draft
+=end

data/Rakefile

@@ -0,0 +1,6 @@
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/lib/tdiary-style-emptdiary.rb

@@ -0,0 +1 @@
+require 'tdiary/style/emptdiary'

data/lib/tdiary/style/emptdiary.rb

@@ -0,0 +1,158 @@
+# -*- coding: utf-8; -*-
+
+require 'tdiary/style/tdiary'
+
+=begin
+== Classes and methods defined in this style
+Please note that not all are documented.
+=end
+
+module TDiary
+	module Style
+=begin
+=== TDiary::Emptdiary::EmptdiaryString < String
+Extended String class not to divide things between <% and %>.
+
+--- TDiary::Emptdiary::EmptdiaryString.split_unless_plugin ( delimiter = "\n\n" )
+      Returns an array of EmptdiaryString splitted at ((|delimiter|))
+      which is outside of <% and %> pairs. Specify ((|delimiter|)) as a
+      String showing a fragment of Regexp. This will be combined in a
+      Regexp like: /(#{delimiter)|<%|%>)/.
+=end
+		class Emptdiary
+			class EmptdiaryString < String
+				def split_unless_plugin( delimiter = "\n\n+" )
+					result = Array.new
+					fragment = ''
+					nest = 0
+					remain = self.gsub(/.*?(#{delimiter}|<%|%>)/m) do
+						fragment += $&
+						case $1
+						when '<%'
+							nest += 1
+						when '%>'
+							nest -= 1
+						else
+							if nest == 0 then
+								fragment.sub!( /#{delimiter}\z/, '' )
+								result << Emptdiary::EmptdiaryString.new( fragment ) unless fragment.empty?
+								fragment = ''
+							end
+						end
+						''
+					end
+					fragment += remain
+					fragment.sub!( /#{delimiter}\z/, '' )
+					result << Emptdiary::EmptdiaryString.new( fragment ) unless fragment.empty?
+					result
+				end
+			end
+		end
+
+=begin
+=== TDiary::EmptdiartySection < TdiarySection
+Almost the same as TdiarySection but usess split_unless_plugin instead
+of split. initialize method is overrideen.
+=end
+		class EmptdiarySection < TdiarySection
+			def initialize( fragment, author = nil )
+				@author = author
+				lines = fragment.split_unless_plugin( "\n+" )
+				if lines.size > 1 then
+					if /\A<</ =~ lines[0]
+						@subtitle = lines.shift.chomp.sub( /\A</, '' )
+					elsif /\A[　 <]/u !~ lines[0]
+						@subtitle = lines.shift.chomp
+					end
+				end
+				@body = Emptdiary::EmptdiaryString.new( lines.join( "\n" ) )
+				@categories = get_categories
+				@stripped_subtitle = strip_subtitle
+			end
+
+			def body_to_html
+				html = ""
+				@body.split_unless_plugin( "\n" ).each do |p|
+					if /\A</ =~ p then
+						html << p
+					else
+						html << "<p>#{p}</p>"
+					end
+				end
+				html
+			end
+		end
+
+=begin
+=== TDiary::EmptdiaryDiary < TdiaryDiary
+Almost the same as TdiarySection but usess split_unless_plugin instead
+of split. append method is overriden and makes EmptdiarySection with
+body being an EmptdiaryString. Also, to_html4 and to_chtml methods are
+overridden to split_unless_plugin before collect'ing the body of the
+sections.
+=end
+		class EmptdiaryDiary < TdiaryDiary
+			def style
+				'emptdiary'
+			end
+			
+			def append( body, author = nil )
+				Emptdiary::EmptdiaryString.new(body.gsub( /\r/, '' )).split_unless_plugin( "\n\n+" ).each do |fragment|
+					section = EmptdiarySection::new( fragment, author )
+					@sections << section if section
+				end
+				@last_modified = Time::now
+				self
+			end
+
+			def to_html4( opt )
+				r = ''
+				each_section do |section|
+					r << %Q[<div class="section">\n]
+					r << %Q[<%=section_enter_proc( Time::at( #{date.to_i} ) )%>\n]
+					if section.subtitle then
+						r << %Q[<h3><%= subtitle_proc( Time::at( #{date.to_i} ), #{section.subtitle.dump.gsub( /%/, '\\\\045' )} ) %></h3>\n]
+					end
+					if /\A</ =~ section.body then
+						r << %Q[#{section.body}]
+					elsif section.subtitle
+						r << %Q[<p>#{section.body.split_unless_plugin( "\n+" ).collect{|l|l.chomp.sub( /\A[　 ]/u, '')}.join( "</p>\n<p>" )}</p>]
+					else
+						r << %Q[<p><%= subtitle_proc( Time::at( #{date.to_i} ), nil ) %>]
+						r << %Q[#{section.body.split_unless_plugin( "\n+" ).collect{|l|l.chomp.sub( /\A[　 ]/u, '' )}.join( "</p>\n<p>" )}</p>]
+					end
+					r << %Q[<%=section_leave_proc( Time::at( #{date.to_i} ) )%>\n]
+					r << %Q[</div>]
+				end
+				r
+			end
+
+			def to_chtml( opt )
+				r = ''
+				each_section do |section|
+					r << %Q[<%=section_enter_proc( Time::at( #{date.to_i} ) )%>\n]
+					if section.subtitle then
+						r << %Q[<H3><%= subtitle_proc( Time::at( #{date.to_i} ), #{section.subtitle.dump.gsub( /%/, '\\\\045' )} ) %></H3>\n]
+					end
+					if /\A</ =~ section.body then
+						r << section.body
+					elsif section.subtitle
+						r << %Q[<P>#{section.body.split_unless_plugin( "\n+" ).collect{|l|l.chomp.sub( /\A[　 ]/u, '' )}.join( "</P>\n<P>" )}</P>]
+					else
+						r << %Q[<P><%= subtitle_proc( Time::at( #{date.to_i} ), nil ) %>]
+						r << %Q[#{section.body.split_unless_plugin( "\n+" ).collect{|l|l.chomp.sub( /\A[　 ]/u, '' )}.join( "</P>\n<P>" )}</P>]
+					end
+					r << %Q[<%=section_leave_proc( Time::at( #{date.to_i} ) )%>\n]
+				end
+				r
+			end
+		end
+	end
+end
+
+# Local Variables:
+# mode: ruby
+# indent-tabs-mode: t
+# tab-width: 3
+# ruby-indent-level: 3
+# End:

data/lib/tdiary/style/emptdiary/version.rb

@@ -0,0 +1,7 @@
+module Tdiary
+  module Style
+    module Emptdiary
+      VERSION = "0.0.2"
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,5 @@
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+require 'tdiary/comment_manager'
+require 'tdiary/referer_manager'
+require 'tdiary/style'
+require 'tdiary/style/emptdiary'

data/spec/tdiary/style/emptdiary_spec.rb

@@ -0,0 +1,162 @@
+# -*- coding: utf-8; -*-
+require 'spec_helper'
+
+describe TDiary::Style::EmptdiaryDiary do
+	before do
+		@diary = TDiary::Style::EmptdiaryDiary.new(Time::at( 1041346800 ), "TITLE", "")
+	end
+
+	describe '#append' do
+		before do
+			source = <<-'EOF'
+subTitle
+<p>honbun</p>
+
+subTitle2
+<p>honbun</p>
+			EOF
+			@diary.append(source)
+		end
+
+		context 'HTML' do
+			before do
+				@html = <<-'EOF'
+<div class="section">
+<%=section_enter_proc( Time::at( 1041346800 ) )%>
+<h3><%= subtitle_proc( Time::at( 1041346800 ), "subTitle" ) %></h3>
+<p>honbun</p><%=section_leave_proc( Time::at( 1041346800 ) )%>
+</div><div class="section">
+<%=section_enter_proc( Time::at( 1041346800 ) )%>
+<h3><%= subtitle_proc( Time::at( 1041346800 ), "subTitle2" ) %></h3>
+<p>honbun</p><%=section_leave_proc( Time::at( 1041346800 ) )%>
+</div>
+				EOF
+			end
+			it { @diary.to_html.should eq @html.chomp }
+		end
+
+		context 'CHTML' do
+			before do
+				@html = <<-'EOF'
+<%=section_enter_proc( Time::at( 1041346800 ) )%>
+<H3><%= subtitle_proc( Time::at( 1041346800 ), "subTitle" ) %></H3>
+<p>honbun</p><%=section_leave_proc( Time::at( 1041346800 ) )%>
+<%=section_enter_proc( Time::at( 1041346800 ) )%>
+<H3><%= subtitle_proc( Time::at( 1041346800 ), "subTitle2" ) %></H3>
+<p>honbun</p><%=section_leave_proc( Time::at( 1041346800 ) )%>
+				EOF
+			end
+			it { @diary.to_html({}, :CHTML).should eq @html }
+		end
+	end
+
+	describe '#replace' do
+		before do
+			source = <<-'EOF'
+subTitle
+<p>honbun</p>
+
+subTitle2
+<p>honbun</p>
+			EOF
+			@diary.append(source)
+
+			replaced = <<-'EOF'
+replaceTitle
+<p>replace</p>
+
+replaceTitle2
+<p>replace</p>
+
+			EOF
+			@diary.replace(Time::at( 1041346800 ), "TITLE", replaced)
+
+			@html = <<-'EOF'
+<div class="section">
+<%=section_enter_proc( Time::at( 1041346800 ) )%>
+<h3><%= subtitle_proc( Time::at( 1041346800 ), "replaceTitle" ) %></h3>
+<p>replace</p><%=section_leave_proc( Time::at( 1041346800 ) )%>
+</div><div class="section">
+<%=section_enter_proc( Time::at( 1041346800 ) )%>
+<h3><%= subtitle_proc( Time::at( 1041346800 ), "replaceTitle2" ) %></h3>
+<p>replace</p><%=section_leave_proc( Time::at( 1041346800 ) )%>
+</div>
+			EOF
+		end
+		it { @diary.to_html.should eq @html.chomp }
+	end
+
+	describe 'test_emptdiary_style_plugin' do
+		before do
+			source = <<-'EOF'
+sectionTitle
+<p>body</p>
+<%=pre <<'_PRE'
+#include <stdio.h>
+
+/* comment */
+int
+main (int argc, char *argv[])
+{
+  puts ("Hello world.");
+}
+_PRE
+%>
+			EOF
+			@diary.append(source)
+		end
+
+		context 'HTML' do
+			before do
+				@html = <<-'EOF'
+<div class="section">
+<%=section_enter_proc( Time::at( 1041346800 ) )%>
+<h3><%= subtitle_proc( Time::at( 1041346800 ), "sectionTitle" ) %></h3>
+<p>body</p>
+<%=pre <<'_PRE'
+#include <stdio.h>
+
+/* comment */
+int
+main (int argc, char *argv[])
+{
+  puts ("Hello world.");
+}
+_PRE
+%><%=section_leave_proc( Time::at( 1041346800 ) )%>
+</div>
+				EOF
+			end
+			it { @diary.to_html.should eq @html.chomp }
+		end
+
+		context 'CHTML' do
+			before do
+				@html = <<-'EOF'
+<%=section_enter_proc( Time::at( 1041346800 ) )%>
+<H3><%= subtitle_proc( Time::at( 1041346800 ), "sectionTitle" ) %></H3>
+<p>body</p>
+<%=pre <<'_PRE'
+#include <stdio.h>
+
+/* comment */
+int
+main (int argc, char *argv[])
+{
+  puts ("Hello world.");
+}
+_PRE
+%><%=section_leave_proc( Time::at( 1041346800 ) )%>
+				EOF
+			end
+			it { @diary.to_html({}, :CHTML).should eq @html }
+		end
+	end
+end
+
+# Local Variables:
+# mode: ruby
+# indent-tabs-mode: t
+# tab-width: 3
+# ruby-indent-level: 3
+# End: