card-mod-assets 0.14.2 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66dfedbd37492ff42246d71926f5917663073239444456d7e85f4912a78ad1e2
-  data.tar.gz: 326db7d6c6f575f2a6e754fd549f13862ef392122f15493979d099ec2e96b38e
+  metadata.gz: f28b495e0d136c8e5f45b1c19bc922ba6da1ba0b33f9478c6efbfc5dd4cd22b0
+  data.tar.gz: 83b8529f49f06ef20b4a9e458e32694650174dc437952ce46885657a6f15ed38
 SHA512:
-  metadata.gz: 79781530986da18cf8b138c6a031e293a2b94dbfbca08b370e191f142458c59af5984fe19216e288e63877db3ad5583382dabdd580c8de1fa67c9481a424e223
-  data.tar.gz: c7a780dd06c7fed0e6e486ae9f3ce9eb2bf974321813ccfd0e5c3a0022007e1779f54b06e2d8999492b325873f227f1eef5032efb9ff41a6ecae24fdd4651b29
+  metadata.gz: c09c79ed6edf0c58b9c46ff5608187c3bcc19bd810b5ac1d06078b822655f0c418a4e3148a8a44ea178a91324473f99f651c2edb3dc6c2e4d5cd241d1371ec14
+  data.tar.gz: 2948211e42bc9578afa028581a57d08d8d8f6d21c7a48e2292c8b634bfed9eeda894751747a9abb86c62ae42ab8fb32f6f4fdbfbf5eebdb27662c3162abfec87

data/data/real.yml

@@ -0,0 +1,7 @@
+- :name: "*asset input"
+  :codename: asset_input
+- :name: "*asset output"
+  :codename: asset_output
+- :name: Remote manifest group
+  :type: :cardtype
+  :codename: remote_manifest_group

data/db/migrate_core_cards/202108028112352_death_to_machines.rb

@@ -43,9 +43,6 @@ class DeathToMachines < Cardio::Migration::Core
     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
 

data/lib/card/assets.rb

@@ -15,8 +15,8 @@ class Card
         ]
       end
 
-      def refresh_assets force: false
-        return unless force || refresh_assets?
+      def refresh force: false
+        return unless force || refresh?
 
         inputters = standard_inputters
 
@@ -30,6 +30,15 @@ class Card
         generate_asset_output_files if force
       end
 
+      def wipe
+        Auth.as_bot do
+          %i[asset_input asset_output].each do |field|
+            Card.search(right: field).each(&:delete!)
+            Virtual.where(right_id: field.card_id).destroy_all
+          end
+        end
+      end
+
       def make_output_coded
         asset_outputters.each(&:make_asset_output_coded)
       end
@@ -72,7 +81,7 @@ class Card
         Card.search type_id: inputter_types.unshift("in")
       end
 
-      def refresh_assets?
+      def refresh?
         case Cardio.config.asset_refresh
         when :eager    then true
         when :cautious then cautious_refresh?

data/set/abstract/asset_file.rb

@@ -59,7 +59,7 @@ format :html do
   end
 
   def short_content
-    fa_icon("exclamation-circle", class: "text-muted pr-2") +
+    fa_icon("exclamation-circle", class: "text-muted pe-2") +
       wrap_with(:span, "asset file", class: "text-muted")
   end
 end

data/set/abstract/asset_inputter.rb

@@ -1,4 +1,4 @@
-card_accessor :asset_input, type_id: Card::PlainTextID
+card_accessor :asset_input, type: :plain_text
 
 def dependent_asset_inputters
   referers_responding_to :asset_input
@@ -12,7 +12,7 @@ def referers_responding_to method_name
   referers.select { |referer| referer.respond_to? method_name }
 end
 
-event :asset_input_changed, :finalize, on: :save do
+event :asset_input_changed, :finalize, on: :save, skip: :allowed do
   update_asset_input
 end
 
@@ -33,7 +33,7 @@ def update_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
+    asset_input_card.update({})
     update_referers_after_input_changed
   end
 end

data/set/abstract/asset_outputter.rb

@@ -1,11 +1,8 @@
 include_set Abstract::Lock
+include Env::Location
 
 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
@@ -54,7 +51,7 @@ def store_output output
 end
 
 def handle_file output
-  file = Tempfile.new [id.to_s, ".#{output_filetype}"]
+  file = Tempfile.new [id.to_s, ".#{output_format}"]
   file.write output
   file.close
   yield file

data/set/abstract/mod_assets.rb

@@ -1,4 +1,4 @@
-include_set Abstract::Pointer
+include_set Abstract::List
 include_set Abstract::ReadOnly
 
 def item_cards _args={}
@@ -86,6 +86,7 @@ end
 def load_manifest
   return unless manifest_exists?
   manifest = YAML.load_file manifest_path
+  return {} unless manifest # blank manifest
   validate_manifest manifest
   manifest
 end
@@ -115,13 +116,12 @@ def source_changed? since:
       folder_group_card&.paths&.map { |path| File.mtime(path) }
     end
 
-  return unless source_updates.present?
-
-  source_updates.max > since
+  source_updates.present? && (source_updates.max > since)
 end
 
 def manifest_updated_at
   return unless manifest_exists?
+
   File.mtime(manifest_path)
 end
 
@@ -153,3 +153,12 @@ end
 def raise_manifest_error msg
   raise Card::Error, "invalid manifest format in #{manifest_path}: #{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 }
+  end
+end

data/set/right/asset_output.rb

@@ -10,9 +10,7 @@ def history?
   false
 end
 
-event :remove_codename, :prepare_to_validate,
-      on: :delete,
-      when: proc { |c| c.codename.present? } do
+event :remove_codename, :prepare_to_validate, on: :delete, when: :codename? do
   # load file before deleting codename otherwise it will fail later
   attachment
   self.codename = nil
@@ -20,7 +18,7 @@ end
 
 format do
   def outputter
-    left
+    card.left
   end
 
   view :not_found do

data/set/type/mod.rb

@@ -6,59 +6,15 @@ def modname
   codename.to_s.gsub(/^mod_/, "")
 end
 
-def ensure_mod_script_card
-  ensure_mod_asset_card :script
-end
-
-def ensure_mod_style_card
-  ensure_mod_asset_card :style
-end
-
-private
-
 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? || asset_card.codename.blank?
-
-  if asset_card.content?
-    add_mod_asset_card asset_type
-    asset_card.refresh_asset
-  else
-    puts "Drop: #{asset_card.name}"
-    drop_mod_asset_card asset_type, asset_card
-  end
+  return unless asset_card.assets_path
+  asset_card.save! if asset_card.new?
+  asset_card.name
 end
 
-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_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]
-end
-
-def all_rule asset_type
-  Card[:all, asset_type]
-end
+private
 
 def fetch_mod_assets_card asset_type
-  codename = codename_for asset_type
-  if Card::Codename.exists? codename
-    Card[codename.to_sym]
-  else
-    card = Card.fetch [name, asset_type], new: {
-      type_id: Card::ListID, codename: codename
-    }
-    card.codename = codename
-    card.type_id = Card::ListID
-    card
-  end
+  Card.fetch [name, asset_type], new: { type: :list }
 end

data/set/type/remote_manifest_group.rb

@@ -1,6 +1,8 @@
 include_set Abstract::ReadOnly
 include_set Abstract::ManifestGroup
 
+basket[:non_createable_types] << :remote_manifest_group
+
 def local?
   @local = false
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-assets
 version: !ruby/object:Gem::Version
-  version: 0.14.2
+  version: 0.15.0
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-08 00:00:00.000000000 Z
+date: 2023-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.104.2
+        version: 1.105.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.104.2
+        version: 1.105.0
 - !ruby/object:Gem::Dependency
   name: execjs
   requirement: !ruby/object:Gem::Requirement
@@ -52,70 +52,70 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.2
+        version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.2
+        version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: card-mod-format
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.2
+        version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.2
+        version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: card-mod-list
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.2
+        version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.2
+        version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: card-mod-carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.2
+        version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.2
+        version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: card-mod-content
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.2
+        version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.2
+        version: 0.15.0
 description: ''
 email:
 - info@decko.org
@@ -123,7 +123,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- db/migrate_core_cards/20200806112346_add_mod_type.rb
+- data/real.yml
 - db/migrate_core_cards/202108028112352_death_to_machines.rb
 - lib/card/assets.rb
 - locales/de.yml
@@ -150,6 +150,7 @@ metadata:
   wiki_uri: https://decko.org
   documentation_url: http://docs.decko.org/
   card-mod: assets
+  card-mod-group: gem-defaults
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -165,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.3.11
 signing_key:
 specification_version: 4
 summary: decko asset pipeline

data/db/migrate_core_cards/20200806112346_add_mod_type.rb

@@ -1,13 +0,0 @@
-# -*- encoding : utf-8 -*-
-
-class AddModType < Cardio::Migration::Core
-  def up
-    add_cardtypes
-    Card::Cache.reset_all
-  end
-
-  def add_cardtypes
-    ensure_code_card name: "Remote manifest group", type_id: Card::CardtypeID
-    ensure_code_card name: "Mod", type_id: Card::CardtypeID
-  end
-end