rocket_cms 0.24.0 → 0.25.0

data/lib/rocket_cms/version.rb

@@ -1,3 +1,3 @@
 module RocketCMS
-  VERSION = "0.24.0"
+  VERSION = "0.25.0"
 end

data/template.rb

@@ -3,6 +3,7 @@ version = rails_spec.version.to_s
 
 mongoid = options[:skip_active_record]
 yarn = !options[:skip_yarn]
+is_dev = !options[:is_dev]
 spring = !options[:skip_spring]
 
 if Gem::Version.new(version) < Gem::Version.new('5.0.0')
@@ -17,21 +18,30 @@ git :init
 remove_file 'Gemfile'
 create_file 'Gemfile' do <<-TEXT
 source 'https://rubygems.org'
-
-gem 'rails', '5.1.4'
+#{'
+git_source(:github) do |repo_name|
+  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
+  "https://github.com/#{repo_name}.git"
+end
+'}
+gem 'rails', '5.2.0.rc2'
 #{if mongoid then "gem 'mongoid', '~> 6.1.0'" else "gem 'pg', '~> 0.21.0'" end}
 
 gem 'sass'
 
-#{if mongoid then "gem 'rocket_cms_mongoid'" else "gem 'rocket_cms_activerecord'" end}
-gem 'rails_admin', github: 'crowdtask/rails_admin'
+#{
+"#{if mongoid then "gem 'rocket_cms_mongoid', path: '/data/rocket_cms'" else "gem 'rocket_cms_activerecord', path: '/data/rocket_cms'" end}
+gem 'rocket_cms', path: '/data/rocket_cms'" if is_dev}
+#{"#{if mongoid then "gem 'rocket_cms_mongoid'" else "gem 'rocket_cms_activerecord'" end}" unless is_dev}
+
+gem 'rails_admin', github: 'rs-pro/rails_admin'
 #{"gem 'friendly_id', github: 'norman/friendly_id'" unless mongoid}
 
 gem 'slim'
 gem 'haml'
 
 gem 'sass-rails'
-gem 'webpack-rails'
+gem 'rs-webpack-rails', '~> 0.11.1'
 
 gem 'devise'
 gem 'devise-i18n'
@@ -46,17 +56,22 @@ gem 'sentry-raven'
 gem 'uglifier'
 
 gem 'rs_russian'
+#gem 'enumerize'
+#gem 'active_model_serializers'
 
 # windows
 gem 'tzinfo-data' if Gem.win_platform?
 gem 'wdm', '>= 0.1.0' if Gem.win_platform?
 
+gem 'bootsnap', require: false
+
 group :development do
-  gem 'binding_of_caller'
-  gem 'better_errors', github: 'charliesome/better_errors'
-  gem 'pry-rails'
+  #gem 'binding_of_caller'
+  #gem 'better_errors', github: 'charliesome/better_errors'
+  #gem 'pry-rails'
   gem 'listen'
-  #{"gem 'spring'" if spring}
+  gem 'annotate'
+#{"  gem 'spring'" if spring}
 
   gem 'capistrano', require: false
   gem 'capistrano-bundler', require: false
@@ -68,9 +83,9 @@ group :test do
   gem 'rspec-rails'
   gem 'database_cleaner'
   gem 'email_spec'
-  #{if mongoid then "gem 'mongoid-rspec'" else "" end}
+#{if mongoid then "  gem 'mongoid-rspec'" else "" end}
   gem 'ffaker'
-  gem 'factory_girl_rails'
+  gem 'factory_bot_rails'
 end
 
 TEXT
@@ -124,47 +139,20 @@ ORM: #{if mongoid then 'Mongoid' else 'ActiveRecord' end}
 
 To run (windows):
 ```
-.\node_modules\.bin\webpack-dev-server.cmd --config config\webpack.config.js --hot --inline
+npm start
 bundle exec rails s webrick
 ```
 
 
 To run (nix/mac):
 ```
-./node_modules/.bin/webpack-dev-server --config config/webpack.config.js --hot --inline
+npm start
 puma
 ```
 
-## ngrok
-В одном терминале запускаем ngrok на `webpack`
-```
-ngrok http -host-header=rewrite 0.0.0.0:3808
-```
-В ответе ищем строку, похожую на 
-```
-Forwarding                    http://7c68e072.ngrok.io -> 0.0.0.0:3808
-```
-Достаём из неё хост. В данном примере это ``7c68e072.ngrok.io``
-
-Запускаем webpack
-```
-HOST=0.0.0.0 ./node_modules/.bin/webpack-dev-server --config config/webpack.config.js --hot --inline
-```
-
-Запускаем пуму (меняем ``7c68e072.ngrok.io`` на тот хост, который дал `ngrok`)
-```
-WEBPACK_HOST=7c68e072.ngrok.io puma
-```
-
-И запускаем `ngrok` второй раз уже для `puma`
-```
-ngrok http #{port}
-```
-
-Сайт будет доступен по хосту из последнего запущенного `ngrok`
 "
 
-#create_file '.ruby-version', "2.4.0\n"
+#create_file '.ruby-version', "2.5.0\n"
 #create_file '.ruby-gemset', "#{app_name}\n"
 
 run 'bundle install --without production'
@@ -177,8 +165,6 @@ development:
       database: #{app_name.downcase}_development
       hosts:
           - localhost:27017
-  options:
-    belongs_to_required_by_default: false
 
 test:
   clients:
@@ -186,8 +172,6 @@ test:
       database: #{app_name.downcase}_test
       hosts:
           - localhost:27017
-  options:
-    belongs_to_required_by_default: false
 
 TEXT
 end
@@ -241,7 +225,7 @@ end
 generate "rocket_cms:admin"
 generate "rocket_cms:ability"
 generate "rocket_cms:layout"
-generate "rocket_cms:webpack"
+generate "rocket_cms:webpack", port+1
 
 unless mongoid
   rake "db:migrate"
@@ -327,66 +311,6 @@ TEXT
 end
 
 create_file 'app/assets/stylesheets/rails_admin/custom/theming.css.sass' do <<-TEXT
-.navbar-brand
-  margin-left: 0 !important
-
-.input-small
-  width: 150px
-
-.container-fluid
-  input[type=text]
-    width: 380px !important
-  input.ra-filtering-select-input[type=text]
-    width: 180px !important
-  input.hasDatepicker
-    width: 180px !important
-
-.sidebar-nav
-  a
-    padding: 6px 10px !important
-  .dropdown-header
-    padding: 10px 0px 3px 9px
-
-.label-important
-  background-color: #d9534f
-.alert-notice
-  color: #5bc0de
-
-.page-header
-  display: none
-.breadcrumb
-  margin-top: 20px
-
-.control-group
-  clear: both
-
-.container-fluid
-  padding-left: 0
-  > .row
-    margin: 0
-
-.last.links
-  a
-    display: inline-block
-    padding: 3px
-    font-size: 20px
-
-.remove_nested_fields
-  opacity: 1 !important
-
-.model-dialog
-  width: 800px !important
-
-.content > .alert
-  margin-top: 20px
-
-.badge-important
-  background: red
-.badge-success
-  background: green
-
-.sidebar-nav i
-  margin-right: 5px
 TEXT
 end
 
@@ -397,6 +321,19 @@ Disallow: /
 TEXT
 end
 
+remove_file 'app/helpers/application_helper.rb'
+create_file 'app/helpers/application_helper.rb' do <<-TEXT
+module ApplicationHelper
+  def body_class
+    r = []
+    #{'r.push "b-#{params[:controller].gsub("/", "_")}"'}
+    #{'r.push "b-#{params[:controller].gsub("/", "_")}-#{params[:action]}"'}
+    r.join(" ")
+  end
+end
+TEXT
+end
+
 
 
 remove_file 'config/puma.rb'
@@ -407,7 +344,6 @@ threads 1, 3
 current_dir = File.expand_path("../..", __FILE__)
 base_dir = File.expand_path("../../..", __FILE__)
 
-
 # rackup DefaultRackup
 
 # Default to production
@@ -464,6 +400,7 @@ require "action_controller/railtie"
 require "action_mailer/railtie"
 require "action_view/railtie"
 require "action_cable/engine"
+require "active_storage/engine"
 require "sprockets/railtie"
 # require "rails/test_unit/railtie"
 
@@ -482,20 +419,26 @@ module #{app_name.camelize}
       g.stylesheets false
       g.javascripts false
       g.helper false
-      g.fixture_replacement :factory_girl, :dir => 'spec/factories'
+      g.fixture_replacement :factory_bot, :dir => 'spec/factories'
     end
 
     config.i18n.locale = :ru
     config.i18n.default_locale = :ru
     config.i18n.available_locales = [:ru, :en]
+
     config.i18n.enforce_available_locales = true
-    #{'config.active_record.schema_format = :sql' unless mongoid}
+    # #{'config.active_record.schema_format = :sql' unless mongoid}
 
     #{'config.autoload_paths += %W(#{config.root}/extra)'}
     #{'config.eager_load_paths += %W(#{config.root}/extra)'}
 
     config.time_zone = 'Europe/Moscow'
-    config.assets.paths << Rails.root.join("app", "assets", "fonts")
+
+    config.webpack.dev_server.manifest_port = #{port+1}
+    #config.webpack.dev_server.manifest_host = "192.168.1.1"
+    config.webpack.dev_server.host = proc { request.host }
+    config.webpack.dev_server.port = #{port+1}
+    config.webpack.manifest_type = "manifest"
   end
 end
 
@@ -519,6 +462,18 @@ else
   FileUtils.cp(Pathname.new(destination_root).join('config', 'database.yml').to_s, Pathname.new(destination_root).join('config', 'database.yml.example').to_s)
 end
 
+remove_file 'config/secrets.yml'
+key = SecureRandom.hex(64)
+create_file 'config/secrets.yml' do <<-TEXT
+development:
+  secret_key_base: #{key}
+production:
+  secret_key_base: #{key}
+TEXT
+end
+remove_file 'config/credentials.yml.enc'
+remove_file 'config/master.key'
+
 FileUtils.cp(Pathname.new(destination_root).join('config', 'secrets.yml').to_s, Pathname.new(destination_root).join('config', 'secrets.yml.example').to_s)
 
 unless mongoid
@@ -534,6 +489,5 @@ else
   run 'npm install'
 end
 
-git :init
 git add: "."
 git commit: %Q{ -m 'Initial commit' }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocket_cms
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.25.0
 platform: ruby
 authors:
 - glebtv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-22 00:00:00.000000000 Z
+date: 2018-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -227,30 +227,31 @@ files:
 - app/models/news.rb
 - app/models/page.rb
 - app/models/seo.rb
+- app/views/blocks/_counters.html
 - app/views/blocks/_footer.slim
 - app/views/blocks/_header.slim
-- app/views/contact_mailer/new_message_email.html.haml
-- app/views/contacts/new.html.haml
-- app/views/contacts/sent.html.haml
-- app/views/errors/_base.html.haml
-- app/views/errors/error_403.html.haml
-- app/views/errors/error_404.html.haml
-- app/views/errors/error_500.html.haml
-- app/views/home/index.html.haml
-- app/views/layouts/application.html.slim
-- app/views/news/index.html.haml
-- app/views/news/show.html.haml
-- app/views/pages/show.html.haml
+- app/views/contact_mailer/new_message_email.html.slim
+- app/views/contacts/new.slim
+- app/views/contacts/sent.slim
+- app/views/errors/_base.slim
+- app/views/errors/error_403.slim
+- app/views/errors/error_404.slim
+- app/views/errors/error_500.slim
+- app/views/home/index.slim
+- app/views/layouts/application.slim
+- app/views/news/index.slim
+- app/views/news/show.slim
+- app/views/pages/show.slim
 - app/views/rails_admin/main/_check_boxes.html.haml
 - app/views/rails_admin/main/_enum_check_boxes.html.haml
 - app/views/rails_admin/main/_enum_radio_buttons.html.haml
 - app/views/rails_admin/main/_form_raw.html.haml
 - app/views/search/index.html.haml
-- app/views/shared/_admin_link.html.haml
-- app/views/shared/_messages.html.haml
-- app/views/shared/_meta.html.haml
-- app/views/shared/_obj.html.haml
-- app/views/shared/_og.html.haml
+- app/views/shared/_admin_link.slim
+- app/views/shared/_messages.slim
+- app/views/shared/_meta.slim
+- app/views/shared/_obj.slim
+- app/views/shared/_og.slim
 - config/locales/en.rocket_admin.yml
 - config/locales/en.rs.yml
 - config/locales/ru.cancan.yml
@@ -283,13 +284,27 @@ files:
 - lib/generators/rocket_cms/templates/production.erb
 - lib/generators/rocket_cms/templates/unicorn.erb
 - lib/generators/rocket_cms/templates/webpack.config.js
+- lib/generators/rocket_cms/templates/webpack/analytics.es6
 - lib/generators/rocket_cms/templates/webpack/application.es6
-- lib/generators/rocket_cms/templates/webpack/application.sass
-- lib/generators/rocket_cms/templates/webpack/errors/errors.handlebars
+- lib/generators/rocket_cms/templates/webpack/blocks/footer/index.sass
+- lib/generators/rocket_cms/templates/webpack/blocks/header/index.sass
+- lib/generators/rocket_cms/templates/webpack/blocks/index.es6
+- lib/generators/rocket_cms/templates/webpack/common/index.sass
+- lib/generators/rocket_cms/templates/webpack/common/mixins.sass
+- lib/generators/rocket_cms/templates/webpack/common/variables.sass
+- lib/generators/rocket_cms/templates/webpack/errors/errors.pug
 - lib/generators/rocket_cms/templates/webpack/errors/index.es6
 - lib/generators/rocket_cms/templates/webpack/errors/index.sass
 - lib/generators/rocket_cms/templates/webpack/flash/index.es6
 - lib/generators/rocket_cms/templates/webpack/flash/index.sass
+- lib/generators/rocket_cms/templates/webpack/fonts/index.sass
+- lib/generators/rocket_cms/templates/webpack/fonts/mixin.sass
+- lib/generators/rocket_cms/templates/webpack/layout/buttons.sass
+- lib/generators/rocket_cms/templates/webpack/layout/index.sass
+- lib/generators/rocket_cms/templates/webpack/layout/main.sass
+- lib/generators/rocket_cms/templates/webpack/layout/typography.sass
+- lib/generators/rocket_cms/templates/webpack/pages/home/index.es6
+- lib/generators/rocket_cms/templates/webpack/pages/index.es6
 - lib/generators/rocket_cms/utils.rb
 - lib/generators/rocket_cms/webpack_generator.rb
 - lib/rails_admin/custom_show_in_app.rb

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

@@ -1,4 +0,0 @@
-#rocket_cms_contact_sent
-  %h1 Обратная связь
-  %h2 Ваше сообщение отправлено
-  %div Если оно требует ответа, мы постараемся ответить в ближайшее время

data/app/views/errors/_base.html.haml

@@ -1,3 +0,0 @@
-#rocket_cms_error{class: "error-#{code}"}
-  %h1= t('rs.errors.title', code: code)
-  %p #{text}

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

@@ -1 +0,0 @@
-RocketCMS test app

data/app/views/layouts/application.html.slim

@@ -1,33 +0,0 @@
-doctype html
-html lang="ru"
-  head
-    meta charset="UTF-8"
-    meta name="viewport" content="width=device-width, maximum-scale=1"
-    title= page_title
-    = yield :meta
-    = csrf_meta_tags
-    = favicon_link_tag '/favicon.ico'
-    - if !ENV["WEBPACK_HOST"].blank? && Rails.env.development?
-      script src="http://#{ENV["WEBPACK_HOST"]}/webpack/vendor.js"
-      script src="http://#{ENV["WEBPACK_HOST"]}/webpack/application.js"
-    - else
-      = stylesheet_link_tag *webpack_asset_paths('vendor', extension: 'css')
-      = stylesheet_link_tag *webpack_asset_paths('application', extension: 'css')
-      = javascript_include_tag *webpack_asset_paths('vendor', extension: 'js')
-      = javascript_include_tag *webpack_asset_paths('application', extension: 'js')
-
-  body.no-js
-    = render 'blocks/header'
-    script.no-js-script
-      | document.body.classList.remove('no-js');
-    .no-js-error.alert.alert-error
-      | К сожалению, в вашем браузере отключен JavaScript
-      span Включите его, чтобы зайти на сайт
-      a class="btn-transparent" target="_blank" href="https://yandex.ru/support/common/browsers-settings/browsers-java-js-settings.xml" Включить JavaScript
-
-    .container
-      = render 'shared/messages'
-      = yield
-    #footer
-      = render 'blocks/footer'
-