rocket_cms 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff5e67aaf6a6c9270fb207ec1d91b941b419e07e
-  data.tar.gz: 74f4ae63372c683fc0de7bf513d85df21da00a2d
+  metadata.gz: 15e24497b873e1c0fdaa11337bcf79ab60e44adc
+  data.tar.gz: ba371d9579621d7127501e34c652d09b0e1e5efd
 SHA512:
-  metadata.gz: 363f870524458a6e199d6b917222323e85ceb0ace0e9afbeda473fa6391d5427e0913729fc1acbc388098874e24ca8511b528f020a761a0fafa3b258e71dfef8
-  data.tar.gz: fb2468d78d11554f84ce59a64be5252d34a65f27601a9b65acc4d57e246c2125cfea635ff99fcb0a465183e65dd3d4e147c4129b79c5794b7a4301ae8b64bb37
+  metadata.gz: 17f988247d191712da293b791e127539488758fcbbc4f30688cbdd95638ef276649222a5fc7d6ff1a2e30274c57b3c5dcdf9b7b4cebdb01b7bd98fef964dd8f9
+  data.tar.gz: c5da155755ce1a3d5ff4addc5df3bb3cd142df201c1e2809089a0106cf3fd5abfbd259cbd2e44c3876584895f6f7a2d17d3a7d915ede16ad470b56cd6ecdf5c3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rocket_cms (0.7.0)
+    rocket_cms (0.7.1)
       addressable
       coffee-rails
       devise
@@ -27,36 +27,36 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.1)
-      actionpack (= 4.2.1)
-      actionview (= 4.2.1)
-      activejob (= 4.2.1)
+    actionmailer (4.2.2)
+      actionpack (= 4.2.2)
+      actionview (= 4.2.2)
+      activejob (= 4.2.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.1)
-      actionview (= 4.2.1)
-      activesupport (= 4.2.1)
+    actionpack (4.2.2)
+      actionview (= 4.2.2)
+      activesupport (= 4.2.2)
       rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    actionview (4.2.1)
-      activesupport (= 4.2.1)
+    actionview (4.2.2)
+      activesupport (= 4.2.2)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
       rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    activejob (4.2.1)
-      activesupport (= 4.2.1)
+    activejob (4.2.2)
+      activesupport (= 4.2.2)
       globalid (>= 0.3.0)
-    activemodel (4.2.1)
-      activesupport (= 4.2.1)
+    activemodel (4.2.2)
+      activesupport (= 4.2.2)
       builder (~> 3.1)
-    activerecord (4.2.1)
-      activemodel (= 4.2.1)
-      activesupport (= 4.2.1)
+    activerecord (4.2.2)
+      activemodel (= 4.2.2)
+      activesupport (= 4.2.2)
       arel (~> 6.0)
-    activesupport (4.2.1)
+    activesupport (4.2.2)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -73,7 +73,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.9.1.1)
-    devise (3.4.1)
+    devise (3.5.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
@@ -84,7 +84,7 @@ GEM
     execjs (2.5.2)
     font-awesome-rails (4.3.0.0)
       railties (>= 3.2, < 5.0)
-    geocoder (1.2.8)
+    geocoder (1.2.9)
     glebtv-ckeditor (4.4.7.3)
       mime-types
       mini_magick
@@ -97,13 +97,13 @@ GEM
       tilt
     htmlentities (4.3.3)
     i18n (0.7.0)
-    jquery-rails (4.0.3)
+    jquery-rails (4.0.4)
       rails-dom-testing (~> 1.0)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    jquery-ui-rails (5.0.3)
+    jquery-ui-rails (5.0.5)
       railties (>= 3.2.16)
-    json (1.8.2)
+    json (1.8.3)
     kaminari (0.16.3)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
@@ -111,30 +111,30 @@ GEM
       nokogiri (>= 1.5.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
-    mime-types (2.5)
-    mini_magick (4.2.3)
+    mime-types (2.6.1)
+    mini_magick (4.2.7)
     mini_portile (0.6.2)
-    minitest (5.6.1)
+    minitest (5.7.0)
     nested_form (0.3.2)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     orm_adapter (0.5.0)
-    rack (1.6.1)
+    rack (1.6.4)
     rack-pjax (0.8.0)
       nokogiri (~> 1.5)
       rack (~> 1.1)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.1)
-      actionmailer (= 4.2.1)
-      actionpack (= 4.2.1)
-      actionview (= 4.2.1)
-      activejob (= 4.2.1)
-      activemodel (= 4.2.1)
-      activerecord (= 4.2.1)
-      activesupport (= 4.2.1)
+    rails (4.2.2)
+      actionmailer (= 4.2.2)
+      actionpack (= 4.2.2)
+      actionview (= 4.2.2)
+      activejob (= 4.2.2)
+      activemodel (= 4.2.2)
+      activerecord (= 4.2.2)
+      activesupport (= 4.2.2)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.1)
+      railties (= 4.2.2)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
@@ -144,7 +144,7 @@ GEM
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.2)
       loofah (~> 2.0)
