adapt for plugin storage (#10)

* adapt for plugin storage: use TDiary::Plugin#transaction instead of PStore
 * PStore.new(file).transaction -> transaction(plugin_name)
 * db[key] -> JSON.load(db.get(key))
 * db[key] = object -> db.set(key, object.to_json)
* create rdf file when startup

Author: machu

plugin/blog-category.rb

@@ -10,8 +10,6 @@
 # Distributed under the GPL
 #
 
-require 'pstore'
-
 def blog_category
 	cat = @cgi.params['blogcategory'][0]
 	if cat and !cat.empty?
@@ -46,7 +44,7 @@ def stripped_title
 						return '' unless @title
 						stripped = @title.sub(/^(\[(.*?)\])+\s*/,'')
 					end
-	
+
 					def categories
 						return [] unless @title
 						cat = /^(\[([^\[]+?)\])+/.match(@title).to_a[0]
@@ -107,27 +105,24 @@ def navi_user
 end
 
 def blog_category_cache
-	"#{@cache_path}/blog_category"
+	"blog_category"
 end
 
 def blog_category_cache_add(diary)
-	PStore.new(blog_category_cache).transaction do |db|
-		db['blog_category'] = Hash.new unless db.root?('blog_category')
+	transaction(blog_category_cache) do |db|
+		cache = JSON.load(db.get('blog_category')) || Hash.new
 		diary.categories.each do |c|
-			db['blog_category'][c] = Hash.new unless db['blog_category'][c]
-			db['blog_category'][c][diary.date.strftime('%Y%m%d')] = diary.stripped_title
+			cache[c] ||= Hash.new
+			cache[c][diary.date.strftime('%Y%m%d')] = diary.stripped_title
 		end
+		db.set('blog_category', cache.to_json)
 	end
 end
 
 def blog_category_cache_restore
-	return nil unless File.exist?(blog_category_cache)
-	cache = {}
-	PStore.new(blog_category_cache).transaction do |db|
-		cache.update(db['blog_category'])
-		db.abort
+	transaction(blog_category_cache) do |db|
+		JSON.load(db.get('blog_category'))
 	end
-	cache
 end
 
 def blog_category_entry(limit = 20)
@@ -179,20 +174,21 @@ def blog_category_cache_initialize
 	cgi = CGI::new
 	def cgi.referer; nil; end
 
-	PStore.new(blog_category_cache).transaction do |db|
-		db['blog_category'] = Hash.new
+	transaction(blog_category_cache) do |db|
+		cache = Hash.new
 		@years.each do |y, ms|
 			ms.each do |m|
 				cgi.params['date'] = ["#{y}#{m}"]
 				m = TDiaryMonth.new(cgi, '', @conf)
 				m.diaries.each do |k, diary|
 					diary.categories.each do |c|
-						db['blog_category'][c] = Hash.new unless db['blog_category'][c]
-						db['blog_category'][c][diary.date.strftime('%Y%m%d')] = diary.stripped_title
+						cache[c] ||= Hash.new
+						cache[c][diary.date.strftime('%Y%m%d')] = diary.stripped_title
 					end
 				end
 			end
 		end
+		db.set('blog_category', cache.to_json)
 	end
 end
 

plugin/whatsnew-list.rb

@@ -24,14 +24,13 @@
 # Copyright (c) 2002 by TADA Tadashi <sho@spc.gr.jp>
 # Distributed under the GPL
 #
-require 'pstore'
 
 def whatsnew_list( max = 5, limit = 20 )
 	return 'DO NOT USE IN SECURE MODE' if @conf.secure
 
 	max = max.to_i
 	limit = limit.to_i
-	
+
 	wl = "#{@cache_path}/whatsnew-list"
 	begin
 		if @mode == 'latest' then
@@ -42,15 +41,14 @@ def whatsnew_list( max = 5, limit = 20 )
 	end
 
 	r = "<ul>\n"
-	PStore::new( wl ).transaction do |db|
+	transaction( 'whatsnew-list' ) do |db|
 		begin
-			wn = db['whatsnew']
+			wn = JSON.load( db.get( 'whatsnew' ) ) || []
 			wn.each_with_index do |item,i|
 				break if i >= max
 				title = @conf.shorten( apply_plugin( item[1] ).gsub( /^(\[.*?\])+\s*/, '' ).gsub( /<.*?>/, '' ), limit )
 				r << %Q|<li><a href="#{h @index}#{anchor item[0]}">#{title}</a></li>\n|
 			end
-			db.abort
 		rescue
 		end
 	end
@@ -70,7 +68,7 @@ def whatsnew_list( max = 5, limit = 20 )
 			rescue Errno::EACCES
 				@conf['whatsnew_list.rdf.out'] = false
 				error_message = %Q|<p class="message">#{rdf}#{@whatsnew_list_msg_access}</p>|
-	
+
 			end
 		else
 			@conf['whatsnew_list.rdf.out'] = false
@@ -209,17 +207,14 @@ 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]
-	PStore::new( "#{@cache_path}/whatsnew-list" ).transaction do |db|
+	transaction( 'whatsnew-list' ) do |db|
 		wn = []
-		begin
-			(db['whatsnew'] || []).each_with_index do |item, i|
-				wn << item unless item[0] == new_item[0]
-				break if i > 15
-			end
-		rescue PStore::Error
+		(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['whatsnew'] = wn
+		db.set( 'whatsnew', wn.to_json )
 
 		rdf = whatsnew_list_rdf_file
 		if @conf['whatsnew_list.rdf.out'] then
@@ -253,6 +248,10 @@ def whatsnew_list_update
 	HTML
 end
 
+add_startup_proc do
+	whatsnew_list_update
+end
+
 # Local Variables:
 # mode: ruby
 # indent-tabs-mode: t