ack_rocket_cms 0.8.0 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b4be58e811a9fe7a30b6ae6c5dc4afcf8fb4224
-  data.tar.gz: 539440be1663279ea0e98d7698b1212fef5066e2
+  metadata.gz: 6e33e7acc64054a4dd51d9937ebe3d041f6feabd
+  data.tar.gz: ea547035e193c9a8e691588f3304787191aa790a
 SHA512:
-  metadata.gz: 5698b19ec72e2357d9d4a1eea81bc1c2e90fcb694e93495c3b866a37e9948d1537286fe934183e497882066e40dbed58ac1bc1f58855559d40d81d90595a845d
-  data.tar.gz: 0c8816d2f174cc7453a2401c132da4f8cd81c396d245c1d9ae54741aa260156ec1824bc7db8fe3b23c5da44fae0c5bd1298dd7a98f3576fd02330a00f2f3116d
+  metadata.gz: 90706ad746c30a490c29e78ee23f5219ae7cb8ab283e222aad489f416385c15970f037eb24fca56cb368f0316ea8a1ed0597e61b4ebea0e06f4988990303563f
+  data.tar.gz: 7768a9ebaabb4120f7bbff96d0e4e15560e36c7fff30aa4a123af590585ef8aa84f3829372520ab20278b1da55f4b4ae38457ea93043e02f506d7aba52cbf903

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ack_rocket_cms (0.8.0)
+    ack_rocket_cms (0.8.2)
       ack_rails_admin_jcrop
       addressable
       ckeditor
@@ -70,11 +70,11 @@ GEM
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.3.8)
-    arel (6.0.2)
+    arel (6.0.3)
     bcrypt (3.1.10)
-    bson (3.1.2)
+    bson (3.2.1)
     builder (3.2.2)
-    ckeditor (4.1.2)
+    ckeditor (4.1.3)
       cocaine
       orm_adapter (~> 0.5.0)
     climate_control (0.0.3)
@@ -89,7 +89,7 @@ GEM
       execjs
     coffee-script-source (1.9.1.1)
     connection_pool (2.2.0)
-    devise (3.5.1)
+    devise (3.5.2)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
@@ -98,13 +98,13 @@ GEM
       warden (~> 1.2.3)
     erubis (2.7.0)
     execjs (2.5.2)
-    font-awesome-rails (4.3.0.0)
+    font-awesome-rails (4.4.0.0)
       railties (>= 3.2, < 5.0)
     geocoder (1.2.9)
     glebtv-simple_captcha (0.6.7)
-    globalid (0.3.5)
+    globalid (0.3.6)
       activesupport (>= 4.1.0)
-    haml (4.0.6)
+    haml (4.0.7)
       tilt
     htmlentities (4.3.4)
     i18n (0.7.0)
@@ -123,9 +123,9 @@ GEM
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     mime-types (2.6.1)
-    mini_magick (4.2.7)
+    mini_magick (4.2.10)
     mini_portile (0.6.2)
-    minitest (5.7.0)
+    minitest (5.8.0)
     mongoid (4.0.2)
       activemodel (~> 4.0)
       moped (~> 2.0.0)
@@ -185,7 +185,7 @@ GEM
       mongoid (>= 3.0)
       rails (>= 3.0)
       rails_admin (>= 0.5)
-    rails_admin_nested_set (0.4.4)
+    rails_admin_nested_set (0.4.5)
       rails_admin
     rails_admin_settings (1.0.1)
     rails_admin_toggleable (0.5.1)
@@ -212,7 +212,7 @@ GEM
     simple_form (3.1.0)
       actionpack (~> 4.0)
       activemodel (~> 4.0)
-    sitemap_generator (5.0.5)
+    sitemap_generator (5.1.0)
       builder
     smart_excerpt (0.1.5)
       activesupport
@@ -231,7 +231,7 @@ GEM
       coffee-rails
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    validates_email_format_of (1.6.2)
+    validates_email_format_of (1.6.3)
       i18n
     warden (1.2.3)
       rack (>= 1.0)

data/README.md

