rocket_cms 0.4.2 → 0.5.0.rc.4

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

@@ -0,0 +1,66 @@
+rails_env = ENV['RAILS_ENV'] || 'production'
+
+deploy_to = '<%= deploy_to %>'
+
+rails_root = "#{deploy_to}/current"
+
+tmp_dir = "#{deploy_to}/shared/tmp"
+pid_dir = "#{tmp_dir}/pids"
+if File.directory?(tmp_dir) && !File.directory?(pid_dir)
+  puts "creating pid dir #{pid_dir}"
+  Dir.mkdir(pid_dir)
+end
+pid_file = "#{pid_dir}/unicorn.pid"
+
+log_file = "#{deploy_to}/shared/log/unicorn.log"
+err_log_file = "#{deploy_to}/shared/log/unicorn.error.log"
+
+old_pid_file = pid_file + '.oldbin'
+
+worker_processes 1
+working_directory rails_root
+
+timeout 120
+
+# Specify path to socket unicorn listens to,
+# we will use this in our nginx.conf later
+
+listen "127.0.0.1:<%= port %>"
+
+pid pid_file
+
+# Set log file paths
+stderr_path err_log_file
+stdout_path log_file
+
+# http://tech.tulentsev.com/2012/03/deploying-with-sinatra-capistrano-unicorn/
+# NOTE: http://unicorn.bogomips.org/SIGNALS.html
+preload_app true
+
+# make sure that Bundler finds the Gemfile
+before_exec do |server|
+  ENV['BUNDLE_GEMFILE'] = File.join( rails_root, 'Gemfile' )
+end
+
+before_fork do |server, worker|
+  # при использовании preload_app = true здесь должно быть закрытие всех открытых сокетов
+
+  # Mongoid сам заботится о переконнекте
+  # http://two.mongoid.org/docs/upgrading.html
+
+  # http://stackoverflow.com/a/9498372/2041969
+  # убиваем параллельный старый-процесс просле старта нового
+  if File.exists?( old_pid_file )
+    begin
+      Process.kill( "QUIT", File.read( old_pid_file ).to_i )
+    rescue Errno::ENOENT, Errno::ESRCH
+      puts "Old master alerady dead"
+    end
+  end
+end
+
+after_fork do |server, worker|
+  # pid-ы дочерних процессов
+  child_pid_file = server.config[:pid].sub(".pid", ".#{worker.nr}.pid"
+  system("echo #{Process.pid} > #{child_pid_file}")
+end

data/lib/rocket_cms/configuration.rb

@@ -2,6 +2,9 @@ module RocketCMS
   def self.configuration
     @configuration ||= Configuration.new
   end
+  def self.config
+    @configuration ||= Configuration.new
+  end
 
   def self.configure
     yield configuration

data/lib/rocket_cms/engine.rb

@@ -4,19 +4,13 @@ module RocketCMS
       require File.expand_path('../tasks', __FILE__)
     end
 
-    initializer "rocket_cms.ckeditor" do
-      if Object.const_defined?("Ckeditor")
-        Ckeditor.setup do |config|
-          require "ckeditor/orm/mongoid"
-        end
-      end
-    end
-
     initializer "rocket_cms.email_defaults" do
       # Write default email settings to DB so they can be changed.
-      Settings.default_email_from(default: 'noreply@rscx.ru')
-      Settings.form_email(default: 'glebtv@ya.ru')
-      Settings.email_topic(default: 'с сайта')
+      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
 
     initializer 'rocket_cms.paperclip' do

data/lib/rocket_cms/migration.rb

@@ -0,0 +1,21 @@
+module RocketCMS
+  module Migration
+    extend self
+
+    def seo_fields(t)
+      t.string :name, null: false
+      t.string :h1
+      t.string :title
+      t.string :keywords
+      t.text :description
+      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
+  end
+end

data/lib/rocket_cms/model.rb

@@ -2,16 +2,22 @@ module RocketCMS
   module Model
     extend ActiveSupport::Concern
     included do
-      include Mongoid::Document
-      include Mongoid::Timestamps::Short
+      if RocketCMS.mongoid?
+        include Mongoid::Document
+        include Mongoid::Timestamps::Short
+      end
       include ActiveModel::ForbiddenAttributesProtection
       include BooleanField
       include SortField
-      include Mongoid::Paperclip
+
+      if RocketCMS.mongoid?
+        include Mongoid::Paperclip
+      end
+
       include SmartExcerpt
       include SimpleCaptcha::ModelHelpers
 
-      if defined?(Trackable)
+      if RocketCMS.mongoid? && defined?(Trackable)
         include Trackable
       end
     end

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

@@ -0,0 +1,14 @@
+module RocketCMS
+  module Models
+    module ActiveRecord
+      module ContactMessage
+        extend ActiveSupport::Concern
+        included do
+          has_paper_trail
+          validates_lengths_from_database
+        end
+      end
+    end
+  end
+end
+

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

@@ -0,0 +1,16 @@
+module RocketCMS
+  module Models
+    module ActiveRecord
+      module Menu
+        extend ActiveSupport::Concern
+        included do
+          extend FriendlyId
+          friendly_id :report_slug, use: [:slugged, :finders]
+          has_paper_trail
+          validates_lengths_from_database
+        end
+      end
+    end
+  end
+end
+

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

@@ -0,0 +1,26 @@
+module RocketCMS
+  module Models
+    module ActiveRecord
+      module News
+        extend ActiveSupport::Concern
+        included do
+          extend FriendlyId
+
+          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?
+          end
+          friendly_id :report_slug, use: [:slugged, :finders]
+
+          has_paper_trail
+
+          validates_lengths_from_database only: [:name, :title, :content, :excerpt, :h1, :keywords, :robots, :og_title]
+
+          scope :after_now, -> { where("time < ?", Time.now) }
+          scope :by_date, -> { order(time: :desc) }
+        end
+      end
+    end
+  end
+end
+

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

@@ -0,0 +1,17 @@
+module RocketCMS
+  module Models
+    module ActiveRecord
+      module Page
+        extend ActiveSupport::Concern
+
+        included do
+          extend FriendlyId
+          friendly_id :name, use: [:slugged, :finders]
+          has_paper_trail
+          validates_lengths_from_database only: [:name, :title, :content, :excerpt, :h1, :keywords, :robots, :og_title, :regexp, :redirect, :fullpath]
+        end
+      end
+    end
+  end
+end
+

data/lib/rocket_cms/models/contact_message.rb

@@ -3,32 +3,19 @@ module RocketCMS
     module ContactMessage
       extend ActiveSupport::Concern
       include RocketCMS::Model
+      include RocketCMS.orm_specific('ContactMessage')
 
       included do
         apply_simple_captcha
-
-        field :name, type: String
-        field :email, type: String
-        field :phone, type: String
-        field :content, type: String
-
         validates_email_format_of :email, unless: 'email.blank?'
-
         if RocketCMS.configuration.contacts_message_required
           validates_presence_of :content
         end
-
         validate do
           if email.blank? && phone.blank?
             errors.add(:email, I18n.t('rs.no_contact_info'))
           end
         end
-
-        RocketCMS.configuration.contacts_fields.each_pair do |fn, ft|
-          next if ft.nil?
-          field fn, type: ft
-        end
-
         after_create do
           ContactMailer.new_message_email(self).deliver
         end

data/lib/rocket_cms/models/menu.rb

@@ -4,8 +4,7 @@ module RocketCMS
       extend ActiveSupport::Concern
       include RocketCMS::Model
       include Enableable
-      include ManualSlug
-
+      include RocketCMS.orm_specific('Menu')
       included do
         after_save do
           Rails.cache.delete 'menus'
@@ -13,10 +12,9 @@ module RocketCMS
         after_destroy do
           Rails.cache.delete 'menus'
         end
-        field :name, type: String
-        manual_slug :name
         has_and_belongs_to_many :pages, inverse_of: :menus
       end
     end
   end
 end
+

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

@@ -0,0 +1,20 @@
+module RocketCMS
+  module Models
+    module Mongoid
+      module ContactMessage
+        extend ActiveSupport::Concern
+        included do
+          field :name, type: String
+          field :email, type: String
+          field :phone, type: String
+          field :content, type: String
+          RocketCMS.configuration.contacts_fields.each_pair do |fn, ft|
+            next if ft.nil?
+            field fn, type: ft
+          end
+        end
+      end
+    end
+  end
+end
+

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

@@ -0,0 +1,14 @@
+module RocketCMS
+  module Models
+    module Mongoid
+      module Menu
+        extend ActiveSupport::Concern
+        include ManualSlug
+        included do
+          field :name, type: String
+          manual_slug :name
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+module RocketCMS
+  module Models
+    module Mongoid
+      module News
+        extend ActiveSupport::Concern
+        unless RocketCMS.configuration.news_image_styles.nil?
+          include ::Mongoid::Paperclip
+        end
+        include ManualSlug
+        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 => ['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
+          manual_slug :report_slug
+
+          scope :after_now, -> { where(:time.lt => Time.now) }
+          scope :by_date, -> { desc(:time) }
+        end
+      end
+    end
+  end
+end
+

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

@@ -0,0 +1,19 @@
+module RocketCMS
+  module Models
+    module Mongoid
+      module Page
+        extend ActiveSupport::Concern
+        include ManualSlug
+        included do
+          field :regexp, type: String
+          field :redirect, type: String
+          field :content, type: String, localize: RocketCMS.configuration.localize
+          field :fullpath, type: String
+          has_and_belongs_to_many :menus, inverse_of: :pages
+
+          manual_slug :name
+        end
+      end
+    end
+  end
+end

data/lib/rocket_cms/models/news.rb

@@ -4,58 +4,40 @@ module RocketCMS
       extend ActiveSupport::Concern
       include RocketCMS::Model
       include Seoable
-      include Enableable  
+      include Enableable
+      include RocketCMS.orm_specific('News')
+
       if RocketCMS.configuration.search_enabled
         include RocketCMS::ElasticSearch
       end
-      unless RocketCMS.configuration.news_image_styles.nil?
-        include Mongoid::Paperclip
-      end
-      include ManualSlug
 
       included do
-        field :time, type: Time
-        index({enabled: 1, time: 1})
-        scope :after_now, -> { where(:time.lt => Time.now) }
-
-        field :excerpt, type: String, localize: RocketCMS.configuration.localize
-        field :content, type: String, localize: RocketCMS.configuration.localize
-
-        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 => ['image/gif', 'image/jpeg', 'image/jpg', 'image/png'], if: :image?
-        end
-
         validates_presence_of :name, :content
-
         before_validation do
           self.time = Time.now if self.time.blank?
         end
-
-        manual_slug :report_slug
-
-        scope :by_date, -> { desc(:time) }
         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
         end
-
         smart_excerpt :excerpt, :content, RocketCMS.configuration.news_excerpt
-
         RocketCMS.apply_patches self
       end
 
       def report_slug
-        time.strftime('%Y-%m-%d') + '-' + name[0..20]
+        if name.blank?
+          time.strftime('%Y-%m-%d')
+        else
+          time.strftime('%Y-%m-%d') + '-' + name[0..20]
+        end
       end
-
       def html5_date
         time.strftime('%Y-%m-%d')
       end
-
       def format_date
         time.strftime('%d.%m.%Y')
       end
     end
   end
 end
+

data/lib/rocket_cms/models/page.rb

@@ -2,35 +2,24 @@ module RocketCMS
   module Models
     module Page
       extend ActiveSupport::Concern
-
       include RocketCMS::Model
       include Enableable
       include Seoable
-      include ManualSlug
+
+      include RocketCMS.orm_specific('Page')
+
       if RocketCMS.configuration.search_enabled
         include RocketCMS::ElasticSearch
       end
         
       included do
-        field :regexp, type: String
-        field :redirect, type: String
-        field :content, type: String, localize: RocketCMS.configuration.localize
-        field :fullpath, type: String
-
         scope :sorted, -> { order_by([:lft, :asc]) }
         scope :menu, ->(menu_id) { enabled.sorted.where(menu_ids: menu_id) }
-
         has_and_belongs_to_many :menus, inverse_of: :pages
-
-        acts_as_nested_set
-        
-        manual_slug :name
-
         before_validation do
           self.fullpath = "/pages/#{slug}" if self.fullpath.blank?
         end
         validates_uniqueness_of :fullpath
-
         validates_presence_of :name
       end
 

data/lib/rocket_cms/version.rb

@@ -1,3 +1,3 @@
-module RocketCms
-  VERSION = "0.4.2"
+module RocketCMS
+  VERSION = "0.5.0.rc.4"
 end

data/lib/rocket_cms.rb

@@ -1,32 +1,20 @@
-require 'rocket_cms/version'
+unless defined?(RocketCMS) && [:active_record, :mongoid].include?(RocketCMS.orm)
+  puts "please use rocket_cms_mongoid or rocket_cms_activerecord and not rocket_cms directly"
+  exit 1
+end
 
-require 'mongoid'
-# require 'yajl/json_gem'
+require 'rocket_cms/version'
 require 'devise'
-
 require 'simple_form'
 require 'glebtv-simple_captcha'
-
 require 'validates_email_format_of'
-
 require 'smart_excerpt'
-
-# uploads
-require 'glebtv-mongoid-paperclip'
 require 'filename_to_slug'
-
 require 'rails_admin'
-# require 'rs_russian'
-
-require 'glebtv-mongoid_nested_set'
 require 'rails_admin_nested_set'
 require 'rails_admin_toggleable'
-require 'glebtv-ckeditor'
 require 'rails_admin_settings'
-require 'mongoid-audit'
-
-require 'mongoid_slug'
-
+require 'glebtv-ckeditor'
 require 'sitemap_generator'
 require 'kaminari'
 require 'addressable/uri'
@@ -36,18 +24,49 @@ require 'simple-navigation'
 require 'rocket_cms/configuration'
 require 'rocket_cms/patch'
 require 'rocket_cms/admin'
-require 'rocket_cms/elastic_search' # FTS, optional
+require 'rocket_cms/elastic_search'
 require 'rocket_cms/model'
 require 'rocket_cms/rails_admin_menu'
 require 'rocket_cms/engine'
 require 'rocket_cms/controller'
 
 module RocketCMS
+  class << self
+    def mongoid?
+      RocketCMS.orm == :mongoid
+    end
+    def active_record?
+      RocketCMS.orm == :active_record
+    end
+    def model_namespace
+      "RocketCMS::Models::#{RocketCMS.orm.to_s.camelize}"
+    end
+    def orm_specific(name)
+      "#{model_namespace}::#{name}".constantize
+    end
+  end
+
+  autoload :Migration, 'rocket_cms/migration'
+
   module Models
     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 :Menu, 'rocket_cms/models/mongoid/menu'
+      autoload :Page, 'rocket_cms/models/mongoid/page'
+      autoload :News, 'rocket_cms/models/mongoid/news'
+      autoload :ContactMessage, 'rocket_cms/models/mongoid/contact_message'
+    end
+
+    module ActiveRecord
+      autoload :Menu, 'rocket_cms/models/active_record/menu'
+      autoload :Page, 'rocket_cms/models/active_record/page'
+      autoload :News, 'rocket_cms/models/active_record/news'
+      autoload :ContactMessage, 'rocket_cms/models/active_record/contact_message'
+    end
   end
 
   module Controllers

data/rocket_cms.gemspec

@@ -1,19 +1,18 @@
-# coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'rocket_cms/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'rocket_cms'
-  spec.version       = RocketCms::VERSION
+  spec.version       = RocketCMS::VERSION
   spec.authors       = ['glebtv']
   spec.email         = ['glebtv@gmail.com']
   spec.description   = %q{RocketCMS}
-  spec.summary       = %q{RocketCMS}
+  spec.summary       = %q{}
   spec.homepage      = 'https://github.com/rs-pro/rocket_cms'
   spec.license       = 'MIT'
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files`.split($/).reject {|f| f.start_with?('mongoid') || f.start_with?('activerecord') }
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
@@ -21,30 +20,26 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   
-  spec.add_dependency 'rails', [">= 4.1.0", "< 5.0.0"]
-  spec.add_dependency 'mongoid', '~> 4.0.0'
+  spec.add_dependency 'rails', "~> 4.1.6"
 
   spec.add_dependency 'jquery-rails'
-  spec.add_dependency 'glebtv-mongoid_nested_set'
   spec.add_dependency 'simple_form'
   spec.add_dependency 'glebtv-simple_captcha'
   spec.add_dependency 'coffee-rails'
   spec.add_dependency 'devise'
   spec.add_dependency 'turbolinks'
   spec.add_dependency 'validates_email_format_of'
-  spec.add_dependency 'glebtv-mongoid-paperclip'
   spec.add_dependency 'rails_admin'
   spec.add_dependency 'rails_admin_nested_set'
   spec.add_dependency 'rails_admin_toggleable'
   spec.add_dependency 'glebtv-ckeditor'
-  spec.add_dependency 'rails_admin_settings', '~> 0.8.0'
+  spec.add_dependency 'rails_admin_settings', '~> 0.9.0.pre.4'
   spec.add_dependency 'geocoder'
-  spec.add_dependency 'mongoid-audit', '~> 1.0.0.alpha.1'
-  spec.add_dependency 'mongoid_slug'
   spec.add_dependency 'simple-navigation'
   spec.add_dependency 'sitemap_generator'
   spec.add_dependency 'kaminari'
   spec.add_dependency 'addressable'
+  spec.add_dependency 'stringex'
   spec.add_dependency 'thor'
 
   spec.add_dependency 'smart_excerpt'