card 1.19.6 → 1.20.0

data/mod/standard/set/self/navbox.rb

@@ -1,29 +1,34 @@
 
 format :html do
-  view :raw do |_args|
-    input_args = { class: "navbox form-control" }
-    @@placeholder ||= begin
-      (p = Card["#{Card[:navbox].name}+*placeholder"]) && p.raw_content
+  view :raw do
+    wrap_with :div, class: "form-group" do
+      text_field_tag :_keyword, "", class: "navbox form-control",
+                                    placeholder: navbar_placeholder
     end
-    input_args[:placeholder] = @@placeholder if @@placeholder
+  end
 
-    content_tag :div, class: "form-group" do
-      text_field_tag :_keyword, "", input_args
+  def navbar_placeholder
+    @@placeholder ||= begin
+      holder_card = Card["#{Card[:navbox].name}+*placeholder"]
+      holder_card ? holder_card.raw_content : ""
     end
   end
 
-  view :navbar_left do |args|
-    _render_core args.merge(navbar_class: "navbar-form navbar-left")
+  view :navbar_left do
+    class_up "navbox-form", "navbar-form navbar-left"
+    _render_core
   end
 
-  view :navbar_right do |args|
-    _render_core args.merge(navbar_class: "navbar-form navbar-right")
+  view :navbar_right do
+    class_up "navbox-form", "navbar-form navbar-left"
+    _render_core
   end
 
-  view :core do |args|
-    tag_args = { method: "get", role: "search", class: "nodblclick navbox-form #{args[:navbar_class]}" }
-    form_tag Card.path_setting("/:search"), tag_args do
-      _render_raw args
+  view :core do
+    form_tag Card.path_setting("/:search"),
+             method: "get", role: "search",
+             class: classy("navbox-form", "nodblclick") do
+      _render_raw
     end
   end
 end

data/mod/standard/set/self/recent.rb

@@ -1,27 +1,35 @@
 ACTS_PER_PAGE = 50
 
-view :title do |args|
-  super args.merge(title: "Recent Changes")
+view :title do
+  voo.title = "Recent Changes"
+  super()
 end
 
 format :html do
-  view :core do |args|
-    content_tag(:div, class: "history-slot list-group") do
-      [history_legend, render_recent_acts(args)].join
+  view :core do
+    voo.hide :history_legend unless voo.main
+    bs_layout container: true, fluid: true do
+      html _optional_render_history_legend with_drafts: false
+      row 12 do
+        html _render_recent_acts
+      end
+      row 12 do
+        col act_paging
+      end
     end
   end
 
-  view :recent_acts do |args|
-    page = params["page"] || 1
-    acts = Act.all_viewable.order(id: :desc).page(page).per(ACTS_PER_PAGE)
-    acts.map do |act|
-      if (act_card = act.card)
-        act_view_args = args.merge(act: act, act_context: :absolute)
-        act_card.format(:html).render_act act_view_args
-      else
-        Rails.logger.info "bad data, act: #{act}"
-        ""
-      end
-    end.join
+
+  view :recent_acts, cache: :never do
+    acts = Act.all_viewable.order(id: :desc)
+              .page(page_from_params).per(ACTS_PER_PAGE)
+    render_act_list acts: acts, act_context: :absolute
+  end
+
+  def act_paging
+    acts = Act.all_viewable.order(id: :desc).page(page_from_params).per(ACTS_PER_PAGE)
+    wrap_with :span, class: "slotter" do
+      paginate acts, remote: true, theme: 'twitter-bootstrap-3'
+    end
   end
 end

data/mod/standard/set/self/search.rb

@@ -1,17 +1,38 @@
+include_set Abstract::SearchParams
+
+format do
+  def extra_paging_path_args
+    vars = query_with_params.vars
+    return {} unless vars.is_a? Hash
+    vars.each_with_object({}) do |(key, value), hash|
+      hash["_#{key}"] = value
+    end
+  end
+
+  def default_search_params
+    hash = super
+    hash[:vars] = params[:vars] || {}
+    params.each do |key, val|
+      next unless key.to_s =~ /^\_(\w+)$/
+      hash[:vars][Regexp.last_match(1).to_sym] = val
+    end
+    hash
+  end
+end
 
 format :html do
-  view :title do |args|
+  view :title do
     vars = root.search_params[:vars]
     if vars && vars[:keyword]
-      args[:title] = %(Search results for: <span class="search-keyword">)\
+      voo.title = %(Search results for: <span class="search-keyword">)\
                          "#{vars[:keyword]}</span>"
     end
-    super args
+    super()
   end
 end
 
 format :json do
-  view :complete do
+  view :complete, cache: :never do
     term = complete_term
     exact = Card.fetch term, new: {}
 

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

@@ -7,19 +7,17 @@ format :html do
 
   view :type_formgroup do |args|
     if card.cards_of_type_exist?
-      %(
-        <div>
-          Sorry, this card must remain a Cardtype so long as there are
-          <strong>#{card.name}</strong> cards.
-        </div>
-      )
+      wrap_with :div do
+        "Sorry, this card must remain a Cardtype so long as " \
+        "there are <strong>#{card.name}</strong> cards."
+      end
     else
       super args
     end
   end
 
   view :add_link do |args|
-    args[:title] ||= "Add #{card.name}"
+    voo.title ||= "Add #{card.name}"
     title = _render_title args
     link_to title, path: _render_add_path(args), class: args[:css_class]
   end
@@ -35,9 +33,9 @@ format :html do
 
   view :add_path do |args|
     path_args = {}
-    if args[:params]
+    if voo.params
       context = ((@parent && @parent.card) || card).name
-      Rack::Utils.parse_nested_query(args[:params]).each do |key, value|
+      Rack::Utils.parse_nested_query(voo.params).each do |key, value|
         value = value.to_name.to_absolute(context) if value
         key = key.to_name.to_absolute(context)
         path_args[key] = value
@@ -68,6 +66,10 @@ def cards_of_type_exist?
   !new_card? && Auth.as_bot { Card.count_by_wql type_id: id } > 0
 end
 
+def create_ok?
+  Card.new(type_id: id).ok? :create
+end
+
 event :check_for_cards_of_type, after: :validate_delete do
   if cards_of_type_exist?
     errors.add :cardtype, "can't alter this type; #{name} cards still exist"

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

@@ -2,7 +2,7 @@
 format :html do
   # what is this for?  Can't you just use TYPE-date and editor
   # to match this cas, no special view needed?
-  view :editor do |_args|
+  view :editor do
     text_field :content, class: "date-editor"
   end
 end

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

@@ -1,5 +1,5 @@
 
-view :editor do |_args|
+view :editor do
   text_field :content, class: "card-content"
 end
 

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

@@ -1,3 +1,3 @@
-view :editor do |_args|
+view :editor do
   text_field :content, class: "card-content"
 end

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

@@ -1,167 +1,16 @@
 include_set Abstract::AceEditor
-
-def item_cards params={}
-  s = query(params)
-  raise("OH NO.. no limit") unless s[:limit]
-  # forces explicit limiting
-  # can be 0 or less to force no limit
-  Query.run(s, name)
-end
-
-def item_names params={}
-  statement = query params.merge(return: :name)
-  Query.run(statement, name)
-end
-
-def item_type
-  return if query[:type].is_a?(Array) || query[:type].is_a?(Hash)
-  query[:type]
-end
-
-def count params={}
-  Card.count_by_wql query(params)
-end
-
-def query params={}
-  @query ||= {}
-  @query[params.to_s] ||= get_query(params.clone)
-end
-
-def get_query params={}
-  # why is this a wagn_bot thing?  can't deny search content??
-  query = Auth.as_bot do
-    query_content = params.delete(:query) || raw_content
-    if query_content.empty?
-      raise JSON::ParserError,
-            "Error in card '#{name}':can't run search with empty content"
-    elsif query_content.is_a?(String)
-      JSON.parse(query_content)
-    else query_content
-    end
-  end
-  query.symbolize_keys!.merge! params.symbolize_keys
-  if (default_limit = query.delete(:default_limit))
-    query[:limit] ||= default_limit
-  end
-  query[:context] ||= cardname
-  query
-end
+include_set Abstract::WqlSearch
 
 format do
-  view :core do |args|
-    view =
-      case search_results args
+  view :core, cache: :never do
+    _render(
+      case search_with_params
       when Exception          then :search_error
       when Integer            then :search_count
       when @mode == :template then :raw
       else                         :card_list
       end
-    _render view, args
-  end
-
-  view :search_count do |_args|
-    search_results.to_s
-  end
-
-  view :search_error do |_args|
-    sr_class = search_results.class.to_s
-    %(#{sr_class} :: #{search_results.message} :: #{card.raw_content})
-  end
-
-  view :card_list do |_args|
-    if search_results.empty?
-      "no results"
-    else
-      search_results.map do |c|
-        nest c
-      end.join "\n"
-    end
-  end
-
-  def search_vars args={}
-    @search_vars ||=
-      begin
-        v = {}
-        v[:query] = card.query(search_params)
-        v[:item] = set_nest_opts args.merge(query_view: v[:query][:view])
-        v
-      rescue JSON::ParserError => e
-        { error: e }
-      end
-  end
-
-  def search_results args={}
-    @search_results ||= begin
-      search_vars args
-      if search_vars[:error]
-        search_vars[:error]
-      else
-        begin
-          raw_results = card.item_cards search_params
-          is_count = search_vars[:query][:return] == "count"
-          is_count ? raw_results.to_i : raw_results
-        rescue Card::Error::BadQuery => e
-          e
-        end
-      end
-    end
-  end
-
-  def search_result_names
-    @search_result_names ||=
-      begin
-        card.item_names search_params
-      rescue => e
-        { error: e }
-      end
-  end
-
-  def each_reference_with_args args={}
-    search_result_names.each do |name|
-      yield(name, nest_args(args.reverse_merge!(item: :content)))
-    end
-  end
-
-  def set_nest_opts args
-    @nest_defaults = nil
-    @nest_opts ||= {}
-    @nest_opts[:view] = args[:item] || nest_opts[:view] ||
-                        args[:query_view] || default_item_view
-    # explicit > nest syntax > WQL > nest defaults
-  end
-
-  def page_link text, page, _current=false, options={}
-    @paging_path_args[:offset] = page * @paging_limit
-    options[:class] = "card-paging-link slotter"
-    options[:remote] = true
-    options[:path] = @paging_path_args
-    link_to raw(text), options
-  end
-
-  def page_li text, page, current=false, options={}
-    css_class = if current
-                  "active"
-                elsif !page
-                  "disabled"
-                end
-    page ||= 0
-    content_tag :li, class: css_class do
-      page_link text, page, current, options
-    end
-  end
-
-  def previous_page_link page
-    page_li '<span aria-hidden="true">&laquo;</span>', page, false,
-            "aria-label" => "Previous"
-  end
-
-  def next_page_link page
-    page_li '<span aria-hidden="true">&raquo;</span>', page, false,
-            "aria-label" => "Next"
-  end
-
-  def ellipse_page
-    content_tag :li, content_tag(:span, "...")
+    )
   end
 
   def chunk_list
@@ -169,30 +18,7 @@ format do
   end
 end
 
-format :data do
-  view :card_list do |_args|
-    search_results.map do |c|
-      nest c
-    end
-  end
-end
-
-format :csv do
-  view :card_list do |args|
-    items = super args
-    if @depth == 0
-      render_csv_title_row + items
-    else
-      items
-    end
-  end
-end
-
 format :json do
-  def default_search_params
-    set_default_search_params default_limit: 0
-  end
-
   view :export do |args|
     # avoid running the search from options and structure that
     # case a huge result or error
@@ -202,7 +28,7 @@ format :json do
     super(args)
   end
 
-  view :export_items do |args|
+  view :export_items, cache: :never do |args|
     card.item_names(limit: 0).map do |i_name|
       next unless (i_card = Card[i_name])
       subformat(i_card).render_atom(args)
@@ -211,123 +37,32 @@ format :json do
 end
 
 format :rss do
-  view :feed_body do |args|
-    case raw_feed_items args
+  view :feed_body do
+    case raw_feed_items
     when Exception then @xml.item(render(:search_error))
     when Integer then @xml.item(render(:search_count))
-    else super args
+    else super()
     end
   end
 
-  def raw_feed_items _args
-    @raw_feed_items ||= begin
-      search_params[:default_limit] = 25
-      search_results
-    end
+  def raw_feed_items
+    @raw_feed_items ||= search_with_params
   end
 end
 
 format :html do
-  def default_editor_args args
-    args[:ace_mode] = "json"
-  end
-
-  view :card_list do |args|
-    paging = _optional_render :paging, args
-
-    if search_results.empty?
-      render_no_search_results(args)
-    else
-      results =
-        search_results.map do |c|
-          item_view = nest_defaults(c)[:view]
-          %(
-            <div class="search-result-item item-#{item_view}">
-              #{nest(c, size: args[:size], view: item_view)}
-            </div>
-          )
-        end.join "\n"
-
-      %(
-        #{paging}
-        <div class="search-result-list">
-          #{results}
-        </div>
-        #{paging if search_results.length > 10}
-      )
-    end
-  end
-
-  view :closed_content do |args|
-    if @depth > self.class.max_depth
+  view :closed_content, cache: :never do
+    if @depth > max_depth
       "..."
     else
-      search_limit = args[:closed_search_limit]
-      search_params[:limit] =
-        search_limit && [search_limit, Card.config.closed_search_limit].min
-      _render_core args.merge(hide: "paging", item: :link)
+      search_params[:limit] = closed_limit
+      _render_core hide: "paging", items: { view: :link }
       # TODO: if item is queryified to be "name", then that should work.
       # otherwise use link
     end
   end
 
-  view :no_search_results do |_args|
-    %(<div class="search-no-results"></div>)
-  end
-
-  view :paging do |args|
-    s = card.query search_params
-    offset = s[:offset].to_i
-    limit = s[:limit].to_i
-    return "" if limit < 1
-    # avoid query if we know there aren't enough results to warrant paging
-    return "" if offset == 0 && limit > offset + search_results.length
-    total = card.count search_params
-    # should only happen if limit exactly equals the total
-    return "" if limit >= total
-    @paging_path_args = { limit: limit,
-                          slot: {
-                            item: args[:item] || nest_defaults(card)[:view]
-                          } }
-    @paging_path_args[:view] = args[:home_view] if args[:home_view]
-    @paging_limit = limit
-
-    s[:vars].each { |key, value| @paging_path_args["_#{key}"] = value }
-
-    out = ['<nav><ul class="pagination paging">']
-
-    total_pages = ((total - 1) / limit).to_i
-    current_page = (offset / limit).to_i # should already be integer
-    window = 2 # should be configurable
-    window_min = current_page - window
-    window_max = current_page + window
-
-    previous_page = current_page > 0 ? current_page - 1 : false
-    out << previous_page_link(previous_page)
-    if window_min > 0
-      out << page_li(1, 0)
-      out << ellipse_page if window_min > 1
-    end
-
-    (window_min..window_max).each do |page|
-      next if page < 0 || page > total_pages
-      text = page + 1
-      out << page_li(text, page, page == current_page)
-    end
-
-    if total_pages > window_max
-      out << ellipse_page if total_pages > window_max + 1
-      out << page_li(total_pages + 1, total_pages)
-    end
-
-    next_page = current_page < total_pages ? current_page + 1 : false
-    out << next_page_link(next_page)
-
-    out << %(</ul></nav>)
-    out.join
-  end
-
-  def default_search_params
-    set_default_search_params default_limit: 20
+  def default_editor_args args
+    args[:ace_mode] = "json"
   end
 end