@@ -117,6 +117,12 @@ or
 gem 'hstore_translate'
 ```
 
+Add ```rails_admin_mongoid_localize_field``` gem if using MongoDB:
+
+```ruby
+gem 'rails_admin_mongoid_localize_field'
+```
+
 ### Documentation
 
 It's basically Mongoid + Rails Admin + some of my common models and controllers, capistrano config (from root repo), etc.

data/app/controllers/concerns/rs_errors.rb

@@ -71,7 +71,7 @@ module RsErrors
     Rails.logger.error "__________________________"
     begin
       if rails_admin?
-        render text: t('rs.errors.internal_error', klass: exception.class.name, message: exception.message), status: 500
+        render text: t('rs.errors.internal_error_full', klass: exception.class.name, message: exception.message), status: 500
         return
       end
     rescue Exception => e

data/app/controllers/concerns/rs_localizeable.rb

@@ -13,7 +13,11 @@ module RsLocalizeable
   end
   def nav_get_menu_items(type)
     pages = ::Menu.find(type.to_s).pages.enabled
-    pages = pages.where(["EXIST(name_translations, ?) = TRUE AND name_translations -> ? != ''", I18n.locale, I18n.locale])
+    if RocketCMS.mongoid?
+      pages = pages.where(:"name.#{I18n.locale}".exists => true)
+    elsif RocketCMS.active_record?
+      pages = pages.where(["EXIST(name_translations, ?) = TRUE AND name_translations -> ? != ''", I18n.locale, I18n.locale])
+    end
     pages.sorted.to_a
   end
   def nav_get_url(item)

data/app/controllers/concerns/rs_menu.rb

@@ -33,13 +33,16 @@ module RsMenu
       begin
         nav_extra_data_before(type, primary)
         items = nav_get_menu_items(type)
-        items.select { |i| i.parent_id.nil? && !i.name.blank? && i.enabled }.each do |item|
-          render_with_subs(items, primary, item) if primary
+        items = items.select { |i| i.parent_id.nil? && !i.name.blank? && i.enabled }
+        items.each do |item|
+          render_with_subs(items, primary, item)
         end
         nav_extra_data_after(type, primary)
       rescue Exception => exception
         Rails.logger.error exception.message
         Rails.logger.error exception.backtrace.join("\n")
+        puts exception.message
+        puts exception.backtrace.join("\n")
         capture_exception(exception) if respond_to?(:capture_exception)
         items || []
       end

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

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

data/app/views/news/show.html.slim

@@ -1,7 +1,7 @@
 .rs-news-show
   h1.rs-news-title= @news.name
   .rs-news-date= l(@news.time.to_date)
-  .rs-news-text= @news.excerpt
+  .rs-news-text== @news.content
   - if !RocketCMS.config.news_image_styles.nil? && @news.image?
     .rs-news-image= image_tag @news.image.url(:main)
   .rs-news-content

data/app/views/shared/_obj.html.slim

@@ -1,7 +1,7 @@
 - unless obj.nil?
   .text_content
     - if (!defined?(h1) || h1) && !obj.h1.blank?
-      %h1= obj.h1
+      h1= obj.h1
     - if obj.content.blank?
       - unless @seo_page.nil?
         = raw @seo_page.page_content
@@ -18,4 +18,4 @@
 
   - content_for :title do
     - if obj.title
-      %title= obj.title
+      title= obj.title

data/config/locales/en.rs.yml

@@ -23,6 +23,7 @@ en:
     errors:
       title: "Error %{code}"
       form_expired: "Token expired"
-      internal_error: "Internal error: %{klass} %{message}"
+      internal_error: "Internal error"
+      internal_error_full: "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

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

data/lib/generators/rocket_cms/templates/admin.erb

@@ -54,16 +54,12 @@ RailsAdmin.config do |config|
     end
     
     toggle
-<<<<<<< HEAD
-    toggle_menu
-    sitemap
-=======
-    toggle_menu do
+    toggle_menu  do
       visible do
         ['Page'].include? bindings[:abstract_model].model_name
       end
     end
->>>>>>> upstream/master
+    sitemap
   end
 
   config.main_app_name = ['<%= Rails.application.class.name.split('::')[0] %>', 'Админка']

data/lib/rocket_cms/version.rb

@@ -1,3 +1,3 @@
 module RocketCMS
-  VERSION = "0.8.0"
+  VERSION = "0.8.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ack_rocket_cms
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.2
 platform: ruby
 authors:
 - Alexander Kiseliev
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-14 00:00:00.000000000 Z
+date: 2015-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler