tdiary/tdiary-core [refactor-rdb] Revert "integrate duplicate methods"

[SHIBATA H. <nul...@cl...>]

SHIBATA Hiroshi	2012-09-30 21:16:32 +0900 (Sun, 30 Sep 2012)

  New Revision: 9039504cbd16e30012b7b5cba59b1394436c43b6
  https://github.com/tdiary/tdiary-core/commit/9039504cbd16e30012b7b5cba59b1394436c43b6

  Log:
    Revert "integrate duplicate methods"
    
    This reverts commit 7cc3a5b57dd66a5ba0214897bb11a2dc63cdbebd.

  Modified files:
    tdiary/io/base.rb
    tdiary/io/default.rb
    tdiary/io/rdb.rb

  Modified: tdiary/io/base.rb (+6 -2)
===================================================================
--- tdiary/io/base.rb    2012-09-30 12:08:48 +0900 (cb706db)
+++ tdiary/io/base.rb    2012-09-30 21:16:32 +0900 (de2bce3)
@@ -21,8 +21,12 @@ module TDiary
 			raise StandardError, 'not implemented'
 		end
 
-		def diary_factory(date, title, body, style = 'Wiki')
-			style(style.downcase).new(date, title, body)
+		def diary_factory(date, title, body, style = nil)
+			raise StandardError, 'not implemented'
+		end
+
+		def styled_diary_factory(date, title, body, style_name = 'tDiary')
+			style(style_name.downcase).new(date, title, body)
 		end
 
 		def cache_dir

  Modified: tdiary/io/default.rb (+4 -1)
===================================================================
--- tdiary/io/default.rb    2012-09-30 12:08:48 +0900 (2ca2063)
+++ tdiary/io/default.rb    2012-09-30 21:16:32 +0900 (9116df1)
@@ -235,8 +235,11 @@ module TDiary
 			@tdiary.conf.cache_path || "#{@data_path}/cache"
 		end
 
-	private
+		def diary_factory( date, title, body, style = 'tDiary' )
+			styled_diary_factory( date, title, body, style )
+		end
 
+	private
 		def restore( fh, diaries )
 			begin
 				fh.seek( 0 )

  Modified: tdiary/io/rdb.rb (+4 -0)
===================================================================
--- tdiary/io/rdb.rb    2012-09-30 12:08:48 +0900 (6cbd59d)
+++ tdiary/io/rdb.rb    2012-09-30 21:16:32 +0900 (155b287)
@@ -132,6 +132,10 @@ module TDiary
       @tdiary.conf.cache_path || "#{Dir.tmpdir}/cache"
     end
 
+    def diary_factory(date, title, body, style = 'tDiary')
+      styled_diary_factory(date, title, body, style)
+    end
+
     private
 
     def restore(date, diaries, month = true)