card-mod-assets 0.13.4 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3856a73931c5fb6ba59e0b0bee0f5630794d275517b55c6c3dbea4fc2f35ba0
-  data.tar.gz: b4d2d032f676b21b464afa6eaa4adbd090c884eb13288effa59c2100545be2d7
+  metadata.gz: 7f9d0e127bf79045726a27dbaf66a286139002334fe4c033cd19623fc9cb8f03
+  data.tar.gz: 6a1f2cfe3e848187feafb484b072b5a0f2a14115159398356e50a6484db3873a
 SHA512:
-  metadata.gz: 185ba36e7fa5b1321da83eaf77be9d4835e377ae1fe1713910f5dd88a6202222d8aed8125a531bcdfd80cb9110c96b13f94d413a958e33ebb55208967c7d3f39
-  data.tar.gz: eefac30edfe41b3f3c1d04c4bc173eafad776e553a5314d8d0f915cd855f6334dd5dc8ade444ed012a8424ba4f15805f30363bdec6d22d5bc021a5ffb62b7c21
+  metadata.gz: 6f5f0481e3982d3683c952143f7f6a6e7250d0aa551792599e553ee319f22bdd03626b1f9153212651eeb3c4f332ec1e332689d43a0a2468f5d6504165ff4abb
+  data.tar.gz: 74796a14ede06d0b95ff3039733deb57a2d96a80ddcc1272160a4060c2b8bd490f2913b28a4cde33aa602bd11daea8ad2a3aceaf2ca4ba7024e2e36a82e05775

data/db/migrate_core_cards/202108028112352_death_to_machines.rb

@@ -0,0 +1,114 @@
+# -*- encoding : utf-8 -*-
+
+class DeathToMachines < Cardio::Migration::Core
+  DEPRECATED_CODE_NAMES = %i[
+    machine_input machine_output machine_cache
+    style_media
+    style_prosemirror script_prosemirror script_prosemirror_config
+    script_ace script_ace_config
+    script_datepicker_config style_datepicker
+    script_tinymce script_tinymce_config
+    script_load_select2 style_select2 script_select2
+    style_bootstrap_cards
+    font_awesome
+    material_icons
+    style_bootstrap_colorpicker
+    style_select2_bootstrap
+    style_libraries
+    script_html5shiv_printshiv
+    smartmenu_css smartmenu_js
+    mod_script_assets mod_style_assets
+    style_bootstrap_compatible
+    style_right_sidebar
+    style_bootstrap_mixins
+    style_bootstrap_breakpoints
+    script_bootstrap
+    script_datepicker
+    script_jquery_helper style_jquery_ui_smoothness
+    style_cards
+  ].freeze
+
+  DEPRECATED_CARD_NAMES = [
+    "simple skin",
+    "themeless bootstrap skin",
+    "style: traditional", "style: common", "style: glyphicons",
+    "classic bootstrap skin+*colors", "classic bootstrap skin+*variables",
+    "style: classic cards"
+  ].freeze
+
+  def up
+    delete_machine_cards :machine_output
+    delete_machine_cards :machine_input
+    delete_machine_cards :machine_cache
+    delete_group_card
+    delete_old_style_cards
+
+    ensure_code_card "*asset input"
+    ensure_code_card "*asset output"
+
+    drop_all_style_items
+    update_mod_asset_type_id
+
+    Card::Cache.reset_all
+
+    delete_deprecated_code_cards
+  end
+
+  private
+
+  def update_mod_asset_type_id
+    return unless Card::Codename.exists? "mod_script_assets"
+
+    Card.search type_id: ["in", Card::ModScriptAssetsID, Card::ModStyleAssetsID] do |card|
+      card.update! type_id: Card::ListID,
+                   skip: %i[validate_asset_inputs update_asset_output_file]
+    end
+  end
+
+  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
+
+  def delete_deprecated_code_cards
+    DEPRECATED_CODE_NAMES.each do |codename|
+      delete_code_card codename
+    end
+
+    %w[cerulean cosmo cyborg darkly flatly journal lumen
+       paper readable sandstone simplex
+       slate spacelab superhero united yeti bootstrap_default].each do |theme|
+      delete_code_card "theme_#{theme}"
+    end
+  end
+
+  def delete_machine_cards codename
+    Card.search right: codename do |card|
+      card.update_column :codename, ""
+      card.delete!
+    end
+  end
+
+  def delete_old_style_cards
+    DEPRECATED_CARD_NAMES.each do |doomed|
+      delete_card doomed
+    end
+  end
+
+  def delete_group_card
+    Card.search type_id: ["in",
+                          Card::LocalScriptManifestGroupID,
+                          Card::LocalStyleManifestGroupID,
+                          Card::LocalScriptFolderGroupID,
+                          Card::LocalStyleFolderGroupID] do |card|
+      Card.search left_id: card.id do |field|
+        field.update_column :codename, ""
+        field.delete
+      end
+      card.update_column :codename, ""
+      card.delete! skip: :asset_input_changed_on_delete
+    end
+  end
+end

