tdiary 4.0.5.1 → 4.1.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.travis.yml +8 -12
- data/ChangeLog +17 -0
- data/Gemfile +3 -2
- data/Gemfile.lock +66 -72
- data/Rakefile +1 -1
- data/bin/tdiary +1 -1
- data/config.ru +1 -1
- data/doc/HOWTO-authenticate-in-rack.md +1 -1
- data/doc/HOWTO-make-io.md +28 -1
- data/doc/HOWTO-make-theme.md +1 -1
- data/doc/INSTALL.md +1 -1
- data/doc/README.en.md +1 -1
- data/doc/README.md +1 -1
- data/index.fcgi +1 -1
- data/index.rb +4 -4
- data/js/00default.js +1 -1
- data/js/01conf.js +1 -1
- data/js/amazon.js +1 -1
- data/js/category.js +1 -1
- data/js/category_autocomplete.js +1 -1
- data/js/comment_ajax.js +1 -1
- data/js/comment_emoji_autocomplete.js +1 -1
- data/js/draft.js +1 -1
- data/js/highlight.js +1 -1
- data/js/image.js +1 -1
- data/{tdiary.rb → lib/tdiary.rb} +5 -4
- data/{tdiary → lib/tdiary}/admin.rb +0 -0
- data/{tdiary → lib/tdiary}/application.rb +0 -0
- data/{tdiary → lib/tdiary}/application/configuration.rb +0 -0
- data/{tdiary → lib/tdiary}/application/extensions/omniauth.rb +0 -0
- data/{tdiary → lib/tdiary}/author_only_base.rb +0 -0
- data/{tdiary → lib/tdiary}/base.rb +2 -2
- data/{tdiary → lib/tdiary}/cache/file.rb +0 -0
- data/{tdiary → lib/tdiary}/cli.rb +3 -3
- data/{tdiary → lib/tdiary}/comment.rb +0 -0
- data/{tdiary → lib/tdiary}/comment_manager.rb +0 -0
- data/{tdiary → lib/tdiary}/compatible.rb +0 -0
- data/{tdiary → lib/tdiary}/configuration.rb +2 -1
- data/{tdiary → lib/tdiary}/core_ext.rb +13 -4
- data/{tdiary → lib/tdiary}/dispatcher.rb +0 -0
- data/{tdiary → lib/tdiary}/dispatcher/index_main.rb +0 -0
- data/{tdiary → lib/tdiary}/dispatcher/update_main.rb +0 -0
- data/{tdiary → lib/tdiary}/environment.rb +1 -1
- data/{tdiary → lib/tdiary}/extensions.rb +0 -0
- data/{tdiary → lib/tdiary}/extensions/core.rb +0 -0
- data/{tdiary → lib/tdiary}/filter.rb +0 -0
- data/{tdiary → lib/tdiary}/filter/default.rb +1 -1
- data/{tdiary → lib/tdiary}/filter/spam.rb +1 -1
- data/{tdiary → lib/tdiary}/io/base.rb +0 -0
- data/{tdiary → lib/tdiary}/io/default.rb +1 -1
- data/lib/tdiary/io/plugin_pstore.rb +51 -0
- data/{tdiary → lib/tdiary}/io/pstore.rb +1 -1
- data/{tdiary → lib/tdiary}/lang/en.rb +1 -1
- data/{tdiary → lib/tdiary}/lang/ja.rb +1 -1
- data/{tdiary → lib/tdiary}/plugin.rb +17 -2
- data/{plugin → lib/tdiary/plugin}/00default.rb +3 -3
- data/{plugin → lib/tdiary/plugin}/05referer.rb +1 -1
- data/{plugin → lib/tdiary/plugin}/10spamfilter.rb +1 -1
- data/{plugin → lib/tdiary/plugin}/50sp.rb +2 -2
- data/{plugin → lib/tdiary/plugin}/60sf.rb +1 -1
- data/{plugin → lib/tdiary/plugin}/90migrate.rb +0 -0
- data/{plugin → lib/tdiary/plugin}/en/00default.rb +1 -1
- data/{plugin → lib/tdiary/plugin}/en/05referer.rb +1 -1
- data/{plugin → lib/tdiary/plugin}/en/10spamfilter.rb +0 -0
- data/{plugin → lib/tdiary/plugin}/en/50sp.rb +1 -2
- data/{plugin → lib/tdiary/plugin}/en/60sf.rb +1 -2
- data/{plugin → lib/tdiary/plugin}/ja/00default.rb +1 -1
- data/{plugin → lib/tdiary/plugin}/ja/05referer.rb +1 -1
- data/{plugin → lib/tdiary/plugin}/ja/10spamfilter.rb +0 -0
- data/{plugin → lib/tdiary/plugin}/ja/50sp.rb +1 -2
- data/{plugin → lib/tdiary/plugin}/ja/60sf.rb +1 -2
- data/{tdiary → lib/tdiary}/rack.rb +0 -0
- data/{tdiary → lib/tdiary}/rack/assets/precompile.rb +0 -0
- data/{tdiary → lib/tdiary}/rack/auth/basic.rb +0 -0
- data/{tdiary → lib/tdiary}/rack/auth/omniauth.rb +0 -0
- data/{tdiary → lib/tdiary}/rack/html_anchor.rb +0 -0
- data/{tdiary → lib/tdiary}/rack/static.rb +0 -0
- data/{tdiary → lib/tdiary}/rack/valid_request_path.rb +0 -0
- data/{tdiary → lib/tdiary}/referer_manager.rb +0 -0
- data/{tdiary → lib/tdiary}/request.rb +0 -0
- data/{tdiary → lib/tdiary}/response.rb +0 -0
- data/{tdiary → lib/tdiary}/server.rb +1 -1
- data/{tdiary → lib/tdiary}/style.rb +2 -2
- data/{tdiary → lib/tdiary}/style/tdiary.rb +1 -1
- data/{tdiary → lib/tdiary}/style/wiki.rb +6 -2
- data/{tdiary → lib/tdiary}/tasks.rb +0 -0
- data/{tdiary → lib/tdiary}/tasks/assets.rake +0 -0
- data/{tdiary → lib/tdiary}/tasks/auth.rake +0 -0
- data/{tdiary → lib/tdiary}/tasks/db.rake +0 -0
- data/{tdiary → lib/tdiary}/tasks/doc.rake +0 -0
- data/{tdiary → lib/tdiary}/tasks/heroku.rake +0 -0
- data/{tdiary → lib/tdiary}/tasks/jasmine.rake +0 -0
- data/{tdiary → lib/tdiary}/tasks/rdoc.rake +0 -0
- data/{tdiary → lib/tdiary}/tasks/release.rake +0 -0
- data/{tdiary → lib/tdiary}/tasks/rspec.rake +0 -0
- data/{tdiary → lib/tdiary}/tasks/server.rake +1 -1
- data/{tdiary → lib/tdiary}/tasks/test.rake +0 -0
- data/lib/tdiary/version.rb +3 -0
- data/{tdiary → lib/tdiary}/view.rb +7 -0
- data/{tdiary → lib/tdiary}/view_helper.rb +0 -0
- data/misc/convert2.rb +1 -1
- data/misc/filter/antispamservice.rb +1 -1
- data/misc/filter/limitdays.rb +1 -1
- data/misc/filter/linkcheck.rb +1 -1
- data/misc/filter/plugin/antispamservice.rb +1 -1
- data/misc/migrate.rb +1 -1
- data/misc/plugin/a.rb +1 -1
- data/misc/plugin/amazon.rb +1 -1
- data/misc/plugin/amazon/amazonimg.rb +1 -1
- data/misc/plugin/append-css.rb +1 -1
- data/misc/plugin/bq.rb +1 -1
- data/misc/plugin/calendar2.rb +1 -1
- data/misc/plugin/calendar3.rb +1 -1
- data/misc/plugin/category.rb +50 -56
- data/misc/plugin/category_autocomplete.rb +1 -1
- data/misc/plugin/comment_emoji_autocomplete.rb +1 -1
- data/misc/plugin/comment_mail-qmail.rb +1 -1
- data/misc/plugin/comment_mail-sendmail.rb +1 -1
- data/misc/plugin/comment_mail-smtp.rb +1 -1
- data/misc/plugin/comment_rank.rb +1 -1
- data/misc/plugin/counter.rb +1 -1
- data/misc/plugin/daily_theme.rb +1 -1
- data/misc/plugin/disp_referrer.rb +14 -54
- data/misc/plugin/doctype-html401tr.rb +1 -1
- data/misc/plugin/draft.rb +1 -1
- data/misc/plugin/dropdown_calendar.rb +1 -1
- data/misc/plugin/edit_today.rb +1 -1
- data/misc/plugin/en/amazon.rb +1 -1
- data/misc/plugin/en/category.rb +1 -1
- data/misc/plugin/en/counter.rb +1 -1
- data/misc/plugin/en/daily_theme.rb +1 -1
- data/misc/plugin/en/disp_referrer.rb +1 -14
- data/misc/plugin/en/recent_comment.rb +1 -1
- data/misc/plugin/en/recent_comment3.rb +1 -1
- data/misc/plugin/en/recent_rss.rb +1 -1
- data/misc/plugin/en/referer_scheme.rb +1 -2
- data/misc/plugin/en/search_control.rb +1 -2
- data/misc/plugin/en/todo.rb +1 -1
- data/misc/plugin/footnote.rb +1 -1
- data/misc/plugin/gradation.rb +1 -1
- data/misc/plugin/gradient.rb +1 -1
- data/misc/plugin/hide-mail-field.rb +1 -1
- data/misc/plugin/highlight.rb +1 -1
- data/misc/plugin/html_anchor.rb +1 -1
- data/misc/plugin/image.rb +1 -1
- data/misc/plugin/ja/amazon.rb +1 -1
- data/misc/plugin/ja/category.rb +1 -1
- data/misc/plugin/ja/daily_theme.rb +1 -1
- data/misc/plugin/ja/disp_referrer.rb +1 -14
- data/misc/plugin/ja/my-sequel.rb +1 -1
- data/misc/plugin/ja/recent_comment.rb +1 -1
- data/misc/plugin/ja/recent_comment3.rb +1 -1
- data/misc/plugin/ja/recent_rss.rb +1 -1
- data/misc/plugin/ja/referer_scheme.rb +1 -2
- data/misc/plugin/ja/search_control.rb +1 -2
- data/misc/plugin/ja/todo.rb +1 -1
- data/misc/plugin/kw.rb +1 -1
- data/misc/plugin/list.rb +1 -1
- data/misc/plugin/makelirs.rb +1 -1
- data/misc/plugin/makerss.rb +115 -81
- data/misc/plugin/my-ex.rb +1 -1
- data/misc/plugin/my-sequel.rb +1 -2
- data/misc/plugin/navi_user.rb +1 -1
- data/misc/plugin/number_anchor.rb +1 -1
- data/misc/plugin/pb-show.rb +1 -1
- data/misc/plugin/ping.rb +1 -1
- data/misc/plugin/pre_wrap.rb +1 -1
- data/misc/plugin/random_google.rb +1 -1
- data/misc/plugin/recent_comment.rb +1 -1
- data/misc/plugin/recent_comment3.rb +2 -2
- data/misc/plugin/recent_list.rb +1 -1
- data/misc/plugin/recent_namazu.rb +1 -1
- data/misc/plugin/recent_rss.rb +1 -1
- data/misc/plugin/referer-antibot.rb +1 -1
- data/misc/plugin/referer_scheme.rb +1 -2
- data/misc/plugin/search-default.rb +1 -1
- data/misc/plugin/search_control.rb +1 -2
- data/misc/plugin/sn.rb +1 -1
- data/misc/plugin/speed_comment.rb +1 -1
- data/misc/plugin/squeeze.rb +2 -2
- data/misc/plugin/src.rb +1 -1
- data/misc/plugin/tb-show.rb +1 -1
- data/misc/plugin/theme_online.rb +1 -1
- data/misc/plugin/title_list.rb +1 -1
- data/misc/plugin/tlink.rb +1 -1
- data/misc/plugin/todo.rb +1 -1
- data/misc/plugin/whatsnew.rb +1 -1
- data/misc/plugin/xmlrpc.rb +1 -1
- data/misc/plugin/xmlrpc/xmlrpc.rb +1 -1
- data/misc/theme_convert/theme_convert.rb +1 -1
- data/spec/acceptance/save_conf_filter_spec.rb +6 -6
- data/spec/acceptance/save_conf_plugin_spec.rb +1 -1
- data/spec/core/core_ext_spec.rb +14 -5
- data/spec/core/style/wiki_style_spec.rb +6 -0
- data/spec/core/tdiary_spec.rb +15 -0
- data/spec/plugin/plugin_helper.rb +9 -2
- data/tdiary.gemspec +3 -3
- data/test/test_plugin_helper_test.rb +10 -10
- data/theme/base.css +1 -1
- data/theme/conf.css +1 -1
- data/theme/default/README +1 -1
- data/theme/default/default.css +1 -1
- data/theme/tdiary1/README +1 -1
- data/theme/tdiary1/tdiary1.css +1 -1
- data/theme/tdiary2/README +1 -1
- data/theme/tdiary2/tdiary2.css +1 -1
- data/update.fcgi +1 -1
- data/update.rb +4 -4
- data/{skel → views}/category.rhtml +0 -0
- data/{skel → views}/conf.rhtml +0 -0
- data/{skel → views}/day.rhtml +1 -1
- data/{skel → views}/diary.rhtml +0 -0
- data/{skel → views}/footer.rhtml +0 -0
- data/{skel → views}/header.rhtml +0 -0
- data/{skel → views}/i.category.rhtml +0 -0
- data/{skel → views}/i.conf.rhtml +0 -0
- data/{skel → views}/i.day.rhtml +1 -1
- data/{skel → views}/i.diary.rhtml +0 -0
- data/{skel → views}/i.footer.rhtml +0 -0
- data/{skel → views}/i.header.rhtml +0 -0
- data/{skel → views}/i.latest.rhtml +1 -1
- data/{skel → views}/i.month.rhtml +1 -1
- data/{skel → views}/i.search.rhtml +0 -0
- data/{skel → views}/i.update.rhtml +0 -0
- data/{skel → views}/i.update.rhtml.en +0 -0
- data/{skel → views}/latest.rhtml +1 -1
- data/{skel → views}/mail.rtxt +0 -0
- data/{skel → views}/mail.rtxt.en +0 -0
- data/{skel → views}/month.rhtml +1 -1
- data/{skel → views}/plugin_error.rhtml +0 -0
- data/{skel → views}/preview.rhtml +1 -1
- data/{skel → views}/preview.rhtml.en +1 -1
- data/{skel → views}/referer.rhtml +0 -0
- data/{skel → views}/search.rhtml +0 -0
- data/{skel → views}/tdiary.rconf +0 -0
- data/{skel → views}/update.rhtml +0 -0
- data/{skel → views}/update.rhtml.en +0 -0
- metadata +110 -107
- data/tdiary/version.rb +0 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: d5056691a2acf020d746a81e726949f233822191
|
4
|
+
data.tar.gz: 9a14322d096d7d747ad54a1924319eb7565988ca
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 7f47d931870094fe7605ed9fb3bf34923576cde01deea204303cbaf9ba21bc5380830902125348e35312b6e7b2731fc9085ce484e229500a941e12c5ad8391d6
|
7
|
+
data.tar.gz: b6442bce75680180b80d2f7dd2fd548108bc51a5610321d556af518223573d244be11bd66cd9e42a80fbd34a34a159e8c06ff3b5e69cd33bc6d66492fba08c7f
|
data/.travis.yml
CHANGED
@@ -1,5 +1,7 @@
|
|
1
1
|
language: ruby
|
2
2
|
|
3
|
+
sudo: false
|
4
|
+
|
3
5
|
services: memcache
|
4
6
|
|
5
7
|
rvm:
|
@@ -8,18 +10,19 @@ rvm:
|
|
8
10
|
- 2.1
|
9
11
|
- ruby-head
|
10
12
|
|
11
|
-
cache:
|
13
|
+
cache:
|
14
|
+
bundler: true
|
15
|
+
directories:
|
16
|
+
- node_modules
|
17
|
+
- bower_components
|
12
18
|
|
13
19
|
# ignored --deployment option
|
14
|
-
bundler_args: "--without server"
|
20
|
+
bundler_args: "--without server --jobs=3 --retry=3"
|
15
21
|
|
16
22
|
before_install:
|
17
|
-
- "export DISPLAY=:99.0"
|
18
|
-
- "sh -e /etc/init.d/xvfb start"
|
19
23
|
- "echo 'gemspec' > Gemfile.local"
|
20
24
|
|
21
25
|
before_script:
|
22
|
-
- DAEMON=1 bundle exec rake server
|
23
26
|
- npm install
|
24
27
|
- grunt
|
25
28
|
|
@@ -27,15 +30,8 @@ script: if [ $TEST_MODE = "gem" ] ; then bundle exec tdiary test ; else bundle e
|
|
27
30
|
|
28
31
|
env:
|
29
32
|
- TEST_MODE=rack
|
30
|
-
- TEST_MODE=webrick
|
31
33
|
- TEST_MODE=secure
|
32
34
|
- TEST_MODE=gem
|
33
35
|
|
34
36
|
notifications:
|
35
37
|
irc: "irc.freenode.org#tdiary"
|
36
|
-
|
37
|
-
matrix:
|
38
|
-
allow_failures:
|
39
|
-
# webrick mode is unstable results...
|
40
|
-
- env: TEST_MODE=webrick
|
41
|
-
- rvm: ruby-head
|
data/ChangeLog
CHANGED
@@ -1,3 +1,20 @@
|
|
1
|
+
2014-11-29 TADA Tadashi <t@tdtds.jp>
|
2
|
+
* release 4.1.0
|
3
|
+
|
4
|
+
2014-11-26 TADA Tadashi <t@tdtds.jp>
|
5
|
+
* misc/plugin/category.rb: support plugin storage
|
6
|
+
* misc/plugin/disp_referrer.rb: unsupport nora library
|
7
|
+
* misc/plugin/recent_comment3.rb: fix error on tree view mode
|
8
|
+
|
9
|
+
2014-11-10 TADA Tadashi <t@tdtds.jp>
|
10
|
+
* misc/plugin/makerss.rb: support plugin storage
|
11
|
+
|
12
|
+
2014-10-17 TADA Tadashi <t@tdtds.jp>
|
13
|
+
* implement plugin storage in IO class
|
14
|
+
|
15
|
+
2014-09-05 TADA Tadashi <t@tdtds.jp>
|
16
|
+
* style/wiki.rb: fix #437: error when 'a' element with some attr in plugin notation
|
17
|
+
|
1
18
|
2014-08-29 TADA Tadashi <t@tdtds.jp>
|
2
19
|
* release 4.0.5
|
3
20
|
|
data/Gemfile
CHANGED
@@ -4,6 +4,7 @@ gem 'rack'
|
|
4
4
|
gem 'sprockets'
|
5
5
|
gem 'hikidoc'
|
6
6
|
gem 'fastimage'
|
7
|
+
gem 'gemoji'
|
7
8
|
|
8
9
|
group :coffee do
|
9
10
|
gem 'coffee-script'
|
@@ -12,6 +13,7 @@ end
|
|
12
13
|
|
13
14
|
group :server do
|
14
15
|
platforms :mri do
|
16
|
+
gem 'eventmachine', github: 'eventmachine/eventmachine'
|
15
17
|
gem 'thin'
|
16
18
|
end
|
17
19
|
|
@@ -24,11 +26,10 @@ group :development do
|
|
24
26
|
gem 'pit', require: false
|
25
27
|
gem 'racksh', require: false
|
26
28
|
gem 'rake'
|
27
|
-
gem 'octorelease'
|
28
29
|
gem 'redcarpet'
|
29
30
|
|
30
31
|
group :test do
|
31
|
-
gem 'pry-byebug'
|
32
|
+
gem 'pry-byebug', platforms: [:ruby_20, :ruby_21]
|
32
33
|
gem 'test-unit'
|
33
34
|
gem 'rspec'
|
34
35
|
gem 'capybara', require: 'capybara/rspec'
|
data/Gemfile.lock
CHANGED
@@ -1,75 +1,72 @@
|
|
1
|
+
GIT
|
2
|
+
remote: git://github.com/eventmachine/eventmachine.git
|
3
|
+
revision: 4d53154a9ea420cdc65bf8985b9156ad4c3730c9
|
4
|
+
specs:
|
5
|
+
eventmachine (1.0.3)
|
6
|
+
|
1
7
|
GEM
|
2
8
|
remote: https://rubygems.org/
|
3
9
|
specs:
|
4
10
|
addressable (2.3.6)
|
5
|
-
byebug (
|
6
|
-
columnize (~> 0.
|
11
|
+
byebug (3.5.1)
|
12
|
+
columnize (~> 0.8)
|
7
13
|
debugger-linecache (~> 1.2)
|
8
|
-
|
14
|
+
slop (~> 3.6)
|
15
|
+
capybara (2.4.4)
|
9
16
|
mime-types (>= 1.16)
|
10
17
|
nokogiri (>= 1.3.3)
|
11
18
|
rack (>= 1.0.0)
|
12
19
|
rack-test (>= 0.5.4)
|
13
20
|
xpath (~> 2.0)
|
14
|
-
childprocess (0.5.
|
21
|
+
childprocess (0.5.5)
|
15
22
|
ffi (~> 1.0, >= 1.0.11)
|
16
23
|
coderay (1.1.0)
|
17
24
|
coffee-script (2.3.0)
|
18
25
|
coffee-script-source
|
19
26
|
execjs
|
20
|
-
coffee-script-source (1.
|
27
|
+
coffee-script-source (1.8.0)
|
21
28
|
columnize (0.8.9)
|
22
|
-
coveralls (0.7.
|
29
|
+
coveralls (0.7.2)
|
23
30
|
multi_json (~> 1.3)
|
24
|
-
rest-client
|
31
|
+
rest-client (= 1.6.7)
|
25
32
|
simplecov (>= 0.7)
|
26
|
-
term-ansicolor
|
27
|
-
thor
|
33
|
+
term-ansicolor (= 1.2.2)
|
34
|
+
thor (= 0.18.1)
|
28
35
|
daemons (1.1.9)
|
29
36
|
debugger-linecache (1.2.0)
|
30
37
|
diff-lcs (1.2.5)
|
31
38
|
docile (1.1.5)
|
32
|
-
|
33
|
-
|
34
|
-
faraday (0.9.0)
|
35
|
-
multipart-post (>= 1.2, < 3)
|
36
|
-
fastimage (1.6.3)
|
39
|
+
execjs (2.2.2)
|
40
|
+
fastimage (1.6.4)
|
37
41
|
addressable (~> 2.3, >= 2.3.5)
|
38
|
-
ffi (1.9.
|
42
|
+
ffi (1.9.6)
|
43
|
+
gemoji (2.1.0)
|
39
44
|
hike (1.2.3)
|
40
45
|
hikidoc (0.1.0)
|
41
|
-
|
42
|
-
|
43
|
-
jasmine-core (~> 2.0.0)
|
46
|
+
jasmine (2.1.0)
|
47
|
+
jasmine-core (~> 2.1.0)
|
44
48
|
phantomjs
|
45
49
|
rack (>= 1.2.1)
|
46
50
|
rake
|
47
|
-
jasmine-core (2.
|
48
|
-
launchy (2.4.
|
51
|
+
jasmine-core (2.1.2)
|
52
|
+
launchy (2.4.3)
|
49
53
|
addressable (~> 2.3)
|
50
|
-
libv8 (3.16.14.
|
54
|
+
libv8 (3.16.14.7)
|
51
55
|
method_source (0.8.2)
|
52
|
-
mime-types (2.3)
|
53
|
-
mini_portile (0.6.
|
56
|
+
mime-types (2.4.3)
|
57
|
+
mini_portile (0.6.1)
|
54
58
|
multi_json (1.10.1)
|
55
|
-
|
56
|
-
|
57
|
-
nokogiri (1.6.3.1)
|
58
|
-
mini_portile (= 0.6.0)
|
59
|
-
octokit (3.3.1)
|
60
|
-
sawyer (~> 0.5.3)
|
61
|
-
octorelease (0.0.6)
|
62
|
-
hub
|
63
|
-
octokit
|
59
|
+
nokogiri (1.6.4.1)
|
60
|
+
mini_portile (~> 0.6.0)
|
64
61
|
phantomjs (1.9.7.1)
|
65
62
|
pit (0.0.7)
|
66
|
-
power_assert (0.1
|
63
|
+
power_assert (0.2.1)
|
67
64
|
pry (0.10.1)
|
68
65
|
coderay (~> 1.1.0)
|
69
66
|
method_source (~> 0.8.1)
|
70
67
|
slop (~> 3.4)
|
71
|
-
pry-byebug (
|
72
|
-
byebug (~>
|
68
|
+
pry-byebug (2.0.0)
|
69
|
+
byebug (~> 3.4)
|
73
70
|
pry (~> 0.10)
|
74
71
|
rack (1.5.2)
|
75
72
|
rack-test (0.6.2)
|
@@ -78,60 +75,56 @@ GEM
|
|
78
75
|
rack (>= 1.0)
|
79
76
|
rack-test (>= 0.5)
|
80
77
|
rake (10.3.2)
|
81
|
-
redcarpet (3.
|
78
|
+
redcarpet (3.2.0)
|
82
79
|
ref (1.0.5)
|
83
|
-
rest-client (1.7
|
84
|
-
mime-types (>= 1.16
|
85
|
-
|
86
|
-
|
87
|
-
rspec-
|
88
|
-
rspec-
|
89
|
-
|
90
|
-
|
91
|
-
|
92
|
-
rspec-expectations (3.0.4)
|
80
|
+
rest-client (1.6.7)
|
81
|
+
mime-types (>= 1.16)
|
82
|
+
rspec (3.1.0)
|
83
|
+
rspec-core (~> 3.1.0)
|
84
|
+
rspec-expectations (~> 3.1.0)
|
85
|
+
rspec-mocks (~> 3.1.0)
|
86
|
+
rspec-core (3.1.7)
|
87
|
+
rspec-support (~> 3.1.0)
|
88
|
+
rspec-expectations (3.1.2)
|
93
89
|
diff-lcs (>= 1.2.0, < 2.0)
|
94
|
-
rspec-support (~> 3.
|
95
|
-
rspec-mocks (3.
|
96
|
-
rspec-support (~> 3.
|
97
|
-
rspec-support (3.
|
90
|
+
rspec-support (~> 3.1.0)
|
91
|
+
rspec-mocks (3.1.3)
|
92
|
+
rspec-support (~> 3.1.0)
|
93
|
+
rspec-support (3.1.2)
|
98
94
|
rubyzip (1.1.6)
|
99
|
-
|
100
|
-
|
101
|
-
faraday (~> 0.8, < 0.10)
|
102
|
-
selenium-webdriver (2.42.0)
|
103
|
-
childprocess (>= 0.5.0)
|
95
|
+
selenium-webdriver (2.44.0)
|
96
|
+
childprocess (~> 0.5)
|
104
97
|
multi_json (~> 1.0)
|
105
98
|
rubyzip (~> 1.0)
|
106
|
-
websocket (~> 1.0
|
107
|
-
sequel (4.
|
108
|
-
simplecov (0.9.
|
99
|
+
websocket (~> 1.0)
|
100
|
+
sequel (4.16.0)
|
101
|
+
simplecov (0.9.1)
|
109
102
|
docile (~> 1.1.0)
|
110
|
-
multi_json
|
103
|
+
multi_json (~> 1.0)
|
111
104
|
simplecov-html (~> 0.8.0)
|
112
105
|
simplecov-html (0.8.0)
|
113
106
|
slop (3.6.0)
|
114
|
-
sprockets (2.12.
|
107
|
+
sprockets (2.12.3)
|
115
108
|
hike (~> 1.2)
|
116
109
|
multi_json (~> 1.0)
|
117
110
|
rack (~> 1.0)
|
118
111
|
tilt (~> 1.1, != 1.3.0)
|
119
|
-
sqlite3 (1.3.
|
120
|
-
term-ansicolor (1.
|
121
|
-
tins (~>
|
122
|
-
test-unit (3.0.
|
112
|
+
sqlite3 (1.3.10)
|
113
|
+
term-ansicolor (1.2.2)
|
114
|
+
tins (~> 0.8)
|
115
|
+
test-unit (3.0.7)
|
123
116
|
power_assert
|
124
117
|
therubyracer (0.12.1)
|
125
118
|
libv8 (~> 3.16.14.0)
|
126
119
|
ref
|
127
|
-
thin (1.6.
|
128
|
-
daemons (>= 1.0.9)
|
129
|
-
eventmachine (
|
130
|
-
rack (
|
131
|
-
thor (0.
|
120
|
+
thin (1.6.3)
|
121
|
+
daemons (~> 1.0, >= 1.0.9)
|
122
|
+
eventmachine (~> 1.0)
|
123
|
+
rack (~> 1.0)
|
124
|
+
thor (0.18.1)
|
132
125
|
tilt (1.4.1)
|
133
|
-
tins (
|
134
|
-
websocket (1.
|
126
|
+
tins (0.13.2)
|
127
|
+
websocket (1.2.1)
|
135
128
|
xpath (2.0.0)
|
136
129
|
nokogiri (~> 1.3)
|
137
130
|
|
@@ -142,11 +135,12 @@ DEPENDENCIES
|
|
142
135
|
capybara
|
143
136
|
coffee-script
|
144
137
|
coveralls
|
138
|
+
eventmachine!
|
145
139
|
fastimage
|
140
|
+
gemoji
|
146
141
|
hikidoc
|
147
142
|
jasmine
|
148
143
|
launchy
|
149
|
-
octorelease
|
150
144
|
pit
|
151
145
|
pry-byebug
|
152
146
|
rack
|
data/Rakefile
CHANGED
data/bin/tdiary
CHANGED
data/config.ru
CHANGED
@@ -49,7 +49,7 @@ gem 'omniauth-twitter'
|
|
49
49
|
次に設定ファイル `config.ru` を編集します。 ```run TDiary::Applicationn.new( base_dir )``` の前に以下の行を追加します。無ければ追加してください。
|
50
50
|
|
51
51
|
```
|
52
|
-
require 'tdiary/application/
|
52
|
+
require 'tdiary/application/extensions/omniauth'
|
53
53
|
```
|
54
54
|
|
55
55
|
### 鍵とパスワードの取得と環境変数への設定
|
data/doc/HOWTO-make-io.md
CHANGED
@@ -13,7 +13,7 @@ IOクラス
|
|
13
13
|
|
14
14
|
### IOBaseクラス
|
15
15
|
|
16
|
-
tdiary.rbにはTDiary::
|
16
|
+
tdiary.rbにはTDiary::IO::Baseというクラスが定義されており、これを継承 して独自のIOクラスを作成します。下記の例は、Tdiary::IO::Hogeを定義しています。
|
17
17
|
|
18
18
|
```
|
19
19
|
module TDiary
|
@@ -77,6 +77,33 @@ def trasaction( date )
|
|
77
77
|
end
|
78
78
|
```
|
79
79
|
|
80
|
+
### 実装するとよいもの
|
81
|
+
|
82
|
+
オプショナルですがIOに実装しておいた方がよいメソッドがあります。
|
83
|
+
|
84
|
+
プラグインが利用するストレージとしてIOと同じもの(データベースなど)を使えるようにするインタフェースがあります。このストレージはプラグインに対して一種のkey/valueストレージとして見えます。(インスタンスメソッドではなく)クラスメソッドとして下記のメソッドを実装しておくと、そちらが使われます。ない場合はPStoreを使ったデフォルト実装が使われます。サンプル実装はこのデフォルトを参照して下さい( lib/tdiary/io/plugin_pstore.rb )。
|
85
|
+
|
86
|
+
#### IO::plugin_open( conf )
|
87
|
+
|
88
|
+
プラグイン用のストレージを開きます。すべてのプラグインが実行される前に呼び出されます。引数として TDiary::Conf のインスタンスが渡ります。
|
89
|
+
|
90
|
+
実際に何かを開く必要はありませんが、前処理が必要ならここで実施して下さい。また、他の plugin_close や plugin_transaction に渡したい情報があれば返り値に指定して下さい。
|
91
|
+
|
92
|
+
#### IO::plugin_close( plugin_storage )
|
93
|
+
|
94
|
+
プラグインの実行を終えたあとに呼び出されます。引数には plugin_open が返した値が渡されます。必要に応じて後処理を記述して下さい。
|
95
|
+
|
96
|
+
#### IO::plugin_transaction( plugin_storage, plugin_name )
|
97
|
+
|
98
|
+
プラグイン用ストレージを読み書きします。引数には plugin_open が返した値と、プラグインの名前が渡ります。
|
99
|
+
|
100
|
+
また、ブロックが渡されるので、ストレージを読み書き可能にしてから yield する必要があります。yield にはブロック引数をひとつ渡す必要があり、この引数には以下のメソッドが実装されていなければなりません。
|
101
|
+
|
102
|
+
* get( key ) : key で指定された値(value)を返します
|
103
|
+
* set( key, value ) : key に value を保存します。value は文字列です
|
104
|
+
* delete( key ) : key で指定された値を削除します
|
105
|
+
* keys : ストレージに保存されている key をすべて Array で返します
|
106
|
+
|
80
107
|
|
81
108
|
日記データ
|
82
109
|
-----
|
data/doc/HOWTO-make-theme.md
CHANGED
@@ -44,7 +44,7 @@ tDiary.Netには、[テーマ・ギャラリー](http://www.tdiary.org/20021001.
|
|
44
44
|
Title: クローバー
|
45
45
|
Author: ただただし
|
46
46
|
Access: t@tdtds.jp
|
47
|
-
License:
|
47
|
+
License: GPL2 or any later version
|
48
48
|
Comment: 四つ葉のクローバーの葉をあしらった、シンプルでかわいらしいテーマ 春向きのテーマです。 サイドバー対応。 calendar2、recent_list、footnote、amazonプラグイン対応。
|
49
49
|
```
|
50
50
|
|
data/doc/INSTALL.md
CHANGED
@@ -128,7 +128,7 @@ tDiaryにはプラグインと呼ばれる機能があります。プラグイ
|
|
128
128
|
著作権、サポートなど
|
129
129
|
--------------------
|
130
130
|
|
131
|
-
tDiary本体は、原作者であるただただし(t@tdtds.jp)が、GPL2
|
131
|
+
tDiary本体は、原作者であるただただし(t@tdtds.jp)が、GPL2ないしその後継ライセンスの元で配布、改変を許可するフリーソフトウェアです。
|
132
132
|
|
133
133
|
また、tDiaryフルセットに付属するテーマ、プラグインはすべて、それぞれの原作者が著作権を有します。ライセンス等に関しては個々のファイルを参照してください。
|
134
134
|
|
data/doc/README.en.md
CHANGED
@@ -164,7 +164,7 @@ Now, All you have to do is that you write diary ( But, it is the most difficult
|
|
164
164
|
License
|
165
165
|
-------
|
166
166
|
|
167
|
-
tDiary is free software created by TADA Tadashi(sho@spc.gr.jp). tDiary is licensed under the terms of GPL2. You can distribute and modify it under the terms of GPL2.
|
167
|
+
tDiary is free software created by TADA Tadashi(sho@spc.gr.jp). tDiary is licensed under the terms of GPL2 or any later version. You can distribute and modify it under the terms of GPL2.
|
168
168
|
|
169
169
|
But, all the files that are in "erb/" directory is ERb library created by Seki-san. You can know the detail about the license of these files at http://www2a.biglobe.ne.jp/~seki/ruby/.
|
170
170
|
|
data/doc/README.md
CHANGED
@@ -48,7 +48,7 @@ tDiaryのインストールと設定
|
|
48
48
|
著作権、サポートなど
|
49
49
|
----------
|
50
50
|
|
51
|
-
tDiary本体は、原作者であるただただし(t@tdtds.jp)が、GPL2
|
51
|
+
tDiary本体は、原作者であるただただし(t@tdtds.jp)が、GPL2ないしその後継ライセンスの元で配布、改変を許可するフリーソフトウェアです。
|
52
52
|
|
53
53
|
また、tDiaryフルセットに付属するテーマ、プラグインはすべて、それぞれの原作者が著作権を有します。ライセンス等に関しては個々のファイルを参照してください。
|
54
54
|
|
data/index.fcgi
CHANGED
@@ -6,7 +6,7 @@
|
|
6
6
|
# Copyright (C) 2004, Akinori MUSHA
|
7
7
|
# Copyright (C) 2006, moriq
|
8
8
|
# Copyright (C) 2006-2009, Kazuhiko <kazuhiko@fdiary.net>
|
9
|
-
# You can redistribute it and/or modify it under GPL2.
|
9
|
+
# You can redistribute it and/or modify it under GPL2 or any later version.
|
10
10
|
#
|
11
11
|
require 'fcgi'
|
12
12
|
# workaround untaint LOAD_PATH for rubygems library path is always tainted.
|