ack_rocket_cms 0.7.7.1 → 0.8.0

data/app/models/concerns/seoable.rb

@@ -1,35 +1,29 @@
 module Seoable
   extend ActiveSupport::Concern
-  if RocketCMS.mongoid?
-    include ::Mongoid::Paperclip
-  end
-  
-  included do
-    if RocketCMS.mongoid?
-      field :name, type: String, localize: RocketCMS.configuration.localize
-      field :h1, type: String, localize: RocketCMS.configuration.localize
-
-      field :title, type: String, localize: RocketCMS.configuration.localize
-      field :keywords, type: String, localize: RocketCMS.configuration.localize
-      field :description, type: String, localize: RocketCMS.configuration.localize
-      field :robots, type: String, localize: RocketCMS.configuration.localize
+  LOCALIZED_FIELDS = [:h1, :title, :keywords, :description, :og_title]
+  FIELDS = LOCALIZED_FIELDS + [:og_image, :robots]
 
-      field :og_title, type: String, localize: RocketCMS.configuration.localize
-      has_mongoid_attached_file :og_image, styles: {thumb: "800x600>"}
-    elsif RocketCMS.active_record?
-      has_attached_file :og_image, styles: {thumb: "800x600>"}
+  if Seo.separate_table?
+    included do
+      has_one :seo, as: :seoable, autosave: true
+      accepts_nested_attributes_for :seo
+      delegate *FIELDS, to: :seo
+      delegate *(FIELDS.map {|f| "#{f}=".to_sym }), to: :seo
+      alias seo_without_build seo
+      def seo
+        seo_without_build || build_seo
+      end
+      if RocketCMS.config.localize
+        delegate *(LOCALIZED_FIELDS.map {|f| "#{f}_translations".to_sym }), to: :seo
+        delegate *(LOCALIZED_FIELDS.map {|f| "#{f}_translations=".to_sym }), to: :seo
+      end
     end
-    validates_attachment_content_type :og_image, content_type: %w(image/gif image/jpeg image/jpg image/png), if: :og_image?
+    include RocketCMS::SeoHelpers
+  else
+    include RocketCMS::Models::Seo
   end
 
-  def page_title
-    title.blank? ? name : title
-  end
 
-  def get_og_title
-    og_title.blank? ? name : og_title
-  end
-  
   def self.admin
     RocketCMS.seo_config
   end
@@ -37,10 +31,5 @@ module Seoable
   def og_image_jcrop_options
     {aspectRation: 800.0/600.0}
   end
-  
-  # deprecated
-  def self.seo_config
-    RocketCMS.seo_config
-  end
 end
 

data/app/models/seo.rb

@@ -0,0 +1,16 @@
+if RocketCMS.active_record?
+  class Seo < ActiveRecord::Base
+  end
+end
+
+class Seo
+  include RocketCMS::Models::Seo
+  RocketCMS.apply_patches self
+  rails_admin &RocketCMS.seo_config
+  belongs_to :seoable, polymorphic: true
+
+  def self.separate_table?
+    (RocketCMS.mongoid? && RocketCMS.config.separate_seo_table) || (RocketCMS.active_record? && Seo.table_exists?)
+  end
+end
+

data/app/views/devise/registrations/edit.html.slim

@@ -0,0 +1,21 @@
+h2 Редактирование профиля
+= simple_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f|
+  /= devise_error_messages!
+  .field
+    = f.label :email, I18n.t("shared.email")
+    br
+    = f.email_field :email, autofocus: true
+  .field
+    = f.label :password
+    - if @minimum_password_length
+      em
+        (Минимум символов: #{@minimum_password_length})
+    br
+    = f.password_field :password, I18n.t("shared.password"), autocomplete: "off"
+  .field
+    = f.label :password_confirmation
+    br
+    = f.password_field :password_confirmation, I18n.t("shared.password_confirmation"), autocomplete: "off"
+  .actions
+    = f.submit "Зарегистрироваться"
+= render "devise/shared/links"

data/app/views/devise/registrations/new.html.slim

@@ -0,0 +1,21 @@
+h2 Регистрация
+= simple_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f|
+  = devise_error_messages!
+  .field
+    = f.label :email, label: I18n.t("shared.email")
+    br
+    = f.email_field :email, autofocus: true
+  .field
+    = f.label :password
+    - if @minimum_password_length
+      em= " (Минимум символов: #{@minimum_password_length})"
+    br
+    = f.password_field :password, label: I18n.t("shared.password"), autocomplete: "off"
+  .field
+    = f.label :password_confirmation
+    br
+    = f.password_field :password_confirmation, label: I18n.t("shared.password_confirmation"), autocomplete: "off"
+  .actions
+    = f.submit "Зарегистрироваться"
+br
+= render "devise/shared/links"

data/app/views/devise/sessions/new.html.slim

@@ -1,23 +1,22 @@
-main
-  h2 Вход на сайт
-  = form_for(resource, as: resource_name, url: session_path(resource_name)) do |f|
-    .field
-      = f.label :email, "E-mail"
-      br
-      = f.email_field :email, autofocus: true, title: "E-mail"
+h2= I18n.t("shared.enter_site")
+= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f|
+  .field
+    = f.label :email, I18n.t("shared.email")
     br
-    .field
-      = f.label :password, "Пароль"
-      br
-      = f.password_field :password, autocomplete: "off", title: "Пароль"
+    = f.email_field :email, autofocus: true, title: I18n.t("shared.email")
+  br
+  .field
+    = f.label :password, title: I18n.t("shared.password")
     br
-      - if devise_mapping.rememberable?
-        .field
-          = f.check_box :remember_me, title: "Запомнить меня"
-          = f.label :remember_me, "Запомнить меня"
+    = f.password_field :password, autocomplete: "off", title: I18n.t("shared.password")
+  br
+    - if devise_mapping.rememberable?
+      .field
+        = f.check_box :remember_me, title: I18n.t("shared.remember_me")
+        = f.label :remember_me, I18n.t("shared.remember_me")
 
-    .actions
-      = f.submit "Войти"
-    br
+  .actions
+    = f.submit I18n.t("shared.enter")
+br
 
-  = render "devise/shared/links"
+= render "devise/shared/links"

data/app/views/devise/shared/_links.html.slim

@@ -1,25 +1,11 @@
 - if controller_name != 'sessions'
-  = link_to "Войти на сайт", new_session_path(resource_name)
+  = link_to I18n.t("shared.enter_site"), new_session_path(resource_name)
   br
 
 - if devise_mapping.registerable? && controller_name != 'registrations'
-  = link_to "Зарегистрироваться", new_registration_path(resource_name)
+  = link_to I18n.t("shared.registration"), new_registration_path(resource_name)
   br
 
 - if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations'
-  = link_to "Забыли пароль?", new_password_path(resource_name)
-  br
-
-
-- if devise_mapping.confirmable? && controller_name != 'confirmations'
-  = link_to "Не пришли инструкции по подтверждению аккаунта?", new_confirmation_path(resource_name)
-  br
-
-/- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks'
-/  = link_to "Не пришли инстуркции по разблокировке аккаунта?", new_unlock_path(resource_name)
-/  br
-
-- if devise_mapping.omniauthable?
-  - resource_class.omniauth_providers.each do |provider|
-    = link_to "Войти через #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider)
-    br
+  = link_to I18n.t("shared.forget_password"), new_password_path(resource_name)
+  br

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

@@ -2,7 +2,7 @@
   h1.rs-news-title= @news.name
   .rs-news-date= l(@news.time.to_date)
   .rs-news-text= @news.excerpt
-  - if !RocketCMS.configuration.news_image_styles.nil? && @news.image?
+  - if !RocketCMS.config.news_image_styles.nil? && @news.image?
     .rs-news-image= image_tag @news.image.url(:main)
   .rs-news-content
     = render 'shared/obj', obj: @news

data/config/locales/en.rs.yml

@@ -23,6 +23,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

@@ -23,6 +23,16 @@ ru:
     errors:
       title: "Ошибка %{code}"
       form_expired: "Истекло время на заполение формы"
-      internal_error: "Внутренняя ошибка"
+      internal_error: "Внутренняя ошибка: %{klass} %{message}"
       access_denied: "Доступ запрещен"
       not_found: 'Запрашиваемая страница была удалена, или введён некорректный адрес'
+
+
+  shared:
+    enter_site: Войти на сайт
+    email: E-mail
+    password: Пароль
+    remember_me: Запомнить меня
+    enter: Войти
+    registration: Зарегистрироваться
+    forget_password: Забыли пароль?

data/lib/generators/rocket_cms/migration_generator.rb

@@ -9,7 +9,7 @@ module RocketCms
     desc 'RocketCMS migration generator'
     def install
       if RocketCMS.active_record?
-        %w(contact_messages news pages).each do |table_name|
+        %w(contact_messages news pages seos).each do |table_name|
           migration_template "migration_#{table_name}.rb", "db/migrate/rocket_cms_create_#{table_name}.rb"
         end
       end

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

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

data/lib/generators/rocket_cms/templates/migration_news.rb

@@ -3,14 +3,19 @@ class RocketCmsCreateNews < ActiveRecord::Migration
     create_table :news do |t|
       t.boolean :enabled, default: true, null: false
       t.timestamp :time, null: false
-      t.string :name, null: false
-      t.text :excerpt
-      t.text :content
+
+      if RocketCMS.config.localize
+        t.column :name_translations, 'hstore', default: {}
+        t.column :excerpt_translations, 'hstore', default: {}
+        t.column :content_translations, 'hstore', default: {}
+      else
+        t.string :name, null: false
+        t.text :excerpt
+        t.text :content
+      end
 
       t.string :slug, null: false
       t.attachment :image
-      RocketCMS::Migration.seo_fields(t)
-
       t.timestamps
     end
 

data/lib/generators/rocket_cms/templates/migration_pages.rb

@@ -1,7 +1,12 @@
 class RocketCmsCreatePages < ActiveRecord::Migration
   def change
     create_table :menus do |t|
-      t.string :name, null: false
+
+      if RocketCMS.config.localize
+        t.column :name_translations, 'hstore'
+      else
+        t.string :name, null: false
+      end
       t.string :slug, null: false
       t.timestamps
     end
@@ -14,14 +19,18 @@ class RocketCmsCreatePages < ActiveRecord::Migration
       t.integer :rgt
       t.integer :depth 
 
-      t.string :slug, null: false
-      t.attachment :image
+      if RocketCMS.config.localize
+        t.column :name_translations, 'hstore', default: {}
+        t.column :content_translations, 'hstore', default: {}
+      else
+        t.string :name, null: false
+        t.text :content
+      end
 
+      t.string :slug, null: false
       t.string :regexp
       t.string :redirect
-      t.text :content
       t.string :fullpath, null: false
-      RocketCMS::Migration.seo_fields(t)
       t.timestamps
     end
     add_index :pages, :slug, unique: true

data/lib/generators/rocket_cms/templates/migration_seos.rb

@@ -0,0 +1,14 @@
+class RocketCmsCreateSeos < ActiveRecord::Migration
+  def change
+    create_table :seos do |t|
+      t.boolean :enabled, default: true, null: false
+      t.integer :seoable_id
+      t.string  :seoable_type
+      RocketCMS::Migration.seo_fields(t)
+      t.timestamps
+    end
+
+    add_index :seos, [:seoable_id, :seoable_type], unique: true
+  end
+end
+

data/lib/rocket_cms.rb

@@ -29,6 +29,7 @@ require 'turbolinks'
 require 'simple-navigation'
 require 'ack_rails_admin_jcrop'
 
+require 'rocket_cms/seo_helpers'
 require 'rocket_cms/configuration'
 require 'rocket_cms/patch'
 require 'rocket_cms/admin'
@@ -57,6 +58,7 @@ module RocketCMS
   autoload :Migration, 'rocket_cms/migration'
 
   module Models
+    autoload :Seo,  'rocket_cms/models/seo'
     autoload :Menu, 'rocket_cms/models/menu'
     autoload :Page, 'rocket_cms/models/page'
     autoload :News, 'rocket_cms/models/news'
@@ -69,6 +71,7 @@ module RocketCMS
     autoload :Gallery,              'rocket_cms/models/gallery'
 
     module Mongoid
+      autoload :Seo,  'rocket_cms/models/mongoid/seo'
       autoload :Menu, 'rocket_cms/models/mongoid/menu'
       autoload :Page, 'rocket_cms/models/mongoid/page'
       autoload :News, 'rocket_cms/models/mongoid/news'
@@ -82,6 +85,7 @@ module RocketCMS
     end
 
     module ActiveRecord
+      autoload :Seo,  'rocket_cms/models/active_record/seo'
       autoload :Menu, 'rocket_cms/models/active_record/menu'
       autoload :Page, 'rocket_cms/models/active_record/page'
       autoload :News, 'rocket_cms/models/active_record/news'

data/lib/rocket_cms/admin.rb

@@ -20,10 +20,20 @@ module RocketCMS
       }
     end
     
-    def seo_config(is_active = false)
+    def seo_config(is_active = true)
       Proc.new {
-        active is_active
-        label "SEO"
+        if respond_to?(:active)
+          active is_active
+          label "SEO"
+        else
+          visible false
+        end
+        RocketCMS.seo_fields(self)
+      }
+    end
+
+    def seo_fields(s)
+      s.instance_eval do
         field :h1, :string
         field :title, :string
         field :keywords, :text
@@ -31,6 +41,7 @@ module RocketCMS
         field :robots, :string
 
         field :og_title, :string
+
         field :og_image, :jcrop do
           jcrop_options :og_image_jcrop_options
         end
@@ -38,7 +49,7 @@ module RocketCMS
         if block_given?
           yield
         end
-      }
+      end
     end
     
     def page_config(fields = {})
@@ -90,12 +101,21 @@ module RocketCMS
               end
             end
           end
-          group :seo, &RocketCMS.seo_config
+          if Seo.separate_table?
+            group :seo do
+              active true
+              field :seo do
+                active true
+              end
+            end
+          else
+            group :seo, &RocketCMS.seo_config(true)
+          end
           group :sitemap_data, &RocketCMS.sitemap_data_config
         end
         RocketCMS.only_patches self, [:show, :export]
         nested_set({
-          max_depth: RocketCMS.configuration.menu_max_depth,
+          max_depth: RocketCMS.config.menu_max_depth,
           scopes: []
         })
 
@@ -149,9 +169,11 @@ module RocketCMS
         end
 
         field :enabled, :toggle
-        field :time
+        field :time do
+          sort_reverse true
+        end
         field :name
-        unless RocketCMS.configuration.news_image_styles.nil?
+        unless RocketCMS.config.news_image_styles.nil?
           field :image, :jcrop do
             jcrop_options :image_jcrop_options
           end
@@ -172,6 +194,11 @@ module RocketCMS
 
         RocketCMS.apply_patches self
 
+        list do
+          RocketCMS.apply_patches self
+          sort_by :time
+        end
+
         edit do
           field :content, :ck_editor
           fields.each_pair do |name, type|