tdiary-blogkit 5.0.5 → 5.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 417732c89bdd263d96479ff9d55b5c4b4f9d19a8
-  data.tar.gz: 5a2de1b5c53491fd5ae719a7fd9345defa51cc6d
+  metadata.gz: a2389fc4713f1f34ae0b60d624634428024977bf
+  data.tar.gz: ff5dfee302f6d94084f03985d649b41b9769c456
 SHA512:
-  metadata.gz: d4491cb4063b95ac414fea3c167d504ba04b86662dc7080b119423816299818b0decc4c59b6629c6703a5f564301e319b13d5ff8e983183d267f438e25372e3d
-  data.tar.gz: 83c97f1f8f6e98f2998f4cb72467f78962228e2c55b1b74417ee95cbc356d1fb7979cb09abfb2f205d71157ab70ef973d7f2ebb3f416a798b630d9d0ed76f03b
+  metadata.gz: da00021a8a7eba7bb45a5bddb8e3256f7256fe96c5e7f6f1bc6773c47c712c8c5fd1427d6f8f55c8de0d43fa8ea2365373dc16809f5a34fbd5996c17a6d9fe23
+  data.tar.gz: c41424b4eb2a9cafd4afb158a983d1c3668bb612a8b5c33a5c0f163db26386acfc4d0031eed8da7c3612cb4f1b67134401d001bce68e0388853e6f28271bf001

data/ChangeLog

@@ -1,3 +1,26 @@
+2017-09-29 TADA Tadashi <t@tdtds.jp>
+	* release 5.0.6
+
+2017-09-08 TADA Tadashi <t@tdtds.jp>
+	* remove secure mode support and merge to single method
+	* recent_list.rb: update like recent_list plugin in core package
+	* recent_list.rb: update to modern style and fix some information
+
+2017-07-14 Tatsuya Sato <satoryu.1981@gmail.com>
+	* Add bloggfm style
+
+2017-07-13 TADA Tadashi <t@tdtds.jp>
+	* fix error of whatsnew_list plugin on startup
+
+2017-06-29 TADA Tadashi <t@tdtds.jp>
+	* release 5.0.5
+
+2017-03-29 TADA Tadashi <t@tdtds.jp>
+	* release 5.0.4
+
+2016-12-29 TADA Tadashi <t@tdtds.jp>
+	* release 5.0.3
+
 2016-09-29 TADA Tadashi <t@tdtds.jp>
 	* release 5.0.2
 

data/lib/tdiary-blogkit.rb

@@ -2,3 +2,4 @@ require 'tdiary/blogkit'
 require 'tdiary/style/blog'
 require 'tdiary/style/blogrd'
 require 'tdiary/style/blogwiki'
+require 'tdiary/style/bloggfm'

data/lib/tdiary/blogkit/version.rb

@@ -1,5 +1,5 @@
 module TDiary
   class Blogkit
-    VERSION = "5.0.5"
+    VERSION = "5.0.6"
   end
 end

data/lib/tdiary/style/bloggfm.rb

@@ -0,0 +1,64 @@
+# vi: set noexpandtab tabstop=3
+require 'tdiary/style/gfm'
+
+module TDiary
+	module Style
+		class BloggfmSection < GfmSection
+		end
+
+		class BloggfmDiary < GfmDiary
+			def style
+				'BlogGfm'
+			end
+
+			def append( body, author = nil )
+				in_code_block = false
+				section = nil
+				body.each_line do |l|
+					case l
+					when /^\#[^\#]/
+						if in_code_block
+							section << l
+						else
+							@sections << BloggfmSection.new(section, author) if section
+							section = l
+						end
+					when /^```/
+						in_code_block = !in_code_block
+						section << l
+					else
+						section = '' unless section
+						section << l
+					end
+				end
+				if section
+					section << "\n" unless section =~ /\n\n\z/
+					@sections << BloggfmSection.new(section, author)
+				end
+				@last_modified = Time.now
+				self
+			end
+
+			def to_html4( opt )
+				r = ''
+				idx = 1
+				each_section do |section|
+					if idx > 1 and not opt['anchor'] then
+						r << %Q|<p class="readmore"><a href="#{opt['index']}<%=anchor "#{date.strftime( '%Y%m%d' )}"%>">Read more..</a></p>\n|
+						break
+					end
+					r << section.html4( date, idx, opt )
+					idx += 1
+				end
+				r
+			end
+		end
+	end
+end
+
+# Local Variables:
+# mode: ruby
+# indent-tabs-mode: t
+# tab-width: 3
+# ruby-indent-level: 3
+# End:

data/plugin/recent-entry.rb

@@ -1,88 +1,41 @@
-# recent_entry.rb $Revision: 1.13 $
-#
 # recent_entry: modified 'title_list' for Blogkit.
 #   parameter(default):
 #     max:       maximum list items (5)
 #     limit:     max lengh of each items (20)
 #
-# Copyright (c) 2002 TADA Tadashi <sho@spc.gr.jp>
+# Copyright (c) 2002 TADA Tadashi <t@tdtds.jp>
 # Copyright (c) 2001,2002 Junichiro KITA <kita@kitaj.no-ip.com>
-# You can redistribute it and/or modify it under GPL2.
+# You can redistribute it and/or modify it under GPL.
 #
 
-def recent_entry( max = 5, limit = 20 )
-	result = "<ul>\n"
-	if @conf.secure then
-		result << recent_entry_secure( max, limit )
-	else
-		result << recent_entry_insecure( max, limit )
-	end
-	result << "</ul>\n"
-	apply_plugin( result )
-end
-
-
-#---- private ----#
-def recent_entry_secure( max = 5, limit = 20 )
-	max = max.to_i
-	limit = limit.to_i
-
-	result = ''
-	@diaries.keys.sort.reverse.each_with_index do |date, idx|
-		break if idx >= max
-		diary = @diaries[date]
-		next unless diary.visible?
-		title = if diary.respond_to?( :stripped_title ) then
-			diary.stripped_title.gsub( /<[^>]*>/, '' )
-		else
-			diary.title.gsub( /<[^>]*>/, '' )
-		end
-		title = 'no title' if title.empty?
-		result << %Q[<li><a href="#{h @index}#{anchor date}">#{@conf.shorten( title, limit )}</a></li>\n]
-	end
-	result
-end
-
-eval( <<MODIFY_CLASS, TOPLEVEL_BINDING )
-module TDiary
-	class TDiaryMonth
-		attr_reader :diaries
-	end
-end
-MODIFY_CLASS
-
-def recent_entry_insecure( max = 5, limit = 20 )
+def recent_entry(max = 5, limit = 20)
 	max = max.to_i
 	limit = limit.to_i
 
-	cgi = CGI::new
-	def cgi.referer; nil; end
-
-	result = ''
-	catch( :exit ) {
+	result = "<ul>\n"
+	catch(:exit) {
 		@years.keys.sort.reverse_each do |year|
 			@years[year].sort.reverse_each do |month|
-				cgi.params['date'] = ["#{year}#{month}"]
-				m = TDiaryMonth::new( cgi, '', @conf )
+				m = DiaryContainer::find_by_month(@conf, "#{year}#{month}")
 				m.diaries.keys.sort.reverse_each do |date|
 					next unless m.diaries[date].visible?
-					title = if m.diaries[date].respond_to?( :stripped_title ) then
-						title = m.diaries[date].stripped_title.gsub( /<[^>]*>/, '' )
+					title = if m.diaries[date].respond_to?(:stripped_title) then
+						title = m.diaries[date].stripped_title.gsub(/<[^>]*>/, '')
 					else
-						title = m.diaries[date].title.gsub( /<[^>]*>/, '' )
+						title = m.diaries[date].title.gsub(/<[^>]*>/, '')
 					end
 					title = 'no title' if title.empty?
-					result << %Q|<li><a href="#{h @index}#{anchor date}">#{@conf.shorten( title, limit )}</a></li>\n|
+					result << %Q|<li><a href="#{h @index}#{anchor date}">#{@conf.shorten(title, limit)}</a></li>\n|
 					max -= 1
 					throw :exit if max == 0
 				end
 			end
 		end
 	}
-	result
+	result << "</ul>\n"
+	apply_plugin(result)
 end
 
-
 # Local Variables:
 # mode: ruby
 # indent-tabs-mode: t

data/plugin/whatsnew-list.rb

@@ -96,7 +96,12 @@ end
 # private methods
 #
 def whatsnew_list_rdf_file
-	@conf['whatsnew_list.rdf'] || 'index.rdf'
+	return @conf['whatsnew_list.rdf'] if @conf['whatsnew_list.rdf']
+	if @cgi.is_a?(RackCGI)
+		File.join(TDiary.server_root, 'public/index.rdf')
+	else
+		File.join(TDiary.server_root, 'index.rdf')
+	end
 end
 
 def whatsnew_list_rdf( items )
@@ -175,6 +180,28 @@ def feed?
 	@whatsnew_list_in_feed
 end
 
+def whatsnew_list_update_feed(new_items = [])
+	transaction( 'whatsnew-list' ) do |db|
+		wn = []
+		(JSON.load(db.get('whatsnew')) || []).each_with_index do |item, i|
+			wn << item unless item[0] == new_items[0]
+			break if i > 15
+		end
+
+		unless (new_items.empty?)
+			wn.unshift new_items
+			db.set('whatsnew', wn.to_json)
+		end
+
+		rdf = whatsnew_list_rdf_file
+		if @conf['whatsnew_list.rdf.out'] then
+			open(rdf, 'w') do |f|
+				f.write(whatsnew_list_rdf(wn))
+			end
+		end
+	end
+end
+
 def whatsnew_list_update
 	return if @mode == 'comment' and !@comment.visible?
 
@@ -206,23 +233,8 @@ def whatsnew_list_update
 
 	@whatsnew_list_in_feed = false
 
-	new_item = [diary.date.strftime('%Y%m%d'), title, Time::now.strftime("%Y-%m-%dT%H:%M:%S#{zone}"), desc]
-	transaction( 'whatsnew-list' ) do |db|
-		wn = []
-		(JSON.load( db.get( 'whatsnew' ) ) || []).each_with_index do |item, i|
-			wn << item unless item[0] == new_item[0]
-			break if i > 15
-		end
-		wn.unshift new_item if diary.visible?
-		db.set( 'whatsnew', wn.to_json )
-
-		rdf = whatsnew_list_rdf_file
-		if @conf['whatsnew_list.rdf.out'] then
-			open( rdf, 'w' ) do |f|
-				f.write( whatsnew_list_rdf( wn ) )
-			end
-		end
-	end
+	new_items = [diary.date.strftime('%Y%m%d'), title, Time::now.strftime("%Y-%m-%dT%H:%M:%S#{zone}"), desc]
+	whatsnew_list_update_feed(diary.visible? ? new_items : [])
 end
 
 add_update_proc do
@@ -249,7 +261,7 @@ add_edit_proc do
 end
 
 add_startup_proc do
-	whatsnew_list_update
+	whatsnew_list_update_feed
 end
 
 # Local Variables:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tdiary-blogkit
 version: !ruby/object:Gem::Version
-  version: 5.0.5
+  version: 5.0.6
 platform: ruby
 authors:
 - tDiary contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-29 00:00:00.000000000 Z
+date: 2017-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hikidoc
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: tdiary-style-gfm
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -114,6 +128,7 @@ files:
 - lib/tdiary/blogkit/version.rb
 - lib/tdiary/extensions/blogkit.rb
 - lib/tdiary/style/blog.rb
+- lib/tdiary/style/bloggfm.rb
 - lib/tdiary/style/blogrd.rb
 - lib/tdiary/style/blogwiki.rb
 - plugin/archive.rb
@@ -155,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: tDiary blogkit package.