card 1.19.6 → 1.20.0

data/mod/pointer/set/right/options.rb

@@ -0,0 +1,4 @@
+def default_limit
+  wql_limit = fetch_query.limit if respond_to?(:fetch_query)
+  wql_limit || 50
+end

data/mod/pointer/spec/set/type/pointer_spec.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 describe Card::Set::Type::Pointer do
   describe "item_names" do
-    it "should return array of names of items referred to by a pointer" do
+    it "returns array of names of items referred to by a pointer" do
       card = Card.new(type: "Pointer", content: "[[Busy]]\n[[Body]]")
       card.item_names.should == %w(Busy Body)
     end
@@ -133,7 +133,7 @@ describe Card::Set::Type::Pointer do
       end
     end
 
-    it "should include nonexisting card in radio options" do
+    it "includes nonexisting card in radio options" do
       common_html =
         'input[class="pointer-radio-button"]'\
         '[checked="checked"]'\
@@ -146,7 +146,7 @@ describe Card::Set::Type::Pointer do
       assert_view_select @inherit_pointer.format.render_radio, option_html
     end
 
-    it "should include nonexisting card in checkbox options" do
+    it "includes nonexisting card in checkbox options" do
       option_html =
         'input[class="pointer-checkbox-button"]'\
         '[checked="checked"]'\
@@ -157,14 +157,14 @@ describe Card::Set::Type::Pointer do
       assert_view_select @inherit_pointer.format.render_checkbox, option_html
     end
 
-    it "should include nonexisting card in select options" do
+    it "includes nonexisting card in select options" do
       option_html = "option[value='#{@card_name}'][selected='selected']"
       assert_view_select @pointer.format.render_select, option_html, @card_name
       assert_view_select @inherit_pointer.format.render_select, option_html,
                          @card_name
     end
 
-    it "should include nonexisting card in multiselect options" do
+    it "includes nonexisting card in multiselect options" do
       option_html = "option[value='#{@card_name}'][selected='selected']"
       assert_view_select @pointer.format.render_multiselect, option_html,
                          @card_name
@@ -178,7 +178,7 @@ describe Card::Set::Type::Pointer do
       @css = "#box { display: block }"
       Card.create name: "my css", content: @css
     end
-    it "should render CSS of items" do
+    it "renders CSS of items" do
       css_list = render_card(
         :content,
         { type: Card::PointerID, name: "my style list", content: "[[my css]]" },
@@ -191,7 +191,7 @@ describe Card::Set::Type::Pointer do
   end
 
   describe "#standardize_item" do
-    it "should handle unlinked items" do
+    it "handles unlinked items" do
       pointer1 = Card.create!(
         name: "pointer1", type: "Pointer", content: "bracketme"
       )

data/mod/prosemirror_editor/set/abstract/prosemirror_editor.rb

@@ -1,7 +1,7 @@
 format :html do
-  view :editor do |_args|
-    wrap_with(:div, id: unique_id, class: "prosemirror-editor") do
-      hidden_field(:content, class: "card-content", value: card.raw_content)
+  view :editor do
+    wrap_with :div, id: unique_id, class: "prosemirror-editor" do
+      hidden_field :content, class: "card-content", value: card.raw_content
     end
   end
 end

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

@@ -5,37 +5,37 @@ def standardize_items
 end
 
 format :html do
-  view :pointer_core do |args| # view: :core, mod: Type::Pointer::HtmlFormat
-    %(<div class="pointer-list">#{render_pointer_items args}</div>)
+  view :pointer_core do
+    wrap_with :div, pointer_items, class: "pointer-list"
   end
 
-  view :core do |args|
+  view :core do
     if card.content == "_left"
-      core_inherit_content args
+      core_inherit_content
     else
-      render :pointer_core, args
+      render :pointer_core
     end
   end
 
-  view :closed_content do |args|
-    args[:item] ||= :link
-    render_core args
+  view :closed_content do
+    render_core items: { view: :link }
   end
 
-  view :editor do |args|
+  view :editor do
     item_names = inheriting? ? [] : card.item_names
     %(
       #{hidden_field :content, class: 'card-content'}
       <div class="perm-editor">
-        #{inheritance_checkbox args}
+        #{inheritance_checkbox}
         <div class="perm-group perm-vals perm-section">
-          <h5>Groups</h5>
+          <h5 class="text-muted">Groups</h5>
           #{groups item_names}
         </div>
 
         <div class="perm-indiv perm-vals perm-section">
-          <h5>Individuals</h5>
-          #{_render_list item_list: item_names, extra_css_class: 'perm-indiv-ul'}
+          <h5 class="text-muted">Individuals</h5>
+          #{_render_list item_list: item_names,
+                         extra_css_class: 'perm-indiv-ul'}
         </div>
       </div>
     )
@@ -46,10 +46,17 @@ format :html do
   def groups item_names
     group_options.map do |option|
       checked = !item_names.delete(option.name).nil?
-      option_link = link_to_card option.name, nil, target: "wagn_role"
+      icon = glyphicon "question-sign", "link-muted"
+      option_link = link_to_card option.name, icon, target: "wagn_role"
       box = check_box_tag "#{option.key}-perm-checkbox",
                           option.name, checked, class: "perm-checkbox-button"
-      %(<div class="group-option">#{box}<label>#{option_link}</label></div>)
+      <<-HTML
+        <div class="form-check checkbox">
+          <label class="form-check-label">
+            #{box} #{option.name} #{option_link}
+          </label>
+        </div>
+      HTML
     end * "\n"
   end
 
@@ -73,14 +80,14 @@ format :html do
     @inheriting ||= inheritable? && card.content == "_left"
   end
 
-  def inheritance_checkbox args
+  def inheritance_checkbox
     return unless inheritable?
     <<-HTML
       <div class="perm-inheritance perm-section">
         #{check_box_tag 'inherit', 'inherit', inheriting?}
         <label>
-          #{core_inherit_content args.merge(target: 'wagn_role')}
-          #{content_tag(:a, title: "use left's #{card.cardname.tag} rule") { '?' }}
+          #{core_inherit_content target: 'wagn_role'}
+          #{wrap_with(:a, title: "use left's #{card.cardname.tag} rule") { '?' }}
         </label>
       </div>
     HTML

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

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

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

@@ -1,6 +1,5 @@
-
 format :rss do
-  def raw_feed_items _args
+  def raw_feed_items
     [card]
   end
 end
@@ -11,9 +10,9 @@ end
 
 event :update_structurees_references, :integrate,
       when: proc { |c| c.db_content_changed? || c.action == :delete } do
-  return unless (statement = structuree_statement)
+  return unless (query = structuree_query)
   Auth.as_bot do
-    Card::Query.run(statement).each(&:update_references_out)
+    query.run.each(&:update_references_out)
   end
 end
 
@@ -29,12 +28,9 @@ event :update_structurees_type, :finalize,
 end
 
 def structuree_names
-  if (wql = structuree_statement)
-    Auth.as_bot do
-      Card::Query.run wql.merge(return: :name)
-    end
-  else
-    []
+  return [] unless (query = structuree_query(return: :name))
+  Auth.as_bot do
+    query.run
   end
 end
 
@@ -43,19 +39,17 @@ def update_structurees args
   # for example, if someone were to change the type of a
   # +*right+*structure rule that was overridden
   # by a +*type plus right+*structure rule, the override would not be respected.
+  return unless (query = structuree_query(return: :id))
 
-  statement = structuree_statement
-  return unless statement
   Auth.as_bot do
-    statement[:return] = :id
-    Card::Query.run(statement).each_slice(100) do |id_batch|
+    query.run.each_slice(100) do |id_batch|
       Card.where(id: id_batch).update_all args
     end
   end
 end
 
-def structuree_statement
+def structuree_query args={}
   set_card = trunk
   return unless set_card.type_id == SetID
-  set_card.get_query
+  set_card.fetch_query args
 end

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

@@ -9,7 +9,7 @@ describe Card::Set::Right::Comment do
                        content: "[[Anyone Signed In]]"
     end
 
-    it "should have appender immediately" do
+    it "has appender immediately" do
       expect(Card["a"].ok?(:comment)).not_to be_truthy
       Card::Auth.as_bot do
         @rule.save!
@@ -17,7 +17,7 @@ describe Card::Set::Right::Comment do
       expect(Card["a"].ok?(:comment)).to be_truthy
     end
 
-    it "should have appender immediately" do
+    it "has appender immediately" do
       Card::Auth.as_bot do
         expect(Card["a"].ok?(:comment)).not_to be_truthy
         @rule.save!
@@ -27,7 +27,7 @@ describe Card::Set::Right::Comment do
   end
 
   context "comment addition" do
-    it "should combine content after save" do
+    it "combines content after save" do
       Card::Auth.as_bot do
         Card.create name: "basicname+*self+*comment",
                     content: "[[Anyone Signed In]]"

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

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Set::Right::Create do
-  it "should render the perm editor" do
+  it "renders the perm editor" do
     Card::Auth.as_bot do
       card = Card.new name: "A+B+*self+*create"
       assert_view_select card.format._render_editor, "div[class=perm-editor]"

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

@@ -2,7 +2,7 @@
 
 describe Card::Set::Right::Style do
   #  describe "#delet"
-  #  it "should delete tempfile"
+  #  it "deletes tempfile"
   let(:css)                    { "#box { display: block }"  }
   let(:compressed_css)         { "#box{display:block}\n"    }
   let(:changed_css)            { "#box { display: inline }" }

data/mod/settings/spec/set/type/setting_spec.rb

@@ -2,7 +2,7 @@
 
 describe Card::Set::Type::Setting do
   context "core view" do
-    it "should have a table" do
+    it "has a table" do
       core = render_card :core, name: :help
       assert_view_select core, "table"
     end

data/mod/solid_cache/set/abstract/solid_cache.rb

@@ -13,9 +13,9 @@ card_accessor :solid_cache, type: :html
 def self.included host_class
   host_class.format(host_class.try(:cached_format) || :base) do
     view :core do |args|
-      return super(args) unless args[:solid_cache]
+      return super() unless args[:solid_cache]
       card.update_solid_cache if card.solid_cache_card.new?
-      subformat(card.solid_cache_card)._render_core args
+      subformat(card.solid_cache_card)._render_core
     end
   end
 end
@@ -100,8 +100,8 @@ end
 
 def generate_content_for_cache changed_card=nil
   format_type = try(:cached_format) || :base
-  format(format_type)._render_core(solid_cache: false,
-                                   changed_card: changed_card)
+  format(format_type)._render_core solid_cache: false,
+                                   changed_card: changed_card
 end
 
 def updated_content_for_cache _changed_card=nil

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

@@ -11,20 +11,19 @@ def clean_html?
 end
 
 format :html do
-  view :core do |args|
-    return super(args) unless card.new_card?
-    _render_missing args.merge(denied_view: :core)
+  view :core do
+    return super() unless card.new_card?
+    @denied_view = :core
+    _render_missing
   end
 
-  view :missing do |args|
-    if @card.new_card? &&
-       (l = @card.left) &&
-       l.solid_cache?
+  view :missing do
+    if @card.new_card? && (l = @card.left) && l.solid_cache?
       l.update_solid_cache
-      @card = Card.fetch(card.name)
-      render(args[:denied_view], args)
+      @card = Card.fetch card.name
+      render @denied_view
     else
-      super(args)
+      super()
     end
   end
 

data/mod/standard/set/abstract/01_search_params.rb

@@ -0,0 +1,41 @@
+format do
+  def search_params
+    @search_params ||= begin
+      p = default_search_params.clone
+      offset_and_limit_search_params p if focal?
+      p
+    end
+  end
+
+  def default_search_params
+    { limit: default_limit }
+  end
+
+  def default_limit
+    100
+  end
+
+  def offset_and_limit_search_params hash
+    [:offset, :limit].each do |key|
+      hash[key] = params[key].to_i if params[key]
+    end
+  end
+end
+
+format :html do
+  def default_limit
+    20
+  end
+end
+
+format :json do
+  def default_limit
+    0
+  end
+end
+
+format :rss do
+  def default_limit
+    25
+  end
+end

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

@@ -0,0 +1,132 @@
+include_set Abstract::SearchParams
+
+def search _args={}
+  raise Error, "search not overridden"
+end
+
+def cached_search args={}
+  @search_results ||= {}
+  @search_results[args.to_s] ||= search args
+end
+
+def returning item, args
+  args[:return] = item
+  yield
+end
+
+def item_cards args={}
+  returning(:card, args) { search args }
+end
+
+def item_names args={}
+  args[:limit] = 0
+  returning(:name, args) { search args }
+end
+
+def count args={}
+  args[:offset] = 0
+  args[:limit] = 0
+  returning(:count, args) { search args }
+end
+
+def item_type
+  type = wql_hash[:type]
+  return if type.is_a?(Array) || type.is_a?(Hash)
+  type
+end
+
+def each_item_name_with_options _content=nil
+  options = {}
+  item = fetch_query.statement[:view]
+  options[:view] = item if item
+  item_names.each do |name|
+    yield name, options
+  end
+end
+
+format do
+  view :search_count, cache: :never do
+    search_with_params.to_s
+  end
+
+  view :search_error, cache: :never do
+    sr_class = search_with_params.class.to_s
+    %(#{sr_class} :: #{search_with_params.message} :: #{card.raw_content})
+  end
+
+  view :card_list, cache: :never do
+    if search_with_params.empty?
+      "no results"
+    else
+      search_with_params.map do |item_card|
+        nest_item item_card
+      end.join "\n"
+    end
+  end
+
+  def search_with_params args={}
+    query_args = search_params.merge args
+    card.cached_search query_args
+  rescue Error::BadQuery => e
+    e
+  end
+
+  def count_with_params args={}
+    search_with_params args.merge return: :count
+  end
+
+  def implicit_item_view
+    view = voo_items_view || query_with_params.statement[:item] ||
+      default_item_view
+    Card::View.canonicalize view
+  end
+end
+
+format :data do
+  view :card_list do |_args|
+    search_with_params.map do |item_card|
+      nest_item item_card
+    end
+  end
+end
+
+format :csv do
+  view :card_list do |args|
+    items = super args
+    if @depth.zero?
+      render_csv_title_row + items
+    else
+      items
+    end
+  end
+end
+
+format :html do
+  view :card_list do
+    return render_no_search_results if search_with_params.empty?
+    search_result_list do
+      search_with_params.map do |item_card|
+        nest_item item_card, size: voo.size do |rendered, item_view|
+          klass = "search-result-item item-#{item_view}"
+          %(<div class="#{klass}">#{rendered}</div>)
+        end
+      end
+    end
+  end
+
+  def search_result_list
+    with_paging do
+      wrap_with :div, class: "search-result-list" do
+        yield
+      end
+    end
+  end
+
+  def closed_limit
+    [search_params[:limit].to_i, Card.config.closed_search_limit].min
+  end
+
+  view :no_search_results do
+    wrap_with :div, "", class: "search-no-results"
+  end
+end