tdiary 4.1.1 → 4.1.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (60) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +1 -1
  3. data/ChangeLog +42 -0
  4. data/Gemfile +2 -11
  5. data/Gemfile.lock +64 -61
  6. data/README.md +4 -2
  7. data/doc/HOWTO-authenticate-in-rack.md +96 -8
  8. data/doc/HOWTO-testing-tDiary.md +1 -1
  9. data/doc/INSTALL-paas.md +19 -54
  10. data/doc/README.en.md +1 -1
  11. data/doc/README.md +1 -1
  12. data/js/comment_ajax.js +1 -1
  13. data/lib/tdiary/application/configuration.rb +5 -9
  14. data/lib/tdiary/application.rb +59 -36
  15. data/lib/tdiary/cli.rb +9 -3
  16. data/lib/tdiary/core_ext.rb +1 -1
  17. data/lib/tdiary/diary_container.rb +55 -0
  18. data/lib/tdiary/environment.rb +3 -0
  19. data/lib/tdiary/plugin/00default.rb +4 -3
  20. data/lib/tdiary/plugin/05referer.rb +9 -7
  21. data/lib/tdiary/plugin.rb +13 -2
  22. data/lib/tdiary/rack/auth/basic.rb +1 -1
  23. data/lib/tdiary/rack/auth/omniauth/authorization.rb +64 -0
  24. data/lib/tdiary/rack/auth/omniauth.rb +78 -46
  25. data/lib/tdiary/rack/auth.rb +20 -0
  26. data/lib/tdiary/rack/session.rb +35 -0
  27. data/lib/tdiary/rack.rb +2 -5
  28. data/lib/tdiary/style.rb +2 -1
  29. data/lib/tdiary/tasks/assets.rake +1 -1
  30. data/lib/tdiary/tasks/release.rake +18 -7
  31. data/lib/tdiary/version.rb +1 -1
  32. data/lib/tdiary.rb +1 -0
  33. data/misc/paas/heroku/Gemfile.local +8 -0
  34. data/misc/paas/heroku/app.json +19 -0
  35. data/misc/paas/heroku/config.ru +6 -0
  36. data/misc/paas/heroku/tasks/mongodb.rake +12 -0
  37. data/misc/paas/heroku/tdiary.conf +14 -14
  38. data/misc/plugin/amazon.rb +9 -1
  39. data/misc/plugin/category.rb +1 -19
  40. data/misc/plugin/category_autocomplete.rb +2 -2
  41. data/misc/plugin/comment_ajax.rb +2 -0
  42. data/misc/plugin/comment_emoji_autocomplete.rb +2 -2
  43. data/misc/plugin/comment_mail-smtp.rb +23 -8
  44. data/misc/plugin/makerss.rb +5 -1
  45. data/misc/plugin/recent_comment3.rb +1 -5
  46. data/misc/plugin/recent_list.rb +1 -5
  47. data/misc/plugin/theme_online.rb +8 -2
  48. data/spec/acceptance/save_conf_plugin_spec.rb +2 -2
  49. data/spec/core/application_spec.rb +65 -0
  50. data/spec/core/diary_container_spec.rb +71 -0
  51. data/spec/core/plugin_spec.rb +13 -0
  52. data/spec/fixtures/tdiary.conf.gem +2 -2
  53. data/spec/fixtures/tdiary.conf.rack +2 -2
  54. data/spec/fixtures/tdiary.conf.secure +2 -2
  55. data/spec/fixtures/tdiary.conf.webrick +2 -2
  56. data/spec/spec_helper.rb +5 -4
  57. metadata +15 -6
  58. data/lib/tdiary/application/extensions/omniauth.rb +0 -22
  59. data/misc/paas/heroku/Gemfile +0 -20
  60. data/misc/paas/heroku/Gemfile.lock +0 -74
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: tdiary
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.1.1
4
+ version: 4.1.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - TADA Tadashi
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2014-12-29 00:00:00.000000000 Z
13
+ date: 2015-03-28 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: thor
@@ -100,7 +100,6 @@ files:
100
100
  - lib/tdiary/admin.rb
101
101
  - lib/tdiary/application.rb
102
102
  - lib/tdiary/application/configuration.rb
103
- - lib/tdiary/application/extensions/omniauth.rb
104
103
  - lib/tdiary/author_only_base.rb
105
104
  - lib/tdiary/base.rb
106
105
  - lib/tdiary/cache/file.rb
@@ -110,6 +109,7 @@ files:
110
109
  - lib/tdiary/compatible.rb
111
110
  - lib/tdiary/configuration.rb
112
111
  - lib/tdiary/core_ext.rb
112
+ - lib/tdiary/diary_container.rb
113
113
  - lib/tdiary/dispatcher.rb
114
114
  - lib/tdiary/dispatcher/index_main.rb
115
115
  - lib/tdiary/dispatcher/update_main.rb
@@ -144,9 +144,12 @@ files:
144
144
  - lib/tdiary/plugin/ja/60sf.rb
145
145
  - lib/tdiary/rack.rb
146
146
  - lib/tdiary/rack/assets/precompile.rb
147
+ - lib/tdiary/rack/auth.rb
147
148
  - lib/tdiary/rack/auth/basic.rb
148
149
  - lib/tdiary/rack/auth/omniauth.rb
150
+ - lib/tdiary/rack/auth/omniauth/authorization.rb
149
151
  - lib/tdiary/rack/html_anchor.rb
152
+ - lib/tdiary/rack/session.rb
150
153
  - lib/tdiary/rack/static.rb
151
154
  - lib/tdiary/rack/valid_request_path.rb
152
155
  - lib/tdiary/referer_manager.rb
@@ -185,8 +188,10 @@ files:
185
188
  - misc/paas/cloudfoundry/Gemfile
186
189
  - misc/paas/cloudfoundry/Gemfile.lock
187
190
  - misc/paas/cloudfoundry/tdiary.conf
188
- - misc/paas/heroku/Gemfile
189
- - misc/paas/heroku/Gemfile.lock
191
+ - misc/paas/heroku/Gemfile.local
192
+ - misc/paas/heroku/app.json
193
+ - misc/paas/heroku/config.ru
194
+ - misc/paas/heroku/tasks/mongodb.rake
190
195
  - misc/paas/heroku/tdiary.conf
191
196
  - misc/paas/sqale/Gemfile
192
197
  - misc/paas/sqale/Gemfile.lock
@@ -342,9 +347,11 @@ files:
342
347
  - spec/acceptance/view_diary_spec.rb
343
348
  - spec/acceptance/view_referer_spec.rb
344
349
  - spec/acceptance_helper.rb
350
+ - spec/core/application_spec.rb
345
351
  - spec/core/compatible_spec.rb
346
352
  - spec/core/configuration_spec.rb
347
353
  - spec/core/core_ext_spec.rb
354
+ - spec/core/diary_container_spec.rb
348
355
  - spec/core/io/default_spec.rb
349
356
  - spec/core/plugin_spec.rb
350
357
  - spec/core/rack/assets/precompile_spec.rb
@@ -449,7 +456,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
449
456
  version: '0'
450
457
  requirements: []
451
458
  rubyforge_project:
452
- rubygems_version: 2.2.2
459
+ rubygems_version: 2.4.5
453
460
  signing_key:
454
461
  specification_version: 4
455
462
  summary: a TSUKKOMI-able Web-log
@@ -472,9 +479,11 @@ test_files:
472
479
  - spec/acceptance/view_diary_spec.rb
473
480
  - spec/acceptance/view_referer_spec.rb
474
481
  - spec/acceptance_helper.rb
482
+ - spec/core/application_spec.rb
475
483
  - spec/core/compatible_spec.rb
476
484
  - spec/core/configuration_spec.rb
477
485
  - spec/core/core_ext_spec.rb
486
+ - spec/core/diary_container_spec.rb
478
487
  - spec/core/io/default_spec.rb
479
488
  - spec/core/plugin_spec.rb
480
489
  - spec/core/rack/assets/precompile_spec.rb
