rocket_cms 0.31.1 → 0.35.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 568b2a729dd587b05c734100dfd82922e5370e537bf1d9f511b0cdbe4c528372
-  data.tar.gz: 2277dc52019bea9bc3a627797e788837f3a02f5ee792f79d995e675a4e84fc08
+  metadata.gz: 8a90552d8b2be28d032feff8ff02ee3b6f3d77caa692ae015cf9395b711a4876
+  data.tar.gz: 901754951a02fcce2aa66905101a51f6a34d97a77844bf6f07f9a7a959f23de8
 SHA512:
-  metadata.gz: ce8c7515a9d24614449afc52b6cac104240da4a7da39de0cc12ae9553f2b434bf4e1f182e926fd1a6cc61f111e11ee0a27f661855e0ed62e84b6bd6ed5b7af8c
-  data.tar.gz: 9408ee092f3b11b552b99feaf42b4ddb26179c628dfd56c82e1c0298da26e40405500eb7c341aae676e68b5a503bda7fff6ef011e413a46d0db43db74a7bd9f5
+  metadata.gz: 5dab7f7ab31b57f0b371f8d8e6c60df3186b6f4738d68c0e55d2b64325cca99b763172d66d5183006a9e714353fb8c6e3e68f35ff283138a052b0e0cb2439cb7
+  data.tar.gz: 2546fff6283204b2af1d29effe641c9f787159ede53f1638dabb427378693bb0a2cfabb49a7b541a60bc38e9ba06900018a66cb5bfe9a0327ae8fd6da3f3feb8

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    rocket_cms (0.31.1)
+    rocket_cms (0.35.0)
       addressable
       coffee-rails
       jquery-rails
       kaminari
       manual_slug
-      rails (>= 5.1, < 6.1)
+      rails (>= 5.1, < 6.2)
       smart_excerpt
       stringex
       thor
@@ -16,64 +16,68 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.0.1)
-      actionpack (= 6.0.1)
+    actioncable (6.1.0)
+      actionpack (= 6.1.0)
+      activesupport (= 6.1.0)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.1)
-      actionpack (= 6.0.1)
-      activejob (= 6.0.1)
-      activerecord (= 6.0.1)
-      activestorage (= 6.0.1)
-      activesupport (= 6.0.1)
+    actionmailbox (6.1.0)
+      actionpack (= 6.1.0)
+      activejob (= 6.1.0)
+      activerecord (= 6.1.0)
+      activestorage (= 6.1.0)
+      activesupport (= 6.1.0)
       mail (>= 2.7.1)
-    actionmailer (6.0.1)
-      actionpack (= 6.0.1)
-      actionview (= 6.0.1)
-      activejob (= 6.0.1)
+    actionmailer (6.1.0)
+      actionpack (= 6.1.0)
+      actionview (= 6.1.0)
+      activejob (= 6.1.0)
+      activesupport (= 6.1.0)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.1)
-      actionview (= 6.0.1)
-      activesupport (= 6.0.1)
-      rack (~> 2.0)
+    actionpack (6.1.0)
+      actionview (= 6.1.0)
+      activesupport (= 6.1.0)
+      rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.1)
-      actionpack (= 6.0.1)
-      activerecord (= 6.0.1)
-      activestorage (= 6.0.1)
-      activesupport (= 6.0.1)
+    actiontext (6.1.0)
+      actionpack (= 6.1.0)
+      activerecord (= 6.1.0)
+      activestorage (= 6.1.0)
+      activesupport (= 6.1.0)
       nokogiri (>= 1.8.5)
-    actionview (6.0.1)
-      activesupport (= 6.0.1)
+    actionview (6.1.0)
+      activesupport (= 6.1.0)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.1)
-      activesupport (= 6.0.1)
+    activejob (6.1.0)
+      activesupport (= 6.1.0)
       globalid (>= 0.3.6)
-    activemodel (6.0.1)
-      activesupport (= 6.0.1)
-    activerecord (6.0.1)
-      activemodel (= 6.0.1)
-      activesupport (= 6.0.1)
-    activestorage (6.0.1)
-      actionpack (= 6.0.1)
-      activejob (= 6.0.1)
-      activerecord (= 6.0.1)
+    activemodel (6.1.0)
+      activesupport (= 6.1.0)
+    activerecord (6.1.0)
+      activemodel (= 6.1.0)
+      activesupport (= 6.1.0)
+    activestorage (6.1.0)
+      actionpack (= 6.1.0)
+      activejob (= 6.1.0)
+      activerecord (= 6.1.0)
+      activesupport (= 6.1.0)
       marcel (~> 0.3.1)
-    activesupport (6.0.1)
+      mimemagic (~> 0.3.2)
+    activesupport (6.1.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    builder (3.2.3)
+    builder (3.2.4)
     coffee-rails (5.0.0)
       coffee-script (>= 2.2.0)
       railties (>= 5.2.0)
@@ -81,32 +85,32 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.1.5)
-    crass (1.0.5)
-    erubi (1.9.0)
+    concurrent-ruby (1.1.7)
+    crass (1.0.6)
+    erubi (1.10.0)
     execjs (2.7.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     htmlentities (4.3.4)
-    i18n (1.7.0)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
-    jquery-rails (4.3.5)
+    jquery-rails (4.4.0)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    kaminari (1.1.1)
+    kaminari (1.2.1)
       activesupport (>= 4.1.0)
-      kaminari-actionview (= 1.1.1)
-      kaminari-activerecord (= 1.1.1)
-      kaminari-core (= 1.1.1)
-    kaminari-actionview (1.1.1)
+      kaminari-actionview (= 1.2.1)
+      kaminari-activerecord (= 1.2.1)
+      kaminari-core (= 1.2.1)
+    kaminari-actionview (1.2.1)
       actionview
-      kaminari-core (= 1.1.1)
-    kaminari-activerecord (1.1.1)
+      kaminari-core (= 1.2.1)
+    kaminari-activerecord (1.2.1)
       activerecord
-      kaminari-core (= 1.1.1)
-    kaminari-core (1.1.1)
-    loofah (2.4.0)
+      kaminari-core (= 1.2.1)
+    kaminari-core (1.2.1)
+    loofah (2.8.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -115,66 +119,65 @@ GEM
       activesupport
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
-    method_source (0.9.2)
-    mimemagic (0.3.3)
+    method_source (1.0.0)
+    mimemagic (0.3.5)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    minitest (5.13.0)
-    nio4r (2.5.2)
-    nokogiri (1.10.5)
+    minitest (5.14.2)
+    nio4r (2.5.4)
+    nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
-    public_suffix (4.0.1)
-    rack (2.0.7)
+    public_suffix (4.0.6)
+    rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (6.0.1)
-      actioncable (= 6.0.1)
-      actionmailbox (= 6.0.1)
-      actionmailer (= 6.0.1)
-      actionpack (= 6.0.1)
-      actiontext (= 6.0.1)
-      actionview (= 6.0.1)
-      activejob (= 6.0.1)
-      activemodel (= 6.0.1)
-      activerecord (= 6.0.1)
-      activestorage (= 6.0.1)
-      activesupport (= 6.0.1)
-      bundler (>= 1.3.0)
-      railties (= 6.0.1)
+    rails (6.1.0)
+      actioncable (= 6.1.0)
+      actionmailbox (= 6.1.0)
+      actionmailer (= 6.1.0)
+      actionpack (= 6.1.0)
+      actiontext (= 6.1.0)
+      actionview (= 6.1.0)
+      activejob (= 6.1.0)
+      activemodel (= 6.1.0)
+      activerecord (= 6.1.0)
+      activestorage (= 6.1.0)
+      activesupport (= 6.1.0)
+      bundler (>= 1.15.0)
+      railties (= 6.1.0)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    railties (6.0.1)
-      actionpack (= 6.0.1)
-      activesupport (= 6.0.1)
+    railties (6.1.0)
+      actionpack (= 6.1.0)
+      activesupport (= 6.1.0)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.20.3, < 2.0)
-    rake (13.0.1)
+      thor (~> 1.0)
+    rake (13.0.3)
     smart_excerpt (0.1.6)
       activesupport
       htmlentities
-    sprockets (4.0.0)
+    sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.1)
+    sprockets-rails (3.2.2)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     stringex (2.8.5)
-    thor (0.20.3)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
+    thor (1.0.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
     validates_email_format_of (1.6.3)
       i18n
-    websocket-driver (0.7.1)
+    websocket-driver (0.7.3)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.4)
-    zeitwerk (2.2.1)
+    websocket-extensions (0.1.5)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
@@ -185,4 +188,4 @@ DEPENDENCIES
   rocket_cms!
 
 BUNDLED WITH
-   1.17.3
+   2.1.4

data/app/views/shared/_og.slim

@@ -4,5 +4,5 @@
   meta property='og:image' content="http://#{request.host_with_port}#{image}"
 - if defined?(desc) && !desc.blank?
   meta property='og:description' content=desc
-- if defined?(url) && !url.blank?
-  meta property='og:url' content=url
+- if defined?(og_url) && !og_url.blank?
+  meta property='og:url' content=og_url

data/lib/generators/rocket_cms/templates/webpack.config.js

@@ -55,7 +55,7 @@ var config = {
               {
                 loader: ExtractCssChunks.loader,
                 options: {
-                  hot: production ? false : true,
+                  hmr: production ? false : true,
                   // Force reload all
                   //reloadAll: true,
                 }

data/lib/generators/rocket_cms/templates/webpack/flash/index.es6

@@ -1,12 +1,16 @@
 import './index.sass';
 
-$(document).on("click", 'a.close_flash', function() {
-  $(this).parent().fadeOut(function() {
-    let $box = $(this).parents('.flash');
-    $(this).remove();
-    if ($box.children().length == 0) {
-      $box.remove();
-    }
+//document.addEventListener('DOMContentLoaded', function () {
+document.addEventListener("turbolinks:load", function() {
+  var close = document.querySelectorAll("a.close_flash");
+  close.forEach(function(n) {
+    n.addEventListener("click", function() {
+      var msg = this.parentNode.parentNode;
+      var box = msg.parentNode;
+      this.parentNode.parentNode.remove();
+      if (box.childNodes.length == 0) {
+        box.remove()
+      }
+    })
   })
 });
-

data/lib/rocket_cms/version.rb

@@ -1,3 +1,3 @@
 module RocketCMS
-  VERSION = '0.31.1'
+  VERSION = '0.35.0'
 end

data/rocket_cms.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
 
-  spec.add_dependency 'rails', '>= 5.1', '< 6.1'
+  spec.add_dependency 'rails', '>= 5.1', '< 6.2'
   spec.add_dependency 'jquery-rails'
   spec.add_dependency 'coffee-rails'
   #spec.add_dependency 'turbolinks'

data/template.rb

@@ -3,8 +3,11 @@ version = rails_spec.version.to_s
 
 mongoid = options[:skip_active_record]
 yarn = !options[:skip_yarn]
-is_dev = options[:template].index("http").nil?
+is_dev = !options[:template].start_with?("http")
 spring = !options[:skip_spring]
+if is_dev
+  rocket_cms_path = File.realpath(options[:template] + "/..")
+end
 
 if Gem::Version.new(version) < Gem::Version.new('6.0.0')
   puts "You are using an old version of Rails (#{version})"
@@ -24,15 +27,14 @@ git_source(:github) do |repo_name|
   "https://github.com/#{repo_name}.git"
 end
 '}
-gem 'rails', '6.0.1'
+gem 'rails', '~> 6.1.0'
 gem 'rails-i18n'
-#{if mongoid then "gem 'mongoid', '~> 6.1.0'" else "gem 'pg', '>= 0.18', '< 2.0'" end}
+#{if mongoid then "gem 'mongoid', '~> 7.2.0'" else "gem 'pg', '>= 0.18', '< 2.0'" end}
 gem 'turbolinks' #required for redirects even if using via webpack
 
-
 #{
-"#{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', path: '#{rocket_cms_path}'" else "gem 'rocket_cms_activerecord', path: '#{rocket_cms_path}'" end}
+gem 'rocket_cms', path: '#{rocket_cms_path}'" if is_dev}
 #{"#{if mongoid then "gem 'rocket_cms_mongoid'" else "gem 'rocket_cms_activerecord'" end}" if !is_dev}
 
 gem 'glebtv-ckeditor'
@@ -87,16 +89,21 @@ group :development do
   gem 'capistrano-rails', require: false
 end
 
-group :test do
+group :development, :test do
+  gem "factory_bot_rails"
   gem 'rspec-rails'
-  gem 'email_spec'
 #{if mongoid then "  gem 'mongoid-rspec'" else "" end}
-  gem 'ffaker'
-  gem 'factory_bot_rails'
-
   gem 'capybara'
-  gem 'capybara-webkit'
+  # https://github.com/mattheworiordan/capybara-screenshot/issues/243
+  gem 'capybara-screenshot'
+  gem 'selenium-webdriver'
+  gem 'webdrivers'
   gem 'database_cleaner'
+#{if mongoid then "  gem 'database_cleaner-mongoid'" else "" end}
+  #gem 'database_cleaner-redis'
+  gem 'ffaker'
+  gem 'timecop'
+  gem "pry-rails"
   gem 'childprocess'
 end
 
@@ -157,14 +164,14 @@ ORM: #{if mongoid then 'Mongoid' else 'ActiveRecord' end}
 
 To run (windows):
 ```
-npm start
+yarn start
 bundle exec rails s webrick
 ```
 
 
 To run (nix/mac):
 ```
-npm start
+yarn start
 puma
 ```
 
@@ -353,20 +360,40 @@ end
 
 create_file 'extra/shrine/plugins/custom_pretty_location.rb' do <<-TEXT
 require 'shrine/plugins/pretty_location'
+
 class Shrine
   module Plugins
     module CustomPrettyLocation
-      include Shrine::Plugins::PrettyLocation
+      def self.configure(uploader, **opts)
+        uploader.opts[:custom_pretty_location] ||= { identifier: :id }
+        uploader.opts[:custom_pretty_location].merge!(opts)
+      end
 
       module InstanceMethods
-        include Shrine::Plugins::PrettyLocation::InstanceMethods
+        def generate_location(io, **options)
+          custom_pretty_location(io, **options)
+        end
+
+        def custom_pretty_location(io, name: nil, record: nil, version: nil, derivative: nil, identifier: nil, metadata: {}, **)
+          if record
+            namespace    = record_namespace(record)
+            identifier ||= record_identifier(record)
+          end
+
+          basename = basic_location(io, metadata: metadata)
+          basename = [*(version || derivative), basename].join("-")
+
+          [*namespace, *identifier, *name, basename].join("/")
+        end
+
+        private
 
         def record_identifier(record)
           id = record.public_send(opts[:custom_pretty_location][:identifier])
           case id
           when Integer
             str_id = "%09d".freeze % id
-            str_id.scan(/\d{3}/).join("/".freeze)
+            str_id.scan(/\\d{3}/).join("/".freeze)
           when String
             id.scan(/.{3}/).first(3).join("/".freeze)
           else
@@ -374,8 +401,27 @@ class Shrine
             nil
           end
         end
-      end
 
+        def transform_class_name(class_name)
+          if opts[:custom_pretty_location][:class_underscore]
+            class_name.gsub(/([A-Z]+)([A-Z][a-z])/, '\\1_\\2').gsub(/([a-z])([A-Z])/, '\\1_\\2').downcase
+          else
+            class_name.downcase
+          end
+        end
+
+        def record_namespace(record)
+          class_name = record.class.name or return
+          parts      = transform_class_name(class_name).split("::")
+
+          if separator = opts[:custom_pretty_location][:namespace]
+            parts.join(separator)
+          else
+            parts.last
+          end
+        end
+
+      end
     end
     register_plugin(:custom_pretty_location, CustomPrettyLocation)
   end
@@ -770,18 +816,57 @@ 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
+  if ENV['CI']
+    Selenium::WebDriver::Chrome.path = '/usr/bin/google-chrome-stable'
+  else
+    begin
+      Selenium::WebDriver::Chrome.path = '/usr/bin/chromium'
+    rescue Selenium::WebDriver::Error::WebDriverError
+    end
+  end
+  
+  Capybara.register_driver :chrome_root do |app|
+      service = ::Selenium::WebDriver::Service.chrome#(args: { verbose: true, log_path: 'chromedriver.log' })
+      options = ::Selenium::WebDriver::Chrome::Options.new
+      options.args << '--headless' unless ENV['NO_HEADLESS']
+      options.args << '--no-sandbox'
+      options.args << '--window-size=1280,1024'
+  
+      Capybara::Selenium::Driver.new(app, browser: :chrome, options: options, service: service)
+  end
+  # не работает, установлено выше
+  # Capybara::Screenshot.webkit_options = { width: 1280, height: 1024 }
+  
+  if ENV['CHROME_VISIBLE']
+    Capybara.javascript_driver = :selenium_chrome
+  else
+    Capybara.javascript_driver = :chrome_root
+  end
+  Capybara.default_driver = :rack_test
+  Capybara.default_max_wait_time = 15
+  Capybara.register_server :puma do |app, port, host|
+    require 'rack/handler/puma'
+    Rack::Handler::Puma.run(app, Host: host, Port: port, Threads: "1:1")
+  end
+  
+  Capybara.configure do |config|
+    config.app_host = "http://\#{Rails.application.secrets.host}"
+    config.server = :puma
+    config.server_port = 9332
+    config.run_server = true
+    config.always_include_port = true
+  end
+  
+  
+  Capybara::Screenshot.register_driver(:selenium_chrome) do |driver, path|
+    driver.browser.save_screenshot(path)
+  end
+  Capybara::Screenshot.register_driver(:chrome_root) do |driver, path|
+    driver.browser.save_screenshot(path)
+  end
+  
+  Capybara::Screenshot.autosave_on_failure = true
+  
 TEXT
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocket_cms
 version: !ruby/object:Gem::Version
-  version: 0.31.1
+  version: 0.35.0
 platform: ruby
 authors:
 - glebtv
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-11-29 00:00:00.000000000 Z
+date: 2020-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -47,7 +47,7 @@ dependencies:
         version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -57,7 +57,7 @@ dependencies:
         version: '5.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -349,7 +349,7 @@ homepage: https://gitlab.com/rocket-science/rocket_cms
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -364,8 +364,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Please DO NOT use this gem directly, use rocket_cms_mongoid or rocket_cms_activerecord
   instead!