card-mod-assets 0.18.1 → 0.19.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f760d28cbd8816fe77585459f95b1da4b34d22e39dffce3dba02479f9e5ab8e0
-  data.tar.gz: '085c3c9529a70d230f4d285a35ca52c7b92a0c4dde349f193f65fe5eb14e3546'
+  metadata.gz: fb9a794fbc07eb171f607b72243b0894a03bec91ea6cd80dc628b32657331085
+  data.tar.gz: 76bc4728b7542d1487ddd6e3c8b2bd60d5306dbc1858b59a987a71bd9b04d12e
 SHA512:
-  metadata.gz: f5f61dda1fce10b16d11c3a703b836a2892ddbdc39743c692b8f7a9a51694f18a4524f83df9ac8cf6473cdd8652cbb1ccd7e524d92e1c44a10b4cac634adfbc4
-  data.tar.gz: efa0c998c16004dd5c7e50d37efb8f076f208d85fc62f807a02534a1d584e3716ec6c42b60c647af3e3187b63a6ecb9236b23ab332e997ba0ed846006808bd50
+  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/data/transform/202108028112352_death_to_machines.rb

@@ -63,6 +63,7 @@ class DeathToMachines < Cardio::Migration::Transform
   def drop_all_style_items
     Card[:all, :style].item_cards.each do |card|
       next unless card.left&.type_id == Card::ModID && card.right&.codename == :style
+
       Card[:all, :style].drop_item! card
     end
   end

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/asset_file.rb

@@ -47,7 +47,7 @@ format do
 
   def link_to_view view, text=nil, opts={}
     opts[:path] = { card: { type: card.type, content: card.db_content } }
-    super view, (text || view), opts
+    super(view, text || view, opts)
   end
 end
 

data/set/abstract/asset_group.rb

@@ -20,6 +20,7 @@ end
 
 def new_asset_file_card path, name=::File.basename(path)
   return unless (constants = new_asset_constants path)
+
   asset_card = Card.new(name: name, type_id: constants[:type_id], content: path)
   asset_card.include_set_module constants[:set_module]
   asset_card.minimize if @minimize

data/set/abstract/asset_inputter.rb

@@ -32,6 +32,7 @@ end
 
 def update_asset_input
   return unless Codename.exist? :asset_input
+
   # otherwise the migration that adds the asset_input card fails
 
   Card::Auth.as_bot do
@@ -42,6 +43,7 @@ end
 
 def asset_input_content
   return assemble_asset_input_content if virtual?
+
   update_asset_input if asset_input.blank?
   asset_input
 end

data/set/abstract/asset_outputter.rb

@@ -66,18 +66,11 @@ def make_asset_output_coded mod
   mod ||= :assets
   Card::Auth.as_bot do
     ENV["STORE_CODED_FILES"] = "true"
-    asset_output_card.update! storage_type: :coded, mod: mod,
-                              codename: asset_output_codename
+    asset_output_card.update! storage_type: :coded, mod: mod
     ENV["STORE_CODED_FILES"] = nil
   end
 end
 
-def asset_output_codename
-  asset_output_card.name.parts.map do |part|
-    Card[part].codename&.to_s || part.cardname.safe_key
-  end.join "_"
-end
-
 def input_item_cards
   item_cards(known_only: true).compact.reject(&:trash)
 end

data/set/abstract/folder_group.rb

@@ -10,7 +10,7 @@ end
 def relative_paths
   return [] unless (path = assets_path)
 
-  Dir.chdir(path) { Dir.glob(search_path).sort }
+  Dir.chdir(path) { Dir.glob(search_path) }
 end
 
 def search_path

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
@@ -21,23 +23,20 @@ end
 
 def folder_group_card
   return unless assets_path
+
   card = new_assets_group_card local_group_name, folder_group_type_id
   card.assets_path = assets_path
   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
@@ -67,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
@@ -86,8 +85,10 @@ end
 
 def load_manifest
   return unless manifest_exists?
+
   manifest = YAML.load_file manifest_path
   return {} unless manifest # blank manifest
+
   validate_manifest manifest
   manifest
 end
@@ -130,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
@@ -140,8 +149,7 @@ end
 
 def new_assets_group_card group_name, type_id
   item_name = "#{name}+group: #{group_name}"
-  card = Card.new group_card_args(group_name, type_id, item_name)
-  card
+  Card.new group_card_args(group_name, type_id, item_name)
 end
 
 def validate_manifest_item name, config
@@ -156,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

data/set/type/mod.rb

@@ -1,12 +1,13 @@
-
 def ensure_mod_asset_card asset_type
   asset_card = fetch_mod_assets_card asset_type
   return unless asset_card.assets_path
+
   asset_card.save! if asset_card.new?
   asset_card.name
 end
 
 private
+
 def fetch_mod_assets_card asset_type
   Card.fetch [name, asset_type], new: { type: :list }
 end

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-assets
 version: !ruby/object:Gem::Version
-  version: 0.18.1
+  version: 0.19.1
 platform: ruby
 authors:
 - Ethan McCutchen
 - Philipp Kühl
 - Gerry Gleason
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-22 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,14 +17,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.108.1
+        version: 1.109.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.108.1
+        version: 1.109.1
 - !ruby/object:Gem::Dependency
   name: execjs
   requirement: !ruby/object:Gem::Requirement
@@ -52,70 +51,70 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.1
 - !ruby/object:Gem::Dependency
   name: card-mod-format
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.1
 - !ruby/object:Gem::Dependency
   name: card-mod-list
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.1
 - !ruby/object:Gem::Dependency
   name: card-mod-carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.1
 - !ruby/object:Gem::Dependency
   name: card-mod-content
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: 0.19.1
 description: ''
 email:
 - info@decko.org
@@ -125,7 +124,6 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
-- config/admin.yml
 - config/locales/de.yml
 - config/locales/en.yml
 - data/real.yml
@@ -143,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
@@ -156,7 +154,6 @@ metadata:
   documentation_url: http://docs.decko.org/
   card-mod: assets
   card-mod-group: gem-defaults
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -164,15 +161,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.10
-signing_key:
+rubygems_version: 3.6.8
 specification_version: 4
 summary: decko asset pipeline
 test_files: []

data/config/admin.yml

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