OSDN > 軟體搜索 > Internet > WWW/HTTP > Dynamic Content > Tenarai > SCM > SVN > 提交

Tenarai

R/O
SSH
HTTPS

tenarai: 提交

Commit MetaInfo

修訂	71 (tree)
時間	2008-04-02 20:57:04
作者	junkikuchi

Log Message

updated.

Change Summary

modified: trunk/init_model.rb (diff)
modified: trunk/config.rb (diff)
modified: trunk/webapp/Service.rb (diff)
modified: trunk/webapp/Widget/User.rb (diff)
modified: trunk/webapp/Widget/JQuery.rb (diff)
modified: trunk/webapp/Widget/Widget/List.rb (diff)
modified: trunk/webapp/Widget/Session.rb (diff)
modified: trunk/webapp/Widget/UserAdmin/Form.rb (diff)
modified: trunk/webapp/Widget/UserAdmin/List.rb (diff)
modified: trunk/webapp/Widget/UserAdmin.rb (diff)
modified: trunk/webapp/Widget/YUI/ResetFontsGrids.rb (diff)
modified: trunk/webapp/Widget/HTML.rb (diff)
modified: trunk/webapp/Widget/View/List.rb (diff)
modified: trunk/webapp/Widget/Content/Form.rb (diff)
modified: trunk/webapp/Widget/Content/Tab.rb (diff)
modified: trunk/webapp/Widget/Content/List.rb (diff)
modified: trunk/webapp/Widget/Content/Path.rb (diff)
modified: trunk/webapp/Widget/Content.rb (diff)
modified: trunk/webapp/Widget/User/Form.rb (diff)
modified: trunk/webapp/Widget/User/Login.rb (diff)
modified: trunk/webapp/Widget/User/Logout.rb (diff)
modified: trunk/webapp/Widget/User/List.rb (diff)
modified: trunk/webapp/Widget.rb (diff)
modified: trunk/webapp/Resource.rb (diff)

差異

--- trunk/init_model.rb (revision 70)

+++ trunk/init_model.rb (revision 71)

		@@ -81,13 +81,7 @@
81	81	:class => 'Widget::HTML',
82	82	:row => {},
83	83	:relation => {'view' => 'view:resource'},
84		- :preference => {
85		- 'html.size.width' => '100%',
86		- 'html.size.height' => '100%',
87		- 'body.size.width' => '100%',
88		- 'body.size.height' => '100%',
89		- 'body.text.text_align' => 'left',
90		- }
	84	+ :preference => {}
91	85	},
92	86	{
93	87	:name => 'session.user.content.view.html.title',

--- trunk/config.rb (revision 70)

+++ trunk/config.rb (revision 71)

		@@ -3,7 +3,7 @@
3	3
4	4	CONFIG[:db] = {
5	5	:engine => :mysql,
6		- :db => 'test',
	6	+ :db => 'yamap_jp',
7	7	:host => 'localhost',
8	8	:user => 'root',
9	9	:password => 'root',

		@@ -41,3 +41,5 @@
41	41	['widget.view', 'view.widget' ],
42	42	],
43	43	}
	44	+
	45	+#require 'config_local'

--- trunk/webapp/Service.rb (revision 70)

+++ trunk/webapp/Service.rb (revision 71)

		@@ -13,15 +13,15 @@
13	13	end
14	14
15	15	class Redirect < Error
16		- def initialize(url, code=302)
	16	+ def initialize(uri, code=302)
17	17	super()
18	18	@code = code
19		- @url = url
	19	+ @uri = uri
20	20	end
21	21
22	22	def exec(service)
23		- service.response.code = @code
24		- service.response['location'] = @url
	23	+ service.response.code = @code
	24	+ service.response['location'] = @uri
25	25	end
26	26	end
27	27

		@@ -33,14 +33,14 @@
33	33	attr_reader :request
34	34	attr_reader :response
35	35
36		- def _build_url(param, res, query)
37		- url = [nil, name, res].join('/')
38		- url += '?' + query.to_s unless query.empty?
39		- url
	36	+ def build_uri(param, res, query)
	37	+ uri = [nil, name, res].join('/')
	38	+ uri += '?' + query.to_s unless query.empty?
	39	+ uri
40	40	end
41	41
42		- def url(*param)
43		- _build_url([], param)
	42	+ def uri(*param)
	43	+ build_uri([], param)
44	44	end
45	45
46	46	def dispatch(model, param, request, response)

--- trunk/webapp/Widget/User.rb (revision 70)

+++ trunk/webapp/Widget/User.rb (revision 71)

		@@ -29,7 +29,7 @@
29	29	end
30	30	resource.content.save
31	31
32		- raise Service::Redirect.new(url(resource.content.user.id))
	32	+ raise Service::Redirect.new(uri(resource.content.user.id))
33	33	end
34	34
35	35	def logout

		@@ -36,7 +36,7 @@
36	36	resource.content.user = default_user
37	37	resource.content.save
38	38
39		- raise Service::Redirect.new(url(resource.content.user.id))
	39	+ raise Service::Redirect.new(uri(resource.content.user.id))
40	40	end
41	41
42	42	def new(row)

		@@ -56,7 +56,7 @@
56	56	resource.content.user = default_user if resource.content.user.nil?
57	57
58	58	unless resource.content.user.equal?(@content)
59		- raise Service::Redirect.new(url(resource.content.user.id))
	59	+ raise Service::Redirect.new(uri(resource.content.user.id))
60	60	end
61	61	end
62	62	end

--- trunk/webapp/Widget/JQuery.rb (revision 70)

+++ trunk/webapp/Widget/JQuery.rb (revision 71)

		@@ -10,8 +10,8 @@
10	10
11	11	preference 'jquery' do \|jquery\|
12	12	jquery.group 'js' do \|js\|
13		- js.edit 'url' do \|url\|
14		- url.value = 'http://localhost/pub/jquery-1.2.3.js'
	13	+ js.edit 'uri' do \|uri\|
	14	+ uri.value = 'http://localhost/pub/jquery-1.2.3.js'
15	15	end
16	16	end
17	17	end

		@@ -20,7 +20,7 @@
20	20	xml.tag(
21	21	'script',
22	22	'type' => 'text/javascript',
23		- 'src' => preference.jquery.js.url.value
	23	+ 'src' => preference.jquery.js.uri.value
24	24	).text('')
25	25	end
26	26	end

--- trunk/webapp/Widget/Session.rb (revision 70)

+++ trunk/webapp/Widget/Session.rb (revision 71)

		@@ -8,9 +8,9 @@
8	8	class Session < Resource
9	9	extend Tenarai::ClassLoader
10	10
11		- preference 'preference' do \|pref\|
12		- pref.group 'session' do \|s\|
13		- s.edit 'session_id' do \|sid\|
	11	+ preference 'session' do \|pref\|
	12	+ pref.group 'cookie' do \|s\|
	13	+ s.edit '_name' do \|sid\|
14	14	sid.value = 'sid'
15	15	end
16	16	s.edit '_path_name' do \|pth\|

		@@ -22,8 +22,8 @@
22	22	def init(*param)
23	23	super
24	24
25		- session_name = preference.preference.session.session_id.value
26		- path_name = preference.preference.session._path_name.value
	25	+ session_name = preference.session.cookie._name.value
	26	+ path_name = preference.session.cookie._path_name.value
27	27
28	28	@content = service.model['session'].fetch_session(
29	29	service.request.cookie[session_name]

		@@ -31,7 +31,7 @@
31	31	@content.date = Time.now
32	32	@content.ip = service.request['remote_addr']
33	33
34		- service.response.cookie << Tenarai::CGI::Response::Cookie.new(
	34	+ service.response.set_cookie(
35	35	session_name,
36	36	@content.session_id,
37	37	:path => path_name

		@@ -38,7 +38,7 @@
38	38	)
39	39	end
40	40
41		- def build_url(param)
	41	+ def build_resource_uri(param)
42	42	'a'
43	43	end
44	44

--- trunk/webapp/Widget/UserAdmin/Form.rb (revision 70)

+++ trunk/webapp/Widget/UserAdmin/Form.rb (revision 71)

		@@ -52,7 +52,7 @@
52	52	xml.tag('div').text(path.map do \|val\| val.class.name end.join(' > '))
53	53
54	54	xml.tag('div', 'id' => html_id) do \|div\|
55		- div.tag('form', 'method' => 'post', 'action' => url) do \|form\|
	55	+ div.tag('form', 'method' => 'post', 'action' => uri) do \|form\|
56	56	form.tag('p') do \|p\|
57	57	p.text(@msg)
58	58	end if @msg

--- trunk/webapp/Widget/UserAdmin/List.rb (revision 70)

+++ trunk/webapp/Widget/UserAdmin/List.rb (revision 71)

		@@ -30,7 +30,7 @@
30	30	resource.each do \|user\|
31	31	tb.tag('tr') do \|th\|
32	32	th.tag('td', 'class' => 'id').text(user.id)
33		- th.tag('td', 'class' => 'name').tag('a', 'href' => resource.url(user.id)).text(user.name)
	33	+ th.tag('td', 'class' => 'name').tag('a', 'href' => resource.uil(user.id)).text(user.name)
34	34	th.tag('td', 'class' => 'active').text(user.active)
35	35	end
36	36	end

--- trunk/webapp/Widget/UserAdmin.rb (revision 70)

+++ trunk/webapp/Widget/UserAdmin.rb (revision 71)

		@@ -10,11 +10,11 @@
10	10
11	11	resource 'Widget::Content'
12	12
13		- def _build_url(param, _resource, _query)
	13	+ def build_uri(param, _resource, _query)
14	14	if view.path.size == 1
15		- _resource.unshift([build_url(param)].join(','))
	15	+ _resource.unshift([build_resource_uri(param)].join(','))
16	16	else
17		- _query[html_id] = [build_url(param)].join(',')
	17	+ _query[html_id] = [build_resource_uri(param)].join(',')
18	18	end
19	19
20	20	if resource.nil?

		@@ -21,7 +21,7 @@
21	21	@service
22	22	else
23	23	resource
24		- end._build_url(
	24	+ end.build_uri(
25	25	[
26	26	if c = resource.content.node.map.shift
27	27	c.id

--- trunk/webapp/Widget/YUI/ResetFontsGrids.rb (revision 70)

+++ trunk/webapp/Widget/YUI/ResetFontsGrids.rb (revision 71)

		@@ -9,8 +9,8 @@
9	9
10	10	preference 'yui' do \|yui\|
11	11	yui.group 'reset_fonts_grids' do \|rfg\|
12		- rfg.edit 'url' do \|url\|
13		- url.value = 'http://yui.yahooapis.com/2.5.1/build/reset-fonts-grids/reset-fonts-grids.css'
	12	+ rfg.edit 'uri' do \|uri\|
	13	+ uri.value = 'http://yui.yahooapis.com/2.5.1/build/reset-fonts-grids/reset-fonts-grids.css'
14	14	end
15	15	end
16	16	end

		@@ -20,7 +20,7 @@
20	20	'link',
21	21	'rel' => 'stylesheet',
22	22	'type' => 'text/css',
23		- 'href' => preference.yui.reset_fonts_grids.url.value
	23	+ 'href' => preference.yui.reset_fonts_grids.uri.value
24	24	)
25	25	end
26	26	end

--- trunk/webapp/Widget/View/List.rb (revision 70)

+++ trunk/webapp/Widget/View/List.rb (revision 71)

		@@ -21,7 +21,7 @@
21	21	div.tag('ul') do \|ul\|
22	22	ul.tag('li') do \|li\|
23	23	li.tag('a') do \|a\|
24		- a['href'] = url(content.id)
	24	+ a['href'] = uri(content.id)
25	25	a['class'] = 'selected' if resource.content.equal?(content)
26	26	end.text(content.name)
27	27	if resource.content.path.include?(content)

		@@ -35,7 +35,7 @@
35	35	content.node.each do \|c\|
36	36	ul.tag('li') do \|li\|
37	37	li.tag('a') do \|a\|
38		- a['href'] = url(c.id)
	38	+ a['href'] = uri(c.id)
39	39	a['class'] = 'selected' if resource.content.equal?(c)
40	40	end.text(c.name)
41	41	if resource.content.path.include?(c)

--- trunk/webapp/Widget/Content/Tab.rb (revision 70)

+++ trunk/webapp/Widget/Content/Tab.rb (revision 71)

		@@ -19,7 +19,7 @@
19	19	xml.tag('ul', 'id' => html_id) do \|ul\|
20	20	ul.tag('li') do \|li\|
21	21	li.tag('a') do \|a\|
22		- a['href'] = url(c.id)
	22	+ a['href'] = uri(c.id)
23	23	a['class'] = 'selected' if resource.content.path.include?(c)
24	24	end.text(c.title)
25	25	end

		@@ -26,7 +26,7 @@
26	26	c.node.each do \|val\|
27	27	ul.tag('li') do \|li\|
28	28	li.tag('a') do \|a\|
29		- a['href'] = url(val.id)
	29	+ a['href'] = uri(val.id)
30	30	a['class'] = 'selected' if resource.content.path.include?(val)
31	31	end.text(val.title)
32	32	end

--- trunk/webapp/Widget/Content/List.rb (revision 70)

+++ trunk/webapp/Widget/Content/List.rb (revision 71)

		@@ -21,7 +21,7 @@
21	21	div.tag('ul') do \|ul\|
22	22	ul.tag('li') do \|li\|
23	23	li.tag('a') do \|a\|
24		- a['href'] = url(content.id)
	24	+ a['href'] = uri(content.id)
25	25	a['class'] = 'selected' if resource.content.equal?(content)
26	26	end.text(content.title)
27	27	if resource.content.path.include?(content)

		@@ -35,7 +35,7 @@
35	35	content.node.each do \|c\|
36	36	ul.tag('li') do \|li\|
37	37	li.tag('a') do \|a\|
38		- a['href'] = url(c.id)
	38	+ a['href'] = uri(c.id)
39	39	a['class'] = 'selected' if resource.content.equal?(c)
40	40	end.text(c.title)
41	41	if resource.content.path.include?(c)

--- trunk/webapp/Widget/Content/Path.rb (revision 70)

+++ trunk/webapp/Widget/Content/Path.rb (revision 71)

		@@ -19,7 +19,7 @@
19	19	resource.content.path.each do \|val\|
20	20	t.tag('ul') do \|ul\|
21	21	ul.tag('li') do \|li\|
22		- li.tag('a', 'href' => url(val.id)) do \|a\|
	22	+ li.tag('a', 'href' => uri(val.id)) do \|a\|
23	23	a['class'] = 'selected' if resource.content.equal?(val)
24	24	end.text(val.title)
25	25	t = li

--- trunk/webapp/Resource.rb (revision 70)

+++ trunk/webapp/Resource.rb (revision 71)

		@@ -13,21 +13,7 @@
13	13	@content = service.model[self.class.name.split('::').pop.downcase].fetch(id)
14	14	end
15	15
16		- def _build_url(param, _resource, _query)
17		- if view.path.size == 1
18		- _resource.unshift([build_url(param)].join(','))
19		- else
20		- _query[html_id] = [build_url(param)].join(',')
21		- end
22		-
23		- if resource.nil?
24		- @service
25		- else
26		- resource
27		- end._build_url([], _resource, _query)
28		- end
29		-
30		- def build_url(param)
	16	+ def build_resource_uri(param)
31	17	if param.empty?
32	18	if @content
33	19	@content.id

		@@ -39,9 +25,23 @@
39	25	end
40	26	end
41	27
42		- def url(*param, &block)
	28	+ def build_uri(param, _resource, _query)
	29	+ if view.path.size == 1
	30	+ _resource.unshift([build_resource_uri(param)].join(','))
	31	+ else
	32	+ _query[html_id] = [build_resource_uri(param)].join(',')
	33	+ end
	34	+
	35	+ if resource.nil?
	36	+ @service
	37	+ else
	38	+ resource
	39	+ end.build_uri([], _resource, _query)
	40	+ end
	41	+
	42	+ def uri(*param, &block)
43	43	query = Tenarai::CGI::Query.new
44	44	block.call(query) if block_given?
45		- _build_url(param, [], query)
	45	+ build_uri(param, [], query)
46	46	end
47	47	end

Show on old repository browser

		@@ -66,7 +66,7 @@
66	66	'link',
67	67	'rel' => 'stylesheet',
68	68	'type' => 'text/css',
69		- 'href' => url('css')
	69	+ 'href' => uri('css')
70	70	)
71	71	render_html_head(head, builder)
72	72	end

		@@ -145,8 +145,8 @@
145	145	self.class.fetch_resource(self)
146	146	end
147	147
148		- def url(*param, &block)
149		- resource.url(*param, &block)
	148	+ def uri(*param, &block)
	149	+ resource.uri(*param, &block)
150	150	end
151	151
152	152	def init(*param)

		@@ -22,7 +22,7 @@
22	22	ul[w.parent.id] \|\|= li[w.parent.id].tag('ul')
23	23	ul[w.parent.id]
24	24	end.tag('li') do \|_li\|
25		- _li.tag('a', 'href' => url(w.id)).text(w.class.name)
	25	+ _li.tag('a', 'href' => uri(w.id)).text(w.class.name)
26	26	li[w.id] = _li
27	27	end
28	28	end