card 1.97.0.1 → 1.98.0

data/mod/navbar/set/abstract/pointer/html_views.rb

@@ -0,0 +1,5 @@
+format :html do
+  view :nav_item do
+    nav_dropdown
+  end
+end

data/mod/navbar/set/abstract/roles_dropdown.rb

@@ -0,0 +1,15 @@
+format :html do
+  def link_to_mycard
+    link_to_card Auth.current.name, nil,
+                 id: "my-card-link", class: "nav-link #{classy('my-card')}"
+  end
+
+  def roles_dropdown role_list
+    split_button link_to_mycard, nil do
+      [
+        link_to_card([Auth.current, :account_settings], "Account"),
+        ["Roles", role_list]
+      ]
+    end
+  end
+end

data/mod/navbar/set/all/navbar_links.rb

@@ -0,0 +1,58 @@
+format :html do
+  view :navbar_links, perms: :none do
+    wrap_with :ul, class: "navbar-nav" do
+      navbar_items
+    end
+  end
+
+  # Iterates over all nests and links and renders them as bootstrap navbar items.
+  # Items that are pointer cards become dropdowns
+  def navbar_items view: :nav_item, link_class: "nav-link"
+    process_content nil, chunk_list: :references do |chunk|
+      case chunk
+      when Card::Content::Chunk::Link
+        link = chunk.render_link view: view, explicit_link_opts: { class: link_class }
+        chunk.explicit_link? && view == :nav_item ? wrap_with_nav_item(link) : link
+      when Card::Content::Chunk::Nest
+        content_nest chunk.options.merge view: view
+      else
+        chunk.process_chunk
+      end
+    end
+  end
+
+  # overridden in Abstact::Pointer to render dropdown
+  view :nav_item do
+    wrap_with_nav_item link_view(class: "nav-link")
+  end
+
+  def wrap_with_nav_item content
+    wrap_with(:li, content, class: "nav-item")
+  end
+
+  view :nav_link_in_dropdown do
+    link_to_card card, render_title, class: "dropdown-item"
+  end
+
+  def nav_dropdown
+    wrap_with(:li, class: "nav-item dropdown") do
+      [
+        dropdown_toggle_link,
+        dropdown_menu
+      ]
+    end
+  end
+
+  def dropdown_toggle_link
+    link_to(render_title, href: "#", class: "nav-link dropdown-toggle",
+                          "data-toggle": "dropdown")
+  end
+
+  def dropdown_menu
+    wrap_with :div, dropdown_menu_items, class: "dropdown-menu"
+  end
+
+  def dropdown_menu_items
+    navbar_items view: :nav_link_in_dropdown, link_class: "dropdown-item"
+  end
+end

data/mod/navbar/set/right/enabled_roles.rb

@@ -0,0 +1,63 @@
+include_set Abstract::RolesDropdown
+
+def ok_to_read
+  true
+end
+
+def ok_to_update
+  left_id == Auth.current_id
+end
+
+def ok_to_create
+  left_id == Auth.current_id
+end
+
+def ensure_roles
+  self.content = Auth.current_roles.to_pointer_content if content.blank?
+end
+
+event :validate_role_enabling, :validate, on: :save do
+  illegal_roles = item_names - Auth.current_roles
+  return if illegal_roles.empty?
+
+  errors.add :content, "illegal roles: #{illegal_roles.to_sentence}" # LOCALIZE
+end
+
+event :clear_roles_cache, :prepare_to_store, before: :store_in_session do
+  clear_roles
+  Auth.update_always_cache Auth.as_id, nil
+end
+
+format :html do
+  # permission change compared to super
+  view :edit_inline, perms: :none, unknown: true, cache: :never, wrap: :slot do
+    super()
+  end
+
+  def editor
+    :checkbox
+  end
+
+  def edit_success
+    { reload: true }
+  end
+
+  def hidden_form_tags _action, opts
+    "#{super} #{hidden_tags card: { type_id: SessionID }}"
+  end
+
+  def checkbox_input
+    card.ensure_roles
+    wrap_with :div, class: "pointer-checkbox-list" do
+      roles_dropdown roles_list
+    end
+  end
+
+  def roles_list
+    Auth.current_roles.map do |option_name|
+      haml :role_checkbox, id: "pointer-checkbox-#{option_name.to_name.key}",
+                           checked: card.item_names.include?(option_name),
+                           option_name: option_name
+    end
+  end
+end

data/mod/navbar/set/right/enabled_roles/role_checkbox.haml

@@ -0,0 +1,4 @@
+.pointer-checkbox
+  = check_box_tag "pointer_checkbox-#{unique_id}", option_name, checked,
+                  id: id, class: "pointer-checkbox-button _submit-on-change"
+  = link_to_card option_name

data/mod/navbar/set/self/account_links.rb

@@ -0,0 +1,98 @@
+include_set Abstract::RolesDropdown
+
+def ok_to_read
+  true
+end
+
+format :html do
+  view :core, cache: :never do
+    status_class = Auth.signed_in? ? "logged-in" : "logged-out"
+    wrap_with :div, id: "logging", class: status_class do
+      navbar_items.join "\n"
+    end
+  end
+
+  def navbar_items
+    # removed invite for now
+    links =
+      %i[my_card sign_out sign_up sign_in].map do |link_view|
+        render(link_view)
+      end.compact
+
+    links.map do |link|
+      wrap_with_nav_item link
+    end
+  end
+
+  def self.link_options opts={}
+    options = { denial: :blank, cache: :never }.merge opts
+    options[:perms] = ->(r) { yield r } if block_given?
+    options.clone
+  end
+
+  view :sign_up, link_options(&:show_signup_link?) do
+    link_to_card :signup, account_link_text(:sign_up),
+                 class: nav_link_class("signup-link"),
+                 path: { action: :new, mark: :signup }
+  end
+
+  view(:sign_in, link_options { !Auth.signed_in? }) do
+    link_to_card :signin, account_link_text(:sign_in),
+                 class: nav_link_class("signin-link")
+  end
+
+  view(:sign_out, link_options { Auth.signed_in? }) do
+    link_to_card :signin, account_link_text(:sign_out),
+                 class: nav_link_class("signout-link"),
+                 path: { action: :delete }
+  end
+
+  view :invite, link_options(&:show_invite_link?) do
+    link_to_card :signup, account_link_text(:invite),
+                 class: nav_link_class("invite-link"),
+                 path: { action: :new, mark: :signup }
+  end
+
+  view(:my_card, link_options { Auth.signed_in? }) do
+    can_disable_roles? ? interactive_roles_dropdown : simple_roles_dropdown
+  end
+
+  def interactive_roles_dropdown
+    nest(enabled_roles_card,
+         view: :edit_inline, hide: %i[edit_inline_buttons name_formgroup])
+  end
+
+  def simple_roles_dropdown
+    roles_dropdown Auth.current_roles.map(&method(:link_to_card))
+  end
+
+  def enabled_roles_card
+    Auth.current.fetch trait: :enabled_roles, new: { type_id: SessionID }
+  end
+
+  def role_list
+    Auth.current_roles.map(&method(:link_to_card))
+  end
+
+  def can_disable_roles?
+    Auth.current_roles.size > 1
+  end
+
+  def account_link_text purpose
+    voo.title ||
+      I18n.t(purpose, scope: "mod.account.set.self.account_links")
+  end
+
+  def nav_link_class type
+    "nav-link #{classy(type)}"
+  end
+
+  def show_signup_link?
+    !Auth.signed_in? && Card.new(type_id: Card::SignupID).ok?(:create)
+  end
+
+  def show_invite_link?
+    Auth.signed_in? &&
+      Card.new(type_id: Card.default_accounted_type_id).ok?(:create)
+  end
+end

data/mod/navbar/set/self/dropdown_divider.rb

@@ -0,0 +1,9 @@
+format :html do
+  view :nav_item do
+    wrap_with :div, "", class: "dropdown-divider"
+  end
+
+  view :nav_link_in_dropdown do
+    wrap_with :div, "", class: "dropdown-divider"
+  end
+end

data/mod/{search → navbar}/set/self/navbox.rb

@@ -1,4 +1,3 @@
-
 format :html do
   view :raw do
     wrap_with :div, class: "form-group w-100" do
@@ -18,7 +17,8 @@ format :html do
   end
 
   view :navbar do
-    class_up "navbox-form", "form-inline col-md-6"
+    # FIXME: not bootstrap class here.
+    class_up "navbox-form", "form-inline"
     _render_core
   end
 

data/mod/navbar/set/type/html.rb

@@ -0,0 +1,14 @@
+format :html do
+  # deprecated; here to support old "*main menu" html cards in existing decks
+  view :navbar_links, perms: :none do
+    wrap_with :ul, class: "navbar-nav" do
+      item_links.map do |link|
+        wrap_with(:li, class: "nav-item") { link }
+      end.join "\n"
+    end
+  end
+
+  def item_links _args={}
+    raw(render_core).split(/[,\n]/)
+  end
+end

data/mod/navbar/spec/set/all/navbar_links_spec.rb

@@ -0,0 +1,55 @@
+RSpec.describe Card::Set::All::NavbarLinks do
+  describe "view: navbar_links" do
+    it "renders pointer as dropdown" do
+      content = "[[Stacks|stacky]]\n[[:recent|Recent]]"
+      expect_view(:navbar_links, card: { name: "B", type: :pointer, content: content })
+        .to have_tag :ul do
+        with_tag "li.nav-item.dropdown" do
+          with_tag "a.nav-link.dropdown-toggle", "stacky"
+          with_tag "div.dropdown-menu" do
+            with_tag "a.dropdown-item", "vertical"
+            with_tag "a.dropdown-item", "horizontal"
+          end
+        end
+        with_tag "li.nav-item" do
+          with_tag "a.nav-link", "Recent"
+        end
+      end
+    end
+
+    it "handles nest" do
+      content = "{{Stacks|title: stacky}}\n[[A|link to A]]"
+      expect_view(:navbar_links, card: { name: "B", type: :pointer, content: content })
+        .to have_tag :ul do
+        with_tag "li.nav-item.dropdown" do
+          with_tag "a.nav-link.dropdown-toggle", "stacky"
+          with_tag "div.dropdown-menu" do
+            with_tag "a.dropdown-item", "vertical"
+            with_tag "a.dropdown-item", "horizontal"
+          end
+        end
+        with_tag "li.nav-item" do
+          with_tag "a.nav-link", "link to A"
+        end
+      end
+    end
+
+    example "divider and explicit link" do
+      content = "[[Stacks|stacky]]\n[[*dropdown divider]]\n[[http://google.com|Google]]"
+      expect_view(:navbar_links, card: { name: "B", type: :pointer, content: content })
+        .to have_tag :ul do
+        with_tag "li.nav-item.dropdown" do
+          with_tag "a.nav-link.dropdown-toggle", "stacky"
+          with_tag "div.dropdown-menu" do
+            with_tag "a.dropdown-item", "vertical"
+            with_tag "a.dropdown-item", "horizontal"
+          end
+        end
+        with_tag "div.dropdown-divider"
+        with_tag "li.nav-item" do
+          with_tag "a.nav-link", "Google"
+        end
+      end
+    end
+  end
+end

data/mod/navbar/spec/set/right/enabled_roles_spec.rb

@@ -0,0 +1,12 @@
+RSpec.describe Card::Set::Right::EnabledRoles do
+  it "doesn't allow illegal roles", with_user: "Joe User" do
+    expect { create_session(["Joe User", :enabled_roles], "[[Administrator]]") }
+      .to raise_error(/illegal roles/)
+  end
+
+  it "disables roles", with_user: "Joe User" do
+    create_session(["Joe User", :enabled_roles], "Shark")
+    expect(Card["Joe User"].all_enabled_roles)
+      .to contain_exactly Card::SharkID
+  end
+end

data/mod/{account → navbar}/spec/set/self/account_links_spec.rb

@@ -1,9 +1,9 @@
 # -*- encoding : utf-8 -*-
 
-describe Card::Set::Self::AccountLinks do
+RSpec.describe Card::Set::Self::AccountLinks do
   it "has a 'my card' link" do
     account_links = render_card :core, name: "*account links"
-    expect(account_links).to have_tag 'span#logging' do
+    expect(account_links).to have_tag "div#logging" do
       have_tag 'a[class=~"my-card-link"]', text: "Joe User"
     end
   end

data/mod/pointer/set/abstract/00_paging_params.rb

@@ -1,3 +1,5 @@
+MAX_ANONYMOUS_SEARCH_PARAM = 1000
+
 format do
   def limit_param
     @limit ||= contextual_param(:limit) || default_limit
@@ -12,10 +14,15 @@ format do
   end
 
   def env_search_param param
-    return unless focal?
+    return unless focal? && Env.params[param].present?
+
+    legal_search_param! param, Env.params[param].to_i
+  end
+
+  def legal_search_param! param, val
+    return val if Card::Auth.signed_in? || val <= MAX_ANONYMOUS_SEARCH_PARAM
 
-    val = Env.params[param]
-    val.present? && val.to_i
+    raise Card::Error::PermissionDenied, "#{param} parameter exceeds maximum"
   end
 
   def voo_search_param param

data/mod/pointer/set/abstract/01_paging.rb

@@ -26,6 +26,7 @@ format do
     (offset / limit).to_i
   end
 
+  # for override
   def extra_paging_path_args
     {}
   end
@@ -42,7 +43,6 @@ format :html do
 
   view :paging, cache: :never do
     return "" unless paging_needed?
-
     <<-HTML
       <nav>
         <ul class="pagination paging">
@@ -89,12 +89,7 @@ format :html do
 
   def paging_path_args local_args={}
     @paging_path_args ||= {}
-    @paging_path_args.reverse_merge!(
-      limit: limit,
-      offset: offset,
-      view: paging_view,
-      slot: voo.slot_options
-    )
+    @paging_path_args.reverse_merge!(limit: limit, offset: offset)
     @paging_path_args.merge! extra_paging_path_args
     @paging_path_args.merge local_args
   end
@@ -103,10 +98,6 @@ format :html do
     paging_path_args.merge offset: page * limit
   end
 
-  def paging_view
-    voo&.home_view || voo.slot_options[:view] || :content
-  end
-
   def paging_needed?
     return false if limit < 1
     return false if fewer_results_than_limit? # avoid extra count search
@@ -133,7 +124,7 @@ format :json do
     }.merge extra_paging_path_args
   end
 
-  def paging_urls
+  view :paging_urls, cache: :never do
     return {} unless total_pages > 1
 
     { paging: paging_urls_hash }