rocket_cms 0.7.1 → 0.8.0.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15e24497b873e1c0fdaa11337bcf79ab60e44adc
-  data.tar.gz: ba371d9579621d7127501e34c652d09b0e1e5efd
+  metadata.gz: a5e6b8f4f4811f703843bb7f92d916540b65f1da
+  data.tar.gz: 1fb08b8c8a19ba2b7ea74b9387228420968272ed
 SHA512:
-  metadata.gz: 17f988247d191712da293b791e127539488758fcbbc4f30688cbdd95638ef276649222a5fc7d6ff1a2e30274c57b3c5dcdf9b7b4cebdb01b7bd98fef964dd8f9
-  data.tar.gz: c5da155755ce1a3d5ff4addc5df3bb3cd142df201c1e2809089a0106cf3fd5abfbd259cbd2e44c3876584895f6f7a2d17d3a7d915ede16ad470b56cd6ecdf5c3
+  metadata.gz: 1e51e89502bec15e060ce1ff17492e946fb53714667e03dac2509aeaf24f4eae63c4a8ccd4c766ec0b2731219272724f8a5f791e35e11183aa77d4282eb0ffdc
+  data.tar.gz: 6c6835cf8fe9339d4b98a14185ca7e8da89ac195c12f9d8a0e7213020da5799fe25f5edaa21d363f17c0d1c2a95161529feb74270fe871dd80ebc6ed0bc29e2c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rocket_cms (0.7.1)
+    rocket_cms (0.8.0.pre.1)
       addressable
       coffee-rails
       devise
@@ -27,36 +27,36 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.2)
-      actionpack (= 4.2.2)
-      actionview (= 4.2.2)
-      activejob (= 4.2.2)
+    actionmailer (4.2.3)
+      actionpack (= 4.2.3)
+      actionview (= 4.2.3)
+      activejob (= 4.2.3)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.2)
-      actionview (= 4.2.2)
-      activesupport (= 4.2.2)
+    actionpack (4.2.3)
+      actionview (= 4.2.3)
+      activesupport (= 4.2.3)
       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.2)
-      activesupport (= 4.2.2)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.3)
+      activesupport (= 4.2.3)
       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.2)
-      activesupport (= 4.2.2)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (4.2.3)
+      activesupport (= 4.2.3)
       globalid (>= 0.3.0)
-    activemodel (4.2.2)
-      activesupport (= 4.2.2)
+    activemodel (4.2.3)
+      activesupport (= 4.2.3)
       builder (~> 3.1)
-    activerecord (4.2.2)
-      activemodel (= 4.2.2)
-      activesupport (= 4.2.2)
+    activerecord (4.2.3)
+      activemodel (= 4.2.3)
+      activesupport (= 4.2.3)
       arel (~> 6.0)
-    activesupport (4.2.2)
+    activesupport (4.2.3)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -95,7 +95,7 @@ GEM
       activesupport (>= 4.1.0)
     haml (4.0.6)
       tilt
-    htmlentities (4.3.3)
+    htmlentities (4.3.4)
     i18n (0.7.0)
     jquery-rails (4.0.4)
       rails-dom-testing (~> 1.0)
@@ -125,16 +125,16 @@ GEM
       rack (~> 1.1)
     rack-test (0.6.3)
       rack (>= 1.0)
-    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)
+    rails (4.2.3)
+      actionmailer (= 4.2.3)
+      actionpack (= 4.2.3)
+      actionview (= 4.2.3)
+      activejob (= 4.2.3)
+      activemodel (= 4.2.3)
+      activerecord (= 4.2.3)
+      activesupport (= 4.2.3)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.2)
+      railties (= 4.2.3)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
@@ -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.2)
-      actionpack (= 4.2.2)
-      activesupport (= 4.2.2)
+    railties (4.2.3)
+      actionpack (= 4.2.3)
+      activesupport (= 4.2.3)
       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.14)
+    sass (3.4.15)
     sass-rails (5.0.3)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.1)
@@ -192,7 +192,7 @@ GEM
       htmlentities
     sprockets (3.2.0)
       rack (~> 1.0)
-    sprockets-rails (2.3.1)
+    sprockets-rails (2.3.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)

data/app/controllers/concerns/rs_errors.rb

@@ -64,7 +64,7 @@ module RsErrors
   end
 
   def render_error(code = 500)
-    render template: "errors/error_#{code}", formats: [:html], handlers: [:haml, :slim], layout: RocketCMS.configuration.error_layout, status: code
+    render template: "errors/error_#{code}", formats: [:html], handlers: [:haml, :slim], layout: RocketCMS.config.error_layout, status: code
   end
 
   def rails_admin?

data/app/models/concerns/seoable.rb

@@ -1,42 +1,23 @@
 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
+  LOCALIZED_FIELDS = [:h1, :title, :keywords, :description, :og_title]
+  FIELDS = LOCALIZED_FIELDS + [:og_image, :robots]
 
-      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
+  if Seo.table_exists?
+    included do
+      has_one :seo, as: :seoable, autosave: true
+      after_create :create_seo
+      accepts_nested_attributes_for :seo
+      delegate *FIELDS, to: :seo
+      delegate *(FIELDS.map {|f| "#{f}=".to_sym }), to: :seo
 
-      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 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?
-  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
-  
-  # deprecated
-  def self.seo_config
-    RocketCMS.seo_config
+  else
+    include RocketCMS::Models::Seo
   end
 end
 

data/app/models/seo.rb

@@ -0,0 +1,12 @@
+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
+end
+

data/app/views/news/index.html.haml

@@ -3,7 +3,7 @@
   - @news.each do |news|
     .rs-news-date= l(news.time.to_date)
     %a.rs-news-title{href: news_path(news)}= news.name
-    - 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(:thumb)
     .rs-news-excerpt= news.excerpt
   = paginate @news

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

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

@@ -51,7 +51,11 @@ RailsAdmin.config do |config|
     end
     
     toggle
-    toggle_menu
+    toggle_menu do
+      visible do
+        ['Page'].include? bindings[:abstract_model].model_name
+      end
+    end
   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'
+        t.column :excerpt_translations, 'hstore'
+        t.column :content_translations, 'hstore'
+      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'
+        t.column :content_translations, 'hstore'
+      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

@@ -52,12 +52,14 @@ 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'
     autoload :ContactMessage, 'rocket_cms/models/contact_message'
 
     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'
@@ -65,6 +67,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

@@ -16,19 +16,27 @@ 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"
+        end
+        RocketCMS.seo_fields(self)
+      }
+    end
+
+    def seo_fields(s)
+      s.instance_eval do
         field :h1, :string
         field :title, :string
-        field :keywords, :string
-        field :description, :string
+        field :keywords, :text
+        field :description, :text
         field :robots, :string
 
         field :og_title, :string
-        field :og_image
-      }
+        field :og_image, :paperclip
+      end
     end
     
     def page_config
@@ -68,11 +76,20 @@ module RocketCMS
               read_only true
             end
           end
-          group :seo, &RocketCMS.seo_config
+          if Seo.table_exists?
+            group :seo do
+              active true
+              field :seo do
+                active true
+              end
+            end
+          else
+            group :seo, &RocketCMS.seo_config(true)
+          end
         end
         RocketCMS.only_patches self, [:show, :export]
         nested_set({
-          max_depth: RocketCMS.configuration.menu_max_depth
+          max_depth: RocketCMS.config.menu_max_depth
         })
       }
     end
@@ -110,7 +127,7 @@ module RocketCMS
         field :enabled, :toggle
         field :time
         field :name
-        unless RocketCMS.configuration.news_image_styles.nil?
+        unless RocketCMS.config.news_image_styles.nil?
           field :image
         end
         field :excerpt

data/lib/rocket_cms/controllers/contacts.rb

@@ -10,7 +10,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
@@ -58,7 +58,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

@@ -21,7 +21,7 @@ module RocketCMS
               }
             }},
             page: params[:page],
-            per_page: RocketCMS.configuration.search_per_page,
+            per_page: RocketCMS.config.search_per_page,
           )
         end
       end

data/lib/rocket_cms/engine.rb

@@ -18,7 +18,7 @@ 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?

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'
+        t.column :title_translations, 'hstore'
+        t.column :keywords_translations, 'hstore'
+        t.column :description_translations, 'hstore'
+        t.column :og_title_translations, 'hstore'
+      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,8 +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
+          unless RocketCMS.config.news_image_styles.nil?
+            has_attached_file :image, styles: RocketCMS.config.news_image_styles
             validates_attachment_content_type :image, content_type: %w(image/gif image/jpeg image/jpg image/png), if: :image?
           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

@@ -8,7 +8,7 @@ module RocketCMS
       included do
         apply_simple_captcha
         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/mongoid/contact_message.rb

@@ -8,7 +8,7 @@ module RocketCMS
           field :email, type: String
           field :phone, type: String
           field :content, type: String
-          RocketCMS.configuration.contacts_fields.each_pair do |fn, ft|
+          RocketCMS.config.contacts_fields.each_pair do |fn, ft|
             next if ft.nil?
             field fn, type: ft
           end

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

@@ -3,19 +3,19 @@ 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
+          unless RocketCMS.config.news_image_styles.nil?
+            has_mongoid_attached_file :image, styles: RocketCMS.config.news_image_styles
             validates_attachment_content_type :image, content_type: %w(image/gif image/jpeg image/jpg image/png), if: :image?
           end
 
-          field :excerpt, type: String, localize: RocketCMS.configuration.localize
-          field :content, type: String, localize: RocketCMS.configuration.localize
+          field :excerpt, type: String, localize: RocketCMS.config.localize
+          field :content, type: String, localize: RocketCMS.config.localize
 
           scope :after_now, -> { where(:time.lt => Time.now) }
           scope :by_date, -> { desc(:time) }

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

@@ -6,7 +6,7 @@ module RocketCMS
         included do
           field :regexp, type: String
           field :redirect, type: String
-          field :content, type: String, localize: RocketCMS.configuration.localize
+          field :content, type: String, localize: RocketCMS.config.localize
           field :fullpath, type: String
           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

@@ -8,7 +8,7 @@ module RocketCMS
       include RocketCMS.orm_specific('News')
       include ManualSlug
 
-      if RocketCMS.configuration.search_enabled
+      if RocketCMS.config.search_enabled
         include RocketCMS::ElasticSearch
       end
 
@@ -18,10 +18,10 @@ module RocketCMS
           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

@@ -9,7 +9,7 @@ module RocketCMS
 
       include RocketCMS.orm_specific('Page')
 
-      if RocketCMS.configuration.search_enabled
+      if RocketCMS.config.search_enabled
         include RocketCMS::ElasticSearch
       end
         

data/lib/rocket_cms/models/seo.rb

@@ -0,0 +1,24 @@
+module RocketCMS
+  module Models
+    module Seo
+      extend ActiveSupport::Concern
+      include RocketCMS::Model
+      include Enableable
+      include RocketCMS.orm_specific('Seo')
+
+      included do
+        RocketCMS.apply_patches self
+        validates_attachment_content_type :og_image, content_type: %w(image/gif image/jpeg image/jpg image/png), if: :og_image?
+      end
+    end
+  end
+
+  def page_title
+    title.blank? ? name : title
+  end
+
+  def get_og_title
+    og_title.blank? ? name : og_title
+  end
+end
+

data/lib/rocket_cms/version.rb

@@ -1,3 +1,3 @@
 module RocketCMS
-  VERSION = "0.7.1"
+  VERSION = "0.8.0.pre.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.7.0'
+#{if mongoid then "gem 'rocket_cms_mongoid'" else "gem 'rocket_cms_activerecord'" end}, '~> 0.8.0.pre.1'
 
 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.1
+  version: 0.8.0.pre.1
 platform: ruby
 authors:
 - glebtv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-22 00:00:00.000000000 Z
+date: 2015-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -384,6 +384,7 @@ files:
 - app/models/menu.rb
 - app/models/news.rb
 - app/models/page.rb
+- app/models/seo.rb
 - app/views/blocks/_footer.html.haml
 - app/views/contact_mailer/new_message_email.html.haml
 - app/views/contacts/new.html.haml
@@ -434,6 +435,7 @@ files:
 - lib/generators/rocket_cms/templates/migration_contact_messages.rb
 - lib/generators/rocket_cms/templates/migration_news.rb
 - lib/generators/rocket_cms/templates/migration_pages.rb
+- lib/generators/rocket_cms/templates/migration_seos.rb
 - lib/generators/rocket_cms/templates/production.erb
 - lib/generators/rocket_cms/templates/unicorn.erb
 - lib/generators/rocket_cms/utils.rb
@@ -457,14 +459,17 @@ files:
 - lib/rocket_cms/models/active_record/menu.rb
 - lib/rocket_cms/models/active_record/news.rb
 - lib/rocket_cms/models/active_record/page.rb
+- lib/rocket_cms/models/active_record/seo.rb
 - lib/rocket_cms/models/contact_message.rb
 - lib/rocket_cms/models/menu.rb
 - lib/rocket_cms/models/mongoid/contact_message.rb
 - lib/rocket_cms/models/mongoid/menu.rb
 - lib/rocket_cms/models/mongoid/news.rb
 - lib/rocket_cms/models/mongoid/page.rb
+- lib/rocket_cms/models/mongoid/seo.rb
 - lib/rocket_cms/models/news.rb
 - lib/rocket_cms/models/page.rb
+- lib/rocket_cms/models/seo.rb
 - lib/rocket_cms/patch.rb
 - lib/rocket_cms/rails_admin_menu.rb
 - lib/rocket_cms/simple_form_patch.rb
@@ -488,9 +493,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5