trusty-cms 2.0.13 → 2.0.14

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/Gemfile.lock +69 -70
  3. data/README.md +2 -0
  4. data/app/controllers/admin/users_controller.rb +1 -1
  5. data/app/controllers/admin/welcome_controller.rb +3 -3
  6. data/app/controllers/site_controller.rb +1 -1
  7. data/lib/trusty_cms.rb +1 -1
  8. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 87bc5cecdef6ecf91497bd8f6407f450bf248514
4
- data.tar.gz: 570e24329c78c50c4201c18194204bdd33899fda
3
+ metadata.gz: ff714cb941dd4bafa96519238af44502f26e09bc
4
+ data.tar.gz: f4980e2dada78d36edf177b157321d42f32cd8e1
5
5
  SHA512:
6
- metadata.gz: 555b21bf4896f724cbf73036d5153e24db1894e6aed6cee9c8816c5e3d56d1cb114b1b6b299be26326c38282ef24d828f1c00b1a341115af2c9bb06c398dc76d
7
- data.tar.gz: 826f28f3dbfef19fbd7865f6d89d5787986f7d793a9f567487cc122f3b782c17bec338140649d3051d05fc10a3a8fc63e56046493664cbf94d4cb876d9a06d9f
6
+ metadata.gz: 12e1d7c2962ad455ed582b7f8369552181d30c8a05bea24cb2bc1bda7d84d92abe37e2ea5a59ff273023a83bbb3c6a08c149fff602af631e42c8ae691bf24608
7
+ data.tar.gz: e779ccae310fca4ed51976056779148f3924ba8b78537d7a4030814a8e3d106dd3353033bd6ec85c33eb64910f26f5c2d72c858427eb7fd0b9d466c1756eed9d
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- trusty-cms (2.0.13)
4
+ trusty-cms (2.0.14)
5
5
  RedCloth (~> 4.2)
6
6
  acts_as_tree (~> 2.1)
7
7
  bundler (~> 1.7)
@@ -30,65 +30,64 @@ GEM
30
30
  remote: https://rubygems.org/
31
31
  specs:
32
32
  RedCloth (4.2.9)
33
- actionmailer (4.2.3)
34
- actionpack (= 4.2.3)
35
- actionview (= 4.2.3)
36
- activejob (= 4.2.3)
33
+ RedCloth (4.2.9-java)
34
+ actionmailer (4.2.5.1)
35
+ actionpack (= 4.2.5.1)
36
+ actionview (= 4.2.5.1)
37
+ activejob (= 4.2.5.1)
37
38
  mail (~> 2.5, >= 2.5.4)
38
39
  rails-dom-testing (~> 1.0, >= 1.0.5)
39
- actionpack (4.2.3)
40
- actionview (= 4.2.3)
41
- activesupport (= 4.2.3)
40
+ actionpack (4.2.5.1)
41
+ actionview (= 4.2.5.1)
42
+ activesupport (= 4.2.5.1)
42
43
  rack (~> 1.6)
43
44
  rack-test (~> 0.6.2)
44
45
  rails-dom-testing (~> 1.0, >= 1.0.5)
45
46
  rails-html-sanitizer (~> 1.0, >= 1.0.2)
46
- actionview (4.2.3)
47
- activesupport (= 4.2.3)
47
+ actionview (4.2.5.1)
48
+ activesupport (= 4.2.5.1)
48
49
  builder (~> 3.1)
49
50
  erubis (~> 2.7.0)
50
51
  rails-dom-testing (~> 1.0, >= 1.0.5)
51
52
  rails-html-sanitizer (~> 1.0, >= 1.0.2)
52
- activejob (4.2.3)
53
- activesupport (= 4.2.3)
53
+ activejob (4.2.5.1)
54
+ activesupport (= 4.2.5.1)
54
55
  globalid (>= 0.3.0)
55
- activemodel (4.2.3)
56
- activesupport (= 4.2.3)
56
+ activemodel (4.2.5.1)
57
+ activesupport (= 4.2.5.1)
57
58
  builder (~> 3.1)
58
- activerecord (4.2.3)
59
- activemodel (= 4.2.3)
60
- activesupport (= 4.2.3)
59
+ activerecord (4.2.5.1)
60
+ activemodel (= 4.2.5.1)
61
+ activesupport (= 4.2.5.1)
61
62
  arel (~> 6.0)
