rocket_cms 0.4.2 → 0.5.0.rc.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc958ba10567b7dbd2c47d0ad77d1f87b430f3f6
-  data.tar.gz: 3dd62cbefa7c6cb9b0ce1fc6187c3f76570bb430
+  metadata.gz: 44a0c682369f69ea98f5067be527d09d2a2db3ef
+  data.tar.gz: 01576c2b8ce639883bc808321313c0e3920d4e20
 SHA512:
-  metadata.gz: ed182f2578e649d18f96cbceffa934d3938dd26afc46b4282f38ded8896703dbfa9d409264ca3eb670459c0ed2d5817362a73fe372eac9ad0a5b501f4147fea3
-  data.tar.gz: 241c23002b1b73a8b3fd225f9d321909307e1302a1d9275edc4ca86df975defbea665173b1556b6839e0f982da611867cbc83afdf9ee71e015d0a38448d0e313
+  metadata.gz: 80ebdbed5f4dfe6b9f507fe355fafca8a232fbbc7982a1e72c1b42bea09a0af7610a8c41f66f6d8aa592fad3f74bf458b3cca116dbde2587530aea744d87038b
+  data.tar.gz: 5b42a35814367854428f94bdedf05cf4bd9f624bceca01119ca53bef11914f48086379dd555649c01fa8cd165b96a64097d0f1c90feac7cf5d096b0aa454794e

data/.ruby-version

@@ -1,2 +1 @@
-2.1.2
-
+2.1.3

data/Gemfile

@@ -2,3 +2,4 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in rocket_cms.gemspec
 gemspec
+

data/Gemfile.lock

@@ -1,29 +1,25 @@
 PATH
   remote: .
   specs:
-    rocket_cms (0.4.2)
+    rocket_cms (0.5.0.rc.4)
       addressable
       coffee-rails
       devise
       geocoder
       glebtv-ckeditor
-      glebtv-mongoid-paperclip
-      glebtv-mongoid_nested_set
       glebtv-simple_captcha
       jquery-rails
       kaminari
-      mongoid (~> 4.0.0)
-      mongoid-audit (~> 1.0.0.alpha.1)
-      mongoid_slug
-      rails (>= 4.1.0, < 5.0.0)
+      rails (~> 4.1.6)
       rails_admin
       rails_admin_nested_set
-      rails_admin_settings (~> 0.8.0)
+      rails_admin_settings (~> 0.9.0.pre.4)
       rails_admin_toggleable
       simple-navigation
       simple_form
       sitemap_generator
       smart_excerpt
+      stringex
       thor
       turbolinks
       validates_email_format_of
@@ -60,12 +56,7 @@ GEM
     addressable (2.3.6)
     arel (5.0.1.20140414130214)
     bcrypt (3.1.7)
-    bson (2.3.0)
     builder (3.2.2)
-    climate_control (0.0.3)
-      activesupport (>= 3.0)
-    cocaine (0.5.4)
-      climate_control (>= 0.0.3, < 1.0)
     coffee-rails (4.0.1)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.0)
@@ -73,14 +64,12 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.8.0)
-    connection_pool (2.0.0)
     devise (3.3.0)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
       thread_safe (~> 0.1)
       warden (~> 1.2.3)
-    easy_diff (0.0.3)
     erubis (2.7.0)
     execjs (2.2.1)
     font-awesome-rails (4.2.0.0)
@@ -90,14 +79,7 @@ GEM
       mime-types
       orm_adapter (~> 0.5.0)
       rails (~> 4.0)
-    glebtv-mongoid-paperclip (0.2.4)
-      mongoid (>= 3.0, < 5.0)
-      paperclip (>= 2.3.6)
-    glebtv-mongoid_nested_set (0.4.3)
-      mongoid (>= 3.1.0, < 4.1)
     glebtv-simple_captcha (0.6.5)
-    glebtv_mongoid_userstamp (0.4.1)
-      mongoid (~> 4.0.0.beta1)
     haml (4.0.5)
       tilt
     hike (1.2.3)
@@ -116,41 +98,12 @@ GEM
       mime-types (>= 1.16, < 3)
     mime-types (2.3)
     mini_portile (0.6.0)
