tdiary 3.2.2.20130617 → 3.2.2.20130720

data/spec/javascripts/support/jasmine.yml

@@ -1,76 +1,16 @@
-# src_files
-#
-# Return an array of filepaths relative to src_dir to include before jasmine specs.
-# Default: []
-#
-# EXAMPLE:
-#
-# src_files:
-#   - lib/source1.js
-#   - lib/source2.js
-#   - dist/**/*.js
-#
 src_files:
-    - vendor/jquery-1.8/jquery.js # load first
-    - vendor/jasmine-jquery-1.4.2/jasmine-jquery.js
-    - js/00default.js
-#    - js/**/*.js
+  - "spec/javascripts/jquery.js"
+  - "js/**/*.js"
 
-# stylesheets
-#
-# Return an array of stylesheet filepaths relative to src_dir to include before jasmine specs.
-# Default: []
-#
-# EXAMPLE:
-#
-# stylesheets:
-#   - css/style.css
-#   - stylesheets/*.css
-#
 stylesheets:
+  - "theme/**/*.css"
 
-# helpers
-#
-# Return an array of filepaths relative to spec_dir to include before jasmine specs.
-# Default: ["helpers/**/*.js"]
-#
-# EXAMPLE:
-#
-# helpers:
-#   - helpers/**/*.js
-#
 helpers:
+  - "helpers/**/*.js"
 
-# spec_files
-#
-#  Return an array of filepaths relative to spec_dir to include.
-# Default: ["**/*[sS]pec.js"]
-#
-# EXAMPLE:
-#
-# spec_files:
-#   - **/*[sS]pec.js
-#
 spec_files:
+  - "**/*_[sS]pec.js"
 
-# src_dir
-#
-# Source directory path. Your src_files must be returned relative to this path. Will use root if left blank.
-# Default: project root
-#
-# EXAMPLE:
-#
-# src_dir: public
-#
 src_dir:
 
-# spec_dir
-#
-# Spec directory path. Your spec_files must be returned relative to this path.
-# Default: spec/javascripts
-#
-# EXAMPLE:
-#
-# spec_dir: spec/javascripts
-#
-spec_dir:
+spec_dir: spec/javascripts

data/tdiary/application.rb

@@ -2,7 +2,6 @@
 require 'rack/builder'
 require 'tdiary/application/configuration'
 require 'tdiary/rack'
-require 'sprockets'
 
 # FIXME too dirty hack :-<
 class CGI

data/tdiary/core_ext.rb

@@ -94,6 +94,8 @@ class CGI
 	end
 end
 
+class RackCGI < CGI; end
+
 =begin
 == Safe module
 =end

data/tdiary/dispatcher.rb

@@ -18,11 +18,11 @@ module TDiary
 
 		def call( env )
 			req = adopt_rack_request_to_plain_old_tdiary_style( env )
-			dispatch_cgi( req )
+			dispatch_cgi(req, RackCGI.new)
 		end
 
 		# FIXME rename method name to more suitable one.
-		def dispatch_cgi( request, cgi = CGI.new )
+		def dispatch_cgi(request, cgi)
 			result = @target.run( request, cgi )
 			result.headers.reject!{|k,v| k.to_s.downcase == "status" }
 			result.to_a
@@ -30,11 +30,12 @@ module TDiary
 
 		class << self
 			# stolen from Rack::Handler::CGI.send_headers
-			def send_headers( status, headers )
+			def send_headers(status, headers)
 				begin
-					$stdout.print CGI.new.header( {'Status'=>status}.merge(headers) )
+					headers['type'] = headers.delete('Content-Type')
+					$stdout.print CGI.new.header({'Status'=>status}.merge(headers))
 				rescue EOFError
-					charset = headers.delete( 'charset' )
+					charset = headers.delete('charset')
 					headers['Content-Type'] ||= headers.delete( 'type' )
 					headers['Content-Type'] += "; charset=#{charset}" if charset
 					$stdout.print headers.map{|k,v| "#{k}: #{v}\r\n"}.join << "\r\n"
@@ -42,14 +43,6 @@ module TDiary
 				$stdout.flush
 			end
 
-			# stolen from Rack::Handler::CGI.send_body
-			def send_body( body )
-				body.lines.each { |part|
-					$stdout.print part
-					$stdout.flush
-				}
-			end
-
 			# FIXME temporary method during (scratch) refactoring
 			def extract_status_for_legacy_tdiary( head )
 				status_str = head.delete('status')
@@ -69,6 +62,7 @@ module TDiary
 			def update
 				new( :update )
 			end
+
 			private :new
 		end
 
@@ -83,11 +77,11 @@ module TDiary
 			req
 		end
 
+		# FIXME dirty hack
 		def fake_stdin_as_params
-			stdin_spy = StringIO.new( "" )
-			# FIXME dirty hack
+			stdin_spy = StringIO.new
 			if $RACK_ENV && $RACK_ENV['rack.input']
-				stdin_spy.print( $RACK_ENV['rack.input'].read )
+				stdin_spy.print($RACK_ENV['rack.input'].read)
 				stdin_spy.rewind
 			end
 			$stdin = stdin_spy

data/tdiary/request.rb

@@ -1,25 +1,18 @@
 # -*- coding: utf-8 -*-
 # stolen from okkez http://github.com/hiki/hiki/blob/rack/hiki/request.rb
 module TDiary
-	if Object.const_defined?( :Rack )
-		Request = ::Rack::Request
-		class ::Rack::Request
-			alias remote_addr ip
-		end
-		Request.class_eval { include RequestExtension }
-	else
-		raise RuntimeError, 'Do not use CGI class!' if Object.const_defined?( :Rack )
-		# CGI を Rack::Request っぽいインターフェイスに変換する
-		class Request
-			include RequestExtension
+	class Request < ::Rack::Request
+		include RequestExtension
 
-			attr_reader :env, :cgi
-			def initialize( env, cgi = CGI.new )
-				@cgi = cgi
-				@env = env
-			end
+		attr_reader :env, :cgi
+
+		def initialize( env, cgi = nil )
+			@env = env
+			@cgi = cgi
+		end
 
-			def params
+		def params
+			if @cgi
 				return @params if @params
 				@params = { }
 				@cgi.params.each{|k, v|
@@ -34,73 +27,141 @@ module TDiary
 					end
 				}
 				@params
+			else
+				super
 			end
+		end
 
-			def []( key )
+		def []( key )
+			if @cgi
 				params[key.to_s]
+			else
+				super
 			end
+		end
 
-			def []=( key, val )
+		def []=( key, val )
+			if @cgi
 				params[key.to_s] = val
+			else
+				super
 			end
+		end
 
-			def request_method
+		def request_method
+			if @cgi
 				@env['REQUEST_METHOD']
+			else
+				super
 			end
+		end
 
-			def header( header )
+		def header( header )
+			if @cgi
 				@cgi.header( header )
+			else
+				super
 			end
+		end
 
-			def get?
+		def get?
+			if @cgi
 				request_method == 'GET'
+			else
+				super
 			end
+		end
 
-			def head?
+		def head?
+			if @cgi
 				request_method == 'HEAD'
+			else
+				super
 			end
+		end
 
-			def post?
+		def post?
+			if @cgi
 				request_method == 'POST'
+			else
+				super
 			end
+		end
 
-			def put?
+		def put?
+			if @cgi
 				request_method == 'PUT'
+			else
+				super
 			end
+		end
 
-			def delete?
+		def delete?
+			if @cgi
 				request_method == 'DELETE'
+			else
+				super
 			end
+		end
 
-			def xhr?
+		def xhr?
+			if @cgi
 				@env["HTTP_X_REQUESTED_WITH"] == "XMLHttpRequest"
+			else
+				super
 			end
+		end
 
-			def accept_encoding
+		def accept_encoding
+			if @cgi
 				raise NameError, 'not implemented : accept_encoding'
+			else
+				super
 			end
+		end
 
-			def body
+		def body
+			if @cgi
 				raise NameError, 'not implemented : body'
+			else
+				super
 			end
+		end
 
-			def content_charset
+		def content_charset
+			if @cgi
 				@env['CONTENT_CHARSET']
+			else
+				super
 			end
+		end
 
-			def content_length
+		def content_length
+			if @cgi
 				@env['CONTENT_LENGTH']
+			else
+				super
 			end
+		end
 
-			def content_type
+		def content_type
+			if @cgi
 				@env['CONTENT_TYPE']
+			else
+				super
 			end
+		end
 
-			def remote_addr
+		def remote_addr
+			if @cgi
 				@env['REMOTE_ADDR']
+			else
+				super
 			end
+		end
 
-			def cookies
+		def cookies
+			if @cgi
 				return @cookies if @cookies
 				@cookies = { }
 				@cgi.cookies.each{|k, v|
@@ -114,96 +175,187 @@ module TDiary
 					end
 				}
 				@cookies
+			else
+				super
 			end
+		end
 
-			def form_data?
+		def form_data?
+			if @cgi
 				raise NameError, 'not implemented : form_data?'
+			else
+				super
 			end
+		end
 
-			def fullpath
+		def fullpath
+			if @cgi
 				raise NameError, 'not implemented : fullpath'
+			else
+				super
 			end
+		end
 
-			def host
+		def host
+			if @cgi
 				# Remove port number.from Rack::Response
 				( @env["HTTP_HOST"] || @env["SERVER_NAME"] ).gsub( /:\d+\z/, '' )
+			else
+				super
 			end
+		end
 
-			def ip
+		def ip
+			if @cgi
 				raise NameError, 'not implemented : ip'
+			else
+				super
 			end
+		end
+		alias remote_addr ip
 
-			def media_type
+		def media_type
+			if @cgi
 				raise NameError, 'not implemented : madia_type'
+			else
+				super
 			end
+		end
 
-			def media_type_params
+		def media_type_params
+			if @cgi
 				raise NameError, 'not implemented : media_type_params'
+			else
+				super
 			end
+		end
 
-			def openid_request
+		def openid_request
+			if @cgi
 				raise NameError, 'not implemented : openid_request'
+			else
+				super
 			end
+		end
 
-			def openid_response
+		def openid_response
+			if @cgi
 				raise NameError, 'not implemented : openid_response'
+			else
+				super
 			end
+		end
 
-			def parseable_data?
+		def parseable_data?
+			if @cgi
 				raise NameError, 'not implemented : parseable_data?'
+			else
+				super
 			end
+		end
 
-			def path
+		def path
+			if @cgi
 				raise NameError, 'not implemented : path'
+			else
+				super
 			end
+		end
 
-			def path_info
-				@env['PATH_INFO'].to_s
+		def path_info
+			if @cgi
+				raise NameError, 'not implemented : path'
+			else
+				super
 			end
+			w		end
 
-			def path_info=( s )
+		def path_info=( s )
+			if @cgi
 				raise NameError, 'not implemented : path_info='
+			else
+				super
 			end
+		end
 
-			def port
+		def port
+			if @cgi
 				raise NameError, 'not implemented : port'
+			else
+				super
 			end
+		end
 
-			def query_string
+		def query_string
+			if @cgi
 				raise NameError, 'not implemented : query_string'
+			else
+				super
 			end
+		end
 
-			def referer
+		def referer
+			if @cgi
 				raise NameError, 'not implemented : referer'
+			else
+				super
 			end
-			alias referrer referer
+		end
+		alias referrer referer
 
-			def schema
+		def schema
+			if @cgi
 				raise NameError, 'not implemented : schema'
+			else
+				super
 			end
+		end
 
-			def script_name
+		def script_name
+			if @cgi
 				@env['SCRIPT_NAME']
+			else
+				super
 			end
+		end
 
-			def session_options
+		def session_options
+			if @cgi
 				raise NameError, 'not implemented : session_options'
+			else
+				super
 			end
+		end
 
-			def url
+		def url
+			if @cgi
 				raise NameError, 'not implemented : url'
+			else
+				super
 			end
+		end
 
-			def user_agent
+		def user_agent
+			if @cgi
 				@cgi.user_agent
+			else
+				super
 			end
+		end
 
-			def base_url
+		def base_url
+			if @cgi
 				@cgi.base_url
+			else
+				super
 			end
+		end
 
-			def values_at( *keys )
+		def values_at( *keys )
+			if @cgi
 				raise NameError, 'not implemented : values_at'
+			else
+				super
 			end
 		end
 	end

data/tdiary/response.rb

@@ -1,23 +1,6 @@
 # -*- coding: utf-8 -*-
-# stolen from okkez http://github.com/hiki/hiki/blob/rack/hiki/response.rb
 module TDiary
-	if Object.const_defined?(:Rack)
-		Response = ::Rack::Response
-	else
-		class Response
-			attr_reader :body, :status, :headers
-			def initialize(body = [], status = 200, headers = {}, &block)
-				@body = body
-				@status = status
-				@headers = headers
-				yield self if block_given?
-			end
-
-			def finish
-				[status, headers, body]
-			end
-			alias to_a finish
-		end
+	class Response < ::Rack::Response
 	end
 end
 

data/tdiary/tasks/release.rake

@@ -8,24 +8,15 @@ REPOS = %w(tdiary-core tdiary-theme tdiary-blogkit tdiary-contrib)
 DEST_DIR = "/var/www/tdiary.org/htdocs/download"
 TARBALLS = []
 
-#
-# utilities
-#
 def fetch_files( repo )
 	Dir.chdir("tmp") do
 		rm_rf repo rescue true
-		sh "git clone --depth 1 git://github.com/tdiary/#{repo}.git #{repo}"
-	end
-end
-
-REPOS.each_with_index do |repo, i|
-	file REPOS[i] do |t|
-		fetch_files(t.name)
+		sh "git clone --depth 10 https://github.com/tdiary/#{repo}.git #{repo}"
 	end
 end
 
 def make_tarball( repo, version = nil )
-	suffix = version ? "-#{version}" : ''
+	suffix = version ? "-#{version}" : '-snapshot'
 	dest = "#{repo == 'tdiary-core' ? 'tdiary' : repo}#{suffix}"
 
 	if version then
@@ -43,7 +34,7 @@ def make_tarball( repo, version = nil )
 			sh "chmod +x index.rb index.fcgi update.rb update.fcgi"
 			sh 'rake doc'
 			Bundler.with_clean_env do
-				sh 'bundle --path .bundle --without development:test'
+				sh 'bundle --path .bundle --without coffee:memcached:redis:gfm:server:development'
 			end
 			Dir.chdir 'misc/lib' do
 				sh 'gem unpack bundler'
@@ -57,13 +48,30 @@ def make_tarball( repo, version = nil )
 	TARBALLS << "#{dest}.tar.gz"
 end
 
-#
-# tasks
-#
+def make_full_package(version = nil)
+	suffix = version ? "-#{version}" : '-snapshot'
+	Dir.chdir("tmp") do
+		TARBALLS.clear
+		REPOS.each do |repo|
+			make_tarball( repo, version )
+		end
+		Dir["tdiary-theme/*"].each do |d|
+			mv d, "tdiary-core/theme/" rescue true
+		end
+		mv "tdiary-core", "tdiary#{suffix}"
+		sh "tar zcf tdiary-full#{suffix}.tar.gz tdiary#{suffix}"
+		TARBALLS << "tdiary-full#{suffix}.tar.gz"
+		rm_rf "tdiary#{suffix}"
+		REPOS.each {|repo| rm_rf repo rescue true }
+	end
+end
+
 task :default => :snapshot
 
 desc 'fetching all files from GitHub.'
-task :fetch => REPOS
+task :fetch do
+	REPOS.each{|r| fetch_files(r) }
+end
 
 desc 'releasing all files'
 task :release do
@@ -76,39 +84,13 @@ task :release do
 end
 
 desc 'making packages of snapshot.'
-task :snapshot => REPOS do
-	Dir.chdir("tmp") do
-		TARBALLS.clear
-		REPOS.each do |repo|
-			make_tarball( repo )
-		end
-		Dir["tdiary-theme/*"].each do |d|
-			mv d, "tdiary-core/theme/"
-		end
-		mv "tdiary-core", "tdiary"
-		sh "tar zcf tdiary-full.tar.gz tdiary"
-		TARBALLS << "tdiary-full.tar.gz"
-		rm_rf "tdiary"
-		REPOS.each {|repo| rm_rf repo rescue true }
-	end
+task :snapshot => :fetch do
+	make_full_package
 end
 
 desc 'making packages of stable.'
-task :stable => REPOS do
-	Dir.chdir("tmp") do
-		TARBALLS.clear
-		REPOS.each do |repo|
-			make_tarball( repo, STABLE )
-		end
-		Dir["tdiary-theme/*"].each do |d|
-			mv d, "tdiary-core/theme/" rescue true
-		end
-		mv "tdiary-core", "tdiary-#{STABLE}"
-		sh "tar zcf tdiary-full-#{STABLE}.tar.gz tdiary-#{STABLE}"
-		TARBALLS << "tdiary-full-#{STABLE}.tar.gz"
-		rm_rf "tdiary-#{STABLE}"
-		REPOS.each {|repo| rm_rf repo rescue true }
-	end
+task :stable => :fetch do
+	make_full_package(STABLE)
 end
 
 desc 'cleanup all files.'

data/tdiary/version.rb

@@ -1,3 +1,3 @@
 module TDiary
-	VERSION = '3.2.2.20130617'
+	VERSION = '3.2.2.20130720'
 end