tdiary 3.2.2.20130617 → 3.2.2.20130720

Sign up to get free protection for your applications and to get access to all the features.
Files changed (33) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +5 -5
  3. data/Gemfile +20 -11
  4. data/Gemfile.lock +24 -18
  5. data/doc/INSTALL-cgi.md +82 -0
  6. data/doc/INSTALL-rack.md +97 -0
  7. data/doc/INSTALL.md +12 -56
  8. data/index.rb +3 -5
  9. data/misc/plugin/image.rb +11 -14
  10. data/misc/style/gfm/gfm_style.rb +4 -0
  11. data/misc/style/rd/rd_style.rb +2 -2
  12. data/plugin/00default.rb +3 -3
  13. data/spec/acceptance_helper.rb +0 -1
  14. data/spec/core/compatible_spec.rb +34 -36
  15. data/spec/core/rack/assets/precompile_spec.rb +40 -41
  16. data/spec/core/style/gfm_style_spec.rb +26 -0
  17. data/spec/core/style/rd_style_spec.rb +22 -0
  18. data/{vendor/jasmine-jquery-1.4.2 → spec/javascripts/helpers}/jasmine-jquery.js +134 -23
  19. data/{vendor/jquery-1.8 → spec/javascripts}/jquery.js +1092 -847
  20. data/spec/javascripts/support/jasmine.yml +6 -66
  21. data/tdiary/application.rb +0 -1
  22. data/tdiary/core_ext.rb +2 -0
  23. data/tdiary/dispatcher.rb +10 -16
  24. data/tdiary/request.rb +210 -58
  25. data/tdiary/response.rb +1 -18
  26. data/tdiary/tasks/release.rake +28 -46
  27. data/tdiary/version.rb +1 -1
  28. data/tdiary.gemspec +2 -3
  29. data/update.rb +3 -5
  30. data/vendor/.gitkeep +0 -0
  31. metadata +27 -24
  32. data/Gemfile.cgi +0 -5
  33. data/Gemfile.cgi.lock +0 -14
data/tdiary.gemspec CHANGED
@@ -21,12 +21,11 @@ Gem::Specification.new do |spec|
21
21
  spec.required_ruby_version = '>= 1.9.2'
22
22
 
23
23
  spec.add_dependency 'rack', '>= 1.0.0'
24
+ spec.add_dependency 'sprockets', '>= 2.10'
24
25
  spec.add_dependency 'rake', '>= 10.0.0'
25
26
  spec.add_dependency 'hikidoc', '>= 0.0.6'
26
27
  spec.add_dependency 'rdtool', '>= 0.6.0'
27
- spec.add_dependency 'imagesize', '>= 0.1.0'
28
-
29
- spec.add_dependency 'sprockets', '~> 2.10'
28
+ spec.add_dependency 'fastimage'
30
29
 
31
30
  spec.add_dependency 'thor', '~> 0.18'
32
31
  spec.add_dependency "bundler", "~> 1.3"
data/update.rb CHANGED
@@ -8,8 +8,6 @@
8
8
  #
9
9
  BEGIN { $stdout.binmode }
10
10
 
11
- ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile.cgi', __FILE__)
12
-
13
11
  begin
14
12
  if FileTest::symlink?( __FILE__ ) then
15
13
  org_path = File::dirname( File::readlink( __FILE__ ) ).untaint
@@ -29,12 +27,12 @@ begin
29
27
  @cgi = CGI::new(:accept_charset => 'shift_jis')
30
28
  @cgi.params = cgi.params.dup
31
29
  end
30
+
32
31
  request = TDiary::Request.new( ENV, @cgi )
33
32
  status, headers, body = TDiary::Dispatcher.update.dispatch_cgi( request, @cgi )
34
- headers['type'] = headers.delete('Content-Type')
35
- TDiary::Dispatcher.send_headers( status, headers )
36
- TDiary::Dispatcher.send_body( body )
37
33
 
34
+ TDiary::Dispatcher.send_headers( status, headers )
35
+ ::Rack::Handler::CGI.send_body(body)
38
36
  rescue Exception
39
37
  if @cgi then
40
38
  print @cgi.header( 'status' => '500 Internal Server Error', 'type' => 'text/html' )
data/vendor/.gitkeep ADDED
File without changes
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: 3.2.2.20130617
4
+ version: 3.2.2.20130720
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: 2013-06-17 00:00:00.000000000 Z
13
+ date: 2013-07-20 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: rack
@@ -27,75 +27,75 @@ dependencies:
27
27
  - !ruby/object:Gem::Version
28
28
  version: 1.0.0
29
29
  - !ruby/object:Gem::Dependency
30
- name: rake
30
+ name: sprockets
31
31
  requirement: !ruby/object:Gem::Requirement
32
32
  requirements:
33
33
  - - '>='
34
34
  - !ruby/object:Gem::Version
35
- version: 10.0.0
35
+ version: '2.10'
36
36
  type: :runtime
37
37
  prerelease: false
38
38
  version_requirements: !ruby/object:Gem::Requirement
39
39
  requirements:
40
40
  - - '>='
41
41
  - !ruby/object:Gem::Version
42
- version: 10.0.0
42
+ version: '2.10'
43
43
  - !ruby/object:Gem::Dependency
44
- name: hikidoc
44
+ name: rake
45
45
  requirement: !ruby/object:Gem::Requirement
46
46
  requirements:
47
47
  - - '>='
48
48
  - !ruby/object:Gem::Version
49
- version: 0.0.6
49
+ version: 10.0.0
50
50
  type: :runtime
51
51
  prerelease: false
52
52
  version_requirements: !ruby/object:Gem::Requirement