62
- activesupport (4.2.3)
63
+ activesupport (4.2.5.1)
63
64
  i18n (~> 0.7)
64
65
  json (~> 1.7, >= 1.7.7)
65
66
  minitest (~> 5.1)
66
67
  thread_safe (~> 0.3, >= 0.3.4)
67
68
  tzinfo (~> 1.1)
68
- acts_as_tree (2.3.0)
69
+ acts_as_tree (2.4.0)
69
70
  activerecord (>= 3.0.0)
70
- addressable (2.3.8)
71
+ addressable (2.4.0)
71
72
  arel (6.0.3)
72
73
  builder (3.2.2)
73
- byebug (5.0.0)
74
- columnize (= 0.9.0)
74
+ byebug (8.2.2)
75
75
  capybara (2.3.0)
76
76
  mime-types (>= 1.16)
77
77
  nokogiri (>= 1.3.3)
78
78
  rack (>= 1.0.0)
79
79
  rack-test (>= 0.5.4)
80
80
  xpath (~> 2.0)
81
- chunky_png (1.3.4)
82
- ckeditor (4.1.3)
81
+ chunky_png (1.3.5)
82
+ ckeditor (4.1.6)
83
83
  cocaine
84
84
  orm_adapter (~> 0.5.0)
85
85
  climate_control (0.0.3)
86
86
  activesupport (>= 3.0)
87
87
  cliver (0.3.2)
88
- cocaine (0.5.7)
88
+ cocaine (0.5.8)
89
89
  climate_control (>= 0.0.3, < 1.0)
90
90
  coderay (1.1.0)
91
- columnize (0.9.0)
92
91
  compass (1.0.3)
93
92
  chunky_png (~> 1.2)
94
93
  compass-core (~> 1.0.2)
@@ -101,9 +100,9 @@ GEM
101
100
  sass (>= 3.3.0, < 3.5)
102
101
  compass-import-once (1.0.5)
103
102
  sass (>= 3.2, < 3.5)
104
- compass-rails (2.0.4)
103
+ compass-rails (2.0.5)
105
104
  compass (~> 1.0.0)
106
- sass-rails (<= 5.0.1)
105
+ sass-rails (< 5.1)
107
106
  sprockets (< 2.13)
108
107
  daemons (1.2.3)
109
108
  database_cleaner (1.3.0)
@@ -111,8 +110,8 @@ GEM
111
110
  rails (>= 3.0)
112
111
  diff-lcs (1.2.5)
113
112
  erubis (2.7.0)
114
- eventmachine (1.0.8)
115
- eventmachine (1.0.8-java)
113
+ eventmachine (1.0.9.1)
114
+ eventmachine (1.0.9.1-java)
116
115
  execjs (2.6.0)
117
116
  factory_girl (4.5.0)
118
117
  activesupport (>= 3.0.0)
@@ -150,19 +149,19 @@ GEM
150
149
  addressable (~> 2.3)
151
150
  spoon (~> 0.0.1)
152
151
  libv8 (3.16.14.13)
153
- loofah (2.0.2)
152
+ loofah (2.0.3)
154
153
  nokogiri (>= 1.5.9)
155
154
  mail (2.6.3)
156
155
  mime-types (>= 1.16, < 3)
157
156
  method_source (0.8.2)
158
- mime-types (2.6.1)
159
- mini_portile (0.6.2)
160
- minitest (5.8.0)
157
+ mime-types (2.99)
158
+ mini_portile2 (2.0.0)
159
+ minitest (5.8.4)
161
160
  multi_json (1.11.2)
162
161
  mysql2 (0.4.2)
163
- nokogiri (1.6.6.2)
164
- mini_portile (~> 0.6.0)
165
- nokogiri (1.6.6.2-java)
162
+ nokogiri (1.6.7.2)
163
+ mini_portile2 (~> 2.0.0.rc2)
164
+ nokogiri (1.6.7.2-java)
166
165
  orm_adapter (0.5.0)
167
166
  poltergeist (1.5.1)
168
167
  capybara (~> 2.1)
@@ -171,53 +170,53 @@ GEM
171
170
  websocket-driver (>= 0.2.0)
172
171
  protected_attributes (1.0.9)
173
172
  activemodel (>= 4.0.1, < 5.0)
174
- pry (0.10.1)
173
+ pry (0.10.3)
175
174
  coderay (~> 1.1.0)
176
175
  method_source (~> 0.8.1)
