card 1.19.6 → 1.20.0

data/mod/standard/set/type/session.rb

@@ -30,6 +30,6 @@ format :html do
   include Pointer::HtmlFormat
 
   def default_core_args args
-    args[:item] = :name
+    args[:items] = { view: :name }
   end
 end

data/mod/standard/set/type/set.rb

@@ -1,173 +1,194 @@
 
+include_set Type::SearchType
+
 format :html do
-  view :core do |args|
-    _render args[:rule_view], args
-  end
+  COMMON_RULE_SETTINGS =
+    [:create, :read, :update, :delete, :structure, :default, :style].freeze
 
-  def default_core_args args
-    args[:rule_view] ||= :common_rules
-    args[:optional_set_label] ||= :show
-    args[:optional_set_navbar] ||= :hide
-    args[:optional_rule_navbar] ||= :show
+  view :core do |args|
+    voo.show :set_label, :rule_navbar
+    voo.hide :set_navbar
+    rule_view = args[:rule_view] || :common_rules
+    _render rule_view
   end
 
-  def with_label_and_navbars args
+  def with_label_and_navbars selected_view
+    @selected_rule_navbar_view = selected_view
     wrap do
       [
-        _optional_render(:set_label,   args, :show),
-        _optional_render(:rule_navbar, args, :hide),
-        _optional_render(:set_navbar,  args, :hide),
+        _optional_render_set_label,
+        _optional_render_rule_navbar,
+        _optional_render_set_navbar,
         yield
       ]
     end
   end
 
-  view :all_rules do |args|
-    with_label_and_navbars args.merge(selected_view: :all_rules) do
-      rules_table card.visible_setting_codenames.sort, args
+  view :all_rules do
+    with_label_and_navbars :all_rules do
+      rules_table card.visible_setting_codenames.sort
     end
   end
 
-  view :grouped_rules do |args|
-    with_label_and_navbars args.merge(selected_view: :grouped_rules) do
-      content_tag(:div, class: "panel-group",
-                        id: "accordion",
-                        role: "tablist",
-                        "aria-multiselectable" => "true") do
+  view :grouped_rules do
+    with_label_and_navbars :grouped_rules do
+      wrap_with :div, class: "panel-group", id: "accordion",
+                      role: "tablist", "aria-multiselectable" => "true" do
         Card::Setting.groups.keys.map do |group_key|
-          _optional_render(group_key, args, :show)
-        end * "\n"
+          _optional_render group_key
+        end
       end
     end
   end
 
-  view :recent_rules do |args|
-    with_label_and_navbars args.merge(selected_view: :recent_rules) do
+  view :recent_rules do
+    with_label_and_navbars :recent_rules do
       recent_settings = Card[:recent_settings].item_cards.map(&:codename)
       settings = recent_settings.map(&:to_sym) & card.visible_setting_codenames
-      rules_table settings, args
+      rules_table settings
     end
   end
 
-  view :common_rules do |args|
-    with_label_and_navbars args.merge(selected_view: :common_rules) do
-      settings =
-        card.visible_setting_codenames &
-        [:create, :read, :update, :delete, :structure, :default, :style]
-      rules_table settings, args
+  view :common_rules do
+    with_label_and_navbars :common_rules do
+      settings = card.visible_setting_codenames & COMMON_RULE_SETTINGS
+      # "&" = set intersection
+      rules_table settings
     end
   end
 
-  view :field_related_rules do |args|
-    with_label_and_navbars args.merge(selected_view: :field_related_rules) do
+  view :field_related_rules do
+    with_label_and_navbars :field_related_rules do
       field_settings = [:default, :help, :structure]
       if card.type_id == PointerID
+        # FIXME: should be done with override in pointer set module
         field_settings += [:input, :options, :options_label]
       end
-      rules_table (card.visible_setting_codenames & field_settings), args
+      settings = card.visible_setting_codenames & field_settings
+      rules_table settings
     end
   end
 
-  view :set_label do |_args|
-    content_tag :h3, card.label, class: "set-label"
+  view :set_label do
+    wrap_with :h3, card.label, class: "set-label"
   end
 
   Card::Setting.groups.keys.each do |group_key|
-    view group_key.to_sym do |args|
+    view group_key.to_sym do
       settings = card.visible_settings group_key
-      if settings.present?
-        group_name = Card::Setting.group_names[group_key] || group.to_s
-        heading_id = "heading-#{group_key}"
-        collapse_id = "collapse-#{card.cardname.safe_key}-#{group_key}"
-        output [
-          (content_tag :div, class: "panel panel-default" do
-            content_tag :div, class: "panel-heading", role: "tab",
-                              id: heading_id do
-              content_tag :h4, class: "panel-title" do
-                content_tag :a, group_name,
-                            "data-toggle" => "collapse",
-                            "data-parent" => "#accordion",
-                            href: "##{collapse_id}",
-                            "aria-expanded" => "false",
-                            "aria-controls" => collapse_id
-              end
-            end
-          end),
-          (content_tag :div, id: collapse_id,
-                             class: "panel-collapse collapse",
-                             role: "tabpanel",
-                             "aria-labelledby" => heading_id do
-             rules_table settings.map(&:codename), args
-           end)
-        ]
+      return unless settings.present?
+      group_panels group_key
+    end
+  end
+
+  def group_panels group_key
+    output [group_tab(group_key), group_tabpanel(group_key)]
+  end
+
+  def group_tab group_key
+    heading_id = "heading-#{group_key}"
+    wrap_with :div, class: "panel panel-default" do
+      wrap_with :div, class: "panel-heading", role: "tab", id: heading_id do
+        wrap_with :h4, class: "panel-title" do
+          group_collapse_link group_key
+        end
       end
     end
   end
 
-  def rules_table settings, args={}
+  def group_collapse_link group_key
+    collapse_id = group_collapse_id group_key
+    group_name = Card::Setting.group_names[group_key] || group_key.to_s
+    link_to group_name,
+            href: "##{collapse_id}",
+            "data-toggle" => "collapse",   "aria-expanded" => "false",
+            "data-parent" => "#accordion", "aria-controls" => collapse_id
+  end
+
+  def group_collapse_id group_key
+    "collapse-#{card.cardname.safe_key}-#{group_key}"
+  end
+
+  def group_tabpanel group_key
+    collapse_id = group_collapse_id group_key
+    heading_id =  "heading-#{group_key}"
+    settings = card.visible_settings group_key
+    wrap_with :div, id: collapse_id, class: "panel-collapse collapse",
+                    role: "tabpanel", "aria-labelledby" => heading_id do
+      rules_table settings.map(&:codename)
+    end
+  end
+
+  def rules_table settings
     wrap_with :table, class: "set-rules table" do
-      [
-        (content_tag(:tr, class: "rule-group") do
-          wrap_each_with :th, %w(Trait Content Set), class: "rule-heading"
-        end),
-        (settings.map do |setting|
-          if show_view? setting, args
-            rule_card = card.fetch(trait: setting, new: {})
-            nest(rule_card, view: :closed_rule).html_safe
-          end
-        end * "\n")
-      ]
+      [rules_table_headings, rules_table_body(settings)]
+    end
+  end
+
+  def rules_table_headings
+    wrap_with :tr, class: "rule-group" do
+      wrap_each_with :th, %w(Trait Content Set), class: "rule-heading"
     end
   end
 
-  view :editor do |_args|
+  def rules_table_body settings
+    settings.map do |setting|
+      next unless show_view? setting
+      rule_card = card.fetch trait: setting, new: {}
+      nest(rule_card, view: :closed_rule).html_safe
+    end * "\n"
+  end
+
+  view :editor do
     "Cannot currently edit Sets" # ENGLISH
   end
 
