card 1.17.4 → 1.18.0

data/mod/01_history/set/all/history.rb

@@ -6,16 +6,20 @@ end
 
 # must be called on all actions and before :set_name, :process_subcards and
 # :validate_delete_children
-event :assign_act,
-      before: :prepare,
-      when: proc { |c| c.history? || c.respond_to?(:attachment) }  do
-  @current_act = (@supercard && @supercard.current_act) ||
-                 Card::Act.create(ip_address: Env.ip)
-end
-
-event :assign_action, after: :assign_act do
+# event :assign_act,
+#       after: :identify_action,
+#       when: proc { |c| c.history? || c.respond_to?(:attachment) }  do
+#   @current_act = (@supercard && @supercard.current_act) ||
+#                  Card::Act.create(ip_address: Env.ip)
+#   assign_action
+# end
+#
+event :assign_action, :initialize,
+      when: proc { |c| c.history? || c.respond_to?(:attachment) } do
+  @current_act = director.need_act
   @current_action = Card::Action.create(
-    card_act_id: @current_act.id, action_type: @action,
+    card_act_id: @current_act.id,
+    action_type: @action,
     draft: (Env.params['draft'] == 'true')
   )
   if @supercard && @supercard != self
@@ -29,7 +33,8 @@ end
 
 # stores changes in the changes table and assigns them to the current action
 # removes the action if there are no changes
-event :finalize_action, after: :stored, when: proc { |c| c.finalize_action? } do
+event :finalize_action, :finalize,
+      when: proc { |c| c.finalize_action? } do
   @changed_fields = Card::TRACKED_FIELDS.select do |f|
     changed_attributes.member? f
   end
@@ -57,8 +62,8 @@ event :finalize_act,
   end
 end
 
-event :rollback_actions,
-      before: :approve, on: :update,
+event :rollback_actions, :prepare_to_validate,
+      on: :update,
       when: proc { |c| c.rollback_request? } do
   revision = { subcards: {} }
   rollback_actions = Env.params['action_ids'].map do |a_id|
@@ -136,9 +141,7 @@ end
 def descendant_card_ids parent_ids=[id]
   more_ids = Card.where('left_id IN (?)', parent_ids).pluck('id')
 
-  if !more_ids.empty?
-    more_ids += descendant_card_ids more_ids
-  end
+  more_ids += descendant_card_ids more_ids unless more_ids.empty?
   more_ids
 end
 
@@ -302,11 +305,11 @@ HAML
 
   def wrap_diff field, content
     return '' unless content.present?
-    %{
+    %(
        <span class="#{field}-diff">
        #{content}
        </span>
-    }
+    )
   end
 
   def name_changes action, hide_diff=false

data/mod/02_basic_types/format/rss_format.rb

@@ -3,7 +3,6 @@ class Card
   Format.register :rss
 
   class RssFormat < HtmlFormat
-
     def internal_url relative_path
       card_url relative_path
     end

data/mod/02_basic_types/set/all/all_css.rb

@@ -1,7 +1,6 @@
 
 format :css do
-
-  def get_inclusion_defaults nested_card
+  def get_nest_defaults _nested_card
     { view: :raw }
   end
 
@@ -11,32 +10,29 @@ format :css do
   end
 
   view :titled do |args|
-    major_comment( %{ Style Card: "#{ card.name }" } ) +
-    _render_core( args )
+    major_comment(%( Style Card: "#{card.name}" )) + _render_core(args)
   end
 
   view :content do |args|
-   _render_core( args )
+    _render_core args
   end
 
-  view :missing do |args|
+  view :missing do |_args|
     major_comment "MISSING Style Card: #{card.name}"
   end
 
-  view :import do |args|
-    %{\n@import url("#{ _render_url item: :import }");\n}
+  view :import do |_args|
+    %{\n@import url("#{_render_url item: :import}");\n}
   end
 
   view :url, perms: :none do |args|
     page_path card.cardname, format: :css, item: args[:item]
