rocket_cms 0.31.1 → 0.32.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 568b2a729dd587b05c734100dfd82922e5370e537bf1d9f511b0cdbe4c528372
-  data.tar.gz: 2277dc52019bea9bc3a627797e788837f3a02f5ee792f79d995e675a4e84fc08
+  metadata.gz: 3ff6c7fbba9482eb4f2d3b0f05517e2a6b5551539b0742b106b9c6e0588efe41
+  data.tar.gz: eef37bde3073a67272ef552a88e5dc567238d6d595053631a94b346ef2d23bed
 SHA512:
-  metadata.gz: ce8c7515a9d24614449afc52b6cac104240da4a7da39de0cc12ae9553f2b434bf4e1f182e926fd1a6cc61f111e11ee0a27f661855e0ed62e84b6bd6ed5b7af8c
-  data.tar.gz: 9408ee092f3b11b552b99feaf42b4ddb26179c628dfd56c82e1c0298da26e40405500eb7c341aae676e68b5a503bda7fff6ef011e413a46d0db43db74a7bd9f5
+  metadata.gz: f5e45afe8c0ce81d01dec373a158aefe6d4de30d8ec5a1ea1aedad893269ee7e0da004968a7b8765021412db0f34a6af2fa9aa14f2f1e3b37f142f7363f7f153
+  data.tar.gz: 8eac157f3014730b9b4cef183cc9d81def6663dc110ebec26583c36a712f02699451e2bc0fb8dab0be73cd111d289ec1e4482708ba385b797e95293f31c51c69

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rocket_cms (0.31.1)
+    rocket_cms (0.32.0)
       addressable
       coffee-rails
       jquery-rails
@@ -16,56 +16,56 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.0.1)
-      actionpack (= 6.0.1)
+    actioncable (6.0.2.1)
+      actionpack (= 6.0.2.1)
       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.2.1)
+      actionpack (= 6.0.2.1)
+      activejob (= 6.0.2.1)
+      activerecord (= 6.0.2.1)
+      activestorage (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
       mail (>= 2.7.1)
-    actionmailer (6.0.1)
-      actionpack (= 6.0.1)
-      actionview (= 6.0.1)
-      activejob (= 6.0.1)
+    actionmailer (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      actionview (= 6.0.2.1)
+      activejob (= 6.0.2.1)
       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.2.1)
+      actionview (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
+      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.2.1)
+      actionpack (= 6.0.2.1)
+      activerecord (= 6.0.2.1)
+      activestorage (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
       nokogiri (>= 1.8.5)
-    actionview (6.0.1)
-      activesupport (= 6.0.1)
+    actionview (6.0.2.1)
+      activesupport (= 6.0.2.1)
       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.2.1)
+      activesupport (= 6.0.2.1)
       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.2.1)
+      activesupport (= 6.0.2.1)
+    activerecord (6.0.2.1)
+      activemodel (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
+    activestorage (6.0.2.1)
+      actionpack (= 6.0.2.1)
+      activejob (= 6.0.2.1)
+      activerecord (= 6.0.2.1)
       marcel (~> 0.3.1)
-    activesupport (6.0.1)
+    activesupport (6.0.2.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -73,7 +73,7 @@ GEM
       zeitwerk (~> 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,31 +81,31 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.1.5)
-    crass (1.0.5)
+    concurrent-ruby (1.1.6)
+    crass (1.0.6)
     erubi (1.9.0)
     execjs (2.7.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     htmlentities (4.3.4)
-    i18n (1.7.0)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
     jquery-rails (4.3.5)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    kaminari (1.1.1)
+    kaminari (1.2.0)
       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.0)
+      kaminari-activerecord (= 1.2.0)
+      kaminari-core (= 1.2.0)
+    kaminari-actionview (1.2.0)
       actionview
-      kaminari-core (= 1.1.1)
-    kaminari-activerecord (1.1.1)
+      kaminari-core (= 1.2.0)
+    kaminari-activerecord (1.2.0)
       activerecord
-      kaminari-core (= 1.1.1)
-    kaminari-core (1.1.1)
+      kaminari-core (= 1.2.0)
+    kaminari-core (1.2.0)
     loofah (2.4.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -116,40 +116,40 @@ GEM
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
     method_source (0.9.2)
-    mimemagic (0.3.3)
+    mimemagic (0.3.4)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    minitest (5.13.0)
+    minitest (5.14.0)
     nio4r (2.5.2)
-    nokogiri (1.10.5)
+    nokogiri (1.10.8)
       mini_portile2 (~> 2.4.0)
-    public_suffix (4.0.1)
-    rack (2.0.7)
+    public_suffix (4.0.3)
+    rack (2.2.2)
     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.2.1)
+      actioncable (= 6.0.2.1)
+      actionmailbox (= 6.0.2.1)
+      actionmailer (= 6.0.2.1)
+      actionpack (= 6.0.2.1)
+      actiontext (= 6.0.2.1)
+      actionview (= 6.0.2.1)
+      activejob (= 6.0.2.1)
+      activemodel (= 6.0.2.1)
+      activerecord (= 6.0.2.1)
+      activestorage (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
       bundler (>= 1.3.0)
-      railties (= 6.0.1)
+      railties (= 6.0.2.1)
       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.2.1)
+      actionpack (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
@@ -165,16 +165,16 @@ GEM
       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.6)
       thread_safe (~> 0.1)
     validates_email_format_of (1.6.3)
       i18n
     websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.4)
-    zeitwerk (2.2.1)
+    zeitwerk (2.2.2)
 
 PLATFORMS
   ruby
@@ -185,4 +185,4 @@ DEPENDENCIES
   rocket_cms!
 
 BUNDLED WITH
-   1.17.3
+   2.1.4

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.32.0'
 end

data/template.rb

@@ -353,13 +353,33 @@ 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])
@@ -374,8 +394,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocket_cms
 version: !ruby/object:Gem::Version
-  version: 0.31.1
+  version: 0.32.0
 platform: ruby
 authors:
 - glebtv
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-29 00:00:00.000000000 Z
+date: 2020-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -364,7 +364,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Please DO NOT use this gem directly, use rocket_cms_mongoid or rocket_cms_activerecord