177
176
  slop (~> 3.4)
178
- pry (0.10.1-java)
177
+ pry (0.10.3-java)
179
178
  coderay (~> 1.1.0)
180
179
  method_source (~> 0.8.1)
181
180
  slop (~> 3.4)
182
181
  spoon (~> 0.0)
183
- pry-byebug (3.2.0)
184
- byebug (~> 5.0)
182
+ pry-byebug (3.3.0)
183
+ byebug (~> 8.0)
185
184
  pry (~> 0.10)
186
185
  rack (1.6.4)
187
- rack-cache (1.5.1)
186
+ rack-cache (1.6.1)
188
187
  rack (>= 0.4)
189
188
  rack-test (0.6.3)
190
189
  rack (>= 1.0)
191
190
  radius (0.7.4)
192
- rails (4.2.3)
193
- actionmailer (= 4.2.3)
194
- actionpack (= 4.2.3)
195
- actionview (= 4.2.3)
196
- activejob (= 4.2.3)
197
- activemodel (= 4.2.3)
198
- activerecord (= 4.2.3)
199
- activesupport (= 4.2.3)
191
+ rails (4.2.5.1)
192
+ actionmailer (= 4.2.5.1)
193
+ actionpack (= 4.2.5.1)
194
+ actionview (= 4.2.5.1)
195
+ activejob (= 4.2.5.1)
196
+ activemodel (= 4.2.5.1)
197
+ activerecord (= 4.2.5.1)
198
+ activesupport (= 4.2.5.1)
200
199
  bundler (>= 1.3.0, < 2.0)
201
- railties (= 4.2.3)
200
+ railties (= 4.2.5.1)
202
201
  sprockets-rails
203
202
  rails-deprecated_sanitizer (1.0.3)
204
203
  activesupport (>= 4.2.0.alpha)
205
- rails-dom-testing (1.0.6)
204
+ rails-dom-testing (1.0.7)
206
205
  activesupport (>= 4.2.0.beta, < 5.0)
207
206
  nokogiri (~> 1.6.0)
208
207
  rails-deprecated_sanitizer (>= 1.0.1)
209
- rails-html-sanitizer (1.0.2)
208
+ rails-html-sanitizer (1.0.3)
210
209
  loofah (~> 2.0)
211
210
  rails-observers (0.1.2)
212
211
  activemodel (~> 4.0)
213
- railties (4.2.3)
214
- actionpack (= 4.2.3)
215
- activesupport (= 4.2.3)
212
+ railties (4.2.5.1)
213
+ actionpack (= 4.2.5.1)
214
+ activesupport (= 4.2.5.1)
216
215
  rake (>= 0.8.7)
217
216
  thor (>= 0.18.1, < 2.0)
218
- rake (10.4.2)
219
- rb-fsevent (0.9.5)
220
- rb-inotify (0.9.5)
217
+ rake (10.5.0)
218
+ rb-fsevent (0.9.7)
219
+ rb-inotify (0.9.7)
221
220
  ffi (>= 0.5.0)
222
221
  rdoc (3.12.2)
223
222
  json (~> 1.4)
@@ -238,16 +237,16 @@ GEM
238
237
  rspec-mocks (~> 3.0.0)
239
238
  rspec-support (~> 3.0.0)
240
239
  rspec-support (3.0.4)
241
- ruby_parser (3.7.2)
240
+ ruby_parser (3.8.0)
242
241
  sexp_processor (~> 4.1)
243
- sass (3.4.16)
244
- sass-rails (5.0.1)
242
+ sass (3.4.21)
243
+ sass-rails (5.0.4)
245
244
  railties (>= 4.0.0, < 5.0)
246
245
  sass (~> 3.1)
247
246
  sprockets (>= 2.8, < 4.0)
248
247
  sprockets-rails (>= 2.0, < 4.0)
249
- tilt (~> 1.1)
250
- sexp_processor (4.6.0)
248
+ tilt (>= 1.1, < 3)
249
+ sexp_processor (4.7.0)
251
250
  slop (3.6.0)
252
251
  spoon (0.0.4)
253
252
  ffi
@@ -256,7 +255,7 @@ GEM
256
255
  multi_json (~> 1.0)
257
256
  rack (~> 1.0)
258
257
  tilt (~> 1.1, != 1.3.0)