-    rails_admin (0.6.7)
+    rails_admin (0.6.8)
       builder (~> 3.1)
       coffee-rails (~> 4.0)
       font-awesome-rails (>= 3.0, < 5)
@@ -163,9 +163,9 @@ GEM
     rails_admin_settings (1.0.0)
     rails_admin_toggleable (0.5.0)
       rails_admin (~> 0.6.6)
-    railties (4.2.1)
-      actionpack (= 4.2.1)
-      activesupport (= 4.2.1)
+    railties (4.2.2)
+      actionpack (= 4.2.2)
+      activesupport (= 4.2.2)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
@@ -173,7 +173,7 @@ GEM
     responders (2.1.0)
       railties (>= 4.2.0, < 5)
     safe_yaml (1.0.4)
-    sass (3.4.13)
+    sass (3.4.14)
     sass-rails (5.0.3)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.1)
@@ -190,9 +190,9 @@ GEM
     smart_excerpt (0.1.5)
       activesupport
       htmlentities
-    sprockets (3.0.3)
+    sprockets (3.2.0)
       rack (~> 1.0)
-    sprockets-rails (2.2.4)
+    sprockets-rails (2.3.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)

data/app/controllers/concerns/rs_errors.rb

@@ -51,10 +51,14 @@ module RsErrors
     capture_exception(exception) if defined?(Raven)
     begin
       if rails_admin?
-        render text: t('rs.errors.internal_error'), status: 500
+        render text: t('rs.errors.internal_error', klass: exception.class.name, message: exception.message), status: 500
         return
       end
-    rescue
+    rescue Exception => e
+      puts "error while rendering rails admin exception"
+      puts e.class.name
+      puts e.message
+      puts e.backtrace.join("\n")
     end
     render_error(500)
   end

data/app/views/contacts/new.html.haml

@@ -6,6 +6,5 @@
     = f.input :email
     = f.input :phone
     = f.input :content
-    = f.input :captcha
+    = f.input :captcha, as: :simple_captcha
     = f.submit t('rs.send')
-

data/config/locales/en.rs.yml

@@ -19,6 +19,6 @@ en:
     errors:
       title: "Error %{code}"
       form_expired: "Token expired"
-      internal_error: "Internal error"
+      internal_error: "Internal error: %{klass} %{message}"
       access_denied: "Access denied"
       not_found: 'The requested page was not found on this server'

data/config/locales/ru.rs.yml

@@ -19,6 +19,6 @@ ru:
     errors:
       title: "Ошибка %{code}"
       form_expired: "Истекло время на заполение формы"
-      internal_error: "Внутренняя ошибка"
+      internal_error: "Внутренняя ошибка: %{klass} %{message}"
       access_denied: "Доступ запрещен"
       not_found: 'Запрашиваемая страница была удалена, или введён некорректный адрес'

data/lib/rocket_cms/version.rb

@@ -1,3 +1,3 @@
 module RocketCMS
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

data/template.rb

@@ -19,7 +19,7 @@ gem 'rails', '4.2.1'
 
 gem 'sass', '~> 3.4.4'
 
-#{if mongoid then "gem 'rocket_cms_mongoid'" else "gem 'rocket_cms_activerecord'" end}, '~> 0.6.12'
+#{if mongoid then "gem 'rocket_cms_mongoid'" else "gem 'rocket_cms_activerecord'" end}, '~> 0.7.0'
 
 gem 'sass-rails'
 gem 'compass-rails', '~> 2.0.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocket_cms
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - glebtv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-07 00:00:00.000000000 Z
+date: 2015-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler