card-mod-format 0.17.0 → 0.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b0ff2d377bf5c92b381014dfde8b3ac4f2bc62567bad7a83a152fbe21b63d5a
-  data.tar.gz: '09619cfd84f48a855c3b18e0f126bf4b02ecaaf26f995d3930b98934357597dd'
+  metadata.gz: 0ae4393c5ae29783e57eeb17d4840da0af745fa793c4d5f13dec9472ac7afe4d
+  data.tar.gz: 24d7a9768c4865c532ba0da5e0a11841e6d3ddab744dbcaab25ab283a7c0a6a9
 SHA512:
-  metadata.gz: abb03121966bc5bb5e764034547882bcfcb49b0275d5df26521fa706ece8d70f52e2125bd60e802d1c936fe9f97f932f1de5c375b55a7326c047ba082e89541e
-  data.tar.gz: f72af9bc82fe9ad28b41bc04ffe03f754838467f3956d0ed443940331129dfe49b91b340f0f1a69e45f8993a2b4a494315e612c96da43df10c7b07062661249a
+  metadata.gz: 158b8bb6ba805b03972fca92ab9c31642f21ce53927213459d200209b2732e4121ef7bbf67b46a3289ca340dc017231ac10ac613085bda1f4d729d2b4713ff36
+  data.tar.gz: f2e54e5296fe3826060a917c74dc514f0843de103c8b0b879ff66c8f18e7ab2acfcff8df147e6864973d401c67ba6cb609fa06b6f977f1ab254e3ee30c7466a5

data/assets/style/menu.scss

@@ -7,6 +7,9 @@
   right: 8px;
   top: 5px;
   width: auto;
+  > a {
+    text-decoration: none !important;
+  }
 }
 
 .d0-card-content, .titled-view > .d0-card-header {

data/assets/style/messaging.scss

@@ -21,7 +21,9 @@
   font-weight: bold;
   font-style: italic;
   text-align: center;
-  margin: 0 0 4px 0;
+  > div {
+    margin: 1em;
+  }
 
   .card-error-msg {
     text-align: left;

data/lib/card/format/csv_format.rb

@@ -6,7 +6,11 @@ class Card
       register :csv
 
       def mime_type
-        "text/comma-separated-values"
+        if params[:disposition] == "inline"
+          "text/plain"
+        else
+          "text/comma-separated-values"
+        end
       end
 
       def self.view_caching?

data/set/all/demo.rb

@@ -12,7 +12,7 @@ format :html do
   end
 
   def view_list
-    %i[content titled labeled bar box open closed content_panel]
+    %i[content titled labeled bar box open closed]
   end
 
   def demo_view

data/set/all/html/head.rb

@@ -1,9 +1,17 @@
 basket[:head_views] =
   %i[page_title_tag meta_tags favicon_tag
-     head_remote_stylesheets head_stylesheet
+     stylesheet_tags
      universal_edit_button rss_links]
 # TODO: the last two should be in mods
 
+basket[:cache_seed_names] += [
+  %i[all head],
+  %i[all style],
+  %i[all style asset_output],
+  %i[all script],
+  %i[script right content_options]
+]
+
 format do
   view :page_title, unknown: true, perms: :none do
     title_parts = [Card::Rule.global_setting(:title)]
@@ -13,7 +21,7 @@ format do
 end
 
 format :html do
-  view :head, unknown: true, perms: :none do
+  view :head, unknown: true, perms: :none, cache: :yes do
     basket[:head_views].map { |viewname| render viewname }.flatten.compact.join "\n"
   end
 
@@ -27,6 +35,7 @@ format :html do
     nest :favicon, view: :link_tag
   end
 
+  # TODO: move to mod
   view :universal_edit_button, unknown: :blank, denial: :blank, perms: :update do
     return if card.new?
 
@@ -34,61 +43,31 @@ format :html do
                 title: "Edit this page!", href: path(view: :edit)
   end
 
+  # TODO: move to rss mod
+  view :rss_links, unknown: true, perms: :none do
+    render :rss_link_tag if rss_link?
+  end
+
   # these should render a view of the rule card
   # it would then be safe to cache if combined with param handling
   # (but note that machine clearing would need to reset card cache...)
-  view :head_stylesheet, unknown: true, cache: :never, perms: :none do
-    return unless (href = head_stylesheet_path)
-
-    tag("link", href: href, media: "all", rel: "stylesheet", type: "text/css")
+  view :stylesheet_tags, cache: :never, unknown: true, perms: :none do
+    [nest(:style_mods, view: :remote_style_tags), head_stylesheet_path]
   end
 
-  view :head_remote_stylesheets, unknown: true, cache: :never, perms: :none do
-    remote_style_tags
+  def head_stylesheet_path
+    @head_stylesheet_path ||=
+      tag "link", media: "all",
+                  rel: "stylesheet",
+                  type: "text/css",
+                  href: nest(param_or_rule_card(:style), view: :stylesheet_path)
   end
 
   def param_or_rule_card setting
-    if params[setting]
-      Card[params[setting]]
-    else
-      root.card.rule_card setting
-    end
-  end
-
-  def debug_or_machine_path setting, debug_lambda, machine_path_lambda
-    return unless (asset_card = param_or_rule_card setting)
-    debug_path(setting, asset_card, &debug_lambda) ||
-      machine_path_lambda.call(asset_card.asset_output_url)
-  end
-
-  def debug_path setting, asset_card
-    return unless params[:debug] == setting.to_s
-
-    yield asset_card
-  end
-
-  # TODO: move to rss mod
-  view :rss_links, unknown: true, perms: :none do
-    render :rss_link_tag if rss_link?
+    params[setting]&.card || root.card.rule_card(setting)
   end
 
   def rss_link?
     Card.config.rss_enabled && respond_to?(:rss_link_tag)
   end
-
-  def remote_style_tags
-    return unless (asset_card = Card[:style_mods])
-
-    asset_card.item_cards.map do |mod_style_card|
-      nest mod_style_card, view: :remote_include_tags
-    end.select(&:present?)
-  end
-
-  def head_stylesheet_path
-    debug_or_machine_path(
-      :style,
-      ->(style_card) { path mark: style_card.name, item: :import, format: :css },
-      ->(machine_path) { machine_path }
-    )
-  end
 end

data/set/all/html/show.rb

@@ -25,7 +25,15 @@ format :html do
     render! view, args
   end
 
+  def default_page_view
+    default_nest_view
+  end
+
   def show_method
     "show_#{show_layout? ? :with : :without}_page_layout"
   end
+
+  def show_layout?
+    !Env.ajax? || params[:layout]
+  end
 end

data/set/all/html/views.rb

@@ -7,7 +7,7 @@ format :html do
 
   before(:content) { prepare_content_slot }
 
-  view :content do
+  view :content, cache: :yes do
     wrap do
       [
         render_menu(optional: :hide),
@@ -52,7 +52,7 @@ format :html do
     end
   end
 
-  view :titled do
+  view :titled, cache: :yes do
     @content_body = true
     wrap do
       [
@@ -64,7 +64,7 @@ format :html do
   end
 
   # unlike unknown: true, unknown: (same view) can be overridden
-  view :labeled, unknown: :labeled do
+  view :labeled, unknown: :labeled, cache: :yes do
     @content_body = true
     wrap(true, class: "row") do
       [labeled(render_title, wrap_body { render_labeled_content }), render_menu]
@@ -76,7 +76,7 @@ format :html do
   end
 
   def labeled_field field, item_view=:name, opts={}
-    opts[:title] ||= Card.fetch_name field
+    opts[:title] ||= field.cardname
     field_nest field, opts.merge(view: :labeled,
                                  items: (opts[:items] || {}).merge(view: item_view))
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-format
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.1
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-12 00:00:00.000000000 Z
+date: 2024-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.107.0
+        version: 1.108.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.107.0
+        version: 1.108.1
 - !ruby/object:Gem::Dependency
   name: card-mod-content
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.18.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.18.1
 description: ''
 email:
 - info@decko.org
@@ -207,7 +207,7 @@ files:
 - vendor/jquery_rails/vendor/assets/javascripts/jquery_ujs.js
 homepage: https://decko.org
 licenses:
-- GPL-3.0
+- GPL-3.0-or-later
 metadata:
   source_code_uri: https://github.com/decko-commons/decko
   homepage_uri: https://decko.org