data/lib/card/assets.rb

@@ -0,0 +1,95 @@
+class Card
+  # Provides methods to refresh script and style assets
+  module Assets
+    REFRESHED = "ASSETS_REFRESHED".freeze
+
+    class << self
+      # FIXME: if we need this (not sure we do? see below), these types should probably
+      # be in a basket so that monkeys can add them.
+      def inputter_types
+        [
+          JavaScriptID,
+          CoffeeScriptID,
+          CssID,
+          ScssID
+        ]
+      end
+
+      def refresh_assets force: false
+        return unless force || refresh_assets?
+
+        inputters = standard_inputters
+
+        # typically nonstandard inputters are standard cards, so their events
+        # should manage normal (non-forced) refreshing.
+        # (standard_inputters, by contrast, are in code, so this refreshing is
+        # needed eg in development mode to detect changes)
+        inputters += nonstandard_inputters if force
+        inputters.each(&:refresh_asset)
+
+        generate_asset_output_files if force
+      end
+
+      def make_output_coded
+        asset_outputters.each(&:make_asset_output_coded)
+      end
+
+      def active_theme_cards
+        style_rule = { left: { type_id: SetID }, right_id: StyleID }
+        Card.search(referred_to_by: style_rule).select do |theme|
+          theme.respond_to? :theme_name
+        end
+      end
+
+      private
+
+      def generate_asset_output_files
+        asset_outputters.each(&:update_asset_output)
+      end
+
+      def script_outputters
+        Card.search(left: { type: :mod }, right_id: ScriptID).flatten
+      end
+
+      def style_outputters
+        [Card[:all, :style]]
+      end
+
+      def asset_outputters
+        script_outputters + style_outputters
+      end
+
+      # MOD+:style and MOD+:script cards, which represent the assets in MOD/assets/style
+      # and MOD/assets/script directories respectively
+      def standard_inputters
+        @standard_inputter_ids ||=
+          Card.search left: { type: :mod }, right_id: [StyleID, ScriptID], return: :id
+        @standard_inputter_ids.map(&:card)
+      end
+
+      # standalone cards, NOT in mod assets directories
+      def nonstandard_inputters
+        Card.search type_id: inputter_types.unshift("in")
+      end
+
+      def refresh_assets?
+        case Cardio.config.asset_refresh
+        when :eager    then true
+        when :cautious then cautious_refresh?
+        when :never    then false
+        else
+          raise Card::Error,
+                "unknown option for asset refresh: #{Cardio.config.asset_refresh}"
+        end
+      end
+
+      # only refresh when cache was cleared
+      def cautious_refresh?
+        return false unless Cache.persistent_cache
+        return false if Card.cache.read REFRESHED
+
+        Card.cache.write REFRESHED, true
+      end
+    end
+  end
+end

data/locales/de.yml

@@ -0,0 +1,2 @@
+en:
+  assets_invalid_input: "%{input_name} ist keine gültige Asset-Eingabekarte"

data/locales/en.yml

@@ -0,0 +1,2 @@
+en:
+  assets_invalid_input: "%{input_name} is not a valid asset input card"

data/set/abstract/01_manifest_group.rb

@@ -1,10 +1,4 @@
-def group_name
-  codename.to_s.sub(/^.+__/, "")
-end
-
-def relative_paths
-  paths
-end
+attr_accessor :group_name
 
 format :html do
   view :core do

data/set/abstract/asset_file.rb

@@ -8,6 +8,12 @@ def source_paths
   end
 end
 
+def files_must_exist!
+  source_paths.select do |path|
+    raise Card::Error, "couldn't locate asset file: #{path}" if unknown_file? path
+  end
+end
+
 def source_files
   [db_content]
 end
@@ -33,18 +39,6 @@ def new?
   false
 end
 
-def compress?
-  @minimize
-end
-
-def minimize
-  @minimze = true
-end
-
-def local
-  @local = true
-end
-
 format do
   def link_view opts={}
     opts[:path] = { card: { type: card.type, content: card.db_content } }

data/set/abstract/asset_group.rb

@@ -0,0 +1,55 @@
+include_set Abstract::ReadOnly
+include_set Abstract::Sources
+include_set Abstract::Items
+
+def virtual?
+  new?
+end
+
+def render_items_and_compress format
+  item_cards.compact.map do |mcard|
+    mcard.format(format)._render_compressed
+  end.join "\n"
+end
+
+def item_cards _args={}
+  relative_paths.map do |path|
+    new_asset_file_card path
+  end.compact
+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
+  asset_card.local if @local
+  asset_card.base_path = base_path
+  asset_card.files_must_exist!
+  asset_card
+end
+
+def source_paths
+  paths
+end
+
+def local
+  @local = true
+end
+
+def source_changed? since:
+  existing_source_paths.any? { |path| ::File.mtime(path) > since }
+end
+
+def input_item_cards
+  item_cards # we create virtual cards for manifest groups, hence we have
+  # to override the default which rejects virtual cards.
+end
+
+def asset_input_needs_refresh?
+  !asset_input_updated_at || source_changed?(since: asset_input_updated_at)
+end
+
+def last_file_change
+  paths.map { |path| ::File.mtime(path) }.max
+end

data/set/abstract/asset_inputter.rb

@@ -0,0 +1,71 @@
+card_accessor :asset_input, type_id: Card::PlainTextID
+
+def dependent_asset_inputters
+  referers_responding_to :asset_input
+end
+
+def outputters
+  referers_responding_to :update_asset_output
+end
+
+def referers_responding_to method_name
+  referers.select { |referer| referer.respond_to? method_name }
+end
+
+event :asset_input_changed, :finalize, on: :save do
+  update_asset_input
+end
+
+event :asset_input_changed_on_delete, :finalize, on: :delete, before: :clear_references do
+  update_referers_after_input_changed
+end
+
+def update_referers_after_input_changed
+  # puts "dependent inputters for #{name}: #{dependent_asset_inputters}"
+  # puts "outputters: #{outputters}"
+
+  dependent_asset_inputters.each(&:update_asset_input)
+  outputters.each(&:update_asset_output)
+end
+
+def update_asset_input
+  return unless Codename.exists? :asset_input
+  # otherwise the migration that adds the asset_input card fails
+
+  Card::Auth.as_bot do
+    asset_input_card.update content: render_asset_input_content
+    update_referers_after_input_changed
+  end
+end
+
+def asset_input_content
+  return render_asset_input_content if virtual?
+  update_asset_input if asset_input.blank?
+  asset_input
+end
+
+def render_asset_input_content
+  format(input_format).render(input_view)
+end
+
+def input_view
+  :core
+end
+
+def asset_input_updated_at
+  asset_input_card&.updated_at
+end
+
+def refresh_asset
+  update_asset_input if asset_input_needs_refresh?
+end
+
+def asset_input_needs_refresh?
+  false
+end
+
+format :html do
+  def edit_success
+    { reload: true }
+  end
+end

data/set/abstract/asset_outputter.rb

@@ -0,0 +1,97 @@
+include_set Abstract::Lock
+
+card_accessor :asset_output, type: :file
+
+def output_filetype
+  output_format
+end
+
+event :update_asset_output_file, :finalize, on: :save do
+  update_asset_output
+end
+
+event :validate_asset_inputs, :validate, on: :save, skip: :allowed do
+  return unless (invalid_input = find_invalid_input)
+
+  errors.add :content, t(:assets_invalid_input, input_name: invalid_input.name)
+end
+
+def find_invalid_input
+  item_cards.find { |c| !c.respond_to?(:asset_input_content) }
+end
+
+def update_asset_output
+  # puts "update_asset_output called: #{name}"
+  lock do
+    store_output input_from_item_cards
+  end
+end
+
+def update_asset_output_live
+  update_asset_output
+  card_path asset_output_url
+end
+
+def input_from_item_cards joint="\n"
+  input_item_cards.map(&:asset_input_content).compact.join(joint)
+end
+
+def store_output output
+  handle_file(output) do |file|
+    Card::Auth.as_bot do
+      # FIXME: this is definitely not how we want to do this.
+      # problem is that file object is getting stashed in set_specific attributes,
+      # and then reassigned later. This causes problems in cases where a single
+      # card (eg *all+*style) is updated by multiple inputters, because the old file arg
+      # sticks around in the set specific stash and then reemerges after it's been
+      # unlinked. we need a more general solution
+      # (error reproducible eg when running card:mod:install on wikirate)
+      aoc = asset_output_card
+      aoc.update file: file
+      aoc.set_specific.delete :file
+    end
+  end
+end
+
+def handle_file output
+  file = Tempfile.new [id.to_s, ".#{output_filetype}"]
+  file.write output
+  file.close
+  yield file
+  file.unlink
+end
+
+view :asset_output_url do
+  asset_output_url
+end
+
+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
+    ENV["STORE_CODED_FILES"] = nil
+  end
+end
+
+def asset_output_codename
+  asset_output_card.name.parts.map do |part|
+    Card[part].codename&.to_s || Card[part].name.safe_key
+  end.join "_"
+end
+
+def input_item_cards
+  item_cards(known_only: true).compact.reject(&:trash)
+end
+
+def asset_output_url
+  # ensure_asset_output
+  asset_output_card.file&.url # (:default, timestamp: false)
+  # to get rid of additional number in url
+end
+
+def asset_output_path
+  # ensure_asset_output
+  asset_output_card.file&.path
+end

data/set/abstract/folder_group.rb

@@ -0,0 +1,26 @@
+attr_accessor :assets_path
+attr_accessor :group_name
+
+def paths
+  return [] unless (path = assets_path)
+
+  relative_paths.map { |child| ::File.join path, child }
+end
+
+def relative_paths
+  return [] unless (path = assets_path)
+
+  Dir.chdir(path) { Dir.glob(search_path).sort }
+end
+
+def search_path
+  File.join "**", "*.{#{valid_file_extensions.join(',')}}"
+end
+
+def base_path
+  assets_path
+end
+
+def minimize?
+  @minimize = true
+end

data/set/abstract/mod_assets.rb

@@ -1,76 +1,78 @@
 include_set Abstract::Pointer
+include_set Abstract::ReadOnly
 
-def mod_name
-  left&.codename.to_s.sub(/^mod_/, "")
+def item_cards _args={}
+  local_group_cards
 end
 
-def mod
-  @mod ||= Cardio::Mod.dirs.fetch_mod(mod_name)
+def item_names _args={}
+  local_group_cards.map(&:name)
 end
 
-def assets_path
-  return unless mod&.assets_path.present?
-
-  File.join mod&.assets_path, subpath
+# group cards that don't refer to remote sources
+def local_group_cards
+  @local_group_cards ||=
+    if manifest_exists?
+      local_manifest_group_cards
+    else
+      [folder_group_card].compact
+    end
 end
 
-def manifest_path
+def folder_group_card
   return unless assets_path
-
-  File.join(assets_path, "manifest.yml")
+  card = new_assets_group_card local_group_name, folder_group_type_id
+  card.assets_path = assets_path
+  card
 end
 
-def expected_item_keys
-  return [] unless assets_dir_exists?
+def local_manifest_group_cards
+  manifest.map do |group_name, config|
+    next if remote_group?(group_name, config)
+    new_local_manifest_group_card group_name
+  end.compact
+end
 
-  if manifest_exists?
-    manifest.keys.map { |group_key| "#{name}+#{group_key}".to_name.key }
-  else
-    ["#{name}+#{local_group_name}".to_name.key]
-  end
+def remote_group_urls
+  return unless manifest_exists?
+  manifest_group_items "remote"
 end
 
-def local_group_name
-  "local"
+def content?
+  assets_path
 end
 
-def update_items
-  # return unless groups_changed?
+def mod_name
+  left&.codename.to_s.sub(/^mod_/, "")
+end
 
-  delete_unused_items do
-    self.content = ""
-    return unless assets_dir_exists?
+def mod
+  @mod ||= Cardio::Mod.fetch mod_name
+end
 
-    ensure_update_items
-    save!
-  end
+def manifest_exists?
+  @manifest_exists = !manifest_path.nil? if @manifest_exists.nil?
+  @manifest_exists
 end
 
-def ensure_update_items
-  if manifest_exists?
-    ensure_manifest_groups_cards
-  else
-    ensure_item local_group_name, local_folder_group_type_id
-  end
+def assets_path
+  @assets_path ||= mod&.subpath "assets", subpath
 end
 
-def delete_unused_items
-  @old_items = ::Set.new item_keys
-  yield
-  remove_deprecated_items @old_items
+def manifest_path
+  @manifest_path ||= mod&.subpath "assets", subpath, "manifest.yml"
 end
 
-def assets_dir_exists?
-  path = assets_path
-  path && Dir.exist?(path)
+def local_group_name
+  "local"
 end
 
-def manifest_exists?
-  manifest_path && File.exist?(manifest_path)
+def remote_group? name, _config
+  name == "remote" # || config["remote"]
 end
 
 def manifest_group_items group_name
-  manifest.dig(group_name, "items") || []
+  manifest&.dig(group_name, "items") || []
 end
 
 def manifest_group_minimize? group_name
@@ -78,93 +80,76 @@ def manifest_group_minimize? group_name
 end
 
 def manifest
-  @manifest ||= YAML.load_file manifest_path
+  @manifest ||= load_manifest
 end
 
-def with_manifest_groups
-  manifest.each_pair do |key, config|
-    yield key, config
-  end
+def load_manifest
+  return unless manifest_exists?
+  manifest = YAML.load_file manifest_path
+  validate_manifest manifest
+  manifest
 end
 
-def ensure_manifest_groups_cards
-  with_manifest_groups { |group_name, config| new_manifest_group group_name, config }
+def validate_manifest manifest
+  if (remote_index = manifest.keys.find_index("remote")) && remote_index.positive?
+    raise_manifest_error "only the first group can be a remote group"
+  end
+  manifest.each do |name, config|
+    validate_manifest_item name, config
+  end
 end
 
-def new_manifest_group group_name, config
-  type_id =
-    config["remote"] ? ::Card::RemoteManifestGroupID : local_manifest_group_type_id
-  ensure_item group_name, type_id
+def group_card_args field, type_id, name
+  {
+    type_id: type_id,
+    codename: "#{mod_name}_group__#{field}",
+    name: name
+  }
 end
 
-def ensure_item field, type_id
-  item_name = "#{name}+#{field}"
-  ensure_item_content item_name
+def source_changed? since:
+  source_updates =
+    if manifest_exists?
+      [manifest_updated_at, local_manifest_group_cards.map(&:last_file_change)].flatten
+    else
+      folder_group_card&.paths&.map { |path| File.mtime(path) }
+    end
 
-  card = Card[item_name]
-  args = ensure_item_args field, type_id, item_name
-  return if item_already_coded? card, args
+  return unless source_updates.present?
 
-  ensure_item_save card, args
-  card.try :update_machine_output
+  source_updates.max > since
 end
 
-def item_already_coded? card, args
-  card&.type_id == args[:type_id] && card.codename == args[:codename]
+def manifest_updated_at
+  return unless manifest_exists?
+  File.mtime(manifest_path)
 end
 
-def ensure_item_content item_name
-  @old_items.delete item_name.to_name.key
-  add_item item_name
+def no_action?
+  new? && !assets_path
 end
 
-def ensure_item_save card, args
-  if card
-    card.update args
-  else
-    Card.create! args
-  end
-end
+private
 
-def ensure_item_args field, type_id, name
-  {
-    type_id: type_id,
-    codename: "#{mod_name}_group__#{field}",
-    name: name
-  }
+def new_local_manifest_group_card group_name
+  card = new_assets_group_card group_name, local_manifest_group_type_id
+  card.group_name = group_name
+  card
 end
 
-def refresh_output force: false
-  update_items
-  item_cards.each do |item_card|
-    item_card.try :refresh_output, force: force
-  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
 end
 
-def make_machine_output_coded verbose=false
-  item_cards.each do |item_card|
-    puts "coding machine output for #{item_card.name}" if verbose
-    item_card.try(:make_machine_output_coded, mod_name)
-  end
-end
+def validate_manifest_item name, config
+  raise_manifest_error "no items section in group \"#{name}\"" unless config["items"]
+  return if config["items"].is_a? Array
 
-def no_action?
-  new? && !assets_dir_exists?
+  raise_manifest_error "items section \"#{name}\" must contain a list"
 end
 
-private
-
-# def groups_changed?
-#   expected_items = expected_item_keys
-#   actual_items = item_keys
-#   difference = (expected_items + actual_items) - (expected_items & actual_items)
-#   difference.present?
-# end
-
-def remove_deprecated_items items
-  items.each do |deprecated_item|
-    next unless (item_card = Card.fetch(deprecated_item))
-    item_card.update codename: nil
-    item_card.delete
-  end
+def raise_manifest_error msg
+  raise Card::Error, "invalid manifest format in #{manifest_path}: #{msg}"
 end

data/set/right/asset_input.rb

@@ -0,0 +1,17 @@
+include_set Abstract::VirtualCache
+
+def virtual_content
+  left.render_asset_input_content
+end
+
+def history?
+  false
+end
+
+def followable?
+  false
+end
+
+def chunk_list
+  :none
+end

data/set/right/asset_output.rb

@@ -0,0 +1,36 @@
+def followable?
+  false
+end
+
+def ok_to_read
+  left.ok_to_read
+end
+
+def history?
+  false
+end
+
+event :remove_codename, :prepare_to_validate,
+      on: :delete,
+      when: proc { |c| c.codename.present? } do
+  # load file before deleting codename otherwise it will fail later
+  attachment
+  self.codename = nil
+end
+
+format do
+  def outputter
+    left
+  end
+
+  view :not_found do
+    return super() unless update_asset_output_live?
+
+    root.error_status = 302
+    outputter.update_asset_output_live
+  end
+
+  def update_asset_output_live?
+    outputter.is_a?(Abstract::AssetOutputter) && !outputter.locked?
+  end
+end

data/set/type/mod.rb

@@ -1,55 +1,64 @@
+# TODO: We can't detect file removal for folder group
+
+include_set List
+
+def modname
+  codename.to_s.gsub(/^mod_/, "")
+end
+
 def ensure_mod_script_card
-  ensure_mod_asset_card :script, Card::ModScriptAssetsID
+  ensure_mod_asset_card :script
 end
 
 def ensure_mod_style_card
-  ensure_mod_asset_card :style, Card::ModStyleAssetsID
+  ensure_mod_asset_card :style
 end
 
 private
 
-def ensure_mod_asset_card asset_type, type_id
-  asset_card = fetch_mod_assets_card asset_type, type_id
+def ensure_mod_asset_card asset_type
+  asset_card = fetch_mod_assets_card asset_type
   return if asset_card.no_action?
-  asset_card.save! if asset_card.new?
-
-  # TODO: optimize!
-  # this needs to be smarter so that it doesn't do a lot of "re" installing
-  # when things are already set up.
-  asset_card.update_items
-  if asset_card.item_cards.present?
-    add_asset asset_type
+  asset_card.save! if asset_card.new? || asset_card.codename.blank?
+
+  if asset_card.content?
+    add_mod_asset_card asset_type
+    asset_card.refresh_asset
   else
-    drop_asset asset_type, asset_card
+    puts "Drop: #{asset_card.name}"
+    drop_mod_asset_card asset_type, asset_card
   end
 end
 
-def add_asset asset_type
-  all_rule(asset_type).add_item! codename_for(asset_type).to_sym
+def add_mod_asset_card asset_type
+  target = asset_type == :style ? Card[:style_mods] : all_rule(asset_type)
+  target.add_item! codename_for(asset_type)
 end
 
-def drop_asset asset_type, asset_card
+def drop_mod_asset_card asset_type, asset_card
   asset_card.update codename: nil
   asset_card.delete
   all_rule(asset_type).drop_item! asset_card
 end
 
 def codename_for asset_type
-  "#{codename}_#{asset_type}"
+  [codename, asset_type]
 end
 
 def all_rule asset_type
   Card[:all, asset_type]
 end
 
-def fetch_mod_assets_card asset_type, type_id
+def fetch_mod_assets_card asset_type
   codename = codename_for asset_type
   if Card::Codename.exists? codename
     Card[codename.to_sym]
   else
-    Card.fetch [name, asset_type], new: {
-      type_id: type_id,
-      codename: codename
+    card = Card.fetch [name, asset_type], new: {
+      type_id: Card::ListID, codename: codename
     }
+    card.codename = codename
+    card.type_id = Card::ListID
+    card
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-assets
 version: !ruby/object:Gem::Version
-  version: 0.13.4
+  version: 0.14.0
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-24 00:00:00.000000000 Z
+date: 2021-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,42 +18,104 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.103.4
+        version: 1.104.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.103.4
+        version: 1.104.0
 - !ruby/object:Gem::Dependency
-  name: card-mod-machines
+  name: execjs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 2.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 2.8.0
+- !ruby/object:Gem::Dependency
+  name: card-mod-virtual
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.14.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.14.0
+- !ruby/object:Gem::Dependency
+  name: card-mod-format
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.14.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.14.0
+- !ruby/object:Gem::Dependency
+  name: card-mod-list
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.14.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.14.0
+- !ruby/object:Gem::Dependency
+  name: card-mod-carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.4
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.4
+        version: 0.14.0
 - !ruby/object:Gem::Dependency
   name: card-mod-content
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.4
+        version: 0.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.4
+        version: 0.14.0
 description: ''
 email:
 - info@decko.org
@@ -62,12 +124,20 @@ extensions: []
 extra_rdoc_files: []
 files:
 - db/migrate_core_cards/20200806112346_add_mod_type.rb
+- db/migrate_core_cards/202108028112352_death_to_machines.rb
+- lib/card/assets.rb
+- locales/de.yml
+- locales/en.yml
 - set/abstract/01_manifest_group.rb
 - set/abstract/asset_file.rb
-- set/abstract/asset_list.rb
-- set/abstract/local_folder_group.rb
+- set/abstract/asset_group.rb
+- set/abstract/asset_inputter.rb
+- set/abstract/asset_outputter.rb
+- set/abstract/folder_group.rb
 - set/abstract/local_manifest_group.rb
 - set/abstract/mod_assets.rb
+- set/right/asset_input.rb
+- set/right/asset_output.rb
 - set/type/mod.rb
 - set/type/remote_manifest_group.rb
 homepage: https://decko.org
@@ -95,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: decko asset pipeline

data/set/abstract/asset_list.rb

@@ -1,66 +0,0 @@
-include_set Abstract::ReadOnly
-include_set Abstract::Sources
-include_set Abstract::Items
-
-def refresh_output force: false
-  update_items! if refresh_output? || force
-end
-
-def refresh_output?
-  !output_updated_at || source_changed?(since: output_updated_at)
-end
-
-event :update_asset_list, :prepare_to_store, on: :save do
-  self.db_content = relative_paths.join("\n")
-end
-
-def render_items_and_compress format
-  item_cards.map do |mcard|
-    js = mcard.format(format)._render_core
-    js = mcard.compress js if minimize?
-    "// #{mcard.name}\n#{js}"
-  end.join "\n"
-end
-
-def update_items!
-  Card::Auth.as_bot do
-    save!
-  end
-  regenerate_machine_output
-end
-
-def item_name_to_path name
-  name
-end
-
-def fetch_item_card name, _args={}
-  new_asset_file_card item_name_to_path(name)
-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
-  asset_card.local if @local
-  asset_card.base_path = base_path
-  asset_card
-end
-
-def source_paths
-  paths
-end
-
-def self_machine_input?
-  true
-end
-
-def local
-  @local = true
-end
-
-def source_changed? since:
-  difference = (relative_paths + item_names) - (relative_paths & item_names)
-  difference.present? ||
-    existing_source_paths.any? { |path| ::File.mtime(path) > since }
-end

data/set/abstract/local_folder_group.rb

@@ -1,23 +0,0 @@
-def paths
-  return [] unless (path = left&.assets_path)
-
-  relative_paths.map { |child| ::File.join path, child }
-end
-
-def relative_paths
-  return [] unless (path = left&.assets_path)
-
-  Dir.children path
-end
-
-def item_name_to_path name
-  ::File.join base_path, name
-end
-
-def base_path
-  left&.assets_path
-end
-
-def minimize?
-  @minimize = true
-end