rocket_cms 0.6.16 → 0.6.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 129c5e1f7b72e2bfb91cd533f6fb41457d01cbed
-  data.tar.gz: b507a570511479bae72da94a433bdffb2ee33be9
+  metadata.gz: 16198fe2f18bbd0394f5d9b7a93d4aaab023752d
+  data.tar.gz: 2514f9a7ae0d80a69b3f118c1e00c650a4491642
 SHA512:
-  metadata.gz: e5d0a597b1bf2042b421dc9d25fc9d52ab29fa1e9cd2d9944e58c2f61fb55b3f6e1f27007d8c80925f197af70f98a7488bacc7fec7b6604432dfc2e810337c01
-  data.tar.gz: 3ef4040760a5ab69c73c8a928d989f8317876b0b614d57535150460ef3ddcc927cc65a011827f2132914f4baeee73260c002c524c1062dfb5b9fc5e1ee5ebd87
+  metadata.gz: 54a54b0f67863309e193540efafd2a365a0acfbf2a620b6fe38a575244a344ca871fbe238957833b53bbe2213426ef77d5bdb16984ffd0d3b1723b46facdd96b
+  data.tar.gz: 7008fc4c464193874388006dac7bb83dd970600d04e0f3fda9ab343a69e0261eb237b0ac9fbdb15bc7e5fa31de6921e4424c3f5fce1d432c8a425069e3bac339

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rocket_cms (0.6.16)
+    rocket_cms (0.6.17)
       addressable
       coffee-rails
       devise
@@ -190,7 +190,7 @@ GEM
     smart_excerpt (0.1.5)
       activesupport
       htmlentities
-    sprockets (3.0.1)
+    sprockets (3.0.2)
       rack (~> 1.0)
     sprockets-rails (2.2.4)
       actionpack (>= 3.0)

data/app/controllers/concerns/rs_errors.rb

@@ -5,6 +5,7 @@ module RsErrors
       rescue_from Exception, with: :render_500
       rescue_from ActionController::RoutingError, with: :render_404
       rescue_from ActionController::UnknownController, with: :render_404
+      rescue_from ActionController::MissingFile, with: :render_404
       rescue_from AbstractController::ActionNotFound, with: :render_404
       if RocketCMS.mongoid?
         rescue_from Mongoid::Errors::DocumentNotFound, with: :render_404
@@ -22,10 +23,14 @@ module RsErrors
           #redirect_to scope.new_user_session_path, alert: "Необходимо авторизоваться"
           authenticate_user!
         else
-          redirect_to '/', alert: "Доступ запрещен"
+          redirect_to '/', alert: t('rs.errors.access_denied')
         end
       end
     end
+
+    rescue_from ActionController::InvalidAuthenticityToken do |exception|
+      redirect_to '/', alert: t('rs.errors.form_expired')
+    end
   end
 
   protected
@@ -45,8 +50,8 @@ module RsErrors
     Rails.logger.error exception.backtrace.join("\n")
     capture_exception(exception) if defined?(Raven)
     begin
-      if rails_admin_controller?
-        render text: 'Внутренняя ошибка', status: 500
+      if rails_admin?
+        render text: t('rs.errors.internal_error'), status: 500
         return
       end
     rescue

data/app/views/errors/_base.html.haml

@@ -1,3 +1,3 @@
 #rocket_cms_error{class: "error-#{code}"}
-  %h1 Ошибка #{code}
+  %h1= t('rs.errors.title', code: code)
   %p #{text}

data/app/views/errors/error_403.html.haml

@@ -1 +1 @@
-= render 'errors/base', code: 403, text: 'Доступ запрещен'
+= render 'errors/base', code: 403, text: t('rs.errors.access_denied')

data/app/views/errors/error_404.html.haml

@@ -1 +1 @@
-= render 'errors/base', code: 404, text: 'Запрашиваемая страница была удалена, или введён некорректный адрес'
+= render 'errors/base', code: 404, text: t('rs.errors.not_found')

data/app/views/errors/error_500.html.haml

@@ -1 +1 @@
-= render 'errors/base', code: 500, text: 'Внутренняя ошибка сервера'
+= render 'errors/base', code: 500, text: t('rs.errors.internal_error')

data/config/locales/en.rs.yml

@@ -15,4 +15,10 @@ en:
       enabled: 'added to menu "%{menu}"'
       disabled: 'deleted from menu "%{menu}"'
       error: "Error: %{err}"
-      no_id: "No ID"
+      no_id: "No ID"
+    errors:
+      title: "Error %{code}"
+      form_expired: "Token expired"
+      internal_error: "Internal error"
+      access_denied: "Access denied"
+      not_found: 'The requested page was not found on this server'

data/config/locales/ru.rs.yml

@@ -16,3 +16,9 @@ ru:
       disabled: 'удалено из меню "%{menu}"'
       error: "Ошибка: %{err}"
       no_id: "Не указан ID"
+    errors:
+      title: "Ошибка %{code}"
+      form_expired: "Истекло время на заполение формы"
+      internal_error: "Внутренняя ошибка"
+      access_denied: "Доступ запрещен"
+      not_found: 'Запрашиваемая страница была удалена, или введён некорректный адрес'

data/lib/rocket_cms/models/page.rb

@@ -15,12 +15,12 @@ module RocketCMS
         
       included do
         has_and_belongs_to_many :menus, inverse_of: :pages
-        before_validation do
-          self.fullpath = "/pages/#{slug}" if self.fullpath.blank?
-        end
         validates_uniqueness_of :fullpath
         validates_presence_of :name
         manual_slug :name
+        before_validation do
+          self.fullpath = "/pages/#{slug}" if self.fullpath.blank?
+        end
       end
 
       def get_fullpath

data/lib/rocket_cms/version.rb

@@ -1,3 +1,3 @@
 module RocketCMS
-  VERSION = "0.6.16"
+  VERSION = "0.6.17"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocket_cms
 version: !ruby/object:Gem::Version
-  version: 0.6.16
+  version: 0.6.17
 platform: ruby
 authors:
 - glebtv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-22 00:00:00.000000000 Z
+date: 2015-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler