rocket_cms 0.27.5 → 0.27.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e9dd9cc09cefc19411ab3acd4f132b604a0df4b0cdba7b75f24f6a067565fbc
-  data.tar.gz: 86c67eb7e480f165f10cd79ce8b357053d47f9d419e4171e8658fa1ff266753f
+  metadata.gz: 470a0087d23b26487e0a69ecba017ab7fb2437942fec52f0568edb73dc663a62
+  data.tar.gz: 9d9b7265c2af23cf67625f3e0f5012a9101aa1ef8adbe69245115c9a0ea35e33
 SHA512:
-  metadata.gz: f78102a32539492bbcb0cc50b95e274adaf37cd8678f5a2483d3e8213659b155dec8e177259fd4650563489dc0fc79e910cb7f059949c051f7c4ba8ffb072217
-  data.tar.gz: 38b0c4ac253499dd99ca3532d47616c176458765661cf2606c11b8e828fd398470534980eb7206b918f0d974cce6fe97c26e76fa0db2535530f872163c645ccd
+  metadata.gz: e2fdf1c1f3de6f310ec29c966002733285486cf0c047cc114ad531efa2ae84bc603465987ac8c359a26c9298795c6faa7ca12c68a8476e2c0fc851f76969f588
+  data.tar.gz: c43502b1b593d57eee504601d47342d9c5846744344aadec22694f985a86cc91eb89263907fc500248ab51d6f6bcc980fc6a95e77c1e8bcb74552f50c18a0158

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rocket_cms (0.27.5)
+    rocket_cms (0.27.6)
       addressable
       coffee-rails
       jquery-rails
@@ -108,11 +108,11 @@ GEM
     mini_portile2 (2.3.0)
     minitest (5.11.3)
     nio4r (2.3.1)
-    nokogiri (1.8.2)
+    nokogiri (1.8.4)
       mini_portile2 (~> 2.3.0)
     public_suffix (3.0.2)
     rack (2.0.5)
-    rack-test (1.0.0)
+    rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rails (5.2.0)
       actioncable (= 5.2.0)
@@ -142,7 +142,7 @@ GEM
     smart_excerpt (0.1.5)
       activesupport
       htmlentities
-    sprockets (3.7.1)
+    sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.1)
@@ -169,4 +169,4 @@ DEPENDENCIES
   rocket_cms!
 
 BUNDLED WITH
-   1.16.1
+   1.16.3

data/README.md

@@ -70,11 +70,11 @@ If not, uninstall rails and install again
 
 Then, for mongoid:
 
-    rails new my_app -T -O -m https://raw.githubusercontent.com/rs-pro/rocket_cms/master/template.rb --skip-spring
+    rails new my_app -T -O -m https://gitlab.com/rocket-science/rocket_cms/raw/master/template.rb --skip-spring
 
 for ActiveRecord:
 
-    rails new my_app -T --database=postgresql -m https://raw.githubusercontent.com/rs-pro/rocket_cms/master/template.rb --skip-spring
+    rails new my_app -T --database=postgresql -m https://gitlab.com/rocket-science/rocket_cms/raw/master/template.rb --skip-spring
 
 generator creates a new RVM gemset, so after cd'ing to app dir, you should run `bundle install` again if you use rvm.
 

data/config/locales/ru.rails_admin.yml

@@ -72,7 +72,7 @@ ru:
         title: "Новый %{model_label}"
         menu: "Создание"
         breadcrumb: "новый"
-        link: "Добавить новый %{model_label}"
+        link: "Добавить %{model_label}"
         done: "создано"
       edit:
         title: "Редактировение %{model_label} '%{object_label}'"

data/lib/rocket_cms/version.rb

@@ -1,3 +1,3 @@
 module RocketCMS
-  VERSION = '0.27.5'
+  VERSION = '0.27.6'
 end

data/template.rb

@@ -82,11 +82,15 @@ end
 
 group :test do
   gem 'rspec-rails'
-  gem 'database_cleaner'
   gem 'email_spec'
 #{if mongoid then "  gem 'mongoid-rspec'" else "" end}
   gem 'ffaker'
   gem 'factory_bot_rails'
+
+  gem 'capybara'
+  gem 'capybara-webkit'
+  gem 'database_cleaner'
+  gem 'childprocess'
 end
 
 TEXT
@@ -112,6 +116,7 @@ create_file '.gitignore' do <<-TEXT
 #{if mongoid then '/config/mongoid.yml' else '/config/database.yml' end}
 /config/secrets.yml
 yarn-error.log
+spec/examples.txt
 TEXT
 end
 
@@ -121,6 +126,10 @@ remove_file 'app/controllers/application_controller.rb'
 create_file 'app/controllers/application_controller.rb' do <<-TEXT
 class ApplicationController < ActionController::Base
   include RocketCMS::Controller
+
+  def page_title #default page title
+    "#{app_name}"
+  end
 end
 TEXT
 end
@@ -189,6 +198,15 @@ development:
   username: #{app_name.downcase}
   password: #{app_name.downcase}
   template: template0
+test:
+  adapter: postgresql
+  encoding: unicode
+  database: #{app_name.downcase}_test
+  pool: 5
+  host: 'localhost'
+  username: #{app_name.downcase}
+  password: #{app_name.downcase}
+  template: template0
 TEXT
 end
 say "Please create a PostgreSQL user #{app_name.downcase} with password #{app_name.downcase} and a database #{app_name.downcase}_development owned by him for development NOW.", :red
@@ -312,7 +330,7 @@ end
 TEXT
 end
 
-create_file 'app/assets/stylesheets/rails_admin/custom/theming.css.sass' do <<-TEXT
+create_file 'app/assets/stylesheets/rails_admin/custom/theming.sass' do <<-TEXT
 TEXT
 end
 
@@ -441,6 +459,7 @@ module #{app_name.camelize}
     config.webpack.dev_server.host = proc { request.host }
     config.webpack.dev_server.port = #{port+1}
     config.webpack.manifest_type = "manifest"
+    config.webpack.dev_server.enabled = Rails.env.development?
   end
 end
 
@@ -471,6 +490,8 @@ development:
   secret_key_base: #{key}
 production:
   secret_key_base: #{key}
+test:
+  secret_key_base: #{key}
 TEXT
 end
 remove_file 'config/credentials.yml.enc'
@@ -478,10 +499,234 @@ remove_file 'config/master.key'
 
 create_file 'Procfile' do <<-TEXT
 web: bundle exec puma
-webpack: npm start
+webpack: yarn start
+TEXT
+end
+
+unless mongoid
+  create_file 'Dockerfile' do <<-TEXT
+# docker build -t #{app_name.downcase} /root/#{app_name.downcase}/
+FROM ruby:2.5.1-stretch
+
+RUN apt-get update -qq >/dev/null
+
+RUN apt-get install -y -qq postgresql postgresql-contrib libpq-dev cmake libpq5 >/dev/null
+RUN apt-get install -y -qq locales apt-utils apt-transport-https  >/dev/null
+RUN apt-get install -y -qq qt5-default libqt5webkit5-dev gstreamer1.0-plugins-base gstreamer1.0-tools gstreamer1.0-x >/dev/null
+RUN apt-get install -y -qq xvfb > /dev/null
+
+
+RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
+RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
+RUN apt-get update -qq >/dev/null
+RUN apt-get install -y -qq yarn >/dev/null
+
+RUN echo "en_US UTF-8" > /etc/locale.gen
+RUN locale-gen en_US.UTF-8
+ENV LANG=en_US.UTF-8
+ENV LANGUAGE=en_US:en
+ENV LC_ALL=en_US.UTF-8
+
+RUN wget -qO- https://raw.githubusercontent.com/creationix/nvm/v0.31.1/install.sh | bash
+RUN /bin/bash -c "source /root/.bashrc && nvm install node && nvm use node"
+
+ENV TZ=Europe/Moscow
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+TEXT
+end
+
+create_file '.gitlab-ci.yml' do <<-TEXT
+image: #{app_name.downcase}:latest
+
+services:
+  - postgres:latest
+
+variables:
+  POSTGRES_DB: #{app_name.downcase}_test
+  POSTGRES_USER: #{app_name.downcase}
+  POSTGRES_PASSWORD: "#{app_name.downcase}"
+
+cache:
+  untracked: true
+  key: "$CI_PROJECT_ID"
+  paths:
+    - node_modules/
+    - .bundled/
+    - .yarn
+    - tmp/cache
+
+rspec:
+  before_script:
+    - source /root/.bashrc
+    - nvm use node
+    - cp -f config/database.yml.ci config/database.yml
+    - cp -f config/secrets.yml.sample config/secrets.yml
+    - cat config/database.yml
+    - cat config/secrets.yml
+    - ruby -v
+    - which ruby
+    - export RAILS_ENV=test
+    - export CI=YES
+    - gem install bundler --no-ri --no-rdoc
+    - bundle install --jobs $(nproc) --path=/cache/bundler
+    - yarn --version
+    - yarn config set cache-folder .yarn
+    - yarn install
+    - bundle exec rake webpack:compile
+    - date
+    - RAILS_ENV=test bundle exec rake db:create db:schema:load
+  script:
+    - RAILS_ENV=test xvfb-run -a bundle exec rspec
+    - bundle exec pronto run -c=origin/master --exit-code
+
+dependency_scanning:
+  image: docker:stable
+  variables:
+    DOCKER_DRIVER: overlay2
+  allow_failure: true
+  services:
+    - docker:stable-dind
+  script:
+    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\\([0-9]*\\)\\.\\([0-9]*\\).*/\\1-\\2-stable/')
+    - docker run
+        --env DEP_SCAN_DISABLE_REMOTE_CHECKS="${DEP_SCAN_DISABLE_REMOTE_CHECKS:-false}"
+        --volume "$PWD:/code"
+        --volume /var/run/docker.sock:/var/run/docker.sock
+        "registry.gitlab.com/gitlab-org/security-products/dependency-scanning:$SP_VERSION" /code
+  artifacts:
+    paths: [gl-dependency-scanning-report.json]
 TEXT
 end
 
+create_file "config/database.yml.ci" do <<-TEXT
+test:
+  adapter: postgresql
+  encoding: unicode
+  database: #{app_name.downcase}_test
+  pool: 5
+  host: postgres
+  username: #{app_name.downcase}
+  password: #{app_name.downcase}
+  template: template0
+TEXT
+end
+
+create_file "config/secrets.yml.sample" do <<-TEXT
+test:
+  secret_key_base: #{key}
+TEXT
+end
+
+create_file "spec/features/home_page_spec.rb" do <<-TEXT
+require 'rails_helper'
+
+RSpec.feature 'main page', :js do
+  scenario "visit" do
+    visit root_path
+    expect(page.status_code).to eq(200).or eq(304)
+  end
+end
+TEXT
+end
+
+create_file "spec/support/capybara.rb" do <<-TEXT
+require 'capybara/rspec'
+require 'capybara/webkit'
+
+# https://github.com/teamcapybara/capybara/blob/master/lib/capybara.rb#L35
+Capybara.configure do |config|
+  config.default_driver = :webkit
+  config.javascript_driver = :webkit
+
+  # use the custom server
+  config.server = :puma
+  config.run_server = true
+end
+TEXT
+end
+
+create_file "spec/support/database_cleaner.rb" do <<-TEXT
+RSpec.configure do |config|
+  config.before(:suite) do
+    DatabaseCleaner.clean_with(:truncation)
+  end
+  config.before(:each) do
+    DatabaseCleaner.start
+  end
+  config.after(:each) do
+    DatabaseCleaner.clean
+  end
+end
+TEXT
+end
+
+remove_file "spec/rails_helper.rb"
+create_file "spec/rails_helper.rb" do <<-TEXT
+# This file is copied to spec/ when you run 'rails generate rspec:install'
+require 'spec_helper'
+ENV['RAILS_ENV'] ||= 'test'
+require File.expand_path('../../config/environment', __FILE__)
+# Prevent database truncation if the environment is production
+abort("The Rails environment is running in production mode!") if Rails.env.production?
+require 'rspec/rails'
+# Add additional requires below this line. Rails is not loaded until this point!
+
+# Requires supporting ruby files with custom matchers and macros, etc, in
+# spec/support/ and its subdirectories. Files matching `spec/**/*_spec.rb` are
+# run as spec files by default. This means that files in spec/support that end
+# in _spec.rb will both be required and run as specs, causing the specs to be
+# run twice. It is recommended that you do not name files matching this glob to
+# end with _spec.rb. You can configure this pattern with the --pattern
+# option on the command line or in ~/.rspec, .rspec or `.rspec-local`.
+#
+# The following line is provided for convenience purposes. It has the downside
+# of increasing the boot-up time by auto-requiring all files in the support
+# directory. Alternatively, in the individual `*_spec.rb` files, manually
+# require only the support files necessary.
+#
+Dir[Rails.root.join('spec/support/**/*.rb')].each { |f| require f }
+
+# Checks for pending migrations and applies them before tests are run.
+# If you are not using ActiveRecord, you can remove this line.
+ActiveRecord::Migration.maintain_test_schema!
+
+require 'capybara/rails'
+
+RSpec.configure do |config|
+  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
+  config.fixture_path = "#\{::Rails.root}/spec/fixtures"
+
+  # If you're not using ActiveRecord, or you'd prefer not to run each of your
+  # examples within a transaction, remove the following line or assign false
+  # instead of true.
+  config.use_transactional_fixtures = true
+
+  # RSpec Rails can automatically mix in different behaviours to your tests
+  # based on their file location, for example enabling you to call `get` and
+  # `post` in specs under `spec/controllers`.
+  #
+  # You can disable this behaviour by removing the line below, and instead
+  # explicitly tag your specs with their type, e.g.:
+  #
+  #     RSpec.describe UsersController, :type => :controller do
+  #       # ...
+  #     end
+  #
+  # The different available types are documented in the features, such as in
+  # https://relishapp.com/rspec/rspec-rails/docs
+  config.infer_spec_type_from_file_location!
+
+  # Filter lines from Rails gems in backtraces.
+  config.filter_rails_from_backtrace!
+  # arbitrary gems may also be filtered via:
+  # config.filter_gems_from_backtrace("gem name")
+end
+TEXT
+end
+
+
+end # end if unless mongoid
+
 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocket_cms
 version: !ruby/object:Gem::Version
-  version: 0.27.5
+  version: 0.27.6
 platform: ruby
 authors:
 - glebtv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-05 00:00:00.000000000 Z
+date: 2018-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler