ack_rocket_cms 0.7.7.1 → 0.8.0

data/lib/rocket_cms/configuration.rb

@@ -14,6 +14,7 @@ module RocketCMS
     attr_accessor :news_image_styles
     attr_accessor :news_per_page
     attr_accessor :news_excerpt
+    attr_accessor :news_content_required
 
     attr_accessor :error_layout
     attr_accessor :menu_max_depth
@@ -27,6 +28,8 @@ module RocketCMS
     attr_accessor :contacts_message_required
     attr_accessor :contacts_captcha_error_message
 
+    attr_accessor :separate_seo_table
+
     attr_accessor :localize
 
     attr_accessor :recreate_contact_message_action
@@ -38,6 +41,7 @@ module RocketCMS
       }
       @news_per_page = 10
       @news_excerpt = 12
+      @news_content_required = true
 
       @error_layout = 'application'
       @menu_max_depth = 2
@@ -54,6 +58,8 @@ module RocketCMS
       @recreate_contact_message_action = "new"
 
       @localize = false
+
+      @separate_seo_table = false
     end
 
     def search_enabled=(val)
@@ -64,4 +70,4 @@ module RocketCMS
       end
     end
   end
-end
+end

data/lib/rocket_cms/controllers/contacts.rb

@@ -15,7 +15,7 @@ module RocketCMS
       def create
         @contact_message = model.new(message_params)
         after_initialize
-        if RocketCMS.configuration.contacts_captcha
+        if RocketCMS.config.contacts_captcha
           meth = :save_with_captcha
         else
           meth = :save
@@ -63,7 +63,7 @@ module RocketCMS
         ContactMessage
       end
       def message_params
-        params.require(:contact_message).permit(RocketCMS.configuration.contacts_fields.keys + [:name, :email, :phone, :content, :captcha, :captcha_key])
+        params.require(:contact_message).permit(RocketCMS.config.contacts_fields.keys + [:name, :email, :phone, :content, :captcha, :captcha_key])
       end
     end
   end

data/lib/rocket_cms/controllers/news.rb

@@ -6,7 +6,7 @@ module RocketCMS
       def index
         @news = model.enabled.after_now.by_date
 
-        unless RocketCMS.configuration.news_per_page.nil?
+        unless RocketCMS.config.news_per_page.nil?
           @news = @news.page(params[:page])
         end
       end

data/lib/rocket_cms/controllers/search.rb

@@ -38,6 +38,23 @@ module RocketCMS
                                  page: params[:page],
                                  per_page: RocketCMS.configuration.search_per_page
           )
+          # @results = Mongoid::Elasticsearch.search({
+          #   body: {
+          #     query: {
+          #       query_string: {
+          #         query: Mongoid::Elasticsearch::Utils.clean(params[:query])
+          #       }
+          #     },
+          #     highlight: {
+          #       fields: {
+          #         name: {},
+          #         content: {}
+          #       }
+          #     }
+          #   }},
+          #   page: params[:page],
+          #   per_page: RocketCMS.config.search_per_page,
+          # )
         end
       end
     end

data/lib/rocket_cms/engine.rb

@@ -31,12 +31,12 @@ module RocketCMS
 
     config.after_initialize do
       # trigger autoload so models are registered in Mongoid::Elasticearch
-      RocketCMS.configuration.search_models.map(&:constantize)
+      RocketCMS.config.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.default_email_from(default: 'noreply@site.domain')
+        Settings.form_email(default: 'admin@site.domain')
         Settings.email_topic(default: 'с сайта')
       end
     end

data/lib/rocket_cms/migration.rb

@@ -3,19 +3,21 @@ module RocketCMS
     extend self
 
     def seo_fields(t)
-      t.string :name, null: false
-      t.string :h1
-      t.string :title
-      t.text :keywords
-      t.text :description
+      if RocketCMS.config.localize
+        t.column :h1_translations, 'hstore', default: {}
+        t.column :title_translations, 'hstore', default: {}
+        t.column :keywords_translations, 'hstore', default: {}
+        t.column :description_translations, 'hstore', default: {}
+        t.column :og_title_translations, 'hstore', default: {}
+      else
+        t.string :h1
+        t.string :title
+        t.text :keywords
+        t.text :description
+        t.string :og_title
+      end
       t.string :robots
-      t.string :og_title
       t.attachment :og_image
-
-      #if RocketCMS.localize
-        #t.column :name_translations, 'hstore'
-        #t.column :name_translations, 'hstore'
-      #end
     end
 
     def map_fields(t)
@@ -29,3 +31,4 @@ module RocketCMS
     end
   end
 end
+

data/lib/rocket_cms/models/active_record/menu.rb

@@ -6,6 +6,9 @@ module RocketCMS
         included do
           has_paper_trail
           validates_lengths_from_database
+          if RocketCMS.config.localize
+            translates :name
+          end
         end
       end
     end

data/lib/rocket_cms/models/active_record/news.rb

@@ -4,9 +4,8 @@ module RocketCMS
       module News
         extend ActiveSupport::Concern
         included do
-          unless RocketCMS.configuration.news_image_styles.nil?
-            has_attached_file :image, styles: RocketCMS.configuration.news_image_styles
-            validates_attachment_content_type :image, content_type: %w(image/gif image/jpeg image/jpg image/png), if: :image?
+          unless RocketCMS.config.news_image_styles.nil?
+            has_attached_file :image, styles: RocketCMS.config.news_image_styles
           end
 
           has_paper_trail
@@ -15,6 +14,10 @@ module RocketCMS
 
           scope :after_now, -> { where("time < ?", Time.now) }
           scope :by_date, -> { order(time: :desc) }
+
+          if RocketCMS.config.localize
+            translates :name, :excerpt, :content
+          end
         end
       end
     end

data/lib/rocket_cms/models/active_record/page.rb

@@ -9,6 +9,9 @@ module RocketCMS
           has_paper_trail
           validates_lengths_from_database only: [:name, :title, :content, :excerpt, :h1, :keywords, :robots, :og_title, :regexp, :redirect, :fullpath]
           scope :sorted, -> { order(lft: :asc) }
+          if RocketCMS.config.localize
+            translates :name, :content
+          end
         end
       end
     end

data/lib/rocket_cms/models/active_record/seo.rb

@@ -0,0 +1,17 @@
+module RocketCMS
+  module Models
+    module ActiveRecord
+      module Seo
+        extend ActiveSupport::Concern
+        included do
+          has_attached_file :og_image, styles: {thumb: "800x600>"}
+          if RocketCMS.config.localize
+            translates :h1, :title, :keywords, :description, :og_title
+          end
+        end
+      end
+    end
+  end
+end
+
+

data/lib/rocket_cms/models/contact_message.rb

@@ -10,7 +10,7 @@ module RocketCMS
         apply_simple_captcha message: RocketCMS.configuration.contacts_captcha_error_message
 
         validates_email_format_of :email, unless: 'email.blank?'
-        if RocketCMS.configuration.contacts_message_required
+        if RocketCMS.config.contacts_message_required
           validates_presence_of :content
         end
         validate do

data/lib/rocket_cms/models/embedded_gallery_image.rb

@@ -6,6 +6,10 @@ module RocketCMS
       include Enableable
       include Sortable
       include RocketCMS.orm_specific('EmbeddedGalleryImage')
+
+      included do
+        validates_attachment_content_type :image, content_type: /\Aimage\/.*\Z/, if: :image?
+      end
     end
   end
 end

data/lib/rocket_cms/models/gallery.rb

@@ -11,6 +11,8 @@ module RocketCMS
       included do
         has_many :gallery_images
         field :name, type: String, localize: RocketCMS.configuration.localize
+
+        validates_attachment_content_type :image, content_type: /\Aimage\/.*\Z/, if: :image?
       end
     end
   end

data/lib/rocket_cms/models/gallery_image.rb

@@ -9,6 +9,8 @@ module RocketCMS
       included do
         belongs_to :gallery
         field :name, type: String, localize: RocketCMS.configuration.localize
+
+        validates_attachment_content_type :image, content_type: /\Aimage\/.*\Z/, if: :image?
       end
     end
   end

data/lib/rocket_cms/models/mongoid/contact_message.rb

@@ -4,11 +4,11 @@ module RocketCMS
       module ContactMessage
         extend ActiveSupport::Concern
         included do
-          field :name, type: String, default: ""
-          field :email, type: String, default: ""
-          field :phone, type: String, default: ""
-          field :content, type: String, default: ""
-          RocketCMS.configuration.contacts_fields.each_pair do |fn, ft|
+          field :name, type: String
+          field :email, type: String
+          field :phone, type: String
+          field :content, type: String
+          RocketCMS.config.contacts_fields.each_pair do |fn, ft|
             next if ft.nil?
             field fn, type: ft
           end

data/lib/rocket_cms/models/mongoid/embedded_gallery_image.rb

@@ -11,7 +11,6 @@ module RocketCMS
           include EmbeddedElement
 
           has_mongoid_attached_file :image # need to override
-          validates_attachment :image, content_type: { content_type: ["image/jpg", "image/jpeg", "image/png"] }
 
           def image_file_name=(val)
             return self[:image_file_name] = ""  if val == ""

data/lib/rocket_cms/models/mongoid/gallery.rb

@@ -12,7 +12,6 @@ module RocketCMS
           scope :sorted, -> { order_by([:lft, :asc]) }
 
           has_mongoid_attached_file :image # need to override
-          validates_attachment :image, content_type: { content_type: ["image/jpg", "image/jpeg", "image/png"] }
 
           def image_file_name=(val)
             return self[:image_file_name] = ""  if val == ""

data/lib/rocket_cms/models/mongoid/gallery_image.rb

@@ -10,7 +10,6 @@ module RocketCMS
           scope :sorted, -> { order_by([:lft, :asc]) }
 
           has_mongoid_attached_file :image # need to override
-          validates_attachment :image, content_type: { content_type: ["image/jpg", "image/jpeg", "image/png"] }
 
           def image_file_name=(val)
             return self[:image_file_name] = ""  if val == ""

data/lib/rocket_cms/models/mongoid/news.rb

@@ -3,15 +3,14 @@ module RocketCMS
     module Mongoid
       module News
         extend ActiveSupport::Concern
-        unless RocketCMS.configuration.news_image_styles.nil?
+        unless RocketCMS.config.news_image_styles.nil?
           include ::Mongoid::Paperclip
         end
         included do
           field :time, type: Time
           index({enabled: 1, time: 1})
-          unless RocketCMS.configuration.news_image_styles.nil?
-            has_mongoid_attached_file :image, styles: RocketCMS.configuration.news_image_styles
-            validates_attachment_content_type :image, content_type: %w(image/gif image/jpeg image/jpg image/png), if: :image?
+          unless RocketCMS.config.news_image_styles.nil?
+            has_mongoid_attached_file :image, styles: RocketCMS.config.news_image_styles
 
             def image_file_name=(val)
               return self[:image_file_name] = ""  if val == ""

data/lib/rocket_cms/models/mongoid/page.rb

@@ -6,9 +6,10 @@ module RocketCMS
         included do
           field :regexp, type: String, default: ""
           field :redirect, type: String, default: ""
-          field :excerpt, type: String, localize: RocketCMS.configuration.localize, default: ""
-          field :content, type: String, localize: RocketCMS.configuration.localize, default: ""
+          field :excerpt, type: String, localize: RocketCMS.config.localize, default: ""
+          field :content, type: String, localize: RocketCMS.config.localize, default: ""
           field :fullpath, type: String, default: ""
+
           has_and_belongs_to_many :menus, inverse_of: :pages
           acts_as_nested_set
 

data/lib/rocket_cms/models/mongoid/seo.rb

@@ -0,0 +1,23 @@
+module RocketCMS
+  module Models
+    module Mongoid
+      module Seo
+        extend ActiveSupport::Concern
+        include ::Mongoid::Paperclip
+        included do
+          field :name, type: String, localize: RocketCMS.config.localize
+          field :h1, type: String, localize: RocketCMS.config.localize
+
+          field :title, type: String, localize: RocketCMS.config.localize
+          field :keywords, type: String, localize: RocketCMS.config.localize
+          field :description, type: String, localize: RocketCMS.config.localize
+          field :robots, type: String, localize: RocketCMS.config.localize
+
+          field :og_title, type: String, localize: RocketCMS.config.localize
+          has_mongoid_attached_file :og_image, styles: {thumb: "800x600>"}
+        end
+      end
+    end
+  end
+end
+

data/lib/rocket_cms/models/news.rb

@@ -9,21 +9,29 @@ module RocketCMS
       include SitemapData
       include RocketCMS.orm_specific('News')
 
-      if RocketCMS.configuration.search_enabled
+      if RocketCMS.config.search_enabled
         include RocketCMS::ElasticSearch
       end
 
       included do
 
-        validates_presence_of :name, :content
+        unless RocketCMS.config.news_image_styles.nil?
+          validates_attachment_content_type :image, content_type: /\Aimage\/.*\Z/, if: :image?
+        end
+        
+        validates_presence_of :name
+        if RocketCMS.config.news_content_required
+          validates_presence_of :content
+        end
+
         before_validation do
           self.time = Time.now if self.time.blank?
         end
         scope :recent, ->(count = 5) { enabled.after_now.by_date.limit(count) }
-        unless RocketCMS.configuration.news_per_page.nil?
-          paginates_per RocketCMS.configuration.news_per_page
+        unless RocketCMS.config.news_per_page.nil?
+          paginates_per RocketCMS.config.news_per_page
         end
-        smart_excerpt :excerpt, :content, RocketCMS.configuration.news_excerpt
+        smart_excerpt :excerpt, :content, RocketCMS.config.news_excerpt
         manual_slug :report_slug
 
         RocketCMS.apply_patches self

data/lib/rocket_cms/models/page.rb

@@ -10,7 +10,7 @@ module RocketCMS
 
       include RocketCMS.orm_specific('Page')
 
-      if RocketCMS.configuration.search_enabled
+      if RocketCMS.config.search_enabled
         include RocketCMS::ElasticSearch
       end
         
@@ -54,10 +54,14 @@ module RocketCMS
           url.match(clean_regexp)
         end
       end
-      
+
+      def regexp_prefix
+        ""
+      end
+
       def clean_regexp
         if regexp.blank?
-          /^#{Regexp.escape(fullpath)}$/
+          /^#{regexp_prefix}#{Regexp.escape(fullpath)}$/
         else
           begin
             /#{regexp}/

data/lib/rocket_cms/models/seo.rb

@@ -0,0 +1,17 @@
+module RocketCMS
+  module Models
+    module Seo
+      extend ActiveSupport::Concern
+      include RocketCMS::Model
+      include Enableable
+      include RocketCMS.orm_specific('Seo')
+      include RocketCMS::SeoHelpers
+
+      included do
+        RocketCMS.apply_patches self
+        validates_attachment_content_type :og_image, content_type: /\Aimage\/.*\Z/, if: :og_image?
+      end
+    end
+  end
+end
+

data/lib/rocket_cms/seo_helpers.rb

@@ -0,0 +1,13 @@
+module RocketCMS
+  module SeoHelpers
+    extend ActiveSupport::Concern
+    def page_title
+      title.blank? ? name : title
+    end
+
+    def get_og_title
+      og_title.blank? ? name : og_title
+    end
+  end
+end
+