rocket_cms 0.18.0 → 0.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1ab7d984edb267c64290200e1cfac357ac83755
-  data.tar.gz: 442812da272f60b2b8b43ef2684bf651ea1f82cf
+  metadata.gz: 996722169fbbf791a12b6483d6e2853916c06827
+  data.tar.gz: 55f62c4dbafac606514ce7202f631bc026682f26
 SHA512:
-  metadata.gz: 016c3c3ae20e6a98c069dc0f263938d054507d06f0ce0c7513f9c48d43ae288000efd54edabf4faace0b5b404852287c2afdbf47089368157a68851331ccd786
-  data.tar.gz: 372b8609dadce95ef5b42b7bf7db4db2210ace9626e2f78c7f6e443de96f9d3035476e634b446bf9d20672096e0e0b7ee61b2eca0498e4f27671ae84f9853bbd
+  metadata.gz: ed077d4fd1bab074b52ed1ebea4dbe50e89f680cc0cb086185b8ae743ce659cf770db5ba45d455319b3fe02a226c2ee3e5f53450ce95fdf3d93c7db6608c8be4
+  data.tar.gz: 288e7caf4dec5cf4694698c7759711fa56ea6aacbb3da1f6e74ab20460ad16d54c4347ae32f4739dae6efa032a2d020b8bd88c61b15d4a24527ca64420d830d3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rocket_cms (0.18.0)
+    rocket_cms (0.18.1)
       addressable
       coffee-rails
       jquery-rails

data/app/controllers/concerns/rs_cookies.rb

@@ -0,0 +1,12 @@
+module RsCookies
+  extend ActiveSupport::Concern
+  included do
+    def set_cookies_on!
+      cookies.permanent['cookies_on'] = {
+          value: "1",
+          httponly: false,
+      } if cookies['cookies_on'].nil? || cookies['cookies_on'] != "1"
+    end
+    before_action :set_cookies_on!
+  end
+end

data/lib/generators/rocket_cms/templates/Capfile

@@ -4,14 +4,22 @@ require 'capistrano/setup'
 # Includes default deployment tasks
 require 'capistrano/deploy'
 
-require 'rvm1/capistrano3'
 require 'capistrano/bundler'
 require 'capistrano/rails/assets'
+require 'capistrano/rails/migrations'
 #require "whenever/capistrano"
 
-require 'capistrano/unicorn'
+require 'capistrano/rtrack'
+require 'capistrano/npm'
 
-# require 'capistrano/rails/console'
+require 'capistrano/puma'
+
+install_plugin Capistrano::Puma
+install_plugin Capistrano::Puma::Workers
+install_plugin Capistrano::Puma::Jungle
+
+require "capistrano/scm/git"
+install_plugin Capistrano::SCM::Git
 
 # 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/deploy.erb

@@ -1,6 +1,5 @@
 set :user, "<%= app_name.downcase %>"
 set :application, '<%= app_name.downcase %>'
-set :scm, :git
 set :repo_url, 'git@rscz.ru:rocket-science/<%= app_name.downcase %>.git'
 
 set :branch, ENV["REVISION"] || "master"
@@ -12,36 +11,49 @@ set :deploy_to, "<%= deploy_to %>"
 # set :hipchat_room_name, "<%= app_name %>"
 # set :hipchat_announce, false
 
-set :rvm_type, :user
-set :rvm_ruby_version, "2.2.0@#{fetch :application}"
+#set :rvm_type, :user
+#set :rvm_ruby_version, "2.4.1@#{fetch :application}"
 set :use_sudo, false
 
 set :keep_releases, 20
 
+<% if RocketCMS.mongoid? %>
 set :linked_files, %w{config/mongoid.yml config/secrets.yml}
+<% else %>
+set :linked_files, %w{config/database.yml config/secrets.yml}
+<% end %>
 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
+Rake::Task["puma:check"].clear
+Rake::Task["puma:config"].clear
+namespace :puma do
+  task :check do
+  end
+  task :config do
   end
 end
 
 namespace :deploy do
-  task :restart do
+  desc "webpack"
+  task :webpack do
+    on roles(:app) do
+      within release_path do
+        with rails_env: fetch(:rails_env) do
+          execute :rake, "webpack:compile"
+        end
+      end
+    end
   end
-  desc "Update the crontab"
-  task :update_crontab do
+end
+
+after "deploy:updated", "deploy:webpack"
+
+namespace :db do
+  desc "Create the indexes defined on your mongoid models"
+  task :create_mongoid_indexes 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"
+      execute :rake, "db:mongoid:create_indexes"
     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/rocket_cms/controller.rb

@@ -4,6 +4,7 @@ module RocketCMS::Controller
     include RsErrors
     include RsPages
     include RsMenu
+    include RsCookies
     protect_from_forgery with: :exception
     helper_method :page_title
     helper_method :app_url

data/lib/rocket_cms/version.rb

@@ -1,3 +1,3 @@
 module RocketCMS
