card 1.16.8 → 1.16.9

data/mod/05_standard/set/type/listed_by.rb

@@ -0,0 +1,94 @@
+event :validate_listed_by_name, before: :validate, on: :save, changed: :name do
+  if !junction? || !right || right.type_id != CardtypeID
+    errors.add :name, 'must have a cardtype name as right part'
+  end
+end
+
+event :validate_listed_by_content,
+      before: :validate, on: :save,
+      changed: :content do
+  item_cards(content: content).each do |item_card|
+    if item_card.type_id != right.id
+      errors.add(
+        :content,
+        "#{item_card.name} has wrong cardtype; " \
+        "only cards of type #{cardname.right} are allowed"
+      )
+    end
+  end
+end
+
+event :update_content_in_list_cards,
+      before: :approve_subcards, on: :save, changed: :content do
+  if content.present?
+    new_items = item_keys(content: content)
+    old_items = item_keys
+    removed_items = old_items - new_items
+    added_items   = new_items - old_items
+    removed_items.each do |item|
+      if (lc = list_card(item))
+        lc.drop_item cardname.left
+        subcards.add lc
+      end
+    end
+    added_items.each do |item|
+      if (lc = list_card(item))
+        lc.add_item cardname.left
+        subcards.add lc
+      else
+        subcards.add(
+          name: "#{Card[item].name}+#{left.type_name}", type: 'list',
+          content: "[[#{cardname.left}]]"
+        )
+      end
+    end
+  end
+end
+
+def raw_content
+  Card::Cache[Card::Set::Type::ListedBy].fetch(key) do
+    generate_content
+  end
+end
+
+def generate_content
+  listed_by.map do |item|
+    '[[%s]]' % item.to_name.left
+  end.join "\n"
+end
+
+def listed_by
+  Card.search(
+    type: 'list', right: trunk.type_name,
+    left: { type: cardname.tag }, refer_to: cardname.trunk, return: :name
+  )
+end
+
+def update_cached_list
+  Card::Cache[Card::Set::Type::ListedBy].write key, generate_content
+end
+
+def list_card item
+  Card.fetch "#{item}+#{left.type_name}"
+end
+
+def unfilled?
+  false
+end
+
+include Pointer
+format do
+  include Pointer::Format
+end
+format :html do
+  include Pointer::HtmlFormat
+end
+format :css do
+  include Pointer::CssFormat
+end
+format :js do
+  include Pointer::JsFormat
+end
+format :data do
+  include Pointer::DataFormat
+end

data/mod/05_standard/set/type/search_type.rb

@@ -1,11 +1,10 @@
 
-
 def item_cards params={}
   s = query(params)
-  raise("OH NO.. no limit") unless s[:limit]
+  raise('OH NO.. no limit') unless s[:limit]
   # forces explicit limiting
   # can be 0 or less to force no limit
-  Card.search( s )
+  Card.search(s)
 end
 
 def item_names params={}
@@ -13,11 +12,12 @@ def item_names params={}
 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 )
+  Card.count_by_wql query(params)
 end
 
 def query params={}
@@ -26,47 +26,50 @@ def query params={}
 end
 
 def get_query params={}
-  query = Auth.as_bot do ## why is this a wagn_bot thing?  can't deny search content??
+  # 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?
+    case
+    when query_content.empty?
       raise JSON::ParserError,
-        "Error in card '#{self.name}':can't run search with empty content"
+            "Error in card '#{name}':can't run search with empty content"
+    when query_content.is_a?(String)
+      JSON.parse(query_content)
+    else query_content
     end
-    String === query_content ? JSON.parse( query_content ) : query_content
   end
   query.symbolize_keys!.merge! params.symbolize_keys
-  if default_limit = query.delete(:default_limit) and !query[:limit]
-    query[:limit] = default_limit
+  if (default_limit = query.delete(:default_limit))
+    query[:limit] ||= default_limit
   end
   query[:context] ||= cardname
   query
 end
 
-
-
-
 format do
-
+  # rubocop:disable Style/ExtraSpacing
   view :core do |args|
-    view = case search_results args
-      when Exception           ;  :search_error
-      when Integer             ;  :search_count
-      when @mode == :template  ;  :raw
-      else                     ;  :card_list
+    view =
+      case search_results args
+      when Exception          then :search_error
+      when Integer            then :search_count
+      when @mode == :template then :raw
+      else                         :card_list
       end
     _render view, args
   end
+  # rubocop:enable Style/ExtraSpacing
 
-
-  view :search_count do |args|
+  view :search_count do |_args|
     search_results.to_s
   end
 
-  view :search_error do |args|
-    %{#{search_results.class.to_s} :: #{search_results.message} :: #{card.raw_content}}
+  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|
+  view :card_list do |_args|
     if search_results.empty?
       'no results'
     else
@@ -80,8 +83,8 @@ format do
     @search_vars ||=
       begin
         v = {}
-        v[:query] = card.query( search_params )
-        v[:item]  = set_inclusion_opts args.merge( query_view: v[:query][:view] )
+        v[:query] = card.query(search_params)
+        v[:item] = set_inclusion_opts args.merge(query_view: v[:query][:view])
         v
       rescue JSON::ParserError => e
         { error: e }
@@ -99,7 +102,7 @@ format do
           is_count = search_vars[:query][:return] == 'count'
           is_count ? raw_results.to_i : raw_results
         rescue BadQuery => e
-          e 
+          e
         end
       end
     end
@@ -110,7 +113,7 @@ format do
       begin
         card.item_names search_params
       rescue => e
-        { error: e}
+        { error: e }
       end
   end
 
@@ -123,13 +126,12 @@ format do
   def set_inclusion_opts args
     @inclusion_defaults = nil
     @inclusion_opts ||= {}
-    @inclusion_opts[:view] = args[:item] || inclusion_opts[:view] || args[:query_view] || default_item_view
+    @inclusion_opts[:view] = args[:item] || inclusion_opts[:view] ||
+                             args[:query_view] || default_item_view
     # explicit > inclusion syntax > WQL > inclusion defaults
   end
 
-
-
-  def page_link text, page, current=false, options={}
+  def page_link text, page, _current=false, options={}
     @paging_path_args[:offset] = page * @paging_limit
     options.merge!(class: 'card-paging-link slotter', remote: true)
     link_to raw(text), path(@paging_path_args), options
@@ -148,11 +150,13 @@ format do
   end
 
   def previous_page_link page
-    page_li '<span aria-hidden="true">&laquo;</span>', page, false, 'aria-label'=>"Previous"
+    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"
+    page_li '<span aria-hidden="true">&raquo;</span>', page, false,
+            'aria-label' => 'Next'
   end
 
   def ellipse_page
@@ -164,10 +168,8 @@ format do
   end
 end
 
-
 format :data do
-
-  view :card_list do |args|
+  view :card_list do |_args|
     search_results.map do |c|
       nest c
     end
@@ -194,13 +196,13 @@ end
 format :rss do
   view :feed_body do |args|
     case raw_feed_items args
-    when Exception ; @xml.item(render :search_error)
-    when Integer   ; @xml.item(render :search_count)
+    when Exception then @xml.item(render :search_error)
+    when Integer then @xml.item(render :search_count)
     else super args
     end
   end
 
-  def raw_feed_items args
+  def raw_feed_items _args
     @raw_feed_items ||= begin
       search_params.merge!(default_limit: 25)
       search_results
@@ -209,7 +211,6 @@ format :rss do
 end
 
 format :html do
-
   view :card_list do |args|
     paging = _optional_render :paging, args
 
@@ -236,42 +237,44 @@ format :html do
     end
   end
 
-
   view :closed_content do |args|
     if @depth > self.class.max_depth
-      "..."
+      '...'
     else
       search_limit = args[:closed_search_limit]
-      search_params[:limit] = search_limit && search_limit < Card.config.closed_search_limit ?
-                                search_limit : Card.config.closed_search_limit
-      _render_core args.merge( hide: 'paging', item: :link )
-      # TODO: if item is queryified to be "name", then that should work.  otherwise use link
+      search_params[:limit] =
+        search_limit && [search_limit, Card.config.closed_search_limit].min
+      _render_core args.merge(hide: 'paging', item: :link)
+      # TODO: if item is queryified to be "name", then that should work.
+      # otherwise use link
     end
   end
 
   view :editor, mod: Html::HtmlFormat
 
-  view :no_search_results do |args|
+  view :no_search_results do |_args|
     %{<div class="search-no-results"></div>}
   end
 
-  view :paging do |args|
+  view :paging do |_args|
     s = card.query search_params
     offset, limit = s[:offset].to_i, s[:limit].to_i
     return '' if limit < 1
-    return '' if offset==0 && limit > offset + search_results.length #avoid query if we know there aren't enough results to warrant paging
+    # 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
-    return '' if limit >= total # should only happen if limit exactly equals the total
+    # should only happen if limit exactly equals the total
+    return '' if limit >= total
 
     @paging_path_args = { limit: limit, item: inclusion_defaults(card)[:view] }
     @paging_limit = limit
 
     s[:vars].each { |key, value| @paging_path_args["_#{key}"] = value }
 
-    out = ['<nav><ul class="pagination paging">' ]
+    out = ['<nav><ul class="pagination paging">']
 
-    total_pages  = ((total-1) / limit).to_i
-    current_page = ( offset   / limit).to_i # should already be integer
+    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
@@ -279,19 +282,19 @@ format :html do
     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 << page_li(1, 0)
       out << ellipse_page if window_min > 1
     end
 
-    (window_min .. window_max).each do |page|
-      next if page < 0 or page > total_pages
+    (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 )
+      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 )
+      out << page_li(total_pages + 1, total_pages)
     end
 
     next_page = current_page < total_pages ? current_page + 1 : false
@@ -304,6 +307,4 @@ format :html do
   def default_search_params
     set_default_search_params default_limit: 20
   end
-
 end
-

data/mod/05_standard/set/type/signup.rb

@@ -1,80 +1,112 @@
 
 format :html do
-
   def default_new_args args
     super args
     args.merge!(
-      optional_help: :show, #, optional_menu: :never
-      buttons: button_tag( 'Submit', disable_with: 'Submitting', situation: 'primary' ),
-      account: card.fetch( trait: :account, new: {} ),
-      title:   'Sign up',
-      hidden:  {
+      optional_help: :show, # , optional_menu: :never
+      buttons: button_tag(' Submit',
+                          disable_with: 'Submitting', situation: 'primary'),
+      account: card.fetch(trait: :account, new: {}),
+      title: 'Sign up',
+      hidden: {
         success: (card.rule(:thanks) || '_self'),
         'card[type_id]' => card.type_id
       }
     )
+    return unless Auth.signed_in? && args[:account].confirm_ok?
+    invite_args args
+  end
 
-    if Auth.signed_in? and args[:account].confirm_ok?
-      args[:title] = 'Invite'
-      args[:buttons] = button_tag 'Send Invitation', situation: 'primary'
-      args[:hidden][:success] = '_self'
-    end
+  def invite_args args
+    args.merge!(
+      title: 'Invite',
+      buttons: button_tag('Send Invitation', situation: 'primary'),
+      hidden: { success: '_self' }
+    )
   end
 
   view :new do |args|
-    #FIXME - make more use of standard new view?
+    # FIXME: make more use of standard new view?
 
-    frame_and_form :create, args, 'main-success'=>"REDIRECT" do
+    frame_and_form :create, args, 'main-success' => 'REDIRECT' do
       [
-        _render_name_formgroup( help: 'usually first and last name' ),
-        _optional_render( :account_formgroups, args),
-        ( card.structure ? edit_slot : ''),
-        _optional_render( :button_formgroup, args )
+        _render_name_formgroup(help: 'usually first and last name'),
+        _optional_render(:account_formgroups, args),
+        (card.structure ? edit_slot : ''),
+        _optional_render(:button_formgroup, args)
       ]
     end
   end
 
-
   view :account_formgroups do |args|
     sub_args = { structure: true }
     sub_args[:no_password] = true if Auth.signed_in?
-    Auth.as_bot { subformat( args[:account] )._render :content_formgroup, sub_args }  #YUCK!!!!
+    Auth.as_bot do
+      subformat(args[:account])._render :content_formgroup, sub_args
+    end # YUCK!!!!
   end
 
-
-  view :core do |args|
-    headings, links = [], []
-    if !card.new_card? #necessary?
-      by_anon = card.creator_id == AnonymousID
-      headings << %(<strong>#{ card.name }</strong> #{ 'was' if !by_anon } signed up on #{ format_date card.created_at })
-      if account = card.account
-        token_action = 'Send'
-        if account.token.present?
-          headings << "A verification email has been sent #{ "to #{account.email}" if account.email_card.ok? :read }"
-          token_action = 'Resend'
-        end
-        if account.confirm_ok?
-          links << link_to( "#{token_action} verification email", card_path("update/~#{card.id}?approve_with_token=true"  ) )
-          links << link_to( "Approve without verification", card_path("update/~#{card.id}?approve_without_token=true") )
-        end
-        if card.ok? :delete
-          links << link_to( "Deny and delete", card_path("delete/~#{card.id}") )
-        end
-        headings << links * '' if links.any?
-      else
-        headings << "ERROR: signup card missing account"
-      end
+  view :core do |_args|
+    return if card.new_card? # necessary?
+    headings = []
+    by_anon = card.creator_id == AnonymousID
+    headings << %(
+      <strong>#{ card.name }</strong> #{ 'was' if !by_anon } signed up on
+      #{ format_date card.created_at }
+    )
+    if (account = card.account)
+      headings += verification_info account
+    else
+      headings << 'ERROR: signup card missing account'
     end
-    %{<div class="invite-links">
-        #{ headings.map { |h| "<div>#{h}</div>"} * "\n" }
+    <<-HTML
+      <div class="invite-links">
+        #{ headings.map { |h| "<div>#{h}</div>" }.join "\n" }
       </div>
       #{ process_content render_raw }
-    }
+    HTML
+  end
+
+  def verification_info account
+    headings = []
+    token_action = 'Send'
+    if account.token.present?
+      headings << 'A verification email has been sent ' \
+                  "#{ "to #{account.email}" if account.email_card.ok? :read }"
+      token_action = 'Resend'
+    end
+    links = verification_links account, token_action
+    headings << links * '' if links.any?
+    headings
+  end
+
+  def verification_links account, token_action
+    links = []
+    if account.confirm_ok?
+      links << link_to(
+        "#{token_action} verification email",
+        card_path("update/~#{card.id}?approve_with_token=true")
+      )
+      links << link_to(
+        'Approve without verification',
+        card_path("update/~#{card.id}?approve_without_token=true")
+      )
+    end
+    if card.ok? :delete
+      links << link_to('Deny and delete', card_path("delete/~#{card.id}"))
+    end
+    links
   end
 end
 
-event :activate_by_token, before: :approve, on: :update, when: proc{ |c| c.has_token? } do
-  result = account ? account.authenticate_by_token( @env_token ) : "no account associated with #{name}"
+event :activate_by_token, before: :approve, on: :update,
+                          when: proc { |c| c.has_token? } do
+  result = if account
+             account.authenticate_by_token(@env_token)
+           else
+             "no account associated with #{name}"
+           end
+
   case result
   when Integer
     abort :failure, 'no field manipulation mid-activation' if subcards.present?
@@ -96,18 +128,23 @@ def has_token?
 end
 
 event :activate_account do
-  subcards['+*account'] = {'+*status'=>'active'}
+  add_subfield :account
+  subfield(:account).add_subfield :status, content: 'active'
   self.type_id = Card.default_accounted_type_id
   account.send_welcome_email
 end
 
-event :approve_with_token, on: :update, before: :approve, when: proc {|c| Env.params[:approve_with_token] } do
+event :approve_with_token,
+      on: :update, before: :approve,
+      when: proc { Env.params[:approve_with_token] } do
   abort :failure, 'illegal approval' unless account.confirm_ok?
   account.reset_token
   account.send_account_verification_email
 end
 
-event :approve_without_token, on: :update, before: :approve, when: proc {|c| Env.params[:approve_without_token] } do
+event :approve_without_token,
+      on: :update, before: :approve,
+      when: proc { Env.params[:approve_without_token] } do
   abort :failure, 'illegal approval' unless account.confirm_ok?
   activate_account
 end
@@ -118,27 +155,21 @@ event :resend_activation_token do
   Env.params[:success] = {
     id: '_self',
     view: 'message',
-    message: "Sorry, this token has expired. Please check your email for a new password reset link."
+    message: 'Sorry, this token has expired. ' \
+             ' Please check your email for a new password reset link.'
   }
 end
 
 def signed_in_as_me_without_password?
-  Auth.signed_in? && Auth.current_id==id && account.password.blank?
+  Auth.signed_in? && Auth.current_id == id && account.password.blank?
 end
 
-event :redirect_to_edit_password, on: :update, after: :store, when: proc {|c| c.signed_in_as_me_without_password? } do
+event :redirect_to_edit_password,
+      on: :update, after: :store,
+      when: proc { |c| c.signed_in_as_me_without_password? } do
   Env.params[:success] = account.edit_password_success_args
 end
 
-event :preprocess_account_subcards, before: :process_subcards, on: :create do
-  #FIXME: use codenames!
-  email, password = subcards.delete('+*account+*email'), subcards.delete('+*account+*password')
-  subcards['+*account'] ||={}
-  subcards['+*account']['+*email']   = email if email
-  subcards['+*account']['+*password' ]=password if password
-end
-
 event :act_as_current_for_extend_phase, before: :extend, on: :create do
-  Auth.current_id = self.id
+  Auth.current_id = id
 end
-