-  view :template_link do |args|
-    args.delete :style # why? comment needed
-    wrap args do
-      link = link_to_view :template_editor, args[:inc_syntax], class: "slotter"
-      "{{#{link}}"
+  view :template_link, cache: :never do
+    wrap do
+      link = link_to_view :template_editor, parent.voo.nest_syntax,
+                          class: "slotter"
+      "{{#{link}}}"
     end
   end
 
-  view :template_closer do |_args|
+  view :template_closer do
     link_classes = "slotter glyphicon glyphicon-remove template-editor-close"
     link_to_view :template_link, "", class: link_classes
   end
 
-  view :template_editor do |args|
-    wrap args do
-      %(
-        <div class="template-editor-left">{{</div>
-        <div class="template-editor-main">
-          #{render_template_editor_frame args}
-        </div>
-        <div class="template-editor-right">}}</div>
-      )
+  view :template_editor do
+    wrap do
+      [
+        wrap_with(:div, "{{", class: "template-editor-left"),
+        wrap_with(:div, class: "template-editor-main") do
+          render_template_editor_frame
+        end,
+        wrap_with(:div, "}}", class: "template-editor-right")
+      ]
     end
   end
 
-  view :template_editor_frame do |args|
-    frame no_slot: true, title: card.label, menu_hack: :template_closer do
-      _render_core args.merge(hide: "set_label")
+  view :template_editor_frame do
+    voo.title = card.label
+    voo.hide :set_label
+    template_frame do
+      _render_core
     end
   end
 
-  view :closed_content do |_args|
+  view :closed_content do
     ""
   end
 
   view :set_navbar do |args|
-    id = "rule-navbar-#{card.cardname.safe_key}-#{args[:home_view]}"
+    id = "rule-navbar-#{card.cardname.safe_key}-#{voo.home_view}"
     related_sets = card.related_sets(true)
     return "" if related_sets.size <= 1
     navbar id, toggle: 'Rules<span class="caret"></span>', toggle_align: :left,
                class: "slotter toolbar", navbar_type: "inverse",
                collapsed_content: close_link(class: "pull-right visible-xs") do
       [
-        content_tag(:span, "Set:", class: "navbar-text hidden-xs"),
+        wrap_with(:span, "Set:", class: "navbar-text hidden-xs"),
         (wrap_with :ul, class: "nav navbar-nav nav-pills" do
           related_sets.map do |name, label|
             slot_opts = { subheader: showname(name),
@@ -188,37 +209,44 @@ format :html do
     "<li role='presentation' #{"class='active'" if active}>#{content}</li>"
   end
 
-  view :rule_navbar do |args|
-    id = "rule-navbar-#{card.cardname.safe_key}-#{args[:home_view]}"
-    args[:path_opts] = { slot: { show: :rule_navbar } }
-    navbar id, toggle: 'Rules<span class="caret"></span>', toggle_align: :left,
-               class: "slotter toolbar", navbar_type: "inverse",
-               collapsed_content: close_link(class: "pull-right visible-xs") do
-      [
-        content_tag(:span, "Rules:", class: "navbar-text hidden-xs"),
-        (wrap_with :ul, class: "nav navbar-nav nav-pills" do
-          [
-            (view_link_pill("field", :field_related_rules, args) if card.junction?),
-            view_link_pill("common", :common_rules, args),
-            view_link_pill("by group", :grouped_rules, args),
-            view_link_pill("by name", :all_rules, args),
-            (view_link_pill("recent", :recent_rules, args) if recently_edited_settings?)
-          ]
-        end)
-      ]
+  view :rule_navbar do
+    navbar "rule-navbar-#{card.cardname.safe_key}-#{voo.home_view}",
+           toggle: 'Rules<span class="caret"></span>', toggle_align: :left,
+           class: "slotter toolbar", navbar_type: "inverse",
+           collapsed_content: close_link(class: "pull-right visible-xs") do
+      [rule_navbar_heading, rule_navbar_content]
     end
   end
 
-  def view_link_pill name, view, args
-    selected_view = args[:selected_view] || @slot_view || args[:home_view]
+  def rule_navbar_heading
+    wrap_with :span, "Rules:", class: "navbar-text hidden-xs"
+  end
+
+  def rule_navbar_pills
+    pills = [["common",   :common_rules],
+             ["by group", :grouped_rules],
+             ["by name",  :all_rules]]
+    pills.unshift ["field", :field_related_rules] if card.junction?
+    pills.push ["recent", :recent_rules] if recently_edited_settings?
+    pills
+  end
+
+  def rule_navbar_content
+    wrap_with :ul, class: "nav navbar-nav nav-pills" do
+      rule_navbar_pills.map do |label, symbol|
+        view_link_pill label, symbol
+      end
+    end
+  end
+
+  def view_link_pill name, view
+    selected_view = @selected_rule_navbar_view || @slot_view || voo.home_view
     link = link_to_view view, name, class: "slotter", role: "pill",
-                                    path: args[:path_opts]
+                                    path: { slot: { show: :rule_navbar } }
     li_pill link, selected_view == view
   end
 end
 
-include Card::Set::Type::SearchType
-
 def followed_by? user_id=nil
   all_members_followed_by? user_id
 end
@@ -256,6 +284,13 @@ def label
   end
 end
 
+def uncapitalized_label
+  label = label.to_s
+  return label unless label[0]
+  label[0] = label[0].downcase
+  label
+end
+
 def follow_label
   if (klass = subclass_for_set)
     klass.follow_label cardname.left
@@ -276,17 +311,6 @@ def follow_rule_name user=nil
   end
 end
 
-# def to_following_item_name args
-#   left_part = follow_rule_name( args[:user] )
-#   option = args[:option] || if (rule_card = Card.fetch(left_part))
-#        rule_card.content
-#      else
-#        Card[:nothing].name
-#      end
-#
-#   "#{left_part}+#{option}"
-# end
-
 def all_user_ids_with_rule_for setting_code
   Card.all_user_ids_with_rule_for self, setting_code
 end

data/mod/standard/set/type/toggle.rb

@@ -7,6 +7,6 @@ view :core do |_args|
   end
 end
 
-view :editor do |_args|
+view :editor do
   check_box :content
 end

data/mod/standard/set/type/uri.rb

@@ -1,11 +1,11 @@
 format do
   include Phrase::Format
 
-  view :core do |args|
-    link_to_resource _render_raw(args), render_title(args)
+  view :core do
+    link_to_resource _render_raw, render_title
   end
 
-  view :url_link do |args|
-    link_to_resource _render_raw(args)
+  view :url_link do
+    link_to_resource _render_raw
   end
 end

data/mod/standard/spec/chunk/include_spec.rb

@@ -1,9 +1,9 @@
 # -*- encoding : utf-8 -*-
 
-describe Card::Content::Chunk::Include, "Inclusion" do
+describe Card::Content::Chunk::Nest, "Inclusion" do
   context "syntax parsing" do
     before do
-      @class = Card::Content::Chunk::Include
+      @class = Card::Content::Chunk::Nest
     end
 
     let :instance do
@@ -18,25 +18,28 @@ describe Card::Content::Chunk::Include, "Inclusion" do
     it "handles visible comments" do
       expect(render_content("{{# now you see me}}"))
         .to eq("<!-- # now you see me -->")
+    end
+
+    it "handles weird characters in nest comments" do
       expect(render_content("{{# -->}}")).to eq("<!-- # --&gt; -->")
     end
 
     it "handles empty nests" do
       @chunk = "{{ }}"
       expect(name).to eq("")
-      expect(options[:inc_syntax]).to eq(" ")
+      expect(options[:nest_syntax]).to eq(" ")
     end
 
     it "handles empty nests with pipe" do
       @chunk = "{{|}}"
       expect(name).to eq("")
-      expect(options[:inc_syntax]).to eq("|")
+      expect(options[:nest_syntax]).to eq("|")
     end
 
     it "handles no pipes" do
       @chunk = "{{toy}}"
       expect(name).to eq("toy")
-      expect(options[:inc_name]).to eq("toy")
+      expect(options[:nest_name]).to eq("toy")
       expect(options.key?(:view)).to eq(false)
     end
 
@@ -58,7 +61,7 @@ describe Card::Content::Chunk::Include, "Inclusion" do
 
     it "handles single pipe" do
       @chunk = "{{toy|view:link;hide:me}}"
-      expect(options[:inc_name]).to eq("toy")
+      expect(options[:nest_name]).to eq("toy")
       expect(options[:view]).to eq("link")
       expect(options[:hide]).to eq("me")
       expect(options.key?(:items)).to eq(false)
@@ -66,7 +69,7 @@ describe Card::Content::Chunk::Include, "Inclusion" do
 
     it "handles multiple pipes" do
       @chunk = "{{box|open|closed}}"
-      expect(options[:inc_name]).to eq("box")
+      expect(options[:nest_name]).to eq("box")
       expect(options[:view]).to eq("open")
       expect(options[:items][:view]).to eq("closed")
       expect(options[:items].key?(:items)).to eq(false)
@@ -74,14 +77,14 @@ describe Card::Content::Chunk::Include, "Inclusion" do
 
     it "handles multiple pipes with blank lists" do
       @chunk = "{{box||closed}}"
-      expect(options[:inc_name]).to eq("box")
+      expect(options[:nest_name]).to eq("box")
       expect(options[:view]).to eq(nil)
       expect(options[:items][:view]).to eq("closed")
     end
 
     it "treats :item as view of next level" do
       @chunk = "{{toy|link;item:name}}"
-      expect(options[:inc_name]).to eq("toy")
+      expect(options[:nest_name]).to eq("toy")
       expect(options[:view]).to eq("link")
       expect(options[:items][:view]).to eq("name")
     end
@@ -165,7 +168,7 @@ describe Card::Content::Chunk::Include, "Inclusion" do
     it "handles structured cards" do
       create!("age")
       Card["*template"]
-      specialtype = Card.create type_code: "Cardtype", name: "SpecialType"
+      specialtype = Card.create type_code: :cardtype, name: "SpecialType"
       specialtype_template = specialtype.fetch(trait: :type, new: {})
                                         .fetch(trait: :structure, new: {})
       specialtype_template.content = "{{#{Card::Name.joint}age}}"
@@ -178,26 +181,5 @@ describe Card::Content::Chunk::Include, "Inclusion" do
       expect(wooga_age.format.render_core).to eq("39")
       expect(wooga_age.includers.map(&:name)).to eq(["Wooga"])
     end
-
-    it "handles shading" do
-      create! "Alpha", "Pooey"
-      create! "Beta", "{{Alpha|shade:off}}"
-      r = create!("Bee", "{{Alpha|shade:off}}").format.render_core
-      assert_view_select r, 'div[style~="shade:off;"]' do
-        assert_select "div[class~=card-content]", "Pooey"
-      end
-      r = create!("Cee", "{{Alpha| shade: off }}").format.render_core
-      assert_view_select r, 'div[style~="shade:off;"]' do
-        assert_select "div[class~=card-content]", "Pooey"
-      end
-      r = create!("Dee", "{{Alpha| shade:off }}").format.render_core
-      assert_view_select r, 'div[style~="shade:off;"]' do
-        assert_select 'div[class~="card-content"]', "Pooey"
-      end
-      r = create!("Eee", "{{Alpha| shade:on }}").format.render_core
-      assert_view_select r, 'div[style~="shade:on;"]' do
-        assert_select 'div[class~="card-content"]', "Pooey"
-      end
-    end
   end
 end