-  VERSION = "0.18.0"
+  VERSION = "0.18.1"
 end

data/template.rb

@@ -22,9 +22,12 @@ gem 'rails', '5.1.0.rc1'
 gem 'sass'
 
 #{if mongoid then "gem 'rocket_cms_mongoid'" else "gem 'rocket_cms_activerecord'" end}
+gem 'rails_admin', github: 'crowdtask/rails_admin'
 
+gem 'slim', github: 'slim-template/slim'
+gem 'haml', github: 'haml/haml'
 gem 'sass-rails'
-gem 'slim-rails'
+gem 'webpack-rails'
 
 gem 'devise'
 gem 'devise-i18n'
@@ -32,9 +35,16 @@ gem 'cancancan'
 
 gem 'cloner'
 gem 'puma'
+
 gem 'x-real-ip'
 gem 'sentry-raven'
 
+gem 'uglifier'
+
+# windows
+gem 'tzinfo-data'
+gem 'wdm', '>= 0.1.0' if Gem.win_platform?
+
 group :development do
   gem 'better_errors'
   gem 'binding_of_caller'
@@ -437,11 +447,237 @@ TEXT
 end
 
 remove_file 'app/assets/javascripts/application.js'
-create_file 'app/assets/javascripts/application.js.coffee' do <<-TEXT
-#= require rocket_cms
+create_file 'app/assets/javascripts/application.js' do <<-TEXT
+TEXT
+end
+
+remove_file 'app/assets/javascripts/application.css'
+create_file 'app/assets/javascripts/application.css' do <<-TEXT
+TEXT
+end
+
+create_file 'webpack/application.sass' do <<-TEXT
+html
+  font-family: Tahoma, Geneva, sans-serif
+  font-size: 14px
+  text-rendering: optimizeLegibility
+  -webkit-font-smoothing: antialiased
+  -moz-osx-font-smoothing: grayscale
+TEXT
+end
+
+create_file 'webpack/application.es6' do <<-TEXT
+html
+  font-family: Tahoma, Geneva, sans-serif
+  font-size: 14px
+  text-rendering: optimizeLegibility
+  -webkit-font-smoothing: antialiased
+  -moz-osx-font-smoothing: grayscale
 TEXT
 end
 