53
53
  requirements:
54
54
  - - '>='
55
55
  - !ruby/object:Gem::Version
56
- version: 0.0.6
56
+ version: 10.0.0
57
57
  - !ruby/object:Gem::Dependency
58
- name: rdtool
58
+ name: hikidoc
59
59
  requirement: !ruby/object:Gem::Requirement
60
60
  requirements:
61
61
  - - '>='
62
62
  - !ruby/object:Gem::Version
63
- version: 0.6.0
63
+ version: 0.0.6
64
64
  type: :runtime
65
65
  prerelease: false
66
66
  version_requirements: !ruby/object:Gem::Requirement
67
67
  requirements:
68
68
  - - '>='
69
69
  - !ruby/object:Gem::Version
70
- version: 0.6.0
70
+ version: 0.0.6
71
71
  - !ruby/object:Gem::Dependency
72
- name: imagesize
72
+ name: rdtool
73
73
  requirement: !ruby/object:Gem::Requirement
74
74
  requirements:
75
75
  - - '>='
76
76
  - !ruby/object:Gem::Version
77
- version: 0.1.0
77
+ version: 0.6.0
78
78
  type: :runtime
79
79
  prerelease: false
80
80
  version_requirements: !ruby/object:Gem::Requirement
81
81
  requirements:
82
82
  - - '>='
83
83
  - !ruby/object:Gem::Version
84
- version: 0.1.0
84
+ version: 0.6.0
85
85
  - !ruby/object:Gem::Dependency
86
- name: sprockets
86
+ name: fastimage
87
87
  requirement: !ruby/object:Gem::Requirement
88
88
  requirements:
89
- - - ~>
89
+ - - '>='
90
90
  - !ruby/object:Gem::Version
91
- version: '2.10'
91
+ version: '0'
92
92
  type: :runtime
93
93
  prerelease: false
94
94
  version_requirements: !ruby/object:Gem::Requirement
95
95
  requirements:
96
- - - ~>
96
+ - - '>='
97
97
  - !ruby/object:Gem::Version
98
- version: '2.10'
98
+ version: '0'
99
99
  - !ruby/object:Gem::Dependency
100
100
  name: thor
101
101
  requirement: !ruby/object:Gem::Requirement
@@ -137,8 +137,6 @@ files:
137
137
  - .travis.yml
138
138
  - ChangeLog
139
139
  - Gemfile
140
- - Gemfile.cgi
141
- - Gemfile.cgi.lock
142
140
  - Gemfile.lock
143
141
  - LICENSE
144
142
  - Procfile
@@ -155,7 +153,9 @@ files:
155
153
  - doc/HOWTO-use-plugin.md
156
154
  - doc/HOWTO-write-tDiary.en.md
157
155
  - doc/HOWTO-write-tDiary.md
156
+ - doc/INSTALL-cgi.md
158
157
  - doc/INSTALL-paas.md
158
+ - doc/INSTALL-rack.md
159
159
  - doc/INSTALL.md
160
160
  - doc/README.en.md
161
161
  - doc/README.md
@@ -428,6 +428,8 @@ files:
428
428
  - spec/fixtures/tdiary.conf.webrick
429
429
  - spec/javascripts/00default_spec.js
430
430
  - spec/javascripts/fixtures/00default.html
431
+ - spec/javascripts/helpers/jasmine-jquery.js
432
+ - spec/javascripts/jquery.js
431
433
  - spec/javascripts/support/jasmine.yml
432
434
  - spec/plugin/bq_spec.rb
433
435
  - spec/plugin/plugin_helper.rb
@@ -515,8 +517,7 @@ files:
515
517
  - theme/tdiary2/tdiary2.css
516
518
  - update.fcgi
517
519
  - update.rb
518
- - vendor/jasmine-jquery-1.4.2/jasmine-jquery.js
519
- - vendor/jquery-1.8/jquery.js
520
+ - vendor/.gitkeep
520
521
  homepage: http://www.tdiary.org/
521
522
  licenses:
522
523
  - GPL-2
@@ -537,7 +538,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
537
538
  version: '0'
538
539
  requirements: []
539
540
  rubyforge_project:
540
- rubygems_version: 2.0.2
541
+ rubygems_version: 2.0.5
541
542
  signing_key:
542
543
  specification_version: 4
543
544
  summary: a TSUKKOMI-able Web-log
@@ -586,6 +587,8 @@ test_files:
586
587
  - spec/fixtures/tdiary.conf.webrick
587
588
  - spec/javascripts/00default_spec.js
588
589
  - spec/javascripts/fixtures/00default.html
590
+ - spec/javascripts/helpers/jasmine-jquery.js
591
+ - spec/javascripts/jquery.js
589
592
  - spec/javascripts/support/jasmine.yml
590
593
  - spec/plugin/bq_spec.rb
591
594
  - spec/plugin/plugin_helper.rb
data/Gemfile.cgi DELETED
@@ -1,5 +0,0 @@
1
- source 'https://rubygems.org'
2
-
3
- gem 'hikidoc', '>= 0.0.6'
4
- gem 'rdtool', '>= 0.6.0'
5
- gem 'imagesize', '>= 0.1.0'
data/Gemfile.cgi.lock DELETED
@@ -1,14 +0,0 @@
1
- GEM
2
- remote: https://rubygems.org/
3
- specs:
4
- hikidoc (0.0.6)
5
- imagesize (0.1.1)
6
- rdtool (0.6.38)
7
-
8
- PLATFORMS
9
- ruby
10
-
11
- DEPENDENCIES
12
- hikidoc (>= 0.0.6)
13
- imagesize (>= 0.1.0)
14
- rdtool (>= 0.6.0)