card 1.16.8 → 1.16.9

data/mod/05_standard/set/all/list_changes.rb

@@ -0,0 +1,43 @@
+# -*- encoding : utf-8 -*-
+
+event :trunk_cardtype_of_a_list_relation_changed,
+      changed: :type, after: :store, on: :update,
+      when: proc { Codename[:list] } do
+  type_key_was = (tk = Card.fetch(type_id_was)) && tk.key
+  if (list_cards = Card.search(left: name, type_id: Card::ListID))
+    list_cards.each do |card|
+      card.update_listed_by_cache_for card.item_keys, type_key: type_key_was
+      card.update_listed_by_cache_for card.item_keys
+    end
+  end
+  if (listed_by_cards = Card.search(left: name, type_id: Card::ListedByID))
+    listed_by_cards.each(&:update_cached_list)
+  end
+end
+
+event :trunk_name_of_a_list_relation_changed,
+      changed: :name, after: :store, on: :update,
+      when: proc { Codename[:list] } do
+  if (list_cards = Card.search(left: name, type_id: Card::ListID))
+    list_cards.each do |card|
+      card.update_listed_by_cache_for card.item_keys
+    end
+  end
+  if (listed_by_cards = Card.search(left: name, type_id: Card::ListedByID))
+    listed_by_cards.each(&:update_cached_list)
+  end
+end
+
+event :cardtype_of_list_item_changed,
+      changed: :type, before: :approve, on: :save,
+      when: proc { Codename[:list] } do
+  Card.search(type_id: Card::ListID, link_to: name).each do |card|
+    if card.item_type_id != type_id
+      errors.add(
+        :type,
+        "can't be changed because #{name} " \
+        "is referenced by list card #{card.name}"
+      )
+    end
+  end
+end

data/mod/05_standard/set/all/rich_html/form.rb

@@ -1,20 +1,22 @@
 format :html do
   def edit_slot args={}
-    #note: @mode should already be :edit here...
+    # note: @mode should already be :edit here...
     if args[:structure] || card.structure
       # multi-card editing
 
       if args[:core_edit] #need better name
         _render_core args
       else
-        process_relative_tags optional_toolbar: :hide, structure: args[:structure]
+        process_relative_tags optional_toolbar: :hide,
+                              structure: args[:structure]
       end
 
     else
       # single-card edit mode
       field = content_field form, args
 
-      if [ args[:optional_type_formgroup], args[:optional_name_formgroup] ].member? :show
+      if [args[:optional_type_formgroup], args[:optional_name_formgroup]]
+         .member? :show
         # display content field in formgroup for consistency with other fields
         formgroup '', field, editor: :content
       else
@@ -23,16 +25,13 @@ format :html do
     end
   end
 
-
   def form_for_multi
-    card.name = card.name.gsub(/^#{Regexp.escape(root.card.name)}\+/, '+') if root.card.new_card?  ##FIXME -- need to match other relative inclusions.
+    instantiate_builder("card#{subcard_input_names}", card, {})
+  end
 
-    # doesn't work anymore in Rails 4
-    # TODO -- check whether forms work with the new instantiate_builder call
-    # block = Proc.new {}
-    # builder = ActionView::Base.default_form_builder
-    # builder.new("card[subcards][#{card.relative_name}]", card, template, {}, block)
-    builder = instantiate_builder("card[subcards][#{card.relative_name}]", card, {})
+  def subcard_input_names
+    return '' if !form_root_format || form_root_format == self
+    "#{@parent.subcard_input_names}[subcards][#{card.contextual_name}]"
   end
 
   def form
@@ -40,6 +39,7 @@ format :html do
   end
 
   def card_form action, opts={}
+    @form_root = true
     hidden_args = opts.delete :hidden
     form_for card, card_form_opts(action, opts) do |form|
       @form = form
@@ -50,6 +50,16 @@ format :html do
     end
   end
 
+  def form_root_format
+    if @form_root
+      self
+    elsif !@parent
+      nil
+    else
+      @parent.form_root_format
+    end
+  end
+
   def card_form_opts action, html={}
     url, action = case action
       when Symbol ;  [ path(action: action) , action          ]

data/mod/05_standard/set/all/rich_html/menu.rb

@@ -108,7 +108,7 @@ format :html do
   def show_menu_items
     disc_tagname = Card.fetch(:discussion, skip_modules: true).cardname
     disc_card = unless card.new_card? or card.junction? && card.cardname.tag_name.key == disc_tagname.key
-      Card.fetch "#{card.name}+#{disc_tagname}", skip_virtual: true, skip_modules: true, new: {}
+      Card.fetch "#{card.name}+#{disc_tagname}", skip_modules: true, new: {}
     end
 
     res = {

data/mod/05_standard/set/right/account.rb

@@ -65,7 +65,7 @@ event :validate_accountability, on: :create, before: :approve do
 end
 
 event :require_email, on: :create, after: :approve do
-  unless subcards["+#{Card[:email].name}"]
+  unless subfield(:email)
     errors.add :email, 'required'
   end
 end
@@ -74,20 +74,20 @@ end
 event :set_default_salt, on: :create, before: :process_subcards do
   salt = Digest::SHA1.hexdigest "--#{Time.now.to_s}--"
   Env[:salt] = salt # HACK!!! need viable mechanism to get this to password
-  subcards["+#{Card[:salt].name}"] ||= { content: salt }
+  add_subfield :salt, content: salt
 end
 
 event :set_default_status, on: :create, before: :process_subcards do
   default_status = ( Auth.needs_setup? ? 'active' : 'pending' )
-  subcards["+#{Card[:status].name}"] = { content: default_status }
+  add_subfield :status, content: default_status
 end
 
 def confirm_ok?
   Card.new( type_id: Card.default_accounted_type_id ).ok? :create
 end
 
-event :generate_confirmation_token, on: :create, before: :process_subcards, when: proc{ |c| c.confirm_ok? } do
-  subcards["+#{Card[:token].name}"] = {content: generate_token }
+event :generate_confirmation_token, :on=>:create, :before=>:process_subcards, :when=>proc{ |c| c.confirm_ok? } do
+  add_subfield :token, content: generate_token
 end
 
 event :reset_password, on: :update, before: :approve, when: proc{ |c| c.has_reset_token? } do

data/mod/05_standard/set/self/head.rb

@@ -84,7 +84,6 @@ format :html do
     elsif script_card
       javascript_include_tag script_card.machine_output_url
     end
-
     ie9_card    = Card[:script_html5shiv_printshiv]
     %(#{ javascript_tag do varvals * ';' end  }
       #{ @js_tag if @js_tag }

data/mod/05_standard/set/self/signin.rb

@@ -1,6 +1,5 @@
 
 format :html do
-
   view :open do |args|
     args.merge! optional_help: :show
     super args
@@ -12,84 +11,93 @@ format :html do
 
   view :open_content do |args|
     # annoying step designed to avoid table of contents.  sigh
-    _render_core( args )
+    _render_core(args)
   end
 
-  view :closed_content do |args|
+  view :closed_content do |_args|
     ''
   end
 
   def default_core_args args={}
     args[:buttons] = button_tag 'Sign in', situation: 'primary'
     if Card.new(type_id: Card::SignupID).ok? :create
-      args[:buttons] += link_to( '...or sign up!', card_path("account/signup"))
+      args[:buttons] += link_to('...or sign up!', card_path('account/signup'))
     end
-    args[:buttons] += raw("<div style='float:right'>#{ view_link 'RESET PASSWORD', :edit, path_opts: {slot: {hide: :toolbar}} }</div>") #FIXME - hardcoded styling
+    args[:buttons] += raw(
+      "<div style='float:right'>" \
+      "#{ view_link 'RESET PASSWORD', :edit,
+                    path_opts: { slot: { hide: :toolbar } } }" \
+      '</div>') # FIXME: hardcoded styling
     args
   end
 
   view :core do |args|
-    account = card.fetch trait: :account, new: {}
     form_args = {
       hidden: { success: "REDIRECT: #{Env.interrupted_action || '*previous'}" },
       recaptcha: :off
     }
-
     with_inclusion_mode :edit do
       card_form :update, form_args do
         [
-          Auth.as_bot do
-            subformat(account)._render :content_formgroup, structure: true, items: {autocomplete: 'on'}
-          end,
-          _optional_render( :button_formgroup, args )
+          _optional_render(:content_formgroup, args.merge(structure: true)),
+          _optional_render(:button_formgroup, args)
         ].join
       end
     end
   end
 
-  #FORGOT PASSWORD
+  # FORGOT PASSWORD
   view :edit do |args|
-    args.merge!( {
+    @forgot_password = true
+    args.merge!(
       title: 'Forgot Password',
       optional_help: :hide,
-      buttons: button_tag( 'Reset my password', situation: 'primary' ),
+      buttons: button_tag('Reset my password', situation: 'primary'),
       structure: true,
       hidden: {
         reset_password: true,
         success: { view: :reset_password_success }
       }
-    } )
+    )
 
     Auth.as_bot { super args }
   end
 
-  view :raw do |args|
-    '{{+*email|title:email;type:Phrase}}'
+  view :raw do |_args|
+    if @forgot_password
+      "{{+#{Card[:email].name}|title:email;type:Phrase}}"
+    else
+      %(
+        {{+#{Card[:email].name}|titled;title:email}}
+        {{+#{Card[:password].name}|titled;title:password}}
+      )
+    end
   end
 
-  view :reset_password_success do |args|
+  view :reset_password_success do |_args|
     frame { 'Check your email for a link to reset your password' }
   end
-
 end
 
 event :signin, before: :approve, on: :update do
-  email = subcards["+#{Card[:email   ].name}"]
-  email &&= email['content']
-  pword = subcards["+#{Card[:password].name}"]
-  pword &&= pword['content']
+  email = subfield :email
+  email &&= email.content
+  pword = subfield :password
+  pword &&= pword.content
 
   abort :failure, 'bad signin args' unless email && pword
 
-  if signin_id = Auth.authenticate( email, pword )
+  if (signin_id = Auth.authenticate(email, pword))
     Auth.signin signin_id
   else
-    accted = Auth[ email.strip.downcase ]
-    errors.add :signin, case
-      when accted.nil?             ; "Unrecognized email."
-      when !accted.account.active? ; "Sorry, that account is not active."
-      else                         ; "Wrong password"
+    accted = Auth[email.strip.downcase]
+    error_msg =
+      case
+      when accted.nil?             then 'Unrecognized email.'
+      when !accted.account.active? then 'Sorry, that account is not active.'
+      else 'Wrong password'
       end
+    errors.add :signin, error_msg
     abort :failure
   end
 end
@@ -98,11 +106,13 @@ event :signin_success, after: :signin do
   abort :success
 end
 
-event :send_reset_password_token, before: :signin, on: :update, when: proc{ |c| Env.params[:reset_password] } do
-  email = subcards["+#{Card[:email].name}"]
-  email &&= email['content']
+event :send_reset_password_token,
+      before: :signin, on: :update,
+      when: proc { Env.params[:reset_password] } do
+  email = subfield :email
+  email &&= email.content
 
-  if accted = Auth[ email.strip.downcase ] and accted.account.active?
+  if (accted = Auth[email.strip.downcase]) && accted.account.active?
     accted.account.send_reset_password_token
     abort :success
   else
@@ -119,5 +129,3 @@ event :signout, before: :approve, on: :delete do
   Auth.signin nil
   abort :success
 end
-
-

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

@@ -87,9 +87,11 @@ format :html do
   end
 
   view :preview_editor, tags: :unknown_ok do |args|
+    cached_upload_card_name = Card::Env.params[:attachment_upload]
+    cached_upload_card_name.gsub!(/\[\w+\]$/, "[cached_upload]")
     <<-HTML
       <div class="chosen-file">
-        <input type="hidden" name="cached_upload" value="#{card.selected_action_id}">
+        <input type="hidden" name="#{cached_upload_card_name}" value="#{card.selected_action_id}">
         <table role="presentation" class="table table-striped"><tbody class="files">
           <tr class="template-download fade in">
             <td>
@@ -126,7 +128,12 @@ format :html do
             <span>
                 #{card.new_card? ? 'Add' : 'Replace'} #{card.attachment_name}...
             </span>
-             #{file_field card.attachment_name, class: 'file-upload slotter'}
+             <input class="file-upload slotter form-control" type="file" 
+                name="card[#{card.type_code}]" id="card_#{card.type_code}">
+             #{hidden_field_tag 'attachment_type_id', card.type_id}
+             #{hidden_field card.attachment_name, class: "attachment_card_name",
+                            value: ''}
+             #{hidden_field_tag 'file_card_name', card.cardname.url_key}
         </span>
       </div>
       <div id="progress" class="progress" style="display: none;">

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

@@ -0,0 +1,134 @@
+event :validate_list_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_list_item_type_change,
+      before: :validate, on: :save, changed: :name do
+  item_cards.each do |item_card|
+    if item_card.type_cardname.key != item_type_name.key
+      errors.add :name,
+                 "name conflicts with list items' type; " \
+                 'delete content first'
+    end
+  end
+end
+
+event :validate_list_content, before: :validate, on: :save, changed: :content do
+  item_cards.each do |item_card|
+    if item_card.type_cardname.key != item_type_name.key
+      errors.add :content,
+                 "#{item_card.name} has wrong cardtype; " \
+                 "only cards of type #{cardname.right} are allowed"
+    end
+  end
+end
+
+event :create_listed_by_cards,
+      before: :approve, on: :save, changed: :content do
+  item_names.each do |item_name|
+    listed_by_name = "#{item_name}+#{left.type_name}"
+    if !Card[listed_by_name]
+      add_subcard listed_by_name, type_id: ListedByID
+    else
+      Card[listed_by_name].update_references
+    end
+  end
+end
+
+event :update_related_listed_by_card_on_create,
+      after: :store, on: :create do
+  update_listed_by_cache_for item_keys
+end
+
+event :update_related_listed_by_card_on_content_update,
+      after: :store, on: :update, changed: :content do
+  new_items = item_keys
+  changed_items =
+    if db_content_was
+      old_items = item_keys(content: db_content_was)
+      old_items + new_items - (old_items & new_items)
+    else
+      new_items
+    end
+  update_listed_by_cache_for changed_items
+end
+
+event :update_related_listed_by_card_on_name_update,
+      after: :store, on: :update, changed: :name do
+  update_all_items
+end
+
+event :update_related_listed_by_card_on_type_update,
+      after: :store, on: :update, changed: :type_id do
+  update_all_items
+end
+
+event :update_related_listed_by_card_on_delete,
+      after: :store, on: :delete, when: proc { |c| c.junction? } do
+  update_listed_by_cache_for item_keys, type_key: @left_type_key
+end
+
+event :cache_type_key,
+      before: :store, on: :delete, when: proc { |c| c.junction? } do
+  @left_type_key = left.type_card.key
+end
+
+def update_all_items
+  current_items = item_keys
+  if db_content_was
+    old_items = item_keys(content: db_content_was)
+    update_listed_by_cache_for old_items
+  end
+  update_listed_by_cache_for current_items
+end
+
+def update_listed_by_cache_for item_keys, args={}
+  type_key = args[:type_key] || left.type_card.key
+
+  item_keys.each do |item_key|
+    key = "#{item_key}+#{type_key}"
+    if Card::Cache[Card::Set::Type::ListedBy].exist? key
+      if (card = Card.fetch(key))
+        card.update_cached_list
+        card.update_references
+      else
+        Card::Cache[Card::Set::Type::ListedBy].delete key
+      end
+    end
+  end
+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
+
+def item_type
+  cardname.right
+end
+
+def item_type_name
+  cardname.right_name
+end
+
+def item_type_card
+  cardname.right
+end
+
+def item_type_id
+  right.id
+end