card-mod-layout 0.16.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03d108a569f14471991d748ba88c83090cc30390336e5a36d859ebaab663775a
-  data.tar.gz: e8fe906f01bd1f15118f69e59849aebb2903927cdef484f35a13212c1e04287f
+  metadata.gz: 1ec837afb468af7b7cb4e750530af0e9a4969c25790b1d6bd38ae925a911d206
+  data.tar.gz: 9a250e05b0c1de8923dc5ec3625293e4f1944dcdd0e7245606da6ed082a6dcc1
 SHA512:
-  metadata.gz: 2ee0a3db0692e0691fe903381c9732755f0a227e31196bae13f16e73f36db32e872f932fae46db1ba529f37cbb5ae87052b3e6b3514d34497682e101e67dad7a
-  data.tar.gz: 905af8235a9e0ac6fa112e255c9e672778b2af24449424a5b1f14cfa2160b0451147ec083ec959b9d320dafb8ee2141bd30a6f85dc73d2272e46aa6e939c30b1
+  metadata.gz: 9afc1d38fdd83efd10eebae08ceffee72849209db77a7e48e03808d16cbf60b47bc0c5e780628d9d48df0f693485c9373eda8decdef16cebd6e511a99e178e16
+  data.tar.gz: '081c2125e0fd671a18f0f9b0ccf69aedeb3f957cec1281cfb5367974ef153776acc56e7cf90b03e840e97b9dffab586ef0fa5259edf2f2730b4f91bc142681a1'

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/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,6 +1,6 @@
 require "coderay"
 
-def ok_to_read
+def ok_to_read?
   true
 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
 

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.17.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-06-12 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.107.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.106.0
+        version: 1.107.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.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.17.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.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.17.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.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.17.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
@@ -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.10
 signing_key:
 specification_version: 4
 summary: decko layouts