259
- sprockets-rails (2.3.2)
258
+ sprockets-rails (2.3.3)
260
259
  actionpack (>= 3.0)
261
260
  activesupport (>= 3.0)
262
261
  sprockets (>= 2.8, < 4.0)
@@ -264,9 +263,9 @@ GEM
264
263
  therubyracer (0.12.2)
265
264
  libv8 (~> 3.16.14.0)
266
265
  ref
267
- thin (1.6.3)
266
+ thin (1.6.4)
268
267
  daemons (~> 1.0, >= 1.0.9)
269
- eventmachine (~> 1.0)
268
+ eventmachine (~> 1.0, >= 1.0.4)
270
269
  rack (~> 1.0)
271
270
  thor (0.19.1)
272
271
  thread_safe (0.3.5)
@@ -279,12 +278,12 @@ GEM
279
278
  uglifier (2.7.2)
280
279
  execjs (>= 0.3.0)
281
280
  json (>= 1.8.0)
282
- websocket-driver (0.6.2)
281
+ websocket-driver (0.6.3)
283
282
  websocket-extensions (>= 0.1.0)
284
- websocket-driver (0.6.2-java)
283
+ websocket-driver (0.6.3-java)
285
284
  websocket-extensions (>= 0.1.0)
286
285
  websocket-extensions (0.1.2)
287
- will_paginate (3.0.7)
286
+ will_paginate (3.1.0)
288
287
  xpath (2.0.0)
289
288
  nokogiri (~> 1.3)
290
289
 
data/README.md CHANGED
@@ -124,6 +124,8 @@ Most of the development for TrustyCms happens on Github:
124
124
 
125
125
  https://github.com/pgharts/trusty-cms
126
126
 
127
+ TrustyCMS is supported in part by https://www.browserstack.com/
128
+
127
129
  Enjoy!
128
130
 
129
131
  --
data/app/controllers/admin/users_controller.rb CHANGED
@@ -24,7 +24,7 @@ class Admin::UsersController < Admin::ResourceController
24
24
  def ensure_deletable
25
25
  if current_user.id.to_s == params[:id].to_s
26
26
  announce_cannot_delete_self
27
- redirect_to admin_users_url
27
+ redirect_to admin_users_path
28
28
  end
29
29
  end
30
30
 
data/app/controllers/admin/welcome_controller.rb CHANGED
@@ -4,7 +4,7 @@ class Admin::WelcomeController < ApplicationController
4
4
  skip_before_filter :verify_authenticity_token
5
5
 
6
6
  def index
7
- redirect_to admin_pages_url
7
+ redirect_to admin_pages_path
8
8
  end
9
9
 
10
10
  def login
@@ -18,7 +18,7 @@ class Admin::WelcomeController < ApplicationController
18
18
  current_user.remember_me
19
19
  set_session_cookie
20
20
  end
21
- redirect_to(session[:return_to] || welcome_url)
21
+ redirect_to(session[:return_to] || welcome_path)
22
22
  session[:return_to] = nil
23
23
  end
24
24
  end
@@ -28,7 +28,7 @@ class Admin::WelcomeController < ApplicationController
28
28
  self.current_user.forget_me if self.current_user
29
29
  self.current_user = nil
30
30
  announce_logged_out
31
- redirect_to login_url
31
+ redirect_to login_path
32
32
  end
33
33
 
34
34
  private
data/app/controllers/site_controller.rb CHANGED
@@ -34,7 +34,7 @@ class SiteController < ApplicationController
34
34
  render :template => 'site/not_found', :status => 404, layout: false
35
35
  end
36
36
  rescue Page::MissingRootPageError
37
- redirect_to welcome_url
37
+ redirect_to welcome_path
38
38
  end
39
39
 
40
40
  def cacheable_request?
data/lib/trusty_cms.rb CHANGED
@@ -2,6 +2,6 @@ TRUSTY_CMS_ROOT = File.expand_path(File.join(File.dirname(__FILE__), "..")) unle
2
2
 
3
3
  unless defined? TrustyCms::VERSION
4
4
  module TrustyCms
5
- VERSION = "2.0.13"
5
+ VERSION = "2.0.14"
6
6
  end
7
7
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: trusty-cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.13
4
+ version: 2.0.14
5
5
  platform: ruby
6
6
  authors:
7
7
  - TrustyCms CMS dev team
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-12-31 00:00:00.000000000 Z
11
+ date: 2016-02-19 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: tzinfo