tdiary 4.0.1.20130929 → 4.0.1.20131102

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3cb15a291ccf22c9e26d5007c81a8a0d7872217d
-  data.tar.gz: e1967f9cf308aaf0dffa1ccd5cd04e4ca3ee63a2
+  metadata.gz: c92106283ff746cd9b3e761a47e88d977133daae
+  data.tar.gz: ead05318a8f257deb9521da45639fd4ff5f85c51
 SHA512:
-  metadata.gz: 3eebdfd11165028ff3b35fd9731b5f6b5e3c5712c2b96dc8b91666d5f59a3dee08bd0d2134988ec1a8bed70e062f99849293f76e5b77608a598f58cd6584b8d7
-  data.tar.gz: c78628a2c55c3f0a0c9cb87cc46072aa7439fb8be24cc5bdc35757923fd87e3e65ca6cb81764488582f5149004cfed4b623a17838240a42d143af520c44a9eac
+  metadata.gz: 97153fc99872796fdfde5d18ee45a8e5559bb926c935a2e48df67c373f06608ab297b517dac886d7a5956a76bd7657dfdbba787e1264e87ecb0a8d65dcb15374
+  data.tar.gz: 1b7ce4f5dfc798b3f7de85bc269758316f69eece15db576e23ec15273b557e0c10eef231405d4209af05be228aae2f2b84b5373b1c84697406f14c51fd2fde07

data/.travis.yml

@@ -15,11 +15,10 @@ before_install:
 before_script:
   - DAEMON=1 bundle exec rake server
 
-script: if [ $TEST_MODE = "gem" ] ; then bundle exec tdiary test ; else bundle exec rake spec spec:acceptance:rdb jasmine:ci test ; fi
+script: if [ $TEST_MODE = "gem" ] ; then bundle exec tdiary test ; else bundle exec rake spec jasmine:ci test ; fi
 
 env:
   - TEST_MODE=rack
-  - TEST_MODE=rdb
   - TEST_MODE=webrick
   - TEST_MODE=secure
   - TEST_MODE=gem

data/Gemfile

@@ -10,15 +10,6 @@ group :coffee do
   gem 'therubyracer'
 end
 
-group :memcached do
-  gem 'dalli'
-end
-
-group :redis do
-  gem 'redis'
-  gem 'redis-namespace'
-end
-
 group :server do
   platforms :mri do
     gem 'thin'

data/Gemfile.lock

@@ -22,12 +22,12 @@ GEM
       term-ansicolor
       thor
     daemons (1.1.9)
-    dalli (2.6.4)
     diff-lcs (1.2.4)
     eventmachine (1.0.3)
-    execjs (2.0.1)
-    fastimage (1.5.2)
-    ffi (1.9.0)
+    execjs (2.0.2)
+    fastimage (1.5.3)
+      addressable (~> 2.3, >= 2.3.5)
+    ffi (1.9.3)
     hike (1.2.3)
     hikidoc (0.0.6)
     jasmine (1.3.2)
@@ -40,9 +40,9 @@ GEM
       addressable (~> 2.3)
     libv8 (3.16.14.3)
     method_source (0.8.2)
-    mime-types (1.25)
-    mini_portile (0.5.1)
-    multi_json (1.8.0)
+    mime-types (2.0)
+    mini_portile (0.5.2)
+    multi_json (1.8.2)
     nokogiri (1.6.0)
       mini_portile (~> 0.5.0)
     pit (0.0.7)
@@ -57,9 +57,6 @@ GEM
       rack (>= 1.0)
       rack-test (>= 0.5)
     rake (10.1.0)
-    redis (3.0.4)
-    redis-namespace (1.3.1)
-      redis (~> 3.0.0)
     ref (1.0.5)
     rest-client (1.6.7)
       mime-types (>= 1.16)
@@ -67,17 +64,17 @@ GEM
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.5)
+    rspec-core (2.14.7)
     rspec-expectations (2.14.3)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.3)
-    rubyzip (0.9.9)
-    selenium-webdriver (2.35.1)
+    rspec-mocks (2.14.4)
+    rubyzip (1.0.0)
+    selenium-webdriver (2.37.0)
       childprocess (>= 0.2.5)
       multi_json (~> 1.0)
-      rubyzip (< 1.0.0)
+      rubyzip (~> 1.0.0)
       websocket (~> 1.0.4)
-    sequel (4.2.0)
+    sequel (4.4.0)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
@@ -97,13 +94,13 @@ GEM
     therubyracer (0.12.0)
       libv8 (~> 3.16.14.0)
       ref
-    thin (1.5.1)
+    thin (1.6.1)
       daemons (>= 1.0.9)
-      eventmachine (>= 0.12.6)
+      eventmachine (>= 1.0.0)
       rack (>= 1.0.0)
     thor (0.18.1)
     tilt (1.4.1)
-    tins (0.11.0)
+    tins (0.12.0)
     websocket (1.0.7)
     xpath (2.0.0)
       nokogiri (~> 1.3)
@@ -115,7 +112,6 @@ DEPENDENCIES
   capybara
   coffee-script
   coveralls
-  dalli
   fastimage
   hikidoc
   jasmine
@@ -125,8 +121,6 @@ DEPENDENCIES
   rack
   racksh
   rake
-  redis
-  redis-namespace
   rspec
   selenium-webdriver
   sequel

data/misc/convert2.rb

@@ -91,8 +91,8 @@ module TDiary
 						false
 					end
 	
-					require 'tdiary/defaultio'
-					DefaultIO::new( self ).transaction( date ) do |diaries|
+					require 'tdiary/io/default'
+					IO::Default::new( self ).transaction( date ) do |diaries|
 						diaries.update( @diaries )
 						TDiaryBase::DIRTY_DIARY | TDiaryBase::DIRTY_COMMENT | TDiaryBase::DIRTY_REFERER
 					end

data/misc/plugin/disp_referrer.rb

@@ -564,7 +564,7 @@ class DispRef2Setup < Hash
 			options_key = "disp_referrer2.#{key}"
 			self[key] = @options[options_key] if @options.has_key?( options_key )
 		end
-		self['no_cache'] = true if defined?(::TDiary::DefaultIO) && @conf.io_class == ::TDiary::DefaultIO
+		self['no_cache'] = true if defined?(::TDiary::IO::Default) && @conf.io_class == ::TDiary::IO::Default
 
 		# additions
 		self['labels'] = {

data/plugin/05referer.rb

@@ -15,7 +15,7 @@ add_header_proc do
 end
 
 def referer_save_trigger
-	return unless @conf.io_class.to_s == 'TDiary::DefaultIO'
+	return unless @conf.io_class.to_s == 'TDiary::IO::Default'
 	return unless @mode =~ /^(latest|day|edit|append|replace)$/
 
 	if @date then

data/plugin/90migrate.rb

@@ -3,7 +3,7 @@
 # 90migrate.rb: tDiary plugin for migration 2.2 to 2.3.
 #
 
-if !@conf.tdiary_version && @conf.io_class.to_s == 'TDiary::DefaultIO'
+if !@conf.tdiary_version && @conf.io_class.to_s == 'TDiary::IO::Default'
 	def convert_pstore( file )
 		require "pstore"
 	

data/spec/acceptance/save_conf_referer_spec.rb

@@ -2,7 +2,7 @@
 require 'acceptance_helper'
 
 feature 'リンク元設定の利用' do
-	scenario 'リンク元の非表示設定', :exclude_rdb do
+	scenario 'リンク元の非表示設定' do
 		append_default_diary
 		visit '/update.rb?conf=referer'
 		select('非表示', :from => 'show_referer')
@@ -16,7 +16,7 @@ feature 'リンク元設定の利用' do
 		within('div.day') { page.should have_no_css('div[class="refererlist"]') }
 	end
 
-	scenario 'リンク元記録の除外設定が動いている', :exclude_rdb do
+	scenario 'リンク元記録の除外設定が動いている' do
 		append_default_diary
 		visit '/update.rb?conf=referer'
 		fill_in 'no_referer', :with => '^http://www\.example\.com/.*'
@@ -30,7 +30,7 @@ feature 'リンク元設定の利用' do
 		within('div.day div.refererlist') { page.should have_no_link('http://www.example.com') }
 	end
 
-	scenario 'リンク元の置換が動いている', :exclude_selenium, :exclude_rdb do
+	scenario 'リンク元の置換が動いている', :exclude_selenium do
 		append_default_diary
 		visit '/update.rb?conf=referer'
 		fill_in 'referer_table', :with => <<-REFERER

data/spec/acceptance_helper.rb

@@ -39,42 +39,13 @@ RSpec.configure do |config|
 
 	config.before(:each) do
 		FileUtils.mkdir_p work_data_dir
+		FileUtils.cp_r(fixture_conf, File.join(work_data_dir, "tdiary.conf"), :verbose => false) unless fixture_conf.empty?
 	end
 
 	config.after(:each) do
 		FileUtils.rm_rf work_data_dir
 	end
 
-	if ENV['TEST_MODE'] == 'rdb'
-		work_db = 'sqlite://tmp/tdiary_test.db'
-		config.before(:each) do
-			Sequel.connect(work_db) do |db|
-				db.drop_table(:conf) if db.table_exists?(:conf)
-				db.create_table :conf do
-					String :body, :text => true
-				end
-				db[:conf].insert(:body => File.read(fixture_conf))
-			end
-		end
-
-		config.after(:each) do
-			Sequel.connect(work_db) do |db|
-				[:diaries, :comments, :conf].each do |table|
-					db.drop_table(table) if db.table_exists? table
-				end
-			end
-			Dalli::Client.new(nil, {:namespace => 'test'}).flush
-		end
-	else
-		config.before(:each) do
-			FileUtils.cp_r(fixture_conf, File.join(work_data_dir, "tdiary.conf"), :verbose => false) unless fixture_conf.empty?
-		end
-
-		config.after(:each) do
-			FileUtils.rm_r File.join(work_data_dir, "tdiary.conf")
-		end
-	end
-
 	if ENV['TEST_MODE'] == 'webrick'
 		Capybara.default_driver = :selenium
 		Capybara.app_host = 'http://localhost:' + (ENV['PORT'] || '19292')
@@ -85,10 +56,7 @@ RSpec.configure do |config|
 					  [:exclude_selenium, :exclude_no_secure]
 				  when 'secure'
 					  [:exclude_rack, :exclude_secure]
-				  when 'rdb'
-					  [:exclude_rdb, :exclude_rack, :exclude_no_secure]
-				  else
-					  # TEST_MODE = rack
+				  else # rack
 					  [:exclude_rack, :exclude_no_secure]
 				  end
 	excludes.each do |exclude|

data/tdiary/{io/cache → cache}/file.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8; -*-
 
 module TDiary
-	module CacheIO
+	module Cache
 		def restore_cache( prefix )
 			restore_data("#{cache_path}/#{cache_file( prefix )}") if cache_enable?( prefix )
 		end

data/tdiary/configuration.rb

@@ -102,9 +102,9 @@ module TDiary
 			end
 
 			unless @io_class
-				require 'tdiary/io/cache/file'
+				require 'tdiary/cache/file'
 				require 'tdiary/io/default'
-				@io_class = DefaultIO
+				@io_class = IO::Default
 			end
 
 			cgi_conf = @io_class.load_cgi_conf(self)

data/tdiary/io/base.rb

@@ -7,63 +7,65 @@ require 'fileutils'
 require 'tdiary/style' # XXX can't auto loading TDiary::Style subclasses
 
 module TDiary
-	class BaseIO
-		def initialize( tdiary )
-			@tdiary = tdiary
-			@data_path = @tdiary.conf.data_path if @tdiary.conf.data_path
-			load_styles
-		end
-
-		def calendar
-			raise StandardError, 'not implemented'
-		end
+	module IO
+		class Base
+			def initialize( tdiary )
+				@tdiary = tdiary
+				@data_path = @tdiary.conf.data_path if @tdiary.conf.data_path
+				load_styles
+			end
 
-		def transaction(date)
-			raise StandardError, 'not implemented'
-		end
+			def calendar
+				raise StandardError, 'not implemented'
+			end
 
-		def diary_factory(date, title, body, style_name = 'tDiary')
-			style(style_name.downcase).new(date, title, body)
-		end
+			def transaction(date)
+				raise StandardError, 'not implemented'
+			end
 
-		def cache_dir
-			raise StandardError, 'not implemented'
-		end
+			def diary_factory(date, title, body, style_name = 'tDiary')
+				style(style_name.downcase).new(date, title, body)
+			end
 
-		def cache_path
-			@_cache_path ||= cache_dir.untaint
-			FileUtils.mkdir_p(@_cache_path)
-			@_cache_path
-		end
+			def cache_dir
+				raise StandardError, 'not implemented'
+			end
 
-		def load_styles
-			@styles = {}
-			paths = @tdiary.conf.options['style.path'] ||
-				[TDiary::PATH, TDiary.server_root].map {|base| "#{base}/tdiary/style" }
-			[paths].flatten.uniq.each do |path|
-				path = path.sub(/\/+$/, '').untaint
-				Dir.glob("#{path}/*.rb") {|style_file| require style_file.untaint }
+			def cache_path
+				@_cache_path ||= cache_dir.untaint
+				FileUtils.mkdir_p(@_cache_path)
+				@_cache_path
 			end
-			(["tdiary", "wiki"] + [@tdiary.conf.style].map(&:downcase)).flatten.uniq.each do |style|
-				klass = TDiary::Style.const_get("#{style.capitalize}Diary")
-				klass.send(:include, TDiary::Style::BaseDiary)
-				klass.send(:include, TDiary::Style::CategorizableDiary)
-				if TDiary::Style.const_defined? ("#{style.capitalize}Section")
-					TDiary::Style.const_get("#{style.capitalize}Section").send(:include, TDiary::Style::BaseSection)
+
+			def load_styles
+				@styles = {}
+				paths = @tdiary.conf.options['style.path'] ||
+					[TDiary::PATH, TDiary.server_root].map {|base| "#{base}/tdiary/style" }
+				[paths].flatten.uniq.each do |path|
+					path = path.sub(/\/+$/, '').untaint
+					Dir.glob("#{path}/*.rb") {|style_file| require style_file.untaint }
+				end
+				(["tdiary", "wiki"] + [@tdiary.conf.style].map(&:downcase)).flatten.uniq.each do |style|
+					klass = TDiary::Style.const_get("#{style.capitalize}Diary")
+					klass.send(:include, TDiary::Style::BaseDiary)
+					klass.send(:include, TDiary::Style::CategorizableDiary)
+					if TDiary::Style.const_defined? ("#{style.capitalize}Section")
+						TDiary::Style.const_get("#{style.capitalize}Section").send(:include, TDiary::Style::BaseSection)
+					end
+					@styles[style] = klass
 				end
-				@styles[style] = klass
 			end
-		end
 
-		def style(s)
-			unless @styles
-				raise BadStyleError, "styles are not loaded"
-			end
-			r = @styles[s.downcase]
-			unless r
-				raise BadStyleError, "bad style: #{s}"
+			def style(s)
+				unless @styles
+					raise BadStyleError, "styles are not loaded"
+				end
+				r = @styles[s.downcase]
+				unless r
+					raise BadStyleError, "bad style: #{s}"
+				end
+				r
 			end
-			r
 		end
 	end
 end