-#    card_url _render_linkname
+    # card_url _render_linkname
   end
 
   def major_comment comment, char='-'
-    edge = %{/* #{ char * ( comment.length+4 ) } */}
-    main = %{/* #{ char } #{ comment } #{ char } */}
+    edge = %(/* #{char * (comment.length + 4)} */)
+    main = %(/* #{char} #{comment} #{char} */)
     "#{edge}\n#{main}\n#{edge}\n\n"
   end
-
-
 end

data/mod/02_basic_types/set/all/all_csv.rb

@@ -1,7 +1,7 @@
 require 'csv'
 
 format :csv  do
-  def get_inclusion_defaults nested_card
+  def get_nest_defaults _nested_card
     { view: :core }
   end
 
@@ -9,44 +9,41 @@ format :csv  do
     @depth == 0 ? :csv_row : :name
   end
 
-
-  view :csv_row do |args|
-    array = _render_raw.scan( /\{\{[^\}]*\}\}/ ).map do |inc|
-      process_content( inc ).strip
+  view :csv_row do |_args|
+    array = _render_raw.scan(/\{\{[^\}]*\}\}/).map do |inc|
+      process_content(inc).strip
     end
 
     CSV.generate_line(array).strip
-    #strip is because search already joins with newlines
+    # strip is because search already joins with newlines
   end
 
-  view :missing do |args|
+  view :missing do |_args|
     ''
   end
 
-  view :csv_title_row do |args|
-    #NOTE: assumes all cards have the same structure!
+  view :csv_title_row do |_args|
+    # NOTE: assumes all cards have the same structure!
     begin
       card1 = search_results.first
 
       parsed_content = Card::Content.new card1.raw_content, self
-      unless String === parsed_content.__getobj__
+      if parsed_content.__getobj__.is_a? String
+        ''
+      else
         titles = parsed_content.map do |chunk|
           next if chunk.class != Card::Chunk::Include
           opts = chunk.options
-          if ['name','link'].member? opts[:view]
+          if %w(name link).member? opts[:view]
             opts[:view]
           else
             opts[:inc_name].to_name.tag
           end
-        end.compact.map {|title| title.to_s.upcase }
-        CSV.generate_line titles
-
-      else
-        ''
+        end.compact
+        CSV.generate_line titles.map { |title| title.to_s.upcase }
       end
     rescue
       ''
     end
   end
-
 end

data/mod/02_basic_types/set/all/all_js.rb

@@ -1,7 +1,6 @@
-    
+
 format :js do
-  view :include_tag do |args|
-    %{\n#{javascript_include_tag page_path(card.cardname) }\n }
+  view :include_tag do |_args|
+    %(\n#{javascript_include_tag page_path(card.cardname)}\n )
   end
-  
 end

data/mod/02_basic_types/set/all/base.rb

@@ -20,8 +20,8 @@ format do
         name.titleize
       else
         if ::Set.new([
-          :downcase, :upcase, :swapcase, :reverse, :succ
-        ]).include?(variant.to_sym)
+                       :downcase, :upcase, :swapcase, :reverse, :succ
+                     ]).include?(variant.to_sym)
           name.send variant
         else
           name

data/mod/02_basic_types/set/all/file.rb

@@ -1,12 +1,9 @@
 format :file do
-
-  view :core do |args|
+  view :core do |_args|
     'File rendering of this card not yet supported'
   end
 
-
-  view :style do |args|
+  view :style do |_args|
     nil
   end
-
 end

data/mod/02_basic_types/set/all/json.rb

@@ -1,7 +1,6 @@
 
 format :json do
-
-  def get_inclusion_defaults nested_card
+  def get_nest_defaults _nested_card
     { view: :atom }
   end
 
@@ -17,25 +16,28 @@ format :json do
     view ||= :content
     raw = render view, args
     case
