card-mod-assets 0.19.0 → 0.19.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88f6a1deb0eb3fa86f0f197286dafc07ea0f3b6ec177159db630ac4728b9281b
-  data.tar.gz: cca9f12a744519c24ea3bd10773b10608981a495ff34ac1f11f3106377847543
+  metadata.gz: fb9a794fbc07eb171f607b72243b0894a03bec91ea6cd80dc628b32657331085
+  data.tar.gz: 76bc4728b7542d1487ddd6e3c8b2bd60d5306dbc1858b59a987a71bd9b04d12e
 SHA512:
-  metadata.gz: fe292c404c64404e5d5caa3320f27400faa019491f225b7d1a7cbe2f45be997c35d277596e021b1ffc7e255aa6c4278f25885bc21d9925df69da9827960529af
-  data.tar.gz: 2d12201a8aef97015c00b9852b8268dee818dd2ffe0069d9bfd836692d96046eb799804c3e10dca571288c77a7afde40aab94d8f5c75912bb201e2ee60b09984
+  metadata.gz: 9f6922bce169460df9b03285723eea84f2ba4d3cc968be950454dd44995ce2ca1a5372eb4f205dbddb5eed7847eb351175acfd8c094ba5775d42cc45a6646fec
+  data.tar.gz: 8717798d6d89e81a606a2a3fadb76b7e9697861042d56ca94be512e4c0d3457558b1f98b5e966469aa2e926dcf048ec3ce47e064b34b729522f831bcfb40c572

data/data/real.yml

@@ -2,6 +2,7 @@
   :codename: asset_input
 - :name: "*asset output"
   :codename: asset_output
-- :name: Remote manifest group
-  :type: :cardtype
-  :codename: remote_manifest_group
+- :name: "group: local"
+  :codename: group_local
+- :name: "group: remote"
+  :codename: group_remote

data/lib/card/assets.rb

@@ -53,16 +53,8 @@ class Card
         asset_outputters.each(&:update_asset_output)
       end
 
-      def script_outputters
-        Card.search(left: { type: :mod }, right: :script).flatten
-      end
-
-      def style_outputters
-        [Card[:all, :style]]
-      end
-
       def asset_outputters
-        script_outputters + style_outputters
+        %i[script style].map { |asset| [:all, asset].card }
       end
 
       # MOD+:style and MOD+:script cards, which represent the assets in MOD/assets/style

data/set/abstract/mod_assets.rb

@@ -1,6 +1,8 @@
 include_set Abstract::List
 include_set Abstract::ReadOnly
 
+card_accessor :group_remote
+
 def item_cards _args={}
   local_group_cards
 end
@@ -28,19 +30,13 @@ def folder_group_card
 end
 
 def local_manifest_group_cards
-  manifest.map do |group_name, config|
-    next if remote_group?(group_name, config)
+  manifest.map do |group_name, _config|
+    next if remote_group? group_name
 
     new_local_manifest_group_card group_name
   end.compact
 end
 
-def remote_group_urls
-  return unless manifest_exists?
-
-  manifest_group_items "remote"
-end
-
 def content?
   assets_path
 end
@@ -70,8 +66,8 @@ def local_group_name
   "local"
 end
 
-def remote_group? name, _config
-  name == "remote" # || config["remote"]
+def remote_group? name
+  name == "remote"
 end
 
 def manifest_group_items group_name
@@ -135,6 +131,14 @@ def no_action?
   new? && !assets_path
 end
 
+def asset_input_needs_refresh?
+  !asset_input_updated_at || source_changed?(since: asset_input_updated_at)
+end
+
+def asset_input_updated_at
+  asset_input_card&.updated_at
+end
+
 private
 
 def new_local_manifest_group_card group_name
@@ -160,20 +164,17 @@ def raise_manifest_error msg
 end
 
 format :html do
-  def map_remote_items
-    remote_items = card.manifest_group_items "remote"
-    return unless remote_items
-
-    remote_items.map { |args| yield args.clone }
+  def map_remote_items &block
+    card.group_remote_card.map_items(&block)
   end
 
   view :core do
-    groups =
-      card.item_cards.map do |item|
-        [item.cardname.tag, item.input_item_cards.map(&:name)]
-      end
-    if card.remote_group_urls.present?
-      groups << ["group: remote", card.remote_group_urls.map { |remote| remote["src"] }]
+    groups = []
+    urls = card.group_remote_card.urls
+    groups << ["group: remote", urls] if urls.present?
+
+    card.item_cards.map do |item|
+      groups << [item.cardname.tag, item.input_item_cards.map(&:name)]
     end
 
     haml :group_list, groups: groups

data/set/{type/remote_manifest_group.rb → right/group_remote.rb}

@@ -1,8 +1,13 @@
 include_set Abstract::ReadOnly
 include_set Abstract::ManifestGroup
 
+# TODO: migrate away the cardtype and remove the following
 basket[:non_createable_types] << :remote_manifest_group
 
+def virtual?
+  new?
+end
+
 def local?
   @local = false
 end
@@ -11,29 +16,39 @@ def minimize?
   @minimize = false
 end
 
-def paths
-  return [] unless left
+def item_configs
+  return @item_configs if @item_configs
 
-  left.manifest_group_items group_name
+  @item_configs = left.manifest_group_items("remote") || []
 end
 
-def item_names _content=nil
-  paths
+def urls
+  item_configs.map { |path| path["src"] }
 end
 
 def content
-  paths.join "\n"
+  urls.join "\n"
+end
+
+def map_items
+  item_configs.map { |config| yield config.clone }
 end
 
 format :html do
+  delegate :urls, to: :card
+
+  view :core do
+    list_group urls
+  end
+
   view :javascript_include_tag, cache: :never do
-    paths.map do |path|
+    urls.map do |path|
       javascript_include_tag path
     end.join("\n")
   end
 
   view :stylesheet_include_tag do
-    paths.map do |path|
+    urls.map do |path|
       tag "link", href: path, media: "all", rel: "stylesheet", type: "text/css"
     end.join("\n")
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-assets
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.19.1
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.109.0
+        version: 1.109.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.109.0
+        version: 1.109.1
 - !ruby/object:Gem::Dependency
   name: execjs
   requirement: !ruby/object:Gem::Requirement
@@ -51,70 +51,70 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.19.1
 - !ruby/object:Gem::Dependency
   name: card-mod-format
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.19.1
 - !ruby/object:Gem::Dependency
   name: card-mod-list
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.19.1
 - !ruby/object:Gem::Dependency
   name: card-mod-carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.19.1
 - !ruby/object:Gem::Dependency
   name: card-mod-content
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.19.1
 description: ''
 email:
 - info@decko.org
@@ -124,7 +124,6 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
-- config/admin.yml
 - config/locales/de.yml
 - config/locales/en.yml
 - data/real.yml
@@ -142,8 +141,8 @@ files:
 - set/abstract/mod_assets/group_list.haml
 - set/right/asset_input.rb
 - set/right/asset_output.rb
+- set/right/group_remote.rb
 - set/type/mod.rb
-- set/type/remote_manifest_group.rb
 homepage: https://decko.org
 licenses:
 - GPL-3.0-or-later

data/config/admin.yml

@@ -1,3 +0,0 @@
-cardtypes:
-  assets:
-    - remote_manifest_group