card-mod-layout 0.16.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03d108a569f14471991d748ba88c83090cc30390336e5a36d859ebaab663775a
-  data.tar.gz: e8fe906f01bd1f15118f69e59849aebb2903927cdef484f35a13212c1e04287f
+  metadata.gz: 312f14d0e2d9cff16ea45cd52f0c5912d4a88150bd2b9c2ed9035772d7c36775
+  data.tar.gz: 28e9728f028b3c088ebf45eaf4c94d91a307954a06352e8f6af422c487e547cf
 SHA512:
-  metadata.gz: 2ee0a3db0692e0691fe903381c9732755f0a227e31196bae13f16e73f36db32e872f932fae46db1ba529f37cbb5ae87052b3e6b3514d34497682e101e67dad7a
-  data.tar.gz: 905af8235a9e0ac6fa112e255c9e672778b2af24449424a5b1f14cfa2160b0451147ec083ec959b9d320dafb8ee2141bd30a6f85dc73d2272e46aa6e939c30b1
+  metadata.gz: f843062447f1586b31c359b929130f9671ad08c0b1ccafa67e793bf734c184aa0eb297490df915e4da353ed12fc80ffcec6afcd4dfa8d443cfe72469cf1860d5
+  data.tar.gz: f7d4d86b5de8757cd09348d163acdfb6c65bc3b6101737b8e1d9d5a8b095b018092babb18f978b2d8068d0b881a15282390a74a00f15a05feffec58d7012ee3b

data/config/admin.yml

@@ -0,0 +1,10 @@
+settings:
+  - layout
+  - head
+
+cardtypes:
+  styling:
+    - layout_type
+
+views:
+  - modal_link

data/set/abstract/items/options_api.rb

@@ -0,0 +1,85 @@
+# TODO: some of this should be moved to right/options!!
+# or to type/JSON?
+
+def options_hash
+  json_options? ? options_card.parse_content : option_hash_from_names
+end
+
+def json_options?
+  options_card&.type_id == JsonID
+end
+
+def option_hash_from_names
+  option_names.each_with_object({}) do |name, hash|
+    hash[name] = name
+  end
+end
+
+def option_names
+  if (selected_options = item_names)
+    (standard_option_names + selected_options).uniq
+  else
+    standard_option_names
+  end
+end
+
+def option_cards
+  option_names.map do |name|
+    Card.fetch name, new: {}
+  end
+end
+
+def standard_option_names
+  if json_options?
+    options_hash.values.map(&:to_name)
+  else
+    option_names_from_items
+  end
+end
+
+def option_names_from_items
+  o_card = options_card
+  limit = o_card.try(:default_limit).to_i
+  context_name = right_type? ? nil : name
+  o_card.item_names context: context_name, limit: limit
+end
+
+def options_card
+  @options_card ||= rule_card(:content_options) || right_type_options || Card[:all]
+end
+
+def options_card_name
+  options_card&.name&.url_key
+end
+
+private
+
+def right_type_options
+  Card.fetch [right.name, :type, :by_name] if right_type?
+end
+
+def right_type?
+  right&.type_id == CardtypeID
+end
+
+format do
+  delegate :options_card, :options_card_name, to: :card
+end
+
+format :html do
+  def option_label option_name, id
+    wrap_with :label, class: "form-check-label", for: id do
+      option_label_text option_name
+    end
+  end
+
+  def option_view
+    @option_view ||= card.rule(:content_option_view) || :smart_label
+  end
+
+  def option_label_text option_name
+    return option_name unless (option_card = Card.fetch option_name)
+
+    nest option_card, view: option_view
+  end
+end

data/set/abstract/items.rb

@@ -3,3 +3,11 @@ format :html do
     wrap_with_nav_item nav_dropdown
   end
 end
+
+format do
+  def nest_item_array
+    card.item_cards.map do |item|
+      nest_item item, view: :core
+    end
+  end
+end

data/set/all/modal.rb

@@ -16,24 +16,9 @@ format :html do
     ""
   end
 
-  def show_in_modal_link link_text, body
-    link_to_view :modal, link_text, "data-modal-body": body, "data-slotter-mode": "modal"
-  end
-
-  def modal_close_button link_text="Close", opts={}
-    classes = opts.delete(:class)
-    button_opts = opts.merge(MODAL_CLOSE_OPTS)
-    add_class button_opts, classes if classes
-    button_tag link_text, button_opts
-  end
-
-  def modal_submit_button opts={}
-    add_class opts, "submit-button _close-modal"
-    submit_button opts
-  end
-
   view :modal_menu, unknown: true, wrap: :modal_menu do
-    [close_modal_window, pop_out_modal_window]
+    [render_close_modal_link,
+     render_pop_out_modal_link(optional: :show)]
   end
 
   wrapper :modal_menu, :div, class: "modal-menu _modal-menu ms-auto"
@@ -52,6 +37,32 @@ format :html do
     modal_link _render_title, size: voo.size
   end
 
+  view :close_modal_link, unknown: true do
+    link_to icon_tag(:close), path: "",
+                              class: "_close-modal btn-close",
+                              "data-bs-dismiss": "modal"
+  end
+
+  view :pop_out_modal_link, unknown: :blank do
+    link_to icon_tag(:modal), path: {}, class: "pop-out-modal btn-close"
+  end
+
+  def show_in_modal_link link_text, body
+    link_to_view :modal, link_text, "data-modal-body": body, "data-slotter-mode": "modal"
+  end
+
+  def modal_close_button link_text="Close", opts={}
+    classes = opts.delete(:class)
+    button_opts = opts.merge(MODAL_CLOSE_OPTS)
+    add_class button_opts, classes if classes
+    button_tag link_text, button_opts
+  end
+
+  def modal_submit_button opts={}
+    add_class opts, "submit-button _close-modal"
+    submit_button opts
+  end
+
   def modal_link text=nil, opts={}
     opts = modal_link_opts(opts)
     opts[:path][:layout] ||= :modal
@@ -87,18 +98,6 @@ format :html do
     size.in?(MODAL_SIZE.keys) ? size : cast_modal_option(size)
   end
 
-  def close_modal_window
-    link_to icon_tag(:close), path: "",
-                              class: "_close-modal btn-close",
-                              "data-bs-dismiss": "modal"
-  end
-
-  def pop_out_modal_window
-    return unless card.known?
-
-    link_to icon_tag(:modal), path: {}, class: "pop-out-modal btn-close"
-  end
-
   private
 
   def normalize_modal_option key, opts

data/set/all/process_layout.rb

@@ -1,8 +1,19 @@
+basket[:cache_seed_names] << %i[all layout]
+
 format :html do
-  # TODO: use CodeFile cards for these
-  # builtin layouts allow for rescue / testing
-  # HTML_LAYOUTS = Mod::Loader.load_layouts(:html).merge "none" => "{{_main}}"
-  # HAML_LAYOUTS = Mod::Loader.load_layouts(:haml)
+  # for override
+  def layout_for_view _view
+    nil
+  end
+
+  # public for testing
+  def explicit_modal_wrapper? view
+    return unless (wrap_view = view_setting :wrap, view)
+
+    (wrapper_names(wrap_view) & %i[modal board]).any?
+  end
+
+  private
 
   def show_with_page_layout view, args
     main!
@@ -19,35 +30,10 @@ format :html do
     params[:layout] || layout_for_view(view) || layout_name_from_rule || :default
   end
 
-  # for override
-  def layout_for_view _view
-    nil
-  end
-
-  def render_with_layout view, layout, args={}
-    view_opts = Layout.main_nest_opts(layout, self)
-    view ||= view_opts.delete(:view) || default_page_view
-    view_opts[:home_view] = view
-    view_opts[:layout] = layout
-    render! view, view_opts.reverse_merge(args)
-  end
-
-  def default_page_view
-    default_nest_view
-  end
-
-  def show_layout?
-    !Env.ajax? || params[:layout]
-  end
-
-  def explicit_modal_wrapper? view
-    return unless (wrap_view = view_setting :wrap, view)
-
-    (wrapper_names(wrap_view) & %i[modal board]).any?
+  def layout_name_from_rule
+    card.rule_card(:layout)&.try :first_name
   end
 
-  private
-
   def main_render_args view, args
     args[:view] = view if view
     args[:main] = true
@@ -55,15 +41,19 @@ format :html do
     args
   end
 
-  def layout_name_from_rule
-    card.rule_card(:layout)&.try :first_name
-  end
-
   def render_outside_of_layout view, args
     body = render_with_layout nil, page_layout(view), {}
     body_with_modal body, render!(view, args)
   end
 
+  def render_with_layout view, layout, args={}
+    view_opts = Layout.main_nest_opts(layout, self)
+    view ||= view_opts.delete(:view) || default_page_view
+    view_opts[:home_view] = view
+    view_opts[:layout] = layout
+    render! view, view_opts.reverse_merge(args)
+  end
+
   def body_with_modal body, modal
     if body.include? "</body>"
       # a bit hacky

data/set/right/enabled_roles.rb

@@ -2,15 +2,15 @@ include_set Abstract::AccountDropdown
 
 assign_type :session
 
-def ok_to_read
+def ok_to_read?
   true
 end
 
-def ok_to_update
+def ok_to_update?
   left_id == Auth.current_id
 end
 
-def ok_to_create
+def ok_to_create?
   left_id == Auth.current_id
 end
 
@@ -26,7 +26,7 @@ event :validate_role_enabling, :validate, on: :save do
 end
 
 event :clear_roles_cache, :prepare_to_store, before: :store_in_session do
-  clear_roles
+  Auth.current.clear_roles
   Auth.update_always_cache nil
 end
 

data/set/right/head.rb

@@ -1,11 +1,11 @@
 require "coderay"
 
-def ok_to_read
+def ok_to_read?
   true
 end
 
 format :html do
-  view :head_content do
+  view :head_content, cache: :yes do
     process_content render_raw
   end
 

data/set/right/layout.rb

@@ -1 +1,5 @@
 assign_type :pointer
+
+# def item_references?
+#   false
+# end

data/set/self/account_links.rb

@@ -1,6 +1,6 @@
 include_set Abstract::AccountDropdown
 
-def ok_to_read
+def ok_to_read?
   true
 end
 
@@ -72,7 +72,7 @@ format :html do
 
   def can_disable_roles?
     Auth.current_roles.size > 1 &&
-      Card::Codename.exists?(:enabled_roles) # workaround for broken migrations
+      Card::Codename.exist?(:enabled_roles) # workaround for broken migrations
   end
 
   def account_link_text purpose

data/set/self/head.rb

@@ -20,6 +20,9 @@ format :html do
     "Content can't be edited."
   end
 
+  view :bar_bottom do
+  end
+
   def escape_in_main
     main? ? (h yield) : yield
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-layout
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-18 00:00:00.000000000 Z
+date: 2024-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,56 +18,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.106.0
+        version: 1.108.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.106.0
+        version: 1.108.0
 - !ruby/object:Gem::Dependency
   name: card-mod-account
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.18.0
 - !ruby/object:Gem::Dependency
   name: card-mod-session
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.18.0
 - !ruby/object:Gem::Dependency
   name: card-mod-tabs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.18.0
 description: ''
 email:
 - info@decko.org
@@ -83,6 +83,7 @@ files:
 - assets/style/layout.scss
 - assets/style/modal.scss
 - assets/style/overlay.scss
+- config/admin.yml
 - config/locales/de.yml
 - config/locales/en.yml
 - data/files/mod_layout_script_asset_output/file.js
@@ -96,6 +97,7 @@ files:
 - lib/card/layout/unknown_layout.rb
 - set/abstract/account_dropdown.rb
 - set/abstract/items.rb
+- set/abstract/items/options_api.rb
 - set/abstract/list.rb
 - set/all/alert.rb
 - set/all/layouts.rb
@@ -121,7 +123,7 @@ files:
 - set/type/layout_type.rb
 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
@@ -138,14 +140,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.7
 signing_key:
 specification_version: 4
 summary: decko layouts