+create_file '.babelrc' do <<-TEXT
+{
+  "presets": ["es2015", "stage-0"],
+  "plugins": []
+}
+TEXT
+end
+
+create_file 'package.json' do <<-TEXT
+{
+  "name": "#{app_name.camelize}",
+  "version": "0.0.1",
+  "license": "UNLICENSED",
+  "private": true,
+  "repository": "git@rscz.ru:rocket-science/#{app_name}.git",
+  "dependencies": {
+    "autoprefixer": "^6.5.3",
+    "axios": "^0.16.1",
+    "babel-cli": "^6.18.0",
+    "babel-core": "^6.18.2",
+    "babel-loader": "^7.0.0",
+    "babel-plugin-lodash": "^3.2.9",
+    "babel-plugin-transform-runtime": "^6.15.0",
+    "babel-preset-es2015": "^6.18.0",
+    "babel-preset-stage-0": "^6.16.0",
+    "babel-runtime": "^6.20.0",
+    "bootstrap": "4.0.0-alpha.6",
+    "compression-webpack-plugin": "^0.4.0",
+    "css-loader": "^0.28.0",
+    "extract-text-webpack-plugin": "^2.0.0-rc.3",
+    "file-loader": "^0.11.1",
+    "font-awesome": "^4.7.0",
+    "handlebars": "^4.0.6",
+    "handlebars-loader": "^1.4.0",
+    "html-loader": "^0.4.4",
+    "jquery": "^3.1.1",
+    "jquery-ujs": "^1.2.2",
+    "js-cookie": "^2.1.3",
+    "node-sass": "^4.0.0",
+    "postcss-functions": "^2.1.0",
+    "postcss-loader": "^1.3.0",
+    "sass-loader": "^6.0.0",
+    "stats-webpack-plugin": "^0.6.0",
+    "style-loader": "^0.16.1",
+    "turbolinks": "^5.0.0",
+    "url-loader": "^0.5.7",
+    "webpack": "^2.2.1",
+    "webpack-dev-server": "^2.3.0",
+    "webpack-hot-middleware": "^2.7.1"
+  }
+}
+TEXT
+end
+
+create_file 'config/webpack.config.js' do <<-TEXT
+'use strict';
+
+var path = require('path');
+var webpack = require('webpack');
+var functions = require('postcss-functions');
+var StatsPlugin = require('stats-webpack-plugin');
+
+var ExtractTextPlugin = require("extract-text-webpack-plugin");
+
+var autoprefixer = require('autoprefixer');
+var CompressionPlugin = require("compression-webpack-plugin");
+
+var host = process.env.HOST || 'localhost'
+var devServerPort = 3808;
+
+var production = process.env.NODE_ENV === 'production';
+
+const extractSass = new ExtractTextPlugin({
+    filename: "[name].[contenthash].css",
+    disable: !production
+});
+
+console.log("dir:", __dirname)
+
+var sassExtractor = () => {
+  return extractSass.extract({
+    use: [{
+      loader: "style-loader"
+    }, {
+      loader: "css-loader",
+      options: {
+        sourceMap: true
+      }
+    }, {
+      loader: "sass-loader",
+      options: {
+        sourceMap: true
+      }
+    }],
+    fallback: "style-loader"
+  })
+}
+
+var config = {
+  entry: {
+    // Sources are expected to live in $app_root/webpack
+    vendor: [
+      'babel-polyfill',
+      'axios',
+      'jquery',
+      'lodash',
+    ],
+    application: 'application.es6'
+  },
+
+  module: {
+      rules: [
+          { test: /\.es6/, use: "babel-loader" },
+          { test: /\.handlebars$/, use: "handlebars-loader" },
+          { test: /\.(jpe?g|png|gif)$/i, use: "file-loader" },
+          {
+            test: /\.woff($|\?)|\.woff2($|\?)|\.ttf($|\?)|\.eot($|\?)|\.svg($|\?)/,
+            use: production ? 'file-loader' : 'url-loader'
+          },
+          { test: /\.sass$/, use: sassExtractor() },
+          { test: /\.scss$/, use: sassExtractor() },
+          { test: /\.css$/, use: sassExtractor() }
+      ]
+  },
+
+  output: {
+    // Build assets directly in to public/webpack/, let webpack know
+    // that all webpacked assets start with webpack/
+
+    // must match config.webpack.output_dir
+    path: path.join(__dirname, '..', 'public', 'webpack'),
+    publicPath: '/webpack/',
+
+    filename: production ? '[name]-[chunkhash].js' : '[name].js'
+  },
+
+  resolve: {
+    modules: [path.resolve(__dirname, "..", "webpack"), path.resolve(__dirname, "..", "node_modules")],
+    extensions: [".js", ".es6", ".css", ".sass", ".scss"],
+  },
+
+  plugins: [
+    extractSass,
+    new StatsPlugin('manifest.json', {
+      chunkModules: false,
+      source: false,
+      chunks: false,
+      modules: false,
+      assets: true
+    }),
+    new webpack.ProvidePlugin({
+      $: "jquery/dist/jquery",
+      jQuery: "jquery/dist/jquery",
+      "window.jQuery": "jquery/dist/jquery",
+      //Tether: "tether",
+      //"window.Tether": "tether",
+      "_": "lodash",
+      "window._": "lodash",
+      //Alert: "exports-loader?Alert!bootstrap/js/dist/alert",
+      //Button: "exports-loader?Button!bootstrap/js/dist/button",
+    })
+  ]
+};
+
+if (production) {
+  config.plugins.push(
+    new webpack.optimize.CommonsChunkPlugin({name: 'vendor', filename: 'vendor-[chunkhash].js'}),
+    new webpack.optimize.UglifyJsPlugin({
+      compressor: { warnings: false },
+      sourceMap: false
+    }),
+    new webpack.DefinePlugin({ // <--key to reduce React's size
+      'process.env': { NODE_ENV: JSON.stringify('production') }
+    }),
+    new CompressionPlugin({
+        asset: "[path].gz",
+        algorithm: "gzip",
+        test: /\.js$|\.css$/,
+        threshold: 4096,
+        minRatio: 0.8
+    })
+  );
+} else {
+  config.plugins.push(
+    new webpack.optimize.CommonsChunkPlugin({name: 'vendor', filename: 'vendor.js'}),
+    new webpack.NamedModulesPlugin()
+  )
+
+  config.devServer = {
+    port: devServerPort,
+    headers: { 'Access-Control-Allow-Origin': '*' },
+  };
+  config.output.publicPath = 'http://' + host + ':' + devServerPort + '/webpack/';
+  config.devtool = 'source-map';
+}
+
+module.exports = config;
+
+TEXT
+end
+
+
 if mongoid
   FileUtils.cp(Pathname.new(destination_root).join('config', 'mongoid.yml').to_s, Pathname.new(destination_root).join('config', 'mongoid.yml.example').to_s)
 else
@@ -456,6 +692,8 @@ unless mongoid
   rake "db:migrate"
 end
 
+run 'npm install'
+
 git :init
 git add: "."
 git commit: %Q{ -m 'Initial commit' }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rocket_cms
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.18.1
 platform: ruby
 authors:
 - glebtv
@@ -210,6 +210,7 @@ files:
 - app/assets/stylesheets/rocket_cms/flash.css.sass
 - app/assets/stylesheets/rocket_cms/normalize.css.scss
 - app/controllers/concerns/no_cache.rb
+- app/controllers/concerns/rs_cookies.rb
 - app/controllers/concerns/rs_errors.rb
 - app/controllers/concerns/rs_localizeable.rb
 - app/controllers/concerns/rs_menu.rb