-    minitest (5.4.1)
-    mongoid (4.0.0)
-      activemodel (~> 4.0)
-      moped (~> 2.0.0)
-      origin (~> 2.1)
-      tzinfo (>= 0.3.37)
-    mongoid-audit (1.0.0)
-      activesupport
-      glebtv_mongoid_userstamp
-      kaminari
-      mongoid (~> 4.0.0)
-      mongoid-history (~> 0.4.4)
-    mongoid-history (0.4.4)
-      activesupport
-      easy_diff
-      mongoid (>= 3.0)
-    mongoid_slug (3.2.1)
-      mongoid (> 3.0)
-      stringex (~> 2.0)
-    moped (2.0.0)
-      bson (~> 2.2)
-      connection_pool (~> 2.0)
-      optionable (~> 0.2.0)
+    minitest (5.4.2)
     multi_json (1.10.1)
     nested_form (0.3.2)
     nokogiri (1.6.3.1)
       mini_portile (= 0.6.0)
-    optionable (0.2.0)
-    origin (2.1.1)
     orm_adapter (0.5.0)
-    paperclip (4.2.0)
-      activemodel (>= 3.0.0)
-      activesupport (>= 3.0.0)
-      cocaine (~> 0.5.3)
-      mime-types
     rack (1.5.2)
     rack-pjax (0.8.0)
       nokogiri (~> 1.5)
@@ -182,8 +135,7 @@ GEM
       safe_yaml (~> 1.0)
       sass-rails (~> 4.0)
     rails_admin_nested_set (0.3.6)
-    rails_admin_settings (0.8.0)
-      mongoid (>= 3.0, < 4.1)
+    rails_admin_settings (0.9.0.pre.6)
     rails_admin_toggleable (0.4.1)
     railties (4.1.6)
       actionpack (= 4.1.6)
@@ -205,7 +157,7 @@ GEM
       activemodel (~> 4.0)
     sitemap_generator (5.0.5)
       builder
-    smart_excerpt (0.1.2)
+    smart_excerpt (0.1.4)
       activesupport
       htmlentities
     sprockets (2.12.2)

data/README.md

@@ -13,7 +13,11 @@ any time!**
 
 Add this line to your application's Gemfile:
 
-    gem 'rocket_cms'
+    gem 'rocket_cms_mongoid'
+
+or:
+
+    gem 'rocket_cms_activerecord'
 
 And then execute:
 
@@ -23,6 +27,12 @@ Or install it yourself as:
 
     $ gem install rocket_cms
 
+For activerecord, generate migrations and run them
+
+    rails g rails_admin_settings:migration
+    rails g rocket_cms:migration
+    rake db:migrate
+
 ## Usage
 
 ### Using app generator
@@ -36,10 +46,14 @@ If not, uninstall rails and install again
     gem uninstall rails
     gem install rocket_cms
     
-Then run:
-    
+Then, for mongoid:
+
     rails new my_app -T -O -m https://raw.github.com/rs-pro/rocket_cms/master/template.rb
 
+for ActiveRecord:
+
+    rails new my_app -T --database=postgresql -m https://raw.github.com/rs-pro/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.
 
 ### Documentation
@@ -55,3 +69,4 @@ See their documentation for more info
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+

data/app/models/concerns/boolean_field.rb

@@ -2,7 +2,9 @@ module BooleanField
   extend ActiveSupport::Concern
   module ClassMethods
     def boolean_field(name, default = true)
-      field name, type: Mongoid::Boolean, default: default
+      if RocketCMS.mongoid?
+        field name, type: Mongoid::Boolean, default: default
+      end
       scope name, -> { where(name => true) }
     end
   end

data/app/models/concerns/mappable.rb

@@ -4,14 +4,16 @@ module Mappable
   included do
     include Geocoder::Model::Mongoid
     
-    field :coordinates, type: Array
-    field :address, type: String
-    
-    field :map_address, type: String
-    field :map_hint, type: String
-    
-    field :lat, type: Float
-    field :lon, type: Float
+    if RocketCMS.mongoid?
+      field :coordinates, type: Array
+      field :address, type: String
+      
+      field :map_address, type: String
+      field :map_hint, type: String
+      
+      field :lat, type: Float
+      field :lon, type: Float
+    end
     
     geocoded_by :geo_address
     

data/app/models/concerns/seoable.rb

@@ -1,18 +1,26 @@
 module Seoable
   extend ActiveSupport::Concern
-  include Mongoid::Paperclip
+  if RocketCMS.mongoid?
+    include ::Mongoid::Paperclip
+  end
   
   included do
-    field :name, type: String, localize: RocketCMS.configuration.localize
-    field :h1, type: String, localize: RocketCMS.configuration.localize
+    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
 
-    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
+      field :og_title, type: String, localize: RocketCMS.configuration.localize
+      has_mongoid_attached_file :og_image, styles: {thumb: "800x600>"}
+    end
 
-    field :og_title, type: String, localize: RocketCMS.configuration.localize
-    has_mongoid_attached_file :og_image, styles: {thumb: "800x600>"}
+    if RocketCMS.active_record?
+      has_attached_file :og_image, styles: {thumb: "800x600>"}
+    end
   end
 
   def page_title

data/app/models/concerns/sort_field.rb

@@ -5,8 +5,13 @@ module SortField
     def sort_field(prefix = '')
       prefix = "#{prefix}_" unless prefix == ''
 
-      field "#{prefix}sort".to_sym, type: Integer
-      scope "#{prefix}sorted".to_sym, -> { asc("#{prefix}sort".to_sym) }
+      if RocketCMS.mongoid?
+        field "#{prefix}sort".to_sym, type: Integer
+        scope "#{prefix}sorted".to_sym, -> { asc("#{prefix}sort".to_sym) }
+      end
+      if RocketCMS.active_record?
+        scope "#{prefix}sorted".to_sym, -> { order("#{prefix}sort".to_sym => :asc) }
+      end
     end
   end
 end

data/app/models/contact_message.rb

@@ -1,3 +1,8 @@
+if RocketCMS.active_record?
+  class ContactMessage < ActiveRecord::Base
+  end
+end
+
 class ContactMessage
   include RocketCMS::Models::ContactMessage
   RocketCMS.apply_patches self

data/app/models/menu.rb

@@ -1,3 +1,8 @@
+if RocketCMS.active_record?
+  class Menu < ActiveRecord::Base
+  end
+end
+
 class Menu
   include RocketCMS::Models::Menu
   RocketCMS.apply_patches self

data/app/models/news.rb

@@ -1,3 +1,8 @@
+if RocketCMS.active_record?
+  class News < ActiveRecord::Base
+  end
+end
+
 class News
   include RocketCMS::Models::News
   RocketCMS.apply_patches self

data/app/models/page.rb

@@ -1,3 +1,8 @@
+if RocketCMS.active_record?
+  class Page < ActiveRecord::Base
+  end
+end
+
 class Page
   include RocketCMS::Models::Page
   RocketCMS.apply_patches self

data/app/views/contacts/new.html.haml

@@ -1,10 +1,11 @@
 = render 'shared/obj', obj: @seo_page
 
 #rocket_cms_contact_form
-  = simple_form_for @contact_message do |f|
+  = simple_form_for @contact_message, url: contacts_path do |f|
     = f.input :name
     = f.input :email
     = f.input :phone
     = f.input :content
     = f.input :captcha
     = f.submit t('rs.send')
+

data/config/locales/en.rs.yml

@@ -10,6 +10,7 @@ en:
     no_contact_info: "Please enter your phone or email so we could contact you."
     map: 'Map'
     edit: Edit
+    send: Send
     m:
       enabled: 'added to menu "%{menu}"'
       disabled: 'deleted from menu "%{menu}"'

data/config/locales/ru.models.yml

@@ -36,7 +36,7 @@ ru:
     title: Title
     version: Version
     
-  mongoid:
+  mongoid: &mongoid
     models:
       user: Пользователь
       menu: Меню
@@ -70,6 +70,8 @@ ru:
         email: Ваш е-мейл
         phone: Ваш телефон
         content: Ваше сообщение
+  activerecord:
+    <<: *mongoid
 
   activemodel:
     errors:

data/config/locales/ru.rs.yml

@@ -10,6 +10,7 @@ ru:
     no_contact_info: "Пожалуйста введите ваш е-мейл или телефон чтобы мы могли связаться с вами."
     map: 'Карта'
     edit: Редактировать
+    send: Отправить
     m:
       enabled: 'добавлено в меню "%{menu}"'
       disabled: 'удалено из меню "%{menu}"'

data/lib/generators/rocket_cms/capify_generator.rb

@@ -0,0 +1,40 @@
+require 'rails/generators'
+
+module RocketCms
+  class CapifyGenerator < Rails::Generators::Base
+    argument :kind, type: :string
+    argument :port, type: :string
+    argument :domain, type: :string
+
+    source_root File.expand_path('../templates', __FILE__)
+
+    def app_name
+      Rails.application.class.name.split("::")[0]
+    end
+
+    def deploy_to
+      if kind == 'data'
+        '/data/#{fetch :application}/app'
+      else
+        '/home/#{fetch :user}/#{fetch :application}'
+      end
+    end
+    def tmp_path
+      if kind == 'data'
+        '/data/#{fetch :application}/tmp_dump'
+      else
+        '/home/#{fetch :user}/tmp_dump'
+      end
+    end
+
+    desc 'RocketCMS capistrano setup generator'
+    def install
+      copy_file "Capfile", "Capfile"
+      template "unicorn.erb", "config/unicorn/production.rb"
+      template "deploy.erb", "config/deploy.rb"
+      template "production.erb", "config/deploy/production.rb"
+      template "dl.erb", "lib/tasks/dl.thor"
+    end
+  end
+end
+

data/lib/generators/rocket_cms/migration_generator.rb

@@ -0,0 +1,19 @@
+require 'rails/generators'
+require 'rails/generators/active_record'
+
+module RocketCms
+  class MigrationGenerator < Rails::Generators::Base
+    include ActiveRecord::Generators::Migration
+    source_root File.expand_path('../templates', __FILE__)
+
+    desc 'RocketCMS migration generator'
+    def install
+      if RocketCMS.active_record?
+        %w(contact_messages news pages).each do |table_name|
+          migration_template "migration_#{table_name}.rb", "db/migrate/rocket_cms_create_#{table_name}.rb"
+        end
+      end
+    end
+  end
+end
+

data/lib/generators/rocket_cms/templates/Capfile

@@ -0,0 +1,17 @@
+# Load DSL and Setup Up Stages
+require 'capistrano/setup'
+
+# Includes default deployment tasks
+require 'capistrano/deploy'
+
+require 'rvm1/capistrano3'
+require 'capistrano/bundler'
+require 'capistrano/rails/assets'
+#require "whenever/capistrano"
+
+require 'capistrano/unicorn'
+
+require 'capistrano/rails/console'
+
+# Loads custom tasks from `lib/capistrano/tasks' if you have any defined.
+Dir.glob('lib/capistrano/tasks/*.cap').each { |r| import r }

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

@@ -13,9 +13,13 @@ RailsAdmin.config do |config|
   
   ## == Cancan ==
   config.authorize_with :cancan
-
+<% if RocketCMS.mongoid? %>
   ## == MongoidAudit
   config.audit_with :mongoid_audit, 'HistoryTracker'
+<% elsif RocketCMS.active_record? %>
+  config.audit_with :paper_trail, 'User', 'PaperTrail::Version'
+<% end %>
+
 
   config.actions do
     dashboard # mandatory

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

