card-mod-assets 0.14.2 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66dfedbd37492ff42246d71926f5917663073239444456d7e85f4912a78ad1e2
-  data.tar.gz: 326db7d6c6f575f2a6e754fd549f13862ef392122f15493979d099ec2e96b38e
+  metadata.gz: 25621c837fd7effe9227d019d92fb0cf73c8892b4a9e77b3723a9d160f0457c7
+  data.tar.gz: 205c3ebcfcd1a77cbe48a4f7649a64e9bc7a2aa69fd3913cc8839fbb08623187
 SHA512:
-  metadata.gz: 79781530986da18cf8b138c6a031e293a2b94dbfbca08b370e191f142458c59af5984fe19216e288e63877db3ad5583382dabdd580c8de1fa67c9481a424e223
-  data.tar.gz: c7a780dd06c7fed0e6e486ae9f3ce9eb2bf974321813ccfd0e5c3a0022007e1779f54b06e2d8999492b325873f227f1eef5032efb9ff41a6ecae24fdd4651b29
+  metadata.gz: 93bb6a14918c6b702fb18985966a00628383b68453572545949b402e44c142b22ab580a2ecf021a2ecb74718f8a950005f7e7915d839a26b23095a9603835f50
+  data.tar.gz: 79e3353ed13b1c8320f6f8525a171b16252a96d7f8639d1cbc1eda9a7b1bb9ba0645a1e28234b5d1a335e36beb1505906e52a7b356645a5fc90a72122a97f62b

data/README.md

@@ -0,0 +1,114 @@
+<!--
+# @title README - mod: assets
+-->
+
+# Assets mod
+
+This mod unifies handling of styles (CSS, SCSS, etc) and scripts
+(JavaScript, CoffeeScript, etc).
+
+For both styles and scripts, the idea is to output optimized files for
+browser caching and thus improve users' experience by reducing loading times. In other
+words, we use a wide variety of asset sources to assemble a ready-for-prime-time
+.js and .css files.
+
+There are two main kinds of cards in the asset pipeline: inputters (where
+the code comes from) and outputters (where it ends up).
+
+## Inputters
+
+Inputters are can be created in multiple ways:
+
+1. By adding code to the assets directory in a mod
+2. By adding remote and/or local assets to a manifest.yml file
+3. By combining other inputters
+4. By directly creating cards of an inputter type
+
+### adding code to the assets directory
+
+Each mod can have an `assets` directory with `style` and `script` subdirectories.
+By adding CSS or SCSS files to `assets/style` (or JavaScript or CoffeeScript
+files to `assets/script`) to a mod in use, your code will automatically be included
+in standard asset output.
+
+After adding the first asset to a mod, you may need to run `rake card:mod:install` (or
+the more comprehensive `decko update`) for the change to take effect. Otherwise,
+everything should pretty much handle itself.
+
+By default, the load order within a mod is alphabetical, and the load order across mods
+is governed by the mod load order, which can be seen using `rake card:mod:list`.
+
+### using manifest.yml files
+
+If you want to customize the load order of asset files, you can add a `manifest.yml`
+file to `assets/style` or `assets/script`.
+
+For example, consider these lines from the manifest.yml file in the bootstrap mod:
+
+    libraries:
+      items:
+        - font_awesome.css
+        - material_icons.css
+        - bootstrap_colorpicker.scss
+        - ../../vendor/bootstrap-colorpicker/src/sass/_colorpicker.scss
+
+The word `libraries` is an arbitrary name for the manifest group; you can use any name
+(other than `remote`) as long as it isn't duplicated in the file. The `items` specify
+the load order for this manifest group.
+
+Note that the manifest also makes it possible to include source files that are not in
+the assets directory using relative path references.
+
+Manifests also make it possible to include remote files. For example:
+
+    remote:
+      items:
+        - src: https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.6-rc.1/js/select2.full.min.js
+          integrity: ...
+          referrerpolicy: no-referrer
+          crossorigin: anonymous
+
+### combining other inputters
+
+There are various special cards that combine inputters and are inputters themselves:
+
+- the `:style_mods` card contains all the standard assets from mods' asset directories
+- _Skin_ cards combine a particular set of styles
+- `(Mod)+:style` and `(Mod)+:script` assemble the assets for a given mod
+
+### creating inputter cards
+
+Many Cardtypes are coded to be inputters. If you create a card with the type CSS,
+for example, it will automatically be treated as an inputter. The same goes for SCSS,
+CoffeeScript, and JavaScript cards. (In code terms, this is achieved by having those
+sets include the `Abstract::AssetInputter` set).
+
+Because these cards are intended for Sharks, they are predominantly documented on
+decko.org
+
+## Outputters
+
+Outputters produce the final asset (.js and .css) files delivered to users' browsers.
+
+They work slightly differently with style and script cards. JavaScript (.js) output is
+produced on a mod-by-mod basis. The `:all+:script` rule maintains a list of all mods
+with script inputters, and output is produced for each mod that assembles all the
+javascript for that mod. The output is managed with a file card using the name pattern
+`MOD+:asset_ouput`
+
+With style cards, SCSS variables are often shared across many mods, so the output CSS
+cannot be constructed on a mod-by-mod basis; it has to be generated across all mods at
+once. Thus the site's main CSS is served as a single file associated with `:all+:style`,
+which typically points to a skin card. The output is managed as a file card at
+`:all+:style+:asset_output`.
+
+### generating output from input
+
+For each inputter, we generate a VirtualCache card following this pattern:
+`(Inputter)+:asset_input`. This card processes the inputs as much as it safely can.
+For example, SCSS cards cannot be converted to CSS here, because they often
+involve variables that must be used by other inputters.
+
+When changes to inputters are detected, they trigger changes to all inputters and
+outputters that depend on them.
+

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/lib/tasks/card/assets.rake

@@ -0,0 +1,20 @@
+namespace :card do
+  namespace :assets do
+    desc "regenerate asset outputs"
+    task refresh: :environment do
+      Card::Assets.refresh force: true
+    end
+
+    desc "update coded asset outputs"
+    task code: :environment do
+      Cardio.config.compress_assets = true
+      Card::Cache.reset_all
+      Card::Assets.make_output_coded
+    end
+
+    desc "delete all cached asset outputs and inputs"
+    task wipe: :environment do
+      Card::Assets.wipe
+    end
+  end
+end

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") +
+    icon_tag(:warning, 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,11 +12,13 @@ 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, when: :asset_inputter?, skip: :allowed do
   update_asset_input
 end
 
-event :asset_input_changed_on_delete, :finalize, on: :delete, before: :clear_references do
+event :asset_input_changed_on_delete, :finalize,
+      on: :delete, when: :asset_inputter?, before: :clear_references do
   update_referers_after_input_changed
 end
 
@@ -33,19 +35,19 @@ 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
 
 def asset_input_content
-  return render_asset_input_content if virtual?
+  return assemble_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)
+def assemble_asset_input_content
+  format(input_format).render input_view
 end
 
 def input_view
@@ -64,6 +66,11 @@ def asset_input_needs_refresh?
   false
 end
 
+# for override
+def asset_inputter?
+  true
+end
+
 format :html do
   def edit_success
     { reload: true }

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={}
@@ -80,12 +80,14 @@ def manifest_group_minimize? group_name
 end
 
 def manifest
+  # FIXME: sometimes this needs to get cleared!
   @manifest ||= load_manifest
 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 +117,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 +154,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_input.rb

@@ -1,7 +1,7 @@
 include_set Abstract::VirtualCache
 
 def virtual_content
-  left.render_asset_input_content
+  left.assemble_asset_input_content
 end
 
 def history?

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.1
 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-03-29 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.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.104.2
+        version: 1.105.1
 - !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.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.2
+        version: 0.15.1
 - !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.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.2
+        version: 0.15.1
 - !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.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.2
+        version: 0.15.1
 - !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.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.2
+        version: 0.15.1
 - !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.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.2
+        version: 0.15.1
 description: ''
 email:
 - info@decko.org
@@ -123,11 +123,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- db/migrate_core_cards/20200806112346_add_mod_type.rb
+- README.md
+- config/locales/de.yml
+- config/locales/en.yml
+- data/real.yml
 - db/migrate_core_cards/202108028112352_death_to_machines.rb
 - lib/card/assets.rb
-- locales/de.yml
-- locales/en.yml
+- lib/tasks/card/assets.rake
 - set/abstract/01_manifest_group.rb
 - set/abstract/asset_file.rb
 - set/abstract/asset_group.rb
@@ -150,6 +152,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 +168,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