card-mod-format 0.18.1 → 0.19.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ae4393c5ae29783e57eeb17d4840da0af745fa793c4d5f13dec9472ac7afe4d
-  data.tar.gz: 24d7a9768c4865c532ba0da5e0a11841e6d3ddab744dbcaab25ab283a7c0a6a9
+  metadata.gz: 8fc4d1dcf48d5a8967ef40a89fbe5eb1039de00f4a262434014a4e4a23c716f2
+  data.tar.gz: 69df359302308e13aef004d1ec0c7caa0f73551d8aeac49527cf66077c88d46a
 SHA512:
-  metadata.gz: 158b8bb6ba805b03972fca92ab9c31642f21ce53927213459d200209b2732e4121ef7bbf67b46a3289ca340dc017231ac10ac613085bda1f4d729d2b4713ff36
-  data.tar.gz: f2e54e5296fe3826060a917c74dc514f0843de103c8b0b879ff66c8f18e7ab2acfcff8df147e6864973d401c67ba6cb609fa06b6f977f1ab254e3ee30c7466a5
+  metadata.gz: 3777d94b13161662a563486a9c8c24ead1475db20b5257fa5aa78169a8e1911bc36025c2e5de0e65d2839499cfb9e9405aee30f2300b3b86b2655008c44232c4
+  data.tar.gz: 662c4507e8bf881665850be12882e08c350f874fd8e60a20bda1931bcbe388ba40dda963799fa7b9768a07ed82c24224be85c838b95e3377c57e7affe7ff9a2d

data/assets/script/decko/decko.js.coffee

@@ -27,7 +27,7 @@ window.decko =
 #~~~~~ ( EVENTS )
 
 $(window).ready ->
-  $.ajaxSetup cache: false
+  # $.ajaxSetup cache: false
 
   $('body').on 'click', '._confirm', ->
     confirm $(this).data('confirm-msg') || 'Are you sure?'

data/assets/script/decko/slot.js.coffee

@@ -61,11 +61,9 @@ jQuery.fn.extend
   slotReload: (url) ->
     @each -> $(this)._slotReloadSingle url
 
-  slotReloading: ()->
-    # TODO: add default spinner behavior
-
-  slotLoadingComplete: ()->
-    # TODO: add default spinner behavior
+  startLoading: () ->
+  stopLoading: () ->
+  # TODO: add default spinner behavior
 
   slotUpdate: (newContent, mode) ->
     mode ||= "replace"
@@ -120,7 +118,7 @@ jQuery.fn.extend
     # that's where handleRemote gets the url from
     # .attr(href, url) only works for anchors
     $.rails.handleRemote $slot
-    $slot.slotReloading()
+    $slot.startLoading()
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~
 # "private" helper methods

data/assets/script/decko/slotter.js.coffee

@@ -65,8 +65,10 @@
 #
 #
 $(window).ready ->
-  $('body').on 'ajax:send', '.slotter', (event, data) ->
-    $(this).slot().slotReloading()
+  $('body').on 'ajax:send', '.slotter', () ->
+    slot = $(this).slot()
+    slot.hideErrorResponse()
+    slot.startLoading()
 
   $('body').on 'ajax:success', '.slotter', (event, data) ->
     $(this).slotterSuccess event, data
@@ -74,8 +76,8 @@ $(window).ready ->
   $('body').on 'ajax:error', '.slotter', (event, xhr) ->
     $(this).showErrorResponse xhr.status, xhr.responseText
 
-  $('body').on 'ajax:complete', '.slotter', (event, data) ->
-    $(this).slot().slotLoadingComplete()
+  $('body').on 'ajax:complete', '.slotter', () ->
+    $(this).slot().stopLoading()
 
   $('body').on 'click', 'button.slotter', ->
     return false if !$.rails.allowAction $(this)
@@ -184,6 +186,9 @@ jQuery.fn.extend
           @slot().find('.new-current-revision-id').text()
         )
 
+  hideErrorResponse: () ->
+    $(this).find(".card-notice").hide()
+
   updateModalOrigin: () ->
     if @overlaySlot()
       overlayOrigin = @slotOrigin("overlay")

data/data/real.yml

@@ -65,3 +65,8 @@
     :self:
       :fields:
         :read: Anyone
+
+- :name: "*noindex"
+  :codename: noindex
+  :type: :list
+

data/lib/card/format/css_format.rb

@@ -2,6 +2,7 @@
 
 class Card
   class Format
+    # card format class for css (cascading stylesheet) views
     class CssFormat < Format
       register :css
 

data/lib/card/format/csv_format.rb

@@ -2,6 +2,7 @@
 
 class Card
   class Format
+    # card format class for csv (comma separated values) views
     class CsvFormat < Format
       register :csv
 

data/lib/card/format/html_format.rb

@@ -25,14 +25,16 @@ class Card
         "text/html"
       end
 
+      def stylesheet_link_tag path
+        tag "link", href: path, media: "all", rel: "stylesheet", type: "text/css"
+      end
+
+      private
+
       def final_render_call method
         rendered = super
         rendered.is_a?(Array) ? output(rendered) : rendered
       end
-
-      def stylesheet_link_tag path
-        tag "link", href: path, media: "all", rel: "stylesheet", type: "text/css"
-      end
     end
   end
 end

data/lib/card/format/js_format.rb

@@ -2,6 +2,7 @@
 
 class Card
   class Format
+    # card format class for js (JavaScript) views
     class JsFormat < Format
       register :js
 

data/lib/card/format/json_format.rb

@@ -2,6 +2,7 @@
 
 class Card
   class Format
+    # card format class for json (JavaScript Object Notation) views
     class JsonFormat < DataFormat
       register :json
 

data/lib/card/format/rss_format.rb

@@ -2,6 +2,7 @@
 
 class Card
   class Format
+    # card format class for rss (really simple syndication) views
     class RssFormat < HtmlFormat
       register :rss
     end

data/lib/card/format/text_format.rb

@@ -2,6 +2,7 @@
 
 class Card
   class Format
+    # card format class for plaintext views
     class TextFormat < Format
       register :text
       register :txt

data/lib/card/format/xml_format.rb

@@ -2,6 +2,7 @@
 
 class Card
   class Format
+    # card format class for xml (extensible markup language) views
     class XmlFormat < DataFormat
       register :xml
 

data/lib/card/path/cast_params.rb

@@ -1,4 +1,5 @@
 class Card
+  # handle card-related uri paths
   class Path
     cattr_accessor :cast_params
     self.cast_params = { slot: { hide: :array, show: :array, wrap: :array } }.freeze

data/set/all/content.rb

@@ -1,6 +1,6 @@
-format do
-  ONE_LINE_CHARACTER_LIMIT = 60
+ONE_LINE_CHARACTER_LIMIT = 60
 
+format do
   # override to customize by set
   def chunk_list
     :default

data/set/all/csv.rb

@@ -3,7 +3,7 @@ require "csv"
 format :csv do
   def show view, args
     view ||= :titled
-    super view, args
+    super
   end
 
   def nests
@@ -24,7 +24,7 @@ format :csv do
   end
 
   view :body do
-    item_cards.map { |item_card| nest item_card }
+    card.item_cards.map { |item_card| nest item_card }
   end
 
   view :row do

data/set/all/data.rb

@@ -68,7 +68,7 @@ format :data do
   # NOCACHE because sometimes item_cards is dynamic.
   # could be safely cached for non-dynamic lists
   view :items, cache: :never do
-    listing item_cards, view: (voo_items_view || :atom)
+    listing_list item_cards, view: voo_items_view || :atom
   end
 
   view :links do

data/set/all/demo.rb

@@ -8,7 +8,7 @@ format :html do
   view :view_list do
     view_list.map do |v|
       wrap_with :p, [content_tag(:h3, v), render(v, show: :menu)]
-    end.flatten.join ""
+    end.flatten.join
   end
 
   def view_list

data/set/all/error.rb

@@ -55,17 +55,17 @@ format do
 end
 
 format :json do
-  view :errors do
+  view :errors, perms: :none do
     {
       error_status: error_status,
       errors: card.errors.each_with_object({}) { |e, h| h[e.attribute] = e.message }
     }
   end
 
-  view :server_error, :errors
-  view :denial, :errors
-  view :not_found, :errors
-  view :bad_address do
+  view :server_error, :errors, perms: :none
+  view :denial, :errors, perms: :none
+  view :not_found, :errors, perms: :none
+  view :bad_address, perms: :none do
     card.errors.add :address, super()
     render_errors
   end

data/set/all/haml.rb

@@ -48,7 +48,7 @@ format do
 
   def haml_partial partial, locals={}
     locals[:template_path] ||= @template_path
-    process_haml_template "_#{partial}".to_sym, locals
+    process_haml_template :"_#{partial}", locals
   end
 
   private

data/set/all/html/error.rb

@@ -76,8 +76,14 @@ format :html do
     focal? ? loud_denial : quiet_denial
   end
 
-  def view_for_unknown setting_view
-    main? && voo.root? && ok?(:create) ? :new : super
+  private
+
+  def page_view_for_unknown
+    ok?(:create) ? :new : super
+  end
+
+  def page_status_for_unknown
+    ok?(:create) ? 200 : 404
   end
 
   def show_all_errors?
@@ -94,9 +100,9 @@ format :html do
     wrap_with(:span, class: "render-error alert alert-danger") { super }
   end
 
-  def error_modal_id
-    @error_modal_id ||= unique_id
-  end
+  # def error_modal_id
+  #   @error_modal_id ||= unique_id
+  # end
 
   def error_message exception
     %{
@@ -147,7 +153,22 @@ format :html do
 
   def signin_link
     link_to_card :signin, t(:account_sign_in)&.downcase,
-                 class: "signin-link", path: { view: :titled }
+                 class: "signin-link", path: signin_link_path
+  end
+
+  def signin_link_path
+    { view: :titled }.tap do |path|
+      unless Cardio.config.allow_anonymous_cookies
+        # cookie handles where to go after signin if we have it. if not...
+
+        target = signin_link_success_target
+        path[:success] = { mark: target } if target.present?
+      end
+    end
+  end
+
+  def signin_link_success_target
+    Env.ajax? ? request.referer : request.original_url
   end
 
   def signup_link

data/set/all/html/head.rb

@@ -9,9 +9,14 @@ basket[:cache_seed_names] += [
   %i[all style],
   %i[all style asset_output],
   %i[all script],
-  %i[script right content_options]
+  %i[script right content_options],
+  :noindex
 ]
 
+def noindex?
+  unknown? || :noindex.card.include_item?(name)
+end
+
 format do
   view :page_title, unknown: true, perms: :none do
     title_parts = [Card::Rule.global_setting(:title)]
@@ -21,6 +26,8 @@ format do
 end
 
 format :html do
+  delegate :noindex?, to: :card
+
   view :head, unknown: true, perms: :none, cache: :yes do
     basket[:head_views].map { |viewname| render viewname }.flatten.compact.join "\n"
   end
@@ -52,15 +59,21 @@ format :html do
   # it would then be safe to cache if combined with param handling
   # (but note that machine clearing would need to reset card cache...)
   view :stylesheet_tags, cache: :never, unknown: true, perms: :none do
-    [nest(:style_mods, view: :remote_style_tags), head_stylesheet_path]
+    [nest(:style_mods, view: :remote_style_tags), main_stylesheet_tag]
   end
 
-  def head_stylesheet_path
-    @head_stylesheet_path ||=
+  private
+
+  def main_stylesheet_tag
+    @main_stylesheet_tag ||=
       tag "link", media: "all",
                   rel: "stylesheet",
                   type: "text/css",
-                  href: nest(param_or_rule_card(:style), view: :stylesheet_path)
+                  href: main_stylesheet_path
+  end
+
+  def main_stylesheet_path
+    nest(param_or_rule_card(:style), view: :stylesheet_path)
   end
 
   def param_or_rule_card setting

data/set/all/html/menu.rb

@@ -7,6 +7,7 @@ format :html do
 
   view :menu, denial: :blank, unknown: true do
     return "" unless card.known?
+
     # would be preferable to do this with unknown: :blank, but that fails with view
     # caching on, because voo always thinks it's the root.
     wrap_with(:div, class: "card-menu #{menu_link_classes}") { menu_items }
@@ -149,7 +150,7 @@ format :html do
 
   def edit_link view=:edit, link_text: nil, text: "", modal: nil
     link_to_view view, link_text || "#{menu_icon} #{text}",
-                 edit_link_opts(modal: (modal || :lg))
+                 edit_link_opts(modal: modal || :lg)
   end
 
   # Generates options hash for an edit link with optional parameters.

data/set/all/html/meta_tags.haml

@@ -1,4 +1,4 @@
 %meta{ charset: "UTF-8" }
 %meta{ content: "width=device-width, initial-scale=1.0", name: "viewport" }
-- if card.unknown?
+- if noindex?
   %meta{ content: "noindex", name: "robots"}

data/set/all/html/show.rb

@@ -1,7 +1,7 @@
 format :html do
   def show view, args
     content = send show_method, view, args
-    Env.ajax? ? content : wrap_with_html_page(content)
+    Env.ajax? || no_layout? ? content : wrap_with_html_page(content)
   end
 
   wrapper :html_page do
@@ -9,7 +9,7 @@ format :html do
       <!DOCTYPE HTML>
       <html class="h-100">
         <head>
-          #{nest card.rule_card(:head), view: :head_content}
+          #{head_content}
         </head>
         #{interior}
       </html>
@@ -18,6 +18,10 @@ format :html do
 
   private
 
+  def head_content
+    nest card.rule_card(:head), view: :head_content
+  end
+
   def show_without_page_layout view, args
     @main = true if params[:is_main] || args[:main]
     args.delete(:layout)
@@ -34,6 +38,12 @@ format :html do
   end
 
   def show_layout?
+    return false if no_layout?
+
     !Env.ajax? || params[:layout]
   end
+
+  def no_layout?
+    params[:layout] == "none"
+  end
 end

data/set/all/html/wrap.rb

@@ -49,7 +49,7 @@ format :html do
 
   def slot_cardname
     name = card.name
-    name = card.new? && name.compound? ? name.url_key : name
+    name = name.url_key if card.new? && name.compound?
     h name
   end
 
@@ -122,7 +122,7 @@ format :html do
   end
 
   def no_main_wrap?
-    Env.ajax? || params[:layout] == "none"
+    Env.ajax? || no_layout?
   end
 
   def wrap_with tag, content_or_args={}, html_args={}, &block
@@ -140,21 +140,21 @@ format :html do
   private
 
   def content_items_within_wrap content, args
-    content = block_given? ? yield(args) : content
+    content = yield(args) if block_given?
     content.compact
   end
 
   def content_within_wrap content
-    content = block_given? ? yield : content
+    content = yield if block_given?
     output(content).to_s.html_safe
   end
 
   def html_escape_except_quotes string
     # to be used inside single quotes (makes for readable json attributes)
-    string.to_s.gsub(/&/,  "&")
-          .gsub(/'/, "'")
-          .gsub(/>/,  ">")
-          .gsub(/</,  "&lt;")
+    string.to_s.gsub("&",  "&amp;")
+          .gsub("'", "&apos;")
+          .gsub(">",  "&gt;")
+          .gsub("<",  "&lt;")
   end
 
   wrapper :div, :div

data/set/all/links.rb

@@ -112,13 +112,13 @@ format :html do
     name = Card::Name[cardish]
     slotterify opts if opts[:slotter]
     add_known_or_wanted_class opts, name
-    super name, (text || name), opts
+    super(name, text || name, opts)
   end
 
   # in HTML, #link_to_view defaults to a remote link with rel="nofollow".
   def link_to_view view, text=nil, opts={}
     slotterify opts
-    super view, (text || view), opts
+    super(view, text || view, opts)
   end
 
   # in HTML, #link_to_resource automatically adds a target to external resources

data/set/all/title.rb

@@ -32,7 +32,7 @@ format :html do
   def title_in_context title=nil
     title = title&.html_safe
     # escape titles generated from card names, but not those set explicitly
-    h super(title)
+    h super
   end
 
   def wrapped_title title
@@ -42,6 +42,6 @@ format :html do
   end
 
   def wrapped_joint
-    wrap_with :span, "+", classy("joint")
+    wrap_with :span, (voo.joint || "+"), classy("joint")
   end
 end

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-format
 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,28 +17,28 @@ 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: 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
@@ -69,7 +68,6 @@ files:
 - config/locales/de.yml
 - config/locales/en.yml
 - data/files/credit_image.svg
-- data/files/mod_format_script_asset_output/file.js
 - data/real.yml
 - lib/card/format/css_format.rb
 - lib/card/format/csv_format.rb
@@ -216,7 +214,6 @@ metadata:
   documentation_url: http://docs.decko.org/
   card-mod: format
   card-mod-group: gem-defaults
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -224,15 +221,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: format
 test_files: []