rocket_cms 0.10.1 → 0.10.2

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: de316a36b35fb998028d116a0486fab7ff5b06f5
4
- data.tar.gz: 90cd788b9e58cb4d24f8b36f5a02e0d68dc1b02e
3
+ metadata.gz: 05f3020b87083ad56dd3a05e769f8857d7bd3fc8
4
+ data.tar.gz: e1fa78c5e8cd208787bd51a0b2613ce58f62dd06
5
5
  SHA512:
6
- metadata.gz: 584d9c5ef8a1d57e06238e67fdc11c3f7a9fa685da8b98f68fbebe2b495cac2875ab24ca2125cbc0ec410b8188e2fbd2f5049d481e13b3f45f45939542b9b0ce
7
- data.tar.gz: 28715ffbdf3055fd42c984ab9155575410ea1587f4ec8a137e4820b6657ef103f1658e16da8680cde1ad3309f3e3fe4f51ba6ac207a5b67b1fc5b241c20196d1
6
+ metadata.gz: e3110c1fc7c650f79e73d40d12481746d684851cdae91ca766943e8d4463deb96afb1550100761d443bd58f6f3778ec344cc135f72db6c16d77f3196daeafb6d
7
+ data.tar.gz: bc1a943d39bfad79343e4f1fa4f1dcff877aa25e9d1cf285a97913ad51d8287dca7ec0182f3de8ceb9f0db995897c4e9a95d6c7a931eb67f05b043f0a6d012a3
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- rocket_cms (0.10.1)
4
+ rocket_cms (0.10.2)
5
5
  addressable
6
6
  coffee-rails
7
7
  devise
@@ -83,8 +83,8 @@ GEM
83
83
  warden (~> 1.2.3)
84
84
  erubis (2.7.0)
85
85
  execjs (2.6.0)
86
- font-awesome-rails (4.5.0.0)
87
- railties (>= 3.2, < 5.0)
86
+ font-awesome-rails (4.5.0.1)
87
+ railties (>= 3.2, < 5.1)
88
88
  geocoder (1.3.0)
89
89
  glebtv-ckeditor (4.4.7.4)
90
90
  mime-types
@@ -114,7 +114,7 @@ GEM
114
114
  mail (2.6.3)
115
115
  mime-types (>= 1.16, < 3)
116
116
  mime-types (2.99)
117
- mini_magick (4.3.6)
117
+ mini_magick (4.4.0)
118
118
  mini_portile2 (2.0.0)
119
119
  minitest (5.8.4)
120
120
  nested_form (0.3.2)
@@ -6,7 +6,6 @@ module RsErrors
6
6
  rescue_from ActionController::RoutingError, with: :render_404
7
7
  rescue_from ActionController::UnknownController, with: :render_404
8
8
  rescue_from ActionController::MissingFile, with: :render_404
9
- rescue_from AbstractController::ActionNotFound, with: :render_404
10
9
  if RocketCMS.mongoid?
11
10
  rescue_from Mongoid::Errors::DocumentNotFound, with: :render_404
12
11
  rescue_from Mongoid::Errors::InvalidFind, with: :render_404
@@ -33,7 +32,15 @@ module RsErrors
33
32
  end
34
33
  end
35
34
 
35
+ # http://stackoverflow.com/questions/13432987/rescue-from-abstractcontrolleractionnotfound-not-working
36
+ def process(action, *args)
37
+ super
38
+ rescue AbstractController::ActionNotFound => e
39
+ render_404(e)
40
+ end
41
+
36
42
  private
43
+
37
44
  def render_404(exception = nil)
38
45
  Rails.logger.error "404: #{request.url}"
39
46
  unless exception.nil?
@@ -7,7 +7,6 @@
7
7
  = raw @seo_page.page_content
8
8
  - else
9
9
  = raw obj.content
10
- - if !obj.nil?
11
10
  = render 'shared/admin_link', obj: obj
12
11
  - if !@seo_page.nil? && (@seo_page.id != obj.id || @seo_page.class.name != obj.class.name)
13
12
  = render 'shared/admin_link', obj: @seo_page
@@ -1,3 +1,3 @@
1
1
  module RocketCMS
2
- VERSION = "0.10.1"
2
+ VERSION = "0.10.2"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rocket_cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.10.1
4
+ version: 0.10.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - glebtv
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-02-03 00:00:00.000000000 Z
11
+ date: 2016-02-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler