card-mod-layout 0.11.2 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4f8bee4588b5b82610fc77cd6f6649806169bd492bafad3164a626b4d443e41
-  data.tar.gz: 306fe76d6d25ceb7379bdec8a3773d24cc0f3d6f2204c6b0a366f03cc8620291
+  metadata.gz: 9aebbcb41a5e7d109b07b38006e366d18e82873032e0e0032c87fabaaa324144
+  data.tar.gz: 15e513bbbb39276828cd20a8cf5ca21893d43bd92c9fa9a5be09aafcab2bd97c
 SHA512:
-  metadata.gz: fa1752d2bcec2f88058c7af2b5c91bb614e636dc0ff2658fe899302b3538692753579a33e0eb30fad6eb4ef02db3841566df29f8fde42c1eda089c0fa45921cf
-  data.tar.gz: ad4a39de93feff90538471d8b8f01e8e0d3bac2dff248b6a9d1bb1386b18ab9ad50f2b429fe0f7755d18ea9e2fc526812853a1a312c63ee99dea62c55134e30f
+  metadata.gz: 0caf1aae59a7c90349ebffd38aba724a6c7b2fd73df58681eff1019546b2f7f86ceb28ef764a654f64b2725fbb3764c0243079283963c3831c830dd2babca98c
+  data.tar.gz: 9260c99fcd0fdc641bc1cd5e58f032ca5a867ba0f54cf2d8cfb36c1d180e9ffb5e8e072ea1603129012efef2ddb608e6dbf596e76f6669bd64e117d2461552f9

data/lib/card/layout.rb

@@ -7,18 +7,18 @@ class Card
 
       def layout_class layout
         if layout.respond_to? :call
-          Card::Layout::ProcLayout
+          ProcLayout
         elsif card_layout? layout
-          Card::Layout::CardLayout
+          CardLayout
         elsif code_layout? layout
-          Card::Layout::CodeLayout
+          CodeLayout
         else
-          Card::Layout::UnknownLayout
+          UnknownLayout
         end
       end
 
       def card_layout? name
-        Card.fetch_type_id(name).in? [Card::LayoutTypeID, Card::HtmlID, Card::BasicID]
+        Card.fetch_type_id(name).in? [LayoutTypeID, HtmlID, BasicID]
       rescue ArgumentError, Card::Error::CodenameNotFound => _e
         false
       end
@@ -40,6 +40,7 @@ class Card
 
       def layout_key name
         return name if name.is_a? Symbol
+
         name.to_name.key.to_sym
       end
 

data/lib/card/layout/unknown_layout.rb

@@ -1,18 +1,18 @@
 class Card
   class Layout
     class UnknownLayout < Layout
+      delegate :t, to: Cardio
+
       def render
         @format.output [header, text]
       end
 
       def header
-        @format.content_tag :h1, @format.tr(:unknown_layout,
-                                            scope: "card-mod-format", name: @layout)
+        @format.content_tag :h1, t(:layout_unknown_layout, name: @layout)
       end
 
       def text
-        @format.tr(:available_layouts, scope: "card-mod-format",
-                                       available_layouts: self.class.built_in_layouts)
+        t :layout_available_layouts, available_layouts: self.class.built_in_layouts
       end
     end
   end

data/set/abstract/account_dropdown.rb

@@ -17,9 +17,7 @@ format :html do
     Auth.current_roles.size > 1
   end
 
-  def role_items
-    Auth.current_roles.map do |role_name|
-      yield role_name
-    end
+  def role_items &block
+    Auth.current_roles.map(&block)
   end
 end

data/set/all/modal.rb

@@ -14,6 +14,7 @@ format :html do
   def normalize_modal_option key, opts
     val = opts[key]
     return render("modal_#{key}") unless val
+
     cast_model_option val
   end
 

data/set/all/overlay.rb

@@ -59,8 +59,7 @@ format :html do
   end
 
   def overlay_delete_button
-    opts = { no_success: true }.merge OVERLAY_CLOSE_OPTS
-    delete_button opts
+    delete_button OVERLAY_CLOSE_OPTS.merge(success: {})
   end
 
   def overlay_save_and_close_button
@@ -80,25 +79,23 @@ format :html do
     header_wrap [title, _render_overlay_menu]
   end
 
-  def overlay_frame slot=true, header=render_overlay_header, slot_opts=nil
+  def overlay_frame slot=true, header=render_overlay_header, slot_opts=nil, &block
     slot_opts ||= {}
     overlay_framer slot, header, slot_opts do
-      wrap_body { yield }
+      wrap_body(&block)
     end
   end
 
-  def haml_overlay_frame slot=true, header=render_overlay_header
+  def haml_overlay_frame slot=true, header=render_overlay_header, &block
     overlay_framer slot, header, {} do
-      haml_wrap_body { yield }
+      haml_wrap_body(&block)
     end
   end
 
   private
 
-  def overlay_framer slot, header, slot_opts
+  def overlay_framer slot, header, slot_opts, &block
     class_up "card-slot", "_overlay"
-    with_frame slot, header, slot_opts do
-      yield
-    end
+    with_frame slot, header, slot_opts, &block
   end
 end

data/set/all/process_layout.rb

@@ -14,13 +14,6 @@ format :html do
     end
   end
 
-  def main_render_args view, args
-    args[:view] = view if view
-    args[:main] = true
-    args[:main_view] = true
-    args
-  end
-
   def page_layout
     params[:layout] || layout_name_from_rule || :default
   end
@@ -33,28 +26,43 @@ format :html do
     render! view, view_opts.reverse_merge(args)
   end
 
-  def render_outside_of_layout view, args
-    body = render_with_layout(nil, page_layout, {})
-    modal = render!(view, args)
-    if body.include?("</body>")
-      # a bit hacky
-      # the problem is that the body tag has to be in the layout
-      # so that you can add layout css classes like <body class="right-sidebar">
-      body.sub!("</body>", "#{modal}</body>")
-    else
-      body += modal
-    end
-    body
-  end
-
   def show_layout?
     !Env.ajax? || params[:layout]
   end
 
   def explicit_modal_wrapper? view
-    return unless view_setting(:wrap, view)
+    return unless (wrap_view = view_setting :wrap, view)
+
+    (wrapper_names(wrap_view) & %i[modal bridge]).any?
+  end
+
+  private
+
+  def main_render_args view, args
+    args[:view] = view if view
+    args[:main] = true
+    args[:main_view] = true
+    args
+  end
+
+  def layout_name_from_rule
+    card.rule_card(:layout)&.try :item_name
+  end
+
+  def render_outside_of_layout view, args
+    body = render_with_layout nil, page_layout, {}
+    body_with_modal body, render!(view, args)
+  end
 
-    wrapper_names(view_setting(:wrap, view)).any? { |n| n == :modal || n == :bridge }
+  def body_with_modal body, modal
+    if body.include? "</body>"
+      # a bit hacky
+      # the problem is that the body tag has to be in the layout
+      # so that you can add layout css classes like <body class="right-sidebar">
+      body.sub "</body>", "#{modal}</body>"
+    else
+      body + modal
+    end
   end
 
   def wrapper_names wrappers
@@ -65,12 +73,6 @@ format :html do
     end
   end
 
-  def layout_name_from_rule
-    card.rule_card(:layout)&.try :item_name
-  end
-
-  private
-
   def wrapper_names_from_array wrapper_array
     wrapper_array.map { |w| w.is_a?(Array) ? w.first : w }
   end

data/set/all/tabs.rb

@@ -21,6 +21,7 @@ format :html do
       path: nest_path(name, tab_options).html_safe
     }
     return unless tabs[:active].empty?
+
     tabs[:active] = { name: name, content: nest(name, tab_options) }
   end
 

data/set/right/head.rb

@@ -1,3 +1,5 @@
+require "coderay"
+
 def ok_to_read
   true
 end

data/set/self/account_links.rb

@@ -24,9 +24,9 @@ format :html do
     end
   end
 
-  def self.link_options opts={}
+  def self.link_options opts={}, &block
     options = { denial: :blank, cache: :never }.merge opts
-    options[:perms] = ->(r) { yield r } if block_given?
+    options[:perms] = block if block_given?
     options.clone
   end
 
@@ -80,7 +80,7 @@ format :html do
   end
 
   def account_link_text purpose
-    voo.title || tr(purpose, scope: "card-mod-account")
+    voo.title || t("account_#{purpose}")
   end
 
   def nav_link_class type

data/set/self/foot.rb

@@ -1,4 +1,3 @@
-
 def content
   "<!-- *foot is deprecated. please remove from layout -->"
 end

data/set/self/head.rb

@@ -9,7 +9,7 @@ format :html do
   view :core, cache: :never do
     escape_in_main do
       nest root.card, view: :head
-      # note that the head tag for each card is different
+      # NOTE: that the head tag for each card is different
       # (different title, different style rules, etc)
       # so we don't cache the core of *head, but we _do_ cache some
       # views within each head (see all/head.rb)

data/set/type/layout_type.rb

@@ -1,5 +1,7 @@
 # -*- encoding : utf-8 -*-
 
+require "coderay"
+
 include_set Type::Html
 
 event :update_layout_registry, :finalize, on: :update do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card-mod-layout
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.12.0
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-15 00:00:00.000000000 Z
+date: 2021-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: card
@@ -18,42 +18,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.101.2
+        version: 1.102.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.101.2
+        version: 1.102.0
 - !ruby/object:Gem::Dependency
   name: card-mod-account
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: card-mod-session
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.12.0
 description: ''
 email:
 - info@decko.org
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: decko layouts