card 1.97.0.1 → 1.98.0

data/mod/settings/set/abstract/permission.rb

@@ -1,7 +1,6 @@
 
 def standardize_items
-  # noop to override default behavior, which wouldn't let '_left' through and
-  # would therefore break
+  super unless content == "_left"
 end
 
 format :html do

data/mod/settings/set/abstract/templated_nests.rb

@@ -0,0 +1,7 @@
+format :html do
+  view :core do
+    with_nest_mode :template do
+      super()
+    end
+  end
+end

data/mod/settings/set/right/add_help.rb

@@ -1,11 +1 @@
-format :html do
-  view :core do
-    with_nest_mode :template do
-      super()
-    end
-  end
-
-  view :closed_content do
-    "#{_render_type} : #{_render_raw}"
-  end
-end
+include_set Abstract::TemplatedNests

data/mod/settings/set/right/default.rb

@@ -1,5 +1,10 @@
+include_set Abstract::TemplatedNests
+
 format :html do
-  include AddHelp::HtmlFormat
+  view :closed_content do
+    raw = _render_raw
+    "#{card.type_name} : #{raw.present? ? raw : '<em>empty</em>'}"
+  end
 
   def quick_editor
     wrap_type_formgroup do

data/mod/settings/set/right/help.rb

@@ -1,6 +1,6 @@
-format :html do
-  include AddHelp::HtmlFormat
+include_set Abstract::TemplatedNests
 
+format :html do
   view :popover do
     popover_link _render_core
   end

data/mod/settings/set/right/script.rb

@@ -2,6 +2,10 @@ include_set Abstract::Machine
 
 store_machine_output filetype: "js"
 
+def ok_to_read
+  true
+end
+
 view :javascript_include_tag do
   %(
     <script src="#{card.machine_output_url}" type="text/javascript"></script>

data/mod/settings/set/right/structure.rb

@@ -1,10 +1,15 @@
+include_set Abstract::TemplatedNests
+
 format :rss do
   def raw_feed_items
     [card]
   end
 end
+
 format :html do
-  include AddHelp::HtmlFormat
+  view :closed_content do
+    "#{_render_type} : #{_render_raw}"
+  end
 end
 
 event :update_structurees_references, :integrate,

data/mod/settings/set/right/style.rb

@@ -3,6 +3,10 @@ include_set Abstract::Machine
 
 store_machine_output filetype: "css"
 
+def ok_to_read
+  true
+end
+
 format do
   # turn off autodetection of uri's
   def chunk_list

data/mod/settings/set/type/setting.rb

@@ -13,7 +13,7 @@ end
 
 format :data do
   view :core do
-    wql = { left:  { type: Card::SetID },
+    wql = { left: { type: Card::SetID },
             right: card.id,
             limit: 0 }
     Card.search(wql).compact.map { |c| nest c }
@@ -22,9 +22,9 @@ end
 
 def set_classes_with_rules
   Card.set_patterns.reverse.map do |set_class|
-    wql = { left:  { type: Card::SetID },
+    wql = { left: { type: Card::SetID },
             right: id,
-            sort:  %w[content name],
+            sort: %w[content name],
             limit: 0 }
     wql[:left][(set_class.anchorless? ? :id : :right_id)] = set_class.pattern_id
 
@@ -33,7 +33,7 @@ def set_classes_with_rules
   end.compact
 end
 
-format do
+format :html do
   def duplicate_check rules
     previous_content = nil
     rules.each do |rule|
@@ -45,35 +45,40 @@ format do
     end
   end
 
+  def rule_link rule, text
+    link_to_card rule, text, path: { view: :modal_rule },
+                             slotter: true, "data-modal-class": "modal-lg"
+  end
+
   view :core do
     haml do
       <<-'HAML'.strip_heredoc
         = _render_rule_help
-        %table.table.table-borderless.setting-rules
-          %tr
+        %table.table.setting-rules
+          %thead.thead-dark
             %th Set
             %th Rule
           - card.set_classes_with_rules.each do |klass, rules|
-            %tr.klass-row
-              %td{class: ['setting-klass', "anchorless-#{klass.anchorless?}"]}
-                - kpat = klass.pattern
-                = klass.anchorless? ? link_to_card(kpat) : kpat
-              %td.rule-content-container
-                %span.closed-content.content
-                  - if klass.anchorless?
-                    = subformat(rules[0])._render_closed_content
+            %thead.thead-light
+              %tr.klass-row
+                %th{class: ['setting-klass', "anchorless-#{klass.anchorless?}"]}
+                  = klass.anchorless? ? rule_link(rules.first, klass.pattern) : klass.pattern
+                %th.rule-content-container
+                  %span.closed-content.content
+                    - if klass.anchorless?
+                      = subformat(rules.first)._render_closed_content
             - if !klass.anchorless?
-              - duplicate_check(rules) do |rule, duplicate, changeover|
-                - setname = rule.name.trunk_name
-                %tr{class: ('rule-changeover' if changeover)}
-                  %td.rule-anchor
-                    = link_to_card setname, setname.trunk_name
-                  - if duplicate
-                    %td
-                  - else
-                    %td.rule-content-container
-                      %span.closed-content.content
-                        = subformat(rule)._render_closed_content
+              %tbody
+                - duplicate_check(rules) do |rule, duplicate, changeover|
+                  %tr{class: ('rule-changeover' if changeover)}
+                    %td.rule-anchor
+                      = rule_link rule, rule.name.trunk_name.trunk_name
+                    - if duplicate
+                      %td
+                    - else
+                      %td.rule-content-container
+                        %span.closed-content.content
+                          = subformat(rule)._render_closed_content
       HAML
     end
   end

data/mod/settings/spec/set/right/structure_spec.rb

@@ -5,7 +5,7 @@ describe Card::Set::Right::Structure do
     template = Card.new name: "A+*right+*structure",
                         content: "[[link]] {{nest}}"
     expect(template.format._render(:closed_content)).to eq(
-      '<a class="cardtype known-card" href="/Basic">Basic</a>' \
+      '<a class="cardtype known-card" href="/RichText">RichText</a>' \
       " : [[link]] {{nest}}"
     )
   end

data/mod/solid_cache/set/right/solid_cache.rb

@@ -1,5 +1,9 @@
 include_set Abstract::Lock
 
+def ok_to_read
+  left.ok_to_read
+end
+
 def followable?
   false
 end

data/mod/standard/file/logo/image-original.svg

@@ -1,4 +1,4 @@
-<svg style="min-width: 75px; min-height: 55px;" viewBox="0 0 242 220" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg style="min-width: 65px; min-height: 45px; margin-top: -12px; margin-bottom: -14px;" viewBox="0 0 242 218" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
   <!-- Generator: Sketch 46.2 (44496) - http://www.bohemiancoding.com/sketch -->
   <title>b&amp;w_logo</title>
   <desc>Created with Sketch.</desc>
@@ -56,4 +56,4 @@
           </g>
       </g>
   </g>
-</svg>
+</svg>

data/mod/standard/set/all/comment.rb

@@ -41,8 +41,7 @@ format do
     end
   end
 
-  view :comment_box, denial: :blank, tags: :unknown_ok,
-                     perms: :comment, cache: :never do
+  view :comment_box, denial: :blank, unknown: true, perms: :comment do
     wrap_with :div, class: "comment-box nodblclick" do
       action = card.new_card? ? :create : :update
       card_form action do

data/mod/standard/set/all/error.rb

@@ -9,7 +9,7 @@ format do
     ""
   end
 
-  view :missing, perms: :none do
+  view :missing, perms: :none, cache: :never do
     ""
   end
 
@@ -65,8 +65,7 @@ format :json do
   end
 
   def format_error error
-    { error_status: error_status,
-      errors: error }
+    { error_status: error_status, errors: error }
   end
 
   def error_list

data/mod/standard/set/all/links.rb

@@ -102,14 +102,14 @@ format :html do
   # TODO: upgrade from (known/wanted)-card to (real/virtual/unknown)-card
   def link_to_card cardish, text=nil, opts={}
     name = Card::Name[cardish]
+    slotterify opts if opts[:slotter]
     add_known_or_wanted_class opts, name
     super name, (text || name), opts
   end
 
   # in HTML, #link_to_view defaults to a remote link with rel="nofollow".
   def link_to_view view, text=nil, opts={}
-    opts.reverse_merge! remote: true, rel: "nofollow"
-    add_class opts, "slotter"
+    slotterify opts
     super view, (text || view), opts
   end
 
@@ -123,6 +123,12 @@ format :html do
 
   private
 
+  def slotterify opts
+    opts.delete(:slotter)
+    opts.reverse_merge! remote: true, rel: "nofollow"
+    add_class opts, "slotter"
+  end
+
   def add_known_or_wanted_class opts, name
     known = opts.delete :known
     known = Card.known?(name) if known.nil?

data/mod/standard/set/all/list_changes.rb

@@ -1,20 +1,20 @@
 # -*- encoding : utf-8 -*-
 
 def list_fields
-  Card.search({ left: name, type_id: Card::ListID }, "list fields")
+  Card.search({ left: name, type_id: Card::MirroredListID }, "list fields")
 end
 
 def listed_by_fields
-  Card.search({ left: name, type_id: Card::ListedByID }, "listed by fields")
+  Card.search({ left: name, type_id: Card::MirrorListID }, "listed by fields")
 end
 
 def linker_lists
-  Card.search({ type_id: Card::ListID, link_to: name },
+  Card.search({ type_id: Card::MirroredListID, link_to: name },
               "lists that link to #{name}")
 end
 
 def codename_list_exist?
-  Card::Codename.exists? :list
+  Card::Codename.exists?(:mirrored_list) && Card::Codename.exists?(:mirror_list)
 end
 
 event :trunk_cardtype_of_a_list_relation_changed, :finalize,
@@ -30,7 +30,7 @@ event :trunk_cardtype_of_a_list_relation_changed, :finalize,
 end
 
 event :trunk_name_of_a_list_relation_changed, :finalize,
-      changed: :name,  on: :update,
+      changed: :name, on: :update,
       when: :codename_list_exist? do
   list_fields.each do |card|
     card.update_listed_by_cache_for card.item_keys

data/mod/standard/set/all/path.rb

@@ -29,6 +29,10 @@ format do
   # @option opts [Symbol] :format
   # @option opts [Hash] :card
   # @option opts [TrueClass] :no_mark
+
+  CAST_PARAMS = { slot: { hide: :array, show: :array, wrap: :array } }.freeze
+  # TODO: monkey API for this
+
   def path opts={}
     return opts unless opts.is_a? Hash
     path = new_cardtype_path(opts) || standard_path(opts)
@@ -96,9 +100,31 @@ format do
   end
 
   def path_query opts
+    opts = cast_path_opts opts
     opts.empty? ? "" : "?#{opts.to_param}"
   end
 
+  # normalizes certain path opts to specified data types
+  def cast_path_opts opts, cast_hash=CAST_PARAMS
+    return opts unless opts.is_a?(::Hash)
+    opts.each do |key, value|
+      next unless (cast_to = cast_hash[key])
+      opts[key] = cast_path_value value, cast_to
+    end
+  end
+
+  def cast_path_value value, cast_to
+    if cast_to.is_a? Hash
+      cast_path_opts value, cast_to
+    else
+      send "cast_path_value_as_#{cast_to}", value
+    end
+  end
+
+  def cast_path_value_as_array value
+    Array.wrap value
+  end
+
   def add_unknown_name_to_opts name, opts
     return if name_specified?(opts) || name_simple?(name) || Card.known?(name)
     opts[:card] ||= {}

data/mod/standard/set/all/rich_html/content.rb

@@ -45,20 +45,20 @@ format :html do
     end
   end
 
-  view :titled, tags: :comment do
+  view :titled, commentable: true do
     @content_body = true
     wrap do
       [
-        _render_header,
-        wrap_body { _render_titled_content },
+        naming { render_header },
+        render_flash,
+        wrap_body { render_titled_content },
         render_comment_box
       ]
     end
   end
 
-  view :labeled, tags: :unknown_ok do
+  view :labeled, unknown: true do
     @content_body = true
-    voo.edit ||= :content_modal
     wrap(true, class: "row") do
       labeled(render_title, wrap_body { "#{render_menu}#{render_labeled_content}" } )
     end
@@ -68,7 +68,13 @@ format :html do
     haml :labeled, label: label, content: content
   end
 
-  view :open, tags: :comment do
+  def labeled_field field, item_view=:name, opts={}
+    opts[:title] ||= Card.fetch_name field
+    field_nest field, opts.merge(view: :labeled,
+                                 items: (opts[:items] || {}).merge(view: item_view))
+  end
+
+  view :open, commentable: true do
     toggle_logic
     @toggle_mode = :open
     @content_body = true
@@ -99,7 +105,24 @@ format :html do
     Card.fetch(set_name)
   end
 
+  # LOCALIZE
   def short_content
+    short_content_items || short_content_fields || short_content_from_core
+  end
+
+  def short_content_items
+    return unless card.respond_to? :count
+    "#{count} #{'item'.pluralize count}"
+  end
+
+  def short_content_fields
+    return unless voo.structure || card.structure
+    fields = nested_fields.size
+    return if fields.zero?
+    "#{fields} #{'field'.pluralize fields}"
+  end
+
+  def short_content_from_core
     content = render_core
     if content.blank?
       "empty"
@@ -111,4 +134,8 @@ format :html do
       "#{content.count("\n") + 1} lines"
     end
   end
+
+  def count
+    @count ||= card.count
+  end
 end

data/mod/standard/set/all/rich_html/error.rb

@@ -7,7 +7,7 @@ format :html do
     haml :debug_server_error, {}, error_page
   end
 
-  view :message, perms: :none, tags: :unknown_ok do
+  view :message, perms: :none, unknown: true do
     frame { params[:message] }
   end
 
@@ -23,7 +23,7 @@ format :html do
 
   def missing_link text
     path_opts = voo.type ? { card: { type: voo.type } } : {}
-    link_to_view :new, text, path: path_opts, class: "missing-link"
+    link_to_view :new, text, path: path_opts, class: classy("missing-link")
   end
 
   view :closed_missing, perms: :none do
@@ -76,7 +76,7 @@ format :html do
   end
 
   def commentable? view
-    return false unless self.class.tagged(view, :comment) &&
+    return false unless view_setting(:commentable, view) &&
                         show_view?(:comment_box, :hide)
 
     ok? :comment
@@ -150,14 +150,15 @@ format :html do
   end
 
   def signin_link
-    link_to_card :signin, tr(:sign_in), remote: true, class: "slotter"
+    link_to_card :signin, tr(:sign_in),
+                 class: "signin-link", slotter: true, path: { view: :open }
   end
 
   def signup_link
     return unless signup_ok?
 
-    link_to tr(:sign_up), path: { action: :new, mark: :signup },
-                              remote: true, class: "slotter"
+    link_to_card :signup, tr(:sign_up),
+                 class: "signup-link", slotter: true, path: { action: :new }
   end
 
   def signup_ok?