ack_rocket_cms 0.7.6.4 → 0.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f5c8755a70408ccb0e2018b820542c22e65ddf6
-  data.tar.gz: 6cc2ed7e328c4b1af1f5a65fe98139bd85a06083
+  metadata.gz: b5194b48049e084862a58f444e8e66f69600a335
+  data.tar.gz: 75dcd990fe46e246a0feca826400db4d3271e2fb
 SHA512:
-  metadata.gz: e76306c0c338b37f418859629dd85599b8f33fc90c3783f07ab19029649b2a12ccf4254219c5175d9634bf9c11acc5960b035e842c2124383c25b2034f1c91d1
-  data.tar.gz: 51dd6019831bd6d4478470d211bde3eb818e41b497bc8b11030aa5f988bb79b3f8d88a97bbffb8467771a061ea1d50e1e8228c2c51c23b080f675ab23cf19cb6
+  metadata.gz: 32bbd4068cb4aa1635516aa9302d660c8e3dca1d6ea485d8c401b84d877136356c763f6a34177cfcbad1b4694ab4660661262283bbd90b416553b5c0ac526fcc
+  data.tar.gz: c95b294c7d82c475aaf5bcffc8de63d33772f28c71bf683707944a289aa337cd0e45185cd95405eece3119b194519fc85a851468570a98b75d9cfcea3949b115

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ack_rocket_cms (0.7.6.4)
+    ack_rocket_cms (0.7.7)
       ack_rails_admin_jcrop
       addressable
       ckeditor
@@ -15,7 +15,7 @@ PATH
       rails_admin
       rails_admin_mongoid_localize_field (~> 0.1.2)
       rails_admin_nested_set
-      rails_admin_settings (~> 0.9.0)
+      rails_admin_settings
       rails_admin_toggleable
       simple-navigation
       simple_form
@@ -30,7 +30,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    ack_rails_admin_jcrop (0.0.4)
+    ack_rails_admin_jcrop (0.0.5)
       mini_magick
       rails (>= 3.0.0)
       rails_admin (>= 0.3.0)
@@ -187,7 +187,7 @@ GEM
       rails_admin (>= 0.5)
     rails_admin_nested_set (0.4.2)
       rails_admin (~> 0.6.6)
-    rails_admin_settings (0.9.1)
+    rails_admin_settings (1.0.0)
     rails_admin_toggleable (0.5.0)
       rails_admin (~> 0.6.6)
     railties (4.2.1)

data/README.md

@@ -50,11 +50,11 @@ If not, uninstall rails and install again
     
 Then, for mongoid:
 
-    rails new my_app -T -O -m https://raw.github.com/ack43/rocket_cms/master/template.rb
+    rails new my_app -T -O -m https://raw.githubusercontent.com/ack43/rocket_cms/master/template.rb
 
 for ActiveRecord:
 
-    rails new my_app -T --database=postgresql -m https://raw.github.com/ack43/rocket_cms/master/template.rb
+    rails new my_app -T --database=postgresql -m https://raw.githubusercontent.com/ack43/rocket_cms/master/template.rb
 
 generator creates a new RVM gemset, so after cd'ing to app dir, you should run `bundle install` again if you use rvm.
 

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
@@ -32,10 +33,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
@@ -65,8 +70,8 @@ module RsErrors
     end
     Rails.logger.error "__________________________"
     begin
-      if rails_admin_controller?
-        render text: 'Внутренняя ошибка', status: 500
+      if rails_admin?
+        render text: t('rs.errors.internal_error'), status: 500
         return
       end
     rescue
@@ -79,6 +84,6 @@ module RsErrors
   end
 
   def rails_admin?
-    self.is_a?(RailsAdmin::ApplicationController)
+    self.is_a?(RailsAdmin::ApplicationController) || self.is_a?(RailsAdmin::MainController)
   end
 end

data/app/controllers/concerns/rs_menu.rb

@@ -30,10 +30,12 @@ module RsMenu
     Proc.new do |primary|
       SimpleNavigation.config.autogenerate_item_ids = false
       begin
+        nav_extra_data_before(type, primary)
         items = ::Menu.find(type.to_s).pages.enabled.sorted.to_a
         items.select { |i| i.parent_id.nil? && !i.name.blank? && i.enabled }.each do |item|
           render_with_subs(items, primary, item) if primary
         end
+        nav_extra_data_after(type, primary)
       rescue Exception => exception
         Rails.logger.error exception.message
         Rails.logger.error exception.backtrace.join("\n")
@@ -42,4 +44,12 @@ module RsMenu
       end
     end
   end
+
+  def nav_extra_data_before(type, primary)
+    # override for additional config or items
+  end
+  def nav_extra_data_after(type, primary)
+    # override for additional config or items
+  end
 end
+

data/app/controllers/concerns/rs_pages.rb

@@ -7,6 +7,7 @@ module RsPages
   private
 
   def find_page
+    return if rails_admin?
     @seo_page = find_seo_page request.path
     if !@seo_page.nil? && !@seo_page.redirect.blank?
       redirect_to @seo_page.redirect, status: :moved_permanently
@@ -65,4 +66,7 @@ module RsPages
 
   end
 
+  def rails_admin?
+    self.is_a?(RailsAdmin::ApplicationController) || self.is_a?(RailsAdmin::MainController)
+  end
 end

data/app/views/contacts/index.html.slim

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

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

@@ -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.slim

@@ -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.slim

@@ -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.slim

@@ -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

@@ -19,4 +19,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

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

data/lib/rails_admin/custom_show_in_app.rb

@@ -15,7 +15,11 @@ module RailsAdmin
         register_instance_option :controller do
           Proc.new do
             if @object.class.name == 'Page'
-              redirect_to main_app.page_url(@object)
+              if @object.fullpath.blank?
+                redirect_to main_app.page_url(@object)
+              else
+                redirect_to @object.fullpath
+              end
             elsif @object.class.name == 'News'
               redirect_to main_app.news_url(@object)
             elsif @object.class.name == 'Obj'

data/lib/rocket_cms/controllers/contacts.rb

@@ -28,7 +28,7 @@ module RocketCMS
             redirect_after_done
           end
         else
-          render_error
+          render_contacts_error
         end
       end
 
@@ -36,7 +36,7 @@ module RocketCMS
       end
 
       private
-      def render_error
+      def render_contacts_error
         if request.xhr? && process_ajax
           render json: {errors: @contact_message.errors}, status: 422
         else

data/lib/rocket_cms/engine.rb

@@ -10,14 +10,13 @@ module RocketCMS
       #temp
       begin
         if Settings.table_exists?
-          Settings.default_email_from(default: 'noreply@gpk-holding.ru')
-          Settings.form_email(default: 'admin@gpk-holding.ru')
+          Settings.default_email_from(default: 'noreply@site.domain')
+          Settings.form_email(default: 'admin@site.domain')
           Settings.email_topic(default: 'с сайта')
         end
       rescue
       end
     end
-
     initializer 'rocket_cms.paperclip' do
       require 'paperclip/style'
       module ::Paperclip
@@ -33,6 +32,13 @@ module RocketCMS
     config.after_initialize do
       # trigger autoload so models are registered in Mongoid::Elasticearch
       RocketCMS.configuration.search_models.map(&:constantize)
+
+      # Write default email settings to DB so they can be changed.
+      if Settings.table_exists?
+        Settings.default_email_from(default: 'noreply@rscx.ru')
+        Settings.form_email(default: 'glebtv@ya.ru')
+        Settings.email_topic(default: 'с сайта')
+      end
     end
   end
 end

data/lib/rocket_cms/models/page.rb

@@ -15,13 +15,13 @@ module RocketCMS
       end
         
       included do
-
-        before_validation do
-          self.fullpath = "/pages/#{slug}" if self.fullpath.blank?
-        end
+        has_and_belongs_to_many :menus, inverse_of: :pages
         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.7.6.4"
+  VERSION = "0.7.7"
 end

data/rocket_cms.gemspec

@@ -32,8 +32,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rails_admin'
   spec.add_dependency 'rails_admin_nested_set'
   spec.add_dependency 'rails_admin_toggleable'
+
   spec.add_dependency 'ckeditor'
-  spec.add_dependency 'rails_admin_settings', '~> 0.9.0'
+  spec.add_dependency 'rails_admin_settings'
+
   spec.add_dependency 'geocoder'
   spec.add_dependency 'simple-navigation'
   spec.add_dependency 'sitemap_generator'
@@ -49,7 +51,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'stringex'
   spec.add_dependency 'thor'
-
   spec.add_dependency 'smart_excerpt'
 end
 

data/template.rb

@@ -43,7 +43,8 @@ group :development do
   gem 'pry-rails'
   gem 'spring'
 
-  gem 'capistrano', require: false
+  gem 'capistrano', '~> 3.4.0', require: false
+
   gem 'rvm1-capistrano3', require: false
   gem 'glebtv-capistrano-unicorn', require: false
   gem 'capistrano-bundler', require: false
@@ -61,7 +62,7 @@ group :test do
   gem 'rspec-rails'
   gem 'database_cleaner'
   gem 'email_spec'
-  #{if mongoid then "gem 'glebtv-mongoid-rspec'" else "" end}
+  #{if mongoid then "gem 'mongoid-rspec'" else "" end}
   gem 'ffaker'
   gem 'factory_girl_rails'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ack_rocket_cms
 version: !ruby/object:Gem::Version
-  version: 0.7.6.4
+  version: 0.7.7
 platform: ruby
 authors:
 - Alexander Kiseliev
@@ -217,16 +217,16 @@ dependencies:
   name: rails_admin_settings
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: geocoder
   requirement: !ruby/object:Gem::Requirement