tdiary 3.2.2.20130604 → 3.2.2.20130614

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 445782f3487f022ae8ebcbcd32b4128becce7a28
-  data.tar.gz: 4cb0e65bd997dc61deb4cca6a09a186aa41138d9
+  metadata.gz: eca5541a6d02354e337c5d41dc2bd36fb8ea5fe0
+  data.tar.gz: d5b7f5622d0edaae1391032d2f16e599e93a8133
 SHA512:
-  metadata.gz: acc96b01d7aaa59b4500dac96d42066621c79196c7f96e9b126af9a8b8e0f3612664fc3897a07a8914570d4b68d3c354a21c2a35446c566417384ef31012d1ad
-  data.tar.gz: 60eaa2677f5f5a650b8990a7f678a347b6b862189bdfceccdd793fdb9a6e1c04dd9fc2c18ca30ba943967ed2c3950004fc4955fb839447ec4c196729cc04cef2
+  metadata.gz: 46f8edaf87b103a50c2f4ef339cdc2dc3e202f8486dfb361d58af145019f0e3fe41ad4717fca13d1fa4e021b39235d57ae284761ea2c5735230ac2032062af32
+  data.tar.gz: aed17e747b8f90391fd534bb86feb12532b8b25c51a6652f2951b7bb9aef9b98c4e94188e508232356bcdacc3acfcf8a24073604cbdc17a09d12951a9d7fe972

data/Gemfile

@@ -16,7 +16,6 @@ end
 # use edge tDiary contrib
 # gem 'tdiary-contrib', :git => 'git@github.com:tdiary/tdiary-contrib.git'
 
-gem 'sprockets'
 gem 'coffee-script', :group => [:development, :test]
 
 gem 'omniauth'

data/Gemfile.lock

@@ -1,13 +1,14 @@
 PATH
   remote: .
   specs:
-    tdiary (3.2.2.20130604)
+    tdiary (3.2.2.20130614)
       bundler (~> 1.3)
       hikidoc (>= 0.0.6)
       imagesize (>= 0.1.0)
       rack (>= 1.0.0)
       rake (>= 10.0.0)
       rdtool (>= 0.6.0)
+      sprockets (~> 2.10)
       thor (~> 0.18)
 
 GEM
@@ -42,9 +43,9 @@ GEM
       multi_json (~> 1.0)
     faraday (0.8.7)
       multipart-post (~> 1.1)
-    ffi (1.8.1)
+    ffi (1.9.0)
     hashie (2.0.5)
-    hike (1.2.2)
+    hike (1.2.3)
     hikidoc (0.0.6)
     httpauth (0.2.0)
     imagesize (0.1.1)
@@ -60,9 +61,11 @@ GEM
       addressable (~> 2.3)
     method_source (0.8.1)
     mime-types (1.23)
-    multi_json (1.7.5)
+    mini_portile (0.5.0)
+    multi_json (1.7.6)
     multipart-post (1.2.0)
-    nokogiri (1.5.9)
+    nokogiri (1.6.0)
+      mini_portile (~> 0.5.0)
     oauth (0.4.7)
     oauth2 (0.8.1)
       faraday (~> 0.8)
@@ -177,7 +180,6 @@ DEPENDENCIES
   selenium-webdriver
   sequel
   simplecov
-  sprockets
   sqlite3
   tapp
   tdiary!

data/config.ru

@@ -1,64 +1,7 @@
 $:.unshift( File::dirname( __FILE__ ).untaint )
+require 'tdiary/environment'
+require 'tdiary/application'
 
-require 'tdiary'
-require 'tdiary/rack/html_anchor'
-require 'tdiary/rack/valid_request_path'
-require 'tdiary/rack/auth/basic'
-require 'omniauth'
-require 'tdiary/rack/auth/omniauth'
-
-use Rack::Reloader unless ENV['RACK_ENV'] == 'production'
-
-base_dir = ''
-
-# OmniAuth settings
-use Rack::Session::Pool, :expire_after => 2592000
-use OmniAuth::Builder do
-	configure {|conf| conf.path_prefix = "#{base_dir}/auth" }
-	# provider :twitter, ENV['TWITTER_KEY'], ENV['TWITTER_SECRET']
-	# provider :github, ENV['GITHUB_KEY'], ENV['GITHUB_SECRET']
-end
-map "#{base_dir}/auth" do
-	run TDiary::Rack::Auth::OmniAuth::CallbackHandler.new
-end
-
-map "#{base_dir}/update.rb" do
-	# Basic Auth
-	use TDiary::Rack::Auth::Basic, '.htpasswd'
-
-	# OAuth
-	# use TDiary::Rack::Auth::OmniAuth, :twitter do |auth|
-	#		auth.info.nickname == 'your_twitter_screen_name'
-	# end
-
-	run TDiary::Application.new(:update)
-end
-
-map "#{base_dir}/assets" do
-	environment = Sprockets::Environment.new
-	%w(js theme).each {|path| environment.append_path File.join(TDiary.root, path) }
-
-	# FIXME: dirty hack, it should create TDiary::Server::Config.assets_path
-	TDiary::Contrib::Assets.setup(environment) if defined?(TDiary::Contrib)
-	
-	# if you need to auto compilation for CoffeeScript
-	# require 'tdiary/rack/assets/precompile'
-	# use TDiary::Rack::Assets::Precompile, environment
-
-	run environment
-end
-
-map "#{base_dir}/" do
-	use TDiary::Rack::HtmlAnchor
-	run Rack::Cascade.new([
-		Rack::File.new("./public/"),
-		TDiary::Rack::ValidRequestPath.new(TDiary::Application.new(:index))
-	])
-end
-
-# Local Variables:
-# mode: ruby
-# indent-tabs-mode: t
-# tab-width: 3
-# ruby-indent-level: 3
-# End:
+use ::Rack::Reloader unless ENV['RACK_ENV'] == 'production'
+base_dir = '/'
+run TDiary::Application.new( base_dir )

data/plugin/00default.rb

@@ -851,13 +851,13 @@ def saveconf_theme
 		@conf.css = @cgi.params['css'][0]
 	end
 
-	@conf_theme_list = []
-	Dir::glob( "#{::TDiary::PATH}/theme/*" ).sort.each do |dir|
+	theme_paths = [::TDiary::PATH, TDiary.server_root].map {|d| "#{d}/theme/*" }
+	@conf_theme_list = Dir::glob( theme_paths ).sort.map {|dir|
 		theme = dir.sub( %r[.*/theme/], '')
 		next unless FileTest::file?( "#{dir}/#{theme}.css".untaint )
 		name = theme.split( /_/ ).collect{|s| s.capitalize}.join( ' ' )
-		@conf_theme_list << [theme,name]
-	end
+		[theme,name]
+	}.compact.uniq
 end
 
 # comments

data/spec/acceptance_helper.rb

@@ -1,21 +1,26 @@
 require 'spec_helper'
+require 'sprockets'
 
 Dir["#{File.dirname(__FILE__)}/acceptance/support/**/*.rb"].each {|f| require f}
 
+require 'tdiary/application'
 Capybara.app = Rack::Builder.new do
 	map '/' do
-		run TDiary::Application.new(:index)
+		run TDiary::Dispatcher.index
 	end
 
 	map '/index.rb' do
-		run TDiary::Application.new(:index)
+		run TDiary::Dispatcher.index
 	end
 
 	map '/update.rb' do
-		run TDiary::Application.new(:update)
+		run TDiary::Dispatcher.update
 	end
 end
 
+# FIXME: TDiary::Application has auth middleware in update.rb, so it cannot be tested.
+# Capybara.app = TDiary::Application.new
+
 Capybara.save_and_open_page_path = File.dirname(__FILE__) + '/../tmp/capybara'
 
 RSpec.configure do |config|

data/spec/core/rack/static_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+require 'rack/test'
+require 'tdiary/rack/static'
+
+describe TDiary::Rack::Static do
+	include Rack::Test::Methods
+
+	describe "reserve static files" do
+		let(:app) { TDiary::Rack::Static.new(
+			lambda{|env| [500, {}, ['Internal Server Error']]}, 'doc')}
+
+		it 'should return the file in static directory' do
+			get '/README.md'
+			last_response.should be_ok
+		end
+
+		it 'should run the app if file is not exist' do
+			get '/index.rb'
+			last_response.status.should be 500
+		end
+	end
+end

data/tdiary.gemspec

@@ -26,6 +26,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rdtool', '>= 0.6.0'
   spec.add_dependency 'imagesize', '>= 0.1.0'
 
+  spec.add_dependency 'sprockets', '~> 2.10'
+
   spec.add_dependency 'thor', '~> 0.18'
   spec.add_dependency "bundler", "~> 1.3"
 end

data/tdiary/application.rb

@@ -1,4 +1,8 @@
 # -*- coding: utf-8 -*-
+require 'rack/builder'
+require 'tdiary/application/configuration'
+require 'tdiary/rack'
+require 'sprockets'
 
 # FIXME too dirty hack :-<
 class CGI
@@ -12,40 +16,67 @@ end
 
 module TDiary
 	class Application
-		def initialize( target )
-			@target = target
+		class << self
+			def configure(&block)
+				instance_eval &block
+			end
+
+			def config
+				@config ||= Configuration.new
+			end
+		end
+
+		def initialize( base_dir = '/' )
+			@app = ::Rack::Builder.app {
+				map base_dir do
+					Application.config.builder_procs.each do |builder_proc|
+						instance_eval &builder_proc
+					end
+				end
+			}
 		end
 
 		def call( env )
-			req = adopt_rack_request_to_plain_old_tdiary_style( env )
-			dispatch_request( req )
+			@app.call( env )
 		end
+	end
 
-	private
+	Application.configure do
+		config.assets_paths.concat %w(js theme).map {|path|
+			[TDiary.root, TDiary.server_root].map {|base_dir|
+				File.join(base_dir, path)
+			}
+		}.flatten.uniq
 
-		def adopt_rack_request_to_plain_old_tdiary_style( env )
-			req = TDiary::Request.new( env )
-			req.params # fill params to tdiary_request
-			$RACK_ENV = req.env
-			env["rack.input"].rewind
-			fake_stdin_as_params
-			req
-		end
+		config.builder do
+			map Application.config.path[:index] do
+				use TDiary::Rack::HtmlAnchor
+				use TDiary::Rack::Static, "public"
+				use TDiary::Rack::ValidRequestPath
+				run TDiary::Dispatcher.index
+			end
 
-		def dispatch_request( request )
-			dispatcher = TDiary::Dispatcher.__send__( @target )
-			dispatcher.dispatch_cgi( request )
-		end
+			map Application.config.path[:update] do
+				instance_eval &Application.config.authenticate_proc
+				run TDiary::Dispatcher.update
+			end
 
-		def fake_stdin_as_params
-			stdin_spy = StringIO.new( "" )
-			# FIXME dirty hack
-			if $RACK_ENV && $RACK_ENV['rack.input']
-				stdin_spy.print( $RACK_ENV['rack.input'].read )
-				stdin_spy.rewind
+			map Application.config.path[:assets] do
+				environment = Sprockets::Environment.new
+				Application.config.assets_paths.each do |path|
+					environment.append_path path
+				end
+
+				if Application.config.assets_precompile
+					require 'tdiary/rack/assets/precompile'
+					use TDiary::Rack::Assets::Precompile, environment
+				end
+
+				run environment
 			end
-			$stdin = stdin_spy
 		end
+
+		config.authenticate TDiary::Rack::Auth::Basic, '.htpasswd'
 	end
 end
 

data/tdiary/application/configuration.rb

@@ -0,0 +1,36 @@
+module TDiary
+	class Application
+		class Configuration
+			attr_accessor :assets_paths, :assets_precompile, :plugin_paths, :path, :builder_procs, :authenticate_proc
+
+			def initialize
+				@assets_paths = []
+				# if you need to auto compilation for CoffeeScript
+				@assets_precompile = false;
+				@plugin_paths = []
+				@path = {
+					index: '/',
+					update: '/update.rb',
+					assets: '/assets'
+				}
+				@builder_procs = []
+				@authenticate_proc = proc { }
+			end
+
+			def builder(&block)
+				@builder_procs << block
+			end
+
+			def authenticate(middleware, *params, &block)
+				@authenticate_proc = proc { use middleware, *params, &block }
+			end
+		end
+	end
+end
+
+# Local Variables:
+# mode: ruby
+# indent-tabs-mode: t
+# tab-width: 3
+# ruby-indent-level: 3
+# End:

data/tdiary/application/extensions/omniauth.rb

@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+require 'tdiary/application'
+require 'tdiary/rack/auth/omniauth'
+
+TDiary::Application.configure do
+	config.builder do
+		use ::Rack::Session::Pool, :expire_after => 2592000
+		use OmniAuth::Builder do
+			configure {|conf| conf.path_prefix = "/auth" }
+			provider :twitter, ENV['TWITTER_KEY'], ENV['TWITTER_SECRET']
+			provider :github, ENV['GITHUB_KEY'], ENV['GITHUB_SECRET']
+		end
+
+		map('/auth') do
+			run TDiary::Rack::Auth::OmniAuth::CallbackHandler.new
+		end
+	end
+
+	config.authenticate TDiary::Rack::Auth::OmniAuth, :twitter do |auth|
+		# TODO: an user can setting
+		auth.info.nickname == 'your_twitter_screen_name'
+	end
+end

data/tdiary/cli.rb

@@ -81,6 +81,8 @@ module TDiary
 		method_option "port", :aliases => "p", :type => :numeric, :default => 19292, :banner =>
 			"use PORT"
 		def server
+			require 'tdiary'
+
 			if options[:cgi]
 				opts = {
 					:daemon => ENV['DAEMON'],
@@ -92,7 +94,6 @@ module TDiary
 				TDiary::Server.run( opts )
 			elsif
 				# --rack option
-				require 'rack'
 				# Rack::Server reads ARGV as :config, so delete it
 				ARGV.shift
 				opts = {
@@ -142,6 +143,10 @@ module TDiary
 				empty_directory(target)
 				empty_directory(File.join(target, 'public'))
 				empty_directory(File.join(target, 'misc/plugin'))
+				empty_directory(File.join(target, 'tdiary/filter'))
+				empty_directory(File.join(target, 'tdiary/style'))
+				empty_directory(File.join(target, 'js'))
+				empty_directory(File.join(target, 'theme'))
 				%w(
 				README.md
 				Gemfile

data/tdiary/core_ext.rb

@@ -102,8 +102,13 @@ module Safe
 		result = nil
 		if $SAFE < level then
 			Proc.new {
-				$SAFE = level
-				result = yield
+				begin
+					$SAFE = level
+				rescue ArgumentError => e
+					# $SAFE=4 was removed from Ruby 2.1.0.
+				ensure
+					result = yield
+				end
 			}.call
 		else
 			result = yield

data/tdiary/dispatcher.rb

@@ -16,6 +16,11 @@ module TDiary
 			@target = TARGET[target]
 		end
 
+		def call( env )
+			req = adopt_rack_request_to_plain_old_tdiary_style( env )
+			dispatch_cgi( req )
+		end
+
 		# FIXME rename method name to more suitable one.
 		def dispatch_cgi( request, cgi = CGI.new )
 			result = @target.run( request, cgi )
@@ -66,6 +71,27 @@ module TDiary
 			end
 			private :new
 		end
+
+	private
+
+		def adopt_rack_request_to_plain_old_tdiary_style( env )
+			req = TDiary::Request.new( env )
+			req.params # fill params to tdiary_request
+			$RACK_ENV = req.env
+			env["rack.input"].rewind
+			fake_stdin_as_params
+			req
+		end
+
+		def fake_stdin_as_params
+			stdin_spy = StringIO.new( "" )
+			# FIXME dirty hack
+			if $RACK_ENV && $RACK_ENV['rack.input']
+				stdin_spy.print( $RACK_ENV['rack.input'].read )
+				stdin_spy.rewind
+			end
+			$stdin = stdin_spy
+		end
 	end
 end
 

data/tdiary/io/base.rb

@@ -37,9 +37,12 @@ module TDiary
 
 		def load_styles
 			@styles = {}
-			paths = @tdiary.conf.options['style.path'] || ["#{TDiary::PATH}/tdiary/style", "#{TDiary::PATH}/tdiary"]
-			[paths].flatten.each do |path|
-				path = path.sub(/\/+$/, '')
+			paths = @tdiary.conf.options['style.path'] ||
+				[TDiary::PATH, TDiary.server_root].map {|base|
+					["#{base}/tdiary/style", "#{base}/tdiary"]
+				}
+			[paths].flatten.uniq.each do |path|
+				path = path.sub(/\/+$/, '').untaint
 				Dir.glob("#{path}/*_style.rb") do |style_file|
 					require style_file.untaint
 					style = File.basename(style_file).sub(/_style\.rb$/, '')

data/tdiary/rack.rb

@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+
+module TDiary
+	module Rack
+		autoload :HtmlAnchor,       'tdiary/rack/html_anchor'
+		autoload :ValidRequestPath, 'tdiary/rack/valid_request_path'
+		autoload :Static,           'tdiary/rack/static'
+
+		module Assets
+			autoload :Precompile,    'tdiary/rack/assets/precompile'
+		end
+
+		module Auth
+			autoload :Basic,         'tdiary/rack/auth/basic'
+			autoload :OmniAuth,      'tdiary/rack/auth/omniauth'
+		end
+	end
+end
+
+# Local Variables:
+# mode: ruby
+# indent-tabs-mode: t
+# tab-width: 3
+# ruby-indent-level: 3
+# End:
+# vim: ts=3

data/tdiary/rack/static.rb

@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+require 'rack/file'
+
+module TDiary
+	module Rack
+		class Static
+			def initialize( app, base_dir )
+				@app = app
+				@file = ::Rack::File.new( base_dir )
+			end
+
+			def call( env )
+				result = @file.call( env )
+				if result[0].to_i == 404
+					@app.call( env )
+				else
+					result
+				end
+			end
+		end
+	end
+end
+
+# Local Variables:
+# mode: ruby
+# indent-tabs-mode: t
+# tab-width: 3
+# ruby-indent-level: 3
+# End:

data/tdiary/style/wiki_style.rb

@@ -72,8 +72,13 @@ module TDiary
 
 		def valid_plugin_syntax?(code)
 			lambda {
-				$SAFE = 4
-				eval( "BEGIN {return true}\n#{code}", nil, "(plugin)", 0 )
+				begin
+					$SAFE = 4
+				rescue ArgumentError
+					# $SAFE=4 was removed from Ruby 2.1.0.
+				ensure
+					eval( "BEGIN {return true}\n#{code}", nil, "(plugin)", 0 )
+				end
 			}.call
 		rescue SyntaxError
 			lambda { eval('') }.call

data/tdiary/version.rb

@@ -1,3 +1,3 @@
 module TDiary
-	VERSION = '3.2.2.20130604'
+	VERSION = '3.2.2.20130614'
 end

data/tdiary/view.rb

@@ -83,7 +83,7 @@ module TDiary
 			return if @filters
 
 			@filters = []
-			filter_path = @conf.filter_path || "#{PATH}/tdiary/filter"
+			filter_path = @conf.filter_path || "{#{PATH},#{TDiary.server_root}}/tdiary/filter"
 			Dir::glob( "#{filter_path}/*.rb" ).sort.each do |file|
 				require file.untaint
 				@filters << TDiary::Filter::const_get( "#{File::basename( file, '.rb' ).capitalize}Filter" )::new( @cgi, @conf )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tdiary
 version: !ruby/object:Gem::Version
-  version: 3.2.2.20130604
+  version: 3.2.2.20130614
 platform: ruby
 authors:
 - TADA Tadashi
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-04 00:00:00.000000000 Z
+date: 2013-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -82,6 +82,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.0
+- !ruby/object:Gem::Dependency
+  name: sprockets
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.10'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.10'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -391,6 +405,7 @@ files:
 - spec/core/plugin_spec.rb
 - spec/core/rack/assets/precompile_spec.rb
 - spec/core/rack/html_anchor_spec.rb
+- spec/core/rack/static_spec.rb
 - spec/core/rack/valid_request_path_spec.rb
 - spec/core/style/emptdiary_style_spec.rb
 - spec/core/style/etdiary_style_spec.rb
@@ -422,6 +437,8 @@ files:
 - tdiary.rb
 - tdiary/admin.rb
 - tdiary/application.rb
+- tdiary/application/configuration.rb
+- tdiary/application/extensions/omniauth.rb
 - tdiary/author_only_base.rb
 - tdiary/base.rb
 - tdiary/cli.rb
@@ -447,10 +464,12 @@ files:
 - tdiary/lang/en.rb
 - tdiary/lang/ja.rb
 - tdiary/plugin.rb
+- tdiary/rack.rb
 - tdiary/rack/assets/precompile.rb
 - tdiary/rack/auth/basic.rb
 - tdiary/rack/auth/omniauth.rb
 - tdiary/rack/html_anchor.rb
+- tdiary/rack/static.rb
 - tdiary/rack/valid_request_path.rb
 - tdiary/referer_manager.rb
 - tdiary/request.rb
@@ -544,6 +563,7 @@ test_files:
 - spec/core/plugin_spec.rb
 - spec/core/rack/assets/precompile_spec.rb
 - spec/core/rack/html_anchor_spec.rb
+- spec/core/rack/static_spec.rb
 - spec/core/rack/valid_request_path_spec.rb
 - spec/core/style/emptdiary_style_spec.rb
 - spec/core/style/etdiary_style_spec.rb