data/lib/tdiary/application/extensions/omniauth.rb DELETED
@@ -1,22 +0,0 @@
1
- # -*- coding: utf-8 -*-
2
- require 'tdiary/application'
3
- require 'tdiary/rack/auth/omniauth'
4
-
5
- TDiary::Application.configure do
6
- config.builder do
7
- use ::Rack::Session::Pool, expire_after: 2592000
8
- use OmniAuth::Builder do
9
- configure {|conf| conf.path_prefix = "/auth" }
10
- provider :twitter, ENV['TWITTER_KEY'], ENV['TWITTER_SECRET']
11
- end
12
-
13
- map('/auth') do
14
- run TDiary::Rack::Auth::OmniAuth::CallbackHandler.new
15
- end
16
- end
17
-
18
- config.authenticate TDiary::Rack::Auth::OmniAuth, :twitter do |auth|
19
- # TODO: an user can setting
20
- auth.info.nickname == ENV['TWITTER_NAME']
21
- end
22
- end
data/misc/paas/heroku/Gemfile DELETED
@@ -1,20 +0,0 @@
1
- source 'https://rubygems.org'
2
-
3
- gem 'rake'
4
-
5
- gem 'rack'
6
- gem 'sprockets'
7
- gem 'hikidoc'
8
- gem 'fastimage'
9
-
10
- gem 'omniauth'
11
- gem 'omniauth-twitter'
12
- gem 'omniauth-github'
13
-
14
- gem 'thin', require: false
15
- gem 'tdiary-io-rdb'
16
- gem 'pg'
17
- gem 'thor'
18
-
19
- # To use memcached for Cache
20
- # gem 'tdiary-cache-memcached'
data/misc/paas/heroku/Gemfile.lock DELETED
@@ -1,74 +0,0 @@
1
- GEM
2
- remote: https://rubygems.org/
3
- specs:
4
- addressable (2.3.5)
5
- daemons (1.1.9)
6
- eventmachine (1.0.3)
7
- faraday (0.9.0)
8
- multipart-post (>= 1.2, < 3)
9
- fastimage (1.6.0)
10
- addressable (~> 2.3, >= 2.3.5)
11
- hashie (2.0.5)
12
- hike (1.2.3)
13
- hikidoc (0.0.6)
14
- jwt (0.1.11)
15
- multi_json (>= 1.5)
16
- multi_json (1.8.4)
17
- multi_xml (0.5.5)
18
- multipart-post (2.0.0)
19
- oauth (0.4.7)
20
- oauth2 (0.9.3)
21
- faraday (>= 0.8, < 0.10)
22
- jwt (~> 0.1.8)
23
- multi_json (~> 1.3)
24
- multi_xml (~> 0.5)
25
- rack (~> 1.2)
26
- omniauth (1.2.1)
27
- hashie (>= 1.2, < 3)
28
- rack (~> 1.0)
29
- omniauth-github (1.1.1)
30
- omniauth (~> 1.0)
31
- omniauth-oauth2 (~> 1.1)
32
- omniauth-oauth (1.0.1)
33
- oauth
34
- omniauth (~> 1.0)
35
- omniauth-oauth2 (1.1.2)
36
- faraday (>= 0.8, < 0.10)
37
- multi_json (~> 1.3)
38
- oauth2 (~> 0.9.3)
39
- omniauth (~> 1.2)
40
- omniauth-twitter (1.0.1)
41
- multi_json (~> 1.3)
42
- omniauth-oauth (~> 1.0)
43
- pg (0.17.1)
44
- rack (1.5.2)
45
- rake (10.1.1)
46
- sequel (4.7.0)
47
- sprockets (2.11.0)
48
- hike (~> 1.2)
49
- multi_json (~> 1.0)
50
- rack (~> 1.0)
51
- tilt (~> 1.1, != 1.3.0)
52
- tdiary-io-rdb (0.0.1)
53
- sequel
54
- thin (1.6.1)
55
- daemons (>= 1.0.9)
56
- eventmachine (>= 1.0.0)
57
- rack (>= 1.0.0)
58
- tilt (1.4.1)
59
-
60
- PLATFORMS
61
- ruby
62
-
63
- DEPENDENCIES
64
- fastimage
65
- hikidoc
66
- omniauth
67
- omniauth-github
68
- omniauth-twitter
69
- pg
70
- rack
71
- rake
72
- sprockets
73
- tdiary-io-rdb
74
- thin