rocket_cms 0.31.0 → 0.34.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6f4ecf3595ded8061376b41de02f02ea0bf0f57cd134894cfa6d53b24ed2da7
-  data.tar.gz: 20ef8b7ac32fa60fdeb1e9e4e87e63f8d85de1d891302d4b09a7381310998cc1
+  metadata.gz: 5ce2e38586fe75903f151d03ad0475bea175640c35966c3d7a887d57c41c2c9f
+  data.tar.gz: 03f000448077cd8fb6c88d1a6113d35e43c534f36349cbd2616fe9b94068bc8b
 SHA512:
-  metadata.gz: 708da4b98596577733e91e2e87ca255e8bc0a3b3bd5087e5e1238f4156eedd1318e90be53b51f78a3fbd01bb561fa2c29ab3943809882027556bed411eb86497
-  data.tar.gz: 705c53d6285f644329d506cd65fa24e65bebcfa932b105db772a8eb004e671d7b04cc5cbbd19f23db1c8bbcab4d84f420664986c09b2e563079d06e533cbc1ab
+  metadata.gz: 270f86f06205568c2b093a0b23e2e9e010cf70b9dc5bc88cbfefbc94ce93973e3af78429b9300fbbd49811db85f1f8c7382b99dc04230aa028a6cb99b5d1e2b5
+  data.tar.gz: afad9808cf56640e87c528e59cd2fc8091c091035d6ff252bd7904756d6bb39a042e4601e89a509b385fb6fb8ac8b7a9b6220cbe7387dd1af0144be09902d949

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rocket_cms (0.31.0)
+    rocket_cms (0.34.0)
       addressable
       coffee-rails
       jquery-rails
@@ -16,64 +16,64 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.0.1)
-      actionpack (= 6.0.1)
+    actioncable (6.0.3.4)
+      actionpack (= 6.0.3.4)
       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.0.3.4)
+      actionpack (= 6.0.3.4)
+      activejob (= 6.0.3.4)
+      activerecord (= 6.0.3.4)
+      activestorage (= 6.0.3.4)
+      activesupport (= 6.0.3.4)
       mail (>= 2.7.1)
-    actionmailer (6.0.1)
-      actionpack (= 6.0.1)
-      actionview (= 6.0.1)
-      activejob (= 6.0.1)
+    actionmailer (6.0.3.4)
+      actionpack (= 6.0.3.4)
+      actionview (= 6.0.3.4)
+      activejob (= 6.0.3.4)
       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.0.3.4)
+      actionview (= 6.0.3.4)
+      activesupport (= 6.0.3.4)
+      rack (~> 2.0, >= 2.0.8)
       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.0.3.4)
+      actionpack (= 6.0.3.4)
+      activerecord (= 6.0.3.4)
+      activestorage (= 6.0.3.4)
+      activesupport (= 6.0.3.4)
       nokogiri (>= 1.8.5)
-    actionview (6.0.1)
-      activesupport (= 6.0.1)
+    actionview (6.0.3.4)
+      activesupport (= 6.0.3.4)
       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.0.3.4)
+      activesupport (= 6.0.3.4)
       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.0.3.4)
+      activesupport (= 6.0.3.4)
+    activerecord (6.0.3.4)
+      activemodel (= 6.0.3.4)
+      activesupport (= 6.0.3.4)
+    activestorage (6.0.3.4)
+      actionpack (= 6.0.3.4)
+      activejob (= 6.0.3.4)
+      activerecord (= 6.0.3.4)
       marcel (~> 0.3.1)
-    activesupport (6.0.1)
+    activesupport (6.0.3.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
+      zeitwerk (~> 2.2, >= 2.2.2)
     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 +81,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.3.1)
+      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,41 +115,41 @@ 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)
+    rails (6.0.3.4)
+      actioncable (= 6.0.3.4)
+      actionmailbox (= 6.0.3.4)
+      actionmailer (= 6.0.3.4)
+      actionpack (= 6.0.3.4)
+      actiontext (= 6.0.3.4)
+      actionview (= 6.0.3.4)
+      activejob (= 6.0.3.4)
+      activemodel (= 6.0.3.4)
+      activerecord (= 6.0.3.4)
+      activestorage (= 6.0.3.4)
+      activesupport (= 6.0.3.4)
       bundler (>= 1.3.0)
-      railties (= 6.0.1)
+      railties (= 6.0.3.4)
       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.0.3.4)
+      actionpack (= 6.0.3.4)
+      activesupport (= 6.0.3.4)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
@@ -157,24 +157,24 @@ GEM
     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)
+    thor (1.0.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.8)
       thread_safe (~> 0.1)
     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 +185,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.rb

@@ -45,7 +45,7 @@ module RocketCMS
       defined?(::Shrine)
     end
     def paperclip?
-      !shrine? && defined(::Paperclip)
+      !shrine? && defined?(::Paperclip)
     end
 
     def url_helper

data/lib/rocket_cms/version.rb

@@ -1,3 +1,3 @@
 module RocketCMS
-  VERSION = '0.31.0'
+  VERSION = '0.34.0'
 end

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.0.3.4'
 gem 'rails-i18n'
 #{if mongoid then "gem 'mongoid', '~> 6.1.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.0
+  version: 0.34.0
 platform: ruby
 authors:
 - glebtv
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-11-23 00:00:00.000000000 Z
+date: 2020-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -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!