tdiary 4.1.2 → 4.1.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/ChangeLog +15 -2
  3. data/Gemfile +2 -2
  4. data/Gemfile.lock +42 -43
  5. data/config.ru +1 -1
  6. data/lib/tdiary/application.rb +20 -15
  7. data/lib/tdiary/version.rb +1 -1
  8. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: ff39704729d6f51707c5f7f6798b57b54a7f8f4a
4
- data.tar.gz: b2395bd9d5f340af43d6c3f40290545053ca5ca4
3
+ metadata.gz: a0fde70ef07f181c74d9ecf4e7c2623cd8b94add
4
+ data.tar.gz: 1fffaefa079eb029ffd1936f507efdf2e47eb16c
5
5
  SHA512:
6
- metadata.gz: 1c93b34dcfd979505945f036f88214c4fa7ad0562b5326d82c7a7c609bca5301f08449769868cd161e70676ea253e347cebbaf432e40ea94736c9856eede5625
7
- data.tar.gz: fb1cf6d5f5d79fb6543709b50dd2aef2a93ab4357371818744227fd49326c072e546660206da16342ae9629b6bdde8ffeb8448f28e1da8f35ad924c27a6c0253
6
+ metadata.gz: 9f134da57cffb3350118401ef23a7cc97b3237281e349522223b9e686c547c6fa37372803e65d36b3fa8cc0d1599c8711eb8d9d74826bcbc6d732d2ec7575200
7
+ data.tar.gz: 98129b50e818a21ff936b14297d112579eec7ede81e00da1f26a126bd062985a75bec80dcb417bccf054ecbe2d5521a1c02589001251af50426807b4ad0cbfa3
data/ChangeLog CHANGED
@@ -1,6 +1,19 @@
1
+ 2015-06-29 MATSUOKA Kohei <kohei@machu.jp>
2
+ * release 4.1.3
3
+ * Gemfile: use rack 1.6.4 which sepatates params with ';'. see #485
4
+
5
+ 2015-05-05 MATSUOKA Kohei <kohei@machu.jp>
6
+ * catch TDiary::ForceRedirect exception from 90migrate.rb at startup
7
+
8
+ 2015-04-22 TADA Tadashi <t@tdtds.jp>
9
+ * add full path of lib into LOAD_PATH, fix #481 #483
10
+
11
+ 2015-03-29 MATSUOKA Kohei <kohei@machu.jp>
12
+ * release 4.1.2
13
+
1
14
  2015-03-15 MATSUOKA Kohei <kohei@machu.jp>
2
- * use omniauth automatically if omniauth gem loaded
3
- * support some auth providers (twitter, facebook, google, github)
15
+ * use omniauth automatically if omniauth gem loaded
16
+ * support some auth providers (twitter, facebook, google, github)
4
17
 
5
18
  2015-02-25 MATSUOKA Kohei <kohei@machu.jp>
6
19
  * support ruby-2.2 and unsupport ruby-1.9.3
data/Gemfile CHANGED
@@ -1,6 +1,6 @@
1
1
  source 'https://rubygems.org'
2
2
 
3
- gem 'rack', '~> 1.5.0'
3
+ gem 'rack'
4
4
  gem 'sprockets'
5
5
  gem 'hikidoc'
6
6
  gem 'fastimage'
@@ -29,7 +29,7 @@ group :development do
29
29
  gem 'sqlite3'
30
30
  gem 'jasmine'
31
31
  gem 'simplecov', require: false
32
- gem 'coveralls', require: false
32
+ gem 'coveralls', '~> 0.7.12', require: false
33
33
  end
34
34
  end
35
35
 
data/Gemfile.lock CHANGED
@@ -2,7 +2,7 @@ GEM
2
2
  remote: https://rubygems.org/
3
3
  specs:
4
4
  addressable (2.3.8)
5
- byebug (4.0.4)
5
+ byebug (4.0.5)
6
6
  columnize (= 0.9.0)
7
7
  capybara (2.4.4)
8
8
  mime-types (>= 1.16)
@@ -10,13 +10,13 @@ GEM
10
10
  rack (>= 1.0.0)
11
11
  rack-test (>= 0.5.4)
12
12
  xpath (~> 2.0)
13
- childprocess (0.5.5)
13
+ childprocess (0.5.6)
14
14
  ffi (~> 1.0, >= 1.0.11)
15
15
  coderay (1.1.0)
16
- coffee-script (2.3.0)
16
+ coffee-script (2.4.1)
17
17
  coffee-script-source
18
18
  execjs
19
- coffee-script-source (1.9.1)
19
+ coffee-script-source (1.9.1.1)
20
20
  columnize (0.9.0)
21
21
  coveralls (0.7.12)
22
22
  multi_json (~> 1.10)
@@ -26,32 +26,31 @@ GEM
26
26
  thor (~> 0.19.1)
27
27
  diff-lcs (1.2.5)
28
28
  docile (1.1.5)
29
- domain_name (0.5.23)
29
+ domain_name (0.5.24)
30
30
  unf (>= 0.0.5, < 1.0.0)
31
- execjs (2.4.0)
32
- fastimage (1.6.8)
31
+ execjs (2.5.2)
32
+ fastimage (1.7.0)
33
33
  addressable (~> 2.3, >= 2.3.5)
34
- ffi (1.9.8)
34
+ ffi (1.9.9)
35
35
  gemoji (2.1.0)
36
- hike (1.2.3)
37
36
  hikidoc (0.1.0)
38
37
  http-cookie (1.0.2)
39
38
  domain_name (~> 0.5)
40
- jasmine (2.2.0)
41
- jasmine-core (~> 2.2)
39
+ jasmine (2.3.0)
40
+ jasmine-core (~> 2.3)
42
41
  phantomjs
43
42
  rack (>= 1.2.1)
44
43
  rake
45
- jasmine-core (2.2.0)
44
+ jasmine-core (2.3.4)
46
45
  launchy (2.4.3)
47
46
  addressable (~> 2.3)
48
- libv8 (3.16.14.7)
47
+ libv8 (3.16.14.9)
49
48
  mail (2.6.3)
50
49
  mime-types (>= 1.16, < 3)
51
50
  method_source (0.8.2)
52
- mime-types (2.4.3)
51
+ mime-types (2.6.1)
53
52
  mini_portile (0.6.2)
54
- multi_json (1.11.0)
53
+ multi_json (1.11.1)
55
54
  netrc (0.10.3)
56
55
  nokogiri (1.6.6.2)
57
56
  mini_portile (~> 0.6.0)
@@ -65,65 +64,61 @@ GEM
65
64
  pry-byebug (3.1.0)
66
65
  byebug (~> 4.0)
67
66
  pry (~> 0.10)
68
- rack (1.5.2)
67
+ rack (1.6.4)
69
68
  rack-test (0.6.3)
70
69
  rack (>= 1.0)
71
70
  racksh (1.0.0)
72
71
  rack (>= 1.0)
73
72
  rack-test (>= 0.5)
74
73
  rake (10.4.2)
75
- redcarpet (3.2.2)
74
+ redcarpet (3.3.2)
76
75
  ref (1.0.5)
77
76
  rest-client (1.8.0)
78
77
  http-cookie (>= 1.0.2, < 2.0)
79
78
  mime-types (>= 1.16, < 3.0)
80
79
  netrc (~> 0.7)
81
- rspec (3.2.0)
82
- rspec-core (~> 3.2.0)
83
- rspec-expectations (~> 3.2.0)
84
- rspec-mocks (~> 3.2.0)
85
- rspec-core (3.2.2)
86
- rspec-support (~> 3.2.0)
87
- rspec-expectations (3.2.0)
80
+ rspec (3.3.0)
81
+ rspec-core (~> 3.3.0)
82
+ rspec-expectations (~> 3.3.0)
83
+ rspec-mocks (~> 3.3.0)
84
+ rspec-core (3.3.1)
85
+ rspec-support (~> 3.3.0)
86
+ rspec-expectations (3.3.0)
88
87
  diff-lcs (>= 1.2.0, < 2.0)
89
- rspec-support (~> 3.2.0)
90
- rspec-mocks (3.2.1)
88
+ rspec-support (~> 3.3.0)
89
+ rspec-mocks (3.3.1)
91
90
  diff-lcs (>= 1.2.0, < 2.0)
92
- rspec-support (~> 3.2.0)
93
- rspec-support (3.2.2)
91
+ rspec-support (~> 3.3.0)
92
+ rspec-support (3.3.0)
94
93
  rubyzip (1.1.7)
95
- selenium-webdriver (2.45.0)
94
+ selenium-webdriver (2.46.2)
96
95
  childprocess (~> 0.5)
97
96
  multi_json (~> 1.0)
98
97
  rubyzip (~> 1.0)
99
98
  websocket (~> 1.0)
100
- sequel (4.20.0)
99
+ sequel (4.23.0)
101
100
  simplecov (0.9.2)
102
101
  docile (~> 1.1.0)
103
102
  multi_json (~> 1.0)
104
103
  simplecov-html (~> 0.9.0)
105
104
  simplecov-html (0.9.0)
106
105
  slop (3.6.0)
107
- sprockets (2.12.3)
108
- hike (~> 1.2)
109
- multi_json (~> 1.0)
106
+ sprockets (3.2.0)
110
107
  rack (~> 1.0)
111
- tilt (~> 1.1, != 1.3.0)
112
108
  sqlite3 (1.3.10)
113
- term-ansicolor (1.3.0)
109
+ term-ansicolor (1.3.2)
114
110
  tins (~> 1.0)
115
- test-unit (3.0.9)
111
+ test-unit (3.1.2)
116
112
  power_assert
117
- therubyracer (0.12.1)
113
+ therubyracer (0.12.2)
118
114
  libv8 (~> 3.16.14.0)
119
115
  ref
120
116
  thor (0.19.1)
121
- tilt (1.4.1)
122
- tins (1.3.5)
117
+ tins (1.5.4)
123
118
  unf (0.1.4)
124
119
  unf_ext
125
- unf_ext (0.0.6)
126
- websocket (1.2.1)
120
+ unf_ext (0.0.7.1)
121
+ websocket (1.2.2)
127
122
  xpath (2.0.0)
128
123
  nokogiri (~> 1.3)
129
124
 
@@ -133,7 +128,7 @@ PLATFORMS
133
128
  DEPENDENCIES
134
129
  capybara
135
130
  coffee-script
136
- coveralls
131
+ coveralls (~> 0.7.12)
137
132
  fastimage
138
133
  gemoji
139
134
  hikidoc
@@ -141,8 +136,9 @@ DEPENDENCIES
141
136
  launchy
142
137
  mail
143
138
  pit
139
+ pry
144
140
  pry-byebug
145
- rack (~> 1.5.0)
141
+ rack
146
142
  racksh
147
143
  rake
148
144
  redcarpet
@@ -154,3 +150,6 @@ DEPENDENCIES
154
150
  sqlite3
155
151
  test-unit
156
152
  therubyracer
153
+
154
+ BUNDLED WITH
155
+ 1.10.5
data/config.ru CHANGED
@@ -1,4 +1,4 @@
1
- $:.unshift( File.join(File::dirname( __FILE__ ), 'lib' ).untaint )
1
+ $:.unshift( File.join(File::expand_path(File::dirname( __FILE__ )), 'lib' ).untaint )
2
2
  require 'tdiary/application'
3
3
 
4
4
  use ::Rack::Reloader unless ENV['RACK_ENV'] == 'production'
data/lib/tdiary/application.rb CHANGED
@@ -80,22 +80,27 @@ module TDiary
80
80
  tdiary = TDiary::TDiaryBase.new(cgi, '', conf)
81
81
  io = conf.io_class.new(tdiary)
82
82
 
83
- plugin = TDiary::Plugin.new(
84
- 'conf' => conf,
85
- 'mode' => 'startup',
86
- 'diaries' => tdiary.diaries,
87
- 'cgi' => cgi,
88
- 'years' => nil,
89
- 'cache_path' => io.cache_path,
90
- 'date' => Time.now,
91
- 'comment' => nil,
92
- 'last_modified' => Time.now, # FIXME
93
- 'logger' => TDiary.logger,
94
- # 'debug' => true
95
- )
83
+ begin
84
+ plugin = TDiary::Plugin.new(
85
+ 'conf' => conf,
86
+ 'mode' => 'startup',
87
+ 'diaries' => tdiary.diaries,
88
+ 'cgi' => cgi,
89
+ 'years' => nil,
90
+ 'cache_path' => io.cache_path,
91
+ 'date' => Time.now,
92
+ 'comment' => nil,
93
+ 'last_modified' => Time.now, # FIXME
94
+ 'logger' => TDiary.logger,
95
+ # 'debug' => true
96
+ )
96
97
 
97
- # run startup plugin
98
- plugin.__send__(:startup_proc, self)
98
+ # run startup plugin
99
+ plugin.__send__(:startup_proc, self)
100
+ rescue TDiary::ForceRedirect => e
101
+ # 90migrate.rb raises TDiary::ForceRedirect at first startup
102
+ TDiary::logger.warn(e)
103
+ end
99
104
  end
100
105
  end
101
106
  end
data/lib/tdiary/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module TDiary
2
- VERSION = '4.1.2'
2
+ VERSION = '4.1.3'
3
3
  end
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.2
4
+ version: 4.1.3
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: 2015-03-28 00:00:00.000000000 Z
13
+ date: 2015-06-29 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: thor