-    when String === raw    ;  raw
-    when params[:compress] ;  JSON( raw )
-    else                   ;  JSON.pretty_generate raw
+    when raw.is_a?(String) then raw
+    when params[:compress] then JSON(raw)
+    else JSON.pretty_generate raw
     end
   end
 
-  view :name_complete do |args|
-    card.item_cards complete: params['term'], limit: 8, sort: 'name', return: 'name', context: ''
+  view :name_complete do |_args|
+    card.item_cards complete: params['term'], limit: 8, sort: 'name',
+                    return: 'name', context: ''
   end
 
-  view :status, tags: :unknown_ok, perms: :none do |args|
-    status = case
-    when !card.known?       ;  :unknown
-# do we want the following to prevent fishing?  of course, they can always post...
-    when !card.ok?(:read)   ;  :unknown
-    when card.real?         ;  :real
-    when card.virtual?      ;  :virtual
-    else                    ;  :wtf
-    end
+  view :status, tags: :unknown_ok, perms: :none do |_args|
+    status =
+      case
+      when !card.known?     then :unknown
+      # do we want the following to prevent fishing?  of course, they can always
+      # post...
+      when !card.ok?(:read) then :unknown
+      when card.real?       then :real
+      when card.virtual?    then :virtual
+      else :wtf
+      end
 
     hash = { key: card.key, url_key: card.cardname.url_key, status: status }
     hash[:id] = card.id if status == :real
@@ -43,7 +45,7 @@ format :json do
     hash
   end
 
-  view :content do |args|
+  view :content do |_args|
     req = controller.request
     {
       url:       (req && req.original_url),
@@ -62,5 +64,4 @@ format :json do
     h[:value]    = _render_core args if @depth < max_depth
     h
   end
-
 end

data/mod/02_basic_types/set/all/rss.rb

@@ -23,12 +23,12 @@ format :rss do
           render_feed_body
         end
       end
-    rescue =>e
+    rescue => e
       @xml.error "\n\nERROR rendering RSS: #{e.inspect}\n\n #{e.backtrace}"
     end
   end
 
-  def raw_feed_items args
+  def raw_feed_items _args
     [card]
   end
 
@@ -46,7 +46,7 @@ format :rss do
   end
 
   view :feed_title do
-    Card.global_setting(:title) + ' : ' + card.name.gsub(/^\*/,'')
+    Card.global_setting(:title) + ' : ' + card.name.gsub(/^\*/, '')
   end
 
   view :feed_item do |args|

data/mod/02_basic_types/set/all/text.rb

@@ -1,8 +1,6 @@
 
 format :text do
-
   view :core do |args|
-    HTMLEntities.new.decode "#{ strip_tags( super args ) }" #need this string method to get out of html_safe mode
+    HTMLEntities.new.decode strip_tags(super args).to_s # need this string method to get out of html_safe mode
   end
-
 end

data/mod/02_basic_types/set/type/html.rb

@@ -3,11 +3,11 @@ def clean_html?
 end
 
 def diff_args
- {format: :raw}
+  { format: :raw }
 end
 
 format do
-  view :closed_content do |args|
+  view :closed_content do |_args|
     ''
   end
 
@@ -16,12 +16,8 @@ format do
   end
 end
 
-
 format :html do
-  view :editor do |args|
-    text_area :content, rows: 5, class: 'card-content ace-editor-textarea', "data-card-type-code"=>card.type_code
+  view :editor do |_args|
+    text_area :content, rows: 5, class: 'card-content ace-editor-textarea', 'data-card-type-code' => card.type_code
   end
 end
-
-
-

data/mod/02_basic_types/set/type/plain_text.rb

@@ -1,13 +1,12 @@
 format :html do
-
-  view :editor do |args|
+  view :editor do |_args|
     text_area :content,
               rows: 5,
               class: 'card-content',
               'data-card-type-code' => card.type_code
   end
 
-  view :core do |args|
+  view :core do |_args|
     process_content_object(CGI.escapeHTML _render_raw)
   end
 end

data/mod/02_basic_types/set/type/pointer.rb

@@ -1,27 +1,28 @@
 
 
-event :add_and_drop_items, before: :approve, on: :save do
+event :add_and_drop_items, :prepare_to_validate, on: :save do
   adds = Env.params['add_item']
   drops = Env.params['drop_item']
   Array.wrap(adds).each { |i| add_item i } if adds
   Array.wrap(drops).each { |i| drop_item i } if drops
 end
 
-event :insert_item_event, before: :approve, on: :save, when: proc {|c| Env.params['insert_item']} do
+event :insert_item_event, :prepare_to_validate,
+      on: :save, when: proc { Env.params['insert_item'] } do
   index = Env.params['item_index'] || 0
-  self.insert_item index.to_i, Env.params['insert_item']
+  insert_item index.to_i, Env.params['insert_item']
 end
 
-phase_method :changed_item_names do
+stage_method :changed_item_names do
   dropped_item_names + added_item_names
 end
 
-phase_method :dropped_item_names do
+stage_method :dropped_item_names do
   old_items = item_names content: db_content_was
   old_items - item_names
 end
 
-phase_method :added_item_names do
+stage_method :added_item_names do
   old_items = item_names content: db_content_was
   item_names - old_items
 end
@@ -33,8 +34,8 @@ format do
     end
   end
 
-  def wrap_item item, args={}
-    item #no wrap in base
+  def wrap_item item, _args={}
+    item # no wrap in base
   end
 
   view :core do |args|
@@ -51,46 +52,49 @@ format do
 end
 
 format :html do
-
   view :core do |args|
-    %{<div class="pointer-list">#{ render_pointer_items args }</div>}
+    %(<div class="pointer-list">#{render_pointer_items args}</div>)
   end
 
   view :closed_content do |args|
-    args[:item] = (args[:item] || inclusion_defaults(card)[:view])=='name' ? 'name' : 'link'
+    args[:item] =
+      if (args[:item] || nest_defaults(card)[:view]) == 'name'
+        'name'
+      else
+        'link'
+      end
     args[:joint] ||= ', '
     _render_core args
   end
 
-#  view :edit do |args|
-#    super(args.merge(pointer_item_class: 'form-control'))
-#  end
+  #  view :edit do |args|
+  #    super(args.merge(pointer_item_class: 'form-control'))
+  #  end
 
   view :editor do |args|
-    part_view = (c = card.rule(:input)) ? c.gsub(/[\[\]]/,'') : :list
-    hidden_field( :content, class: 'card-content') +
-    raw(_render part_view, args)
+    part_view = (c = card.rule(:input)) ? c.gsub(/[\[\]]/, '') : :list
+    hidden_field(:content, class: 'card-content') +
+      raw(_render(part_view, args))
+    # .merge(pointer_item_class: 'form-control')))
+  end
 
-    #.merge(pointer_item_class: 'form-control')))
+  def options_card_name
+    (oc = card.options_rule_card) ? oc.cardname.url_key : ':all'
   end
 
   view :list do |args|
     args ||= {}
     items = args[:item_list] || card.item_names(context: :raw)
     items = [''] if items.empty?
-    options_card_name = (oc = card.options_rule_card) ? oc.cardname.url_key : ':all'
-
     extra_css_class = args[:extra_css_class] || 'pointer-list-ul'
 
     <<-HTML
       <ul class="pointer-list-editor #{extra_css_class}" data-options-card="#{options_card_name}">
-        #{
-          items.map do |item|
-            _render_list_item args.merge( pointer_item: item )
-          end * "\n"
-        }
+        #{items.map do |item|
+            _render_list_item args.merge(pointer_item: item)
+          end.join "\n"}
       </ul>
-      #{ add_item_button }
+      #{add_item_button}
     HTML
   end
 
@@ -103,26 +107,26 @@ format :html do
   end
 
   view :list_item do |args|
-   <<-HTML
-    <li class="pointer-li">
-      <span class="input-group">
-        <span class="input-group-addon handle">
-          #{ glyphicon 'option-vertical left' }
-          #{ glyphicon 'option-vertical right'}
-        </span>
-        #{ text_field_tag 'pointer_item', args[:pointer_item], class: 'pointer-item-text form-control' }
-        <span class="input-group-btn">
-          <button class="pointer-item-delete btn btn-default" type="button">
-            #{ glyphicon 'remove'}
-          </button>
-        </span>
+    <<-HTML
+      <li class="pointer-li">
+        <span class="input-group">
+          <span class="input-group-addon handle">
+            #{glyphicon 'option-vertical left'}
+            #{glyphicon 'option-vertical right'}
+          </span>
+          #{text_field_tag 'pointer_item', args[:pointer_item],
+                           class: 'pointer-item-text form-control'}
+          <span class="input-group-btn">
+            <button class="pointer-item-delete btn btn-default" type="button">
+              #{glyphicon 'remove'}
+            </button>
+          </span>
         </span>
       </li>
     HTML
   end
 
-
-  view :checkbox do |args|
+  view :checkbox do |_args|
     options = card.option_names.map do |option_name|
       checked = card.item_names.include?(option_name)
       label = ((o_card = Card.fetch(option_name)) && o_card.label) || option_name
@@ -130,80 +134,74 @@ format :html do
       description = pointer_option_description option_name
       <<-HTML
         <div class="pointer-checkbox">
-          #{ check_box_tag "pointer_checkbox", option_name, checked, id: id, class: 'pointer-checkbox-button' }
+          #{check_box_tag 'pointer_checkbox', option_name, checked, id: id, class: 'pointer-checkbox-button'}
           <label for="#{id}">#{label}</label>
-          #{ %{<div class="checkbox-option-description">#{ description }</div>} if description }
+          #{%(<div class="checkbox-option-description">#{description}</div>) if description}
         </div>
       HTML
     end.join "\n"
 
-    %{<div class="pointer-checkbox-list">#{options}</div>}
+    %(<div class="pointer-checkbox-list">#{options}</div>)
   end
 
-  view :multiselect do |args|
-    select_tag("pointer_multiselect",
+  view :multiselect do |_args|
+    select_tag(
+      'pointer_multiselect',
       options_for_select(card.option_names, card.item_names),
       multiple: true, class: 'pointer-multiselect form-control'
     )
   end
 
-  view :radio do |args|
+  view :radio do |_args|
     input_name = "pointer_radio_button-#{card.key}"
     options = card.option_names.map do |option_name|
-      checked = (option_name==card.item_names.first)
+      checked = (option_name == card.item_names.first)
       id = "pointer-radio-#{option_name.to_name.key}"
       label = ((o_card = Card.fetch(option_name)) && o_card.label) || option_name
       description = pointer_option_description option_name
       <<-HTML
         <li class="pointer-radio radio">
-          #{ radio_button_tag input_name, option_name, checked, id: id, class: 'pointer-radio-button' }
-          <label for="#{id}">#{ label }</label>
-          #{ %{<div class="radio-option-description">#{ description }</div>} if description }
+          #{radio_button_tag input_name, option_name, checked, id: id, class: 'pointer-radio-button'}
+          <label for="#{id}">#{label}</label>
+          #{%(<div class="radio-option-description">#{description}</div>) if description}
         </li>
       HTML
     end.join("\n")
 
-    %{<ul class="pointer-radio-list">#{options}</ul>}
+    %(<ul class="pointer-radio-list">#{options}</ul>)
   end
 
-  view :select do |args|
-    options = [["-- Select --",""]] + card.option_names.map{ |x| [x,x]}
-    select_tag("pointer_select",
-      options_for_select(options, card.item_names.first),
-      class: 'pointer-select form-control'
-    )
+  view :select do |_args|
+    options = [['-- Select --', '']] + card.option_names.map { |x| [x, x] }
+    select_tag('pointer_select',
+               options_for_select(options, card.item_names.first),
+               class: 'pointer-select form-control'
+              )
   end
 
-
   def pointer_option_description option
     pod_name = card.rule(:options_label) || 'description'
-    dcard = Card[ "#{option}+#{pod_name}" ]
-    if dcard and dcard.ok? :read
-      with_inclusion_mode :normal do
+    dcard = Card["#{option}+#{pod_name}"]
+    if dcard && dcard.ok?(:read)
+      with_nest_mode :normal do
         subformat(dcard).render_core
       end
     end
   end
 
-
-
   def wrap_item item, args
-    %{<div class="pointer-item item-#{args[:view]}">#{item}</div>}
+    %(<div class="pointer-item item-#{args[:view]}">#{item}</div>)
   end
-
-
 end
 
-
 format :css do
-
-  #generalize to all collections?
+  # generalize to all collections?
   def default_item_view
     params[:item] || :content
   end
 
-  view :titled do |args|
-    %(#{major_comment "STYLE GROUP: \"#{card.name}\"", '='}#{ _render_core })
+  view :titled do |_args|
+    %(#{major_comment "STYLE GROUP: \"#{card.name}\"", '='}#{_render_core})
   end
 
   view :core do |args|
@@ -213,22 +211,18 @@ format :css do
   end
 
   view :content, :core
-
 end
 
-
 format :js do
-
   view :core do |args|
     card.item_cards.map do |item|
-      nest item, view: ( args[:item] || :core)
+      nest item, view: (args[:item] || :core)
     end.join "\n\n"
   end
 end
 
-
 format :data do
-  view :core do |args|
+  view :core do |_args|
     card.item_cards.map do |c|
       nest c
     end
@@ -236,7 +230,7 @@ format :data do
 end
 
 format :rss do
-  def raw_feed_items args
+  def raw_feed_items _args
     @raw_feed_items ||= begin
       card.item_cards
     end
@@ -247,15 +241,13 @@ end
 # the new module will override the old module's events and functions.
 # this event is only on pointer card. Other type cards do not have this event,
 # so it is not overridden and will be run while updating type and content in the same request.
-event :standardize_items, before: :approve, on: :save, changed: :content,
-    when: proc{  |c| c.type_id == Card::PointerID  } do
-    self.content = item_names(context: :raw).map { |name| "[[#{name}]]" }.join "\n"
+event :standardize_items, :prepare_to_validate, on: :save, changed: :content,
+                                                when: proc {  |c| c.type_id == Card::PointerID  } do
+  self.content = item_names(context: :raw).map { |name| "[[#{name}]]" }.join "\n"
 end
 
-
-
 def diff_args
-  {format: :pointer}
+  { format: :pointer }
 end
 
 def item_cards args={}
@@ -265,7 +257,7 @@ def item_cards args={}
   else
 
     itype = args[:type] || item_type
-    #warn "item_card[#{inspect}], :complete"
+    # warn "item_card[#{inspect}], :complete"
     item_names(args).map do |name|
       new_args = itype ? { type: itype } : {}
       Card.fetch name, new: new_args
@@ -273,12 +265,11 @@ def item_cards args={}
   end
 end
 
-
 def item_names args={}
-  context = args[:context] || self.cardname
-  content = args[:content] || self.raw_content
+  context = args[:context] || cardname
+  content = args[:content] || raw_content
   content.to_s.split(/\n+/).map do |line|
-    item_name = line.gsub( /\[\[|\]\]/, '').strip
+    item_name = line.gsub(/\[\[|\]\]/, '').strip
     if context == :raw
       item_name
     else
@@ -287,7 +278,6 @@ def item_names args={}
   end
 end
 
-
 def item_ids args={}
   item_names(args).map do |name|
     Card.fetch_id name
@@ -296,7 +286,7 @@ end
 
 def item_type
   opt = options_rule_card
-  if !opt or opt==self #fixme, need better recursion prevention
+  if !opt || opt == self # fixme, need better recursion prevention
     nil
   else
     opt.item_type