@@ -0,0 +1,47 @@
+set :user, "<%= app_name.downcase %>"
+set :application, '<%= app_name.downcase %>'
+set :scm, :git
+set :repo_url, 'git@github.com:rs-pro/<%= app_name.downcase %>.git'
+
+set :branch, ENV["REVISION"] || "master"
+
+set :deploy_to, "<%= deploy_to %>
+
+# require 'hipchat/capistrano'
+# set :hipchat_token, ""
+# set :hipchat_room_name, "#{app_name}"
+# set :hipchat_announce, false
+
+set :rvm_type, :user
+set :rvm_ruby_version, "2.1.2@#{fetch :application}"
+set :use_sudo, false
+
+set :keep_releases, 20
+
+set :linked_files, %w{config/mongoid.yml config/secrets.yml}
+set :linked_dirs, %w{log tmp vendor/bundle public/assets public/system public/uploads public/ckeditor_assets public/sitemap}
+
+namespace :db do
+  desc "Create the indexes defined on your mongoid models"
+  task :create_mongoid_indexes do
+    on roles(:app) do
+      execute :rake, "db:mongoid:create_indexes"
+    end
+  end
+end
+
+namespace :deploy do
+  task :restart do
+  end
+  desc "Update the crontab"
+  task :update_crontab do
+    on roles(:app) do
+      execute "cd #{release_path}; #{fetch(:tmp_dir)}/#{fetch :application}/rvm-auto.sh . bundle exec whenever --update-crontab #{fetch :user} --set \'environment=#{fetch :stage}&current_path=#{release_path}\'; true"
+    end
+  end
+end
+
+after 'deploy:publishing', 'deploy:restart'
+after 'deploy:restart', 'unicorn:duplicate' 
+#before "deploy:update_crontab", 'rvm1:hook'
+#after "deploy:restart", "deploy:update_crontab"

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

@@ -0,0 +1,30 @@
+require 'cloner'
+
+class Dl < Cloner::Base
+  no_commands do
+    def rails_path
+      File.expand_path("../../../config/environment", __FILE__)
+    end
+    def ssh_host
+      '<%= domain %>.ru'
+    end
+    def ssh_user
+      '<%= app_name.downcase %>'
+    end
+    def remote_dump_path
+      '<%= tmp_path %>'
+    end
+    def remote_app_path
+      '<%= deploy_to %>'
+    end
+  end
+
+  desc "download", "clone files and DB from production"
+  def download
+    load_env
+    clone_db
+    rsync_public("ckeditor_assets")
+    rsync_public("system")
+  end
+end
+

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

@@ -0,0 +1,15 @@
+class RocketCmsCreateContactMessages < ActiveRecord::Migration
+  def change
+    create_table :contact_messages do |t|
+      t.string :name
+      t.string :email
+      t.string :phone
+      t.text :content
+      t.timestamps
+    end
+
+    add_index :contact_messages, :created_at
+    add_index :contact_messages, :updated_at
+  end
+end
+

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

@@ -0,0 +1,21 @@
+class RocketCmsCreateNews < ActiveRecord::Migration
+  def change
+    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
+
+      t.string :slug, null: false
+      t.attachment :image
+      RocketCMS::Migration.seo_fields(t)
+
+      t.timestamps
+    end
+
+    add_index :news, :slug, unique: true
+    add_index :news, [:enabled, :time]
+  end
+end
+

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

@@ -0,0 +1,30 @@
+class RocketCmsCreatePages < ActiveRecord::Migration
+  def change
+    create_table :menus do |t|
+      t.string :name, null: false
+      t.string :slug, null: false
+      t.timestamps
+    end
+    add_index :menus, :slug, unique: true
+
+    create_table :pages do |t|
+      t.boolean :enabled, default: false
+      t.string :slug, null: false
+      t.attachment :image
+
+      t.string :regexp
+      t.string :redirect
+      t.string :content
+      t.string :fullpath, null: false
+      RocketCMS::Migration.seo_fields(t)
+      t.timestamps
+    end
+    add_index :pages, :slug, unique: true
+
+    create_join_table :menus, :pages
+
+    add_foreign_key(:menus_pages, :menus, dependent: :delete)
+    add_foreign_key(:menus_pages, :pages, dependent: :delete)
+  end
+end
+

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

@@ -0,0 +1,8 @@
+set :stage, :production
+
+server '<%= domain %>', user: '<%= app_name.downcase %>', roles: %w{web app db}
+
+set :rails_env, 'production'
+set :unicorn_env, 'production'
+set :unicorn_rack_env, 'production'
+