voog-kit 0.5.8 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd2772b088e4393011c286f94147c3445c2cd65ca443c5a94bf72dc8a1caf8c7
-  data.tar.gz: 5f5b600bb5ab449e8bdd005d88108285729943bc11aaaac940823240a6518094
+  metadata.gz: 618acbfe55808ed71c5f71a5b8482b41c51bfc178a87689bd0d5736b5482594f
+  data.tar.gz: ee3d0879f105a0b8e3602979fb8566ebf48df97e43d329740c0a77d2beb8046a
 SHA512:
-  metadata.gz: ebe00fbbd5c838201b0e18b14ec89338e3f68b1625b1c1c3b2e0480969d48059b6bfe498f31afdc54bc8a537db9adb0f36c6f7faca6bb1871e6768422c57f7cf
-  data.tar.gz: 988d541f32772e63805d848bdd13f4e853db8324df7c0ea1cde591f9bc7686f54b713bd631be533300516d45bf04fcca49b4d25a60202ba61fbb4776cfdd5ba3
+  metadata.gz: dcb51f26bb93bef797da6da4c105a39426281bfe415fa7c629b7b48e76d99d4f6549bf580642bb41df65181d25a33b208a9d29f4829409da250b511a4805d014
+  data.tar.gz: 49c675bbb059d73c6e9d9f08a5b7ecd49b07f887f99d24dcb0850da014da21cdf0852a48d78a8e83bf54d50ee7163b6f1078b3a03423bcc6f51dcf4d0959053b

data/lib/voog/dtk/filemanager.rb

@@ -34,8 +34,10 @@ module Voog::Dtk
     end
 
     def write_manifest(manifest)
-      if manifest["layouts"].is_a?(Array)
-        manifest["layouts"].sort! { |a, b| a["file"] <=> b["file"]}
+      %w(assets layouts).each do |k|
+        if manifest[k].is_a?(Array)
+          manifest[k].sort! { |a, b| a['file'] <=> b['file'] || 0 }
+        end
       end
       File.open('manifest.json', 'w+', encoding: 'UTF-8') do |file|
         file << JSON.pretty_generate(manifest)
@@ -337,7 +339,7 @@ module Voog::Dtk
         'preview_medium' => "",
         'preview_small' => "",
         'author' => "",
-        'layouts' => sort_layouts_by_content_type(layouts + components),
+        'layouts' => (layouts + components),
         'assets' => assets
       }
       if @old_manifest
@@ -356,15 +358,6 @@ module Voog::Dtk
       generate_manifest get_layouts, get_layout_assets
     end
 
-    def sort_layouts_by_content_type(layouts)
-      # make sure that 'blog' is before 'blog_article' and 'elements' is before 'element'
-      preferred_order = %w(page blog blog_article elements element error_401 error_404 photoset component)
-
-      layouts.sort do |a, b|
-        preferred_order.index(a.fetch('content_type')) <=> preferred_order.index(b.fetch('content_type'))
-      end
-    end
-
     def generate_manifest(layouts = nil, layout_assets = nil)
       layouts ||= get_layouts
       layout_assets ||= get_layout_assets
@@ -403,8 +396,6 @@ module Voog::Dtk
         }
       end
 
-      manifest[:layouts] = sort_layouts_by_content_type(manifest[:layouts])
-
       manifest[:assets] = layout_assets.inject(Array.new) do |memo, a|
 
         # kind is same as asset_type for kinds that are represented in the asset_folders hash, defaults to 'asset'

data/lib/voog/dtk/version.rb

@@ -1,5 +1,5 @@
 module Voog
   module Dtk
-    VERSION = '0.5.8'
+    VERSION = '0.5.9'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: voog-kit
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.9
 platform: ruby
 authors:
 - Mikk Pristavka
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-24 00:00:00.000000000 Z
+date: 2021-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler