card 1.17.4 → 1.18.0

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

@@ -1,9 +1,8 @@
 # -*- encoding : utf-8 -*-
 require_dependency 'card/version'
 
-view :raw do |args|
+view :raw do |_args|
   Card::Version.release
 end
 
 view :core, :raw
-

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

@@ -5,15 +5,16 @@ format :html do
   end
 
   def table_of_contents content
-    return if @mode==:closed || !content.present?
+    return if @mode == :closed || !content.present?
     min = card.rule(:table_of_contents).to_i
-    #warn "table_of #{name}, #{min}"
-    return unless min and min > 0
+    # warn "table_of #{name}, #{min}"
+    return unless min && min > 0
 
-    toc, dep = [], 1
-    content.gsub!( /<(h\d)>(.*?)<\/h\d>/i ) do |match|
-      if $~
-        tag, value = $~[1,2]
+    toc = []
+    dep = 1
+    content.gsub!(/<(h\d)>(.*?)<\/h\d>/i) do |match|
+      if $LAST_MATCH_INFO
+        tag, value = $LAST_MATCH_INFO[1, 2]
         value = ActionView::Base.new.strip_tags(value).strip
         next if value.empty?
         item = { value: value, uri: URI.escape(value) }
@@ -24,23 +25,20 @@ format :html do
           toc << []  if dep == 1
           item[:depth] = dep = 2; toc.last << item
         end
-        %{<a name="#{item[:uri]}"></a>#{match}}
+        %(<a name="#{item[:uri]}"></a>#{match})
       end
     end
 
     if toc.flatten.length >= min
-      content.replace %{ <div class="table-of-contents"> <h5>Table of Contents</h5> } +
-        make_table_of_contents_list(toc) + '</div>'+ content
+      content.replace %( <div class="table-of-contents"> <h5>Table of Contents</h5> ) +
+                      make_table_of_contents_list(toc) + '</div>' + content
     end
   end
 
-
-  def make_table_of_contents_list(items)
-    list = items.collect do |i|
-      Array === i ? make_table_of_contents_list(i) : %{<li><a href="##{i[:uri]}"> #{i[:value]}</a></li>}
+  def make_table_of_contents_list items
+    list = items.map do |i|
+      Array === i ? make_table_of_contents_list(i) : %(<li><a href="##{i[:uri]}"> #{i[:value]}</a></li>)
     end.join("\n")
-    "<ol>" + list + "</ol>"
+    '<ol>' + list + '</ol>'
   end
-
 end
-

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

@@ -1,18 +1,18 @@
 
 format :html do
   view :type do |args|
-    args.merge!(type_class: 'no-edit') if card.cards_of_type_exist?
+    args[:type_class] = 'no-edit' if card.cards_of_type_exist?
     super args
   end
 
   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>
-      }
+      )
     else
       super args
     end

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

@@ -1,8 +1,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 |_args|
     text_field :content, class: 'date-editor'
   end
 end

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

@@ -11,12 +11,11 @@ module SelectedAction
     # find action id from content (saves lookups)
     db_content.to_s.split(/[\/\.]/)[1]
   end
-
 end
 include SelectedAction
 
 format do
-  view :source do |args|
+  view :source do |_args|
     card.attachment.url
   end
 
@@ -28,34 +27,31 @@ format do
 
   def handle_source args
     source = _render_source args
-    source ? yield( source ) : ''
+    source ? yield(source) : ''
   rescue
     'File Error'
   end
 end
 
-
-
 format :file do
-
-  view :core do |args|                                    # returns send_file args.  not in love with this...
-    if format = card.attachment_format( params[:format] ) # this means we only support known formats.  dislike.
-      if params[:explicit_file] and r = controller.response
-        r.headers["Expires"] = 1.year.from_now.httpdate
-        #r.headers["Cache-Control"] = "public"            # currently using default "private", because proxy servers could block needed permission checks
+  view :core do |_args|                                    # returns send_file args.  not in love with this...
+    if format = card.attachment_format(params[:format]) # this means we only support known formats.  dislike.
+      if params[:explicit_file] && (r = controller.response)
+        r.headers['Expires'] = 1.year.from_now.httpdate
+        # r.headers["Cache-Control"] = "public"            # currently using default "private", because proxy servers could block needed permission checks
       end
 
-  #      elsif ![format, 'file'].member? params[:format]  # formerly supported redirecting to correct file format
-  #        return redirect_to( request.fullpath.sub( /\.#{params[:format]}\b/, '.' + format ) ) #card.attachment.url(style) )
+      #      elsif ![format, 'file'].member? params[:format]  # formerly supported redirecting to correct file format
+      #        return redirect_to( request.fullpath.sub( /\.#{params[:format]}\b/, '.' + format ) ) #card.attachment.url(style) )
 
       file = selected_file_version
-      [ file.path,
-        {
-          type: file.content_type,
-          filename:  "#{card.cardname.safe_key}#{file.extension}",
-          x_sendfile: true,
-          disposition: (params[:format]=='file' ? 'attachment' : 'inline' )
-        }
+      [file.path,
+       {
+         type: file.content_type,
+         filename:  "#{card.cardname.safe_key}#{file.extension}",
+         x_sendfile: true,
+         disposition: (params[:format] == 'file' ? 'attachment' : 'inline')
+       }
       ]
     else
       _render_not_found
@@ -65,15 +61,12 @@ format :file do
   def selected_file_version
     card.attachment
   end
-
 end
 
-
 format :html do
-
   view :core do |args|
     handle_source args do |source|
-      "<a href=\"#{source}\">Download #{ showname args[:title] }</a>"
+      "<a href=\"#{source}\">Download #{showname args[:title]}</a>"
     end
   end
 
@@ -81,14 +74,13 @@ format :html do
     file_chooser args
   end
 
-
-  def preview  args
+  def preview  _args
     ''
   end
 
   view :preview_editor, tags: :unknown_ok do |args|
     cached_upload_card_name = Card::Env.params[:attachment_upload]
-    cached_upload_card_name.gsub!(/\[\w+\]$/, "[action_id_of_cached_upload]")
+    cached_upload_card_name.gsub!(/\[\w+\]$/, '[action_id_of_cached_upload]')
     <<-HTML
       <div class="chosen-file">
         <input type="hidden" name="#{cached_upload_card_name}" value="#{card.selected_action_id}">
@@ -128,11 +120,11 @@ format :html do
             <span>
                 #{card.new_card? ? 'Add' : 'Replace'} #{card.attachment_name}...
             </span>
-             <input class="file-upload slotter form-control" type="file" 
+             <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 card.attachment_name, class: 'attachment_card_name',
+                                                  value: ''}
              #{hidden_field_tag 'file_card_name', card.cardname.url_key}
         </span>
       </div>
@@ -142,7 +134,4 @@ format :html do
       <div class="chosen-file"></div>
     HTML
   end
-
 end
-
-

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

@@ -3,19 +3,19 @@ attachment :image, uploader: ImageUploader
 include File::SelectedAction
 
 format do
-
   include File::Format
 
-  view :closed_content do |args|
+  view :closed_content do |_args|
     _render_core size: :icon
   end
 
   view :source do |args|
-    style = case
-      when @mode==:closed ;  :icon
-      when args[:size]    ;  args[:size].to_sym
-      when main?          ;  :large
-      else                ;  :medium
+    style =
+      case
+      when @mode == :closed then :icon
+      when args[:size]    then args[:size].to_sym
+      when main?          then :large
+      else :medium
       end
     style = :original if style.to_sym == :full
     if style == :original
@@ -24,7 +24,6 @@ format do
       card.image.versions[style].url
     end
   end
-
 end
 
 format :html do
@@ -32,37 +31,42 @@ format :html do
 
   view :core do |args|
     handle_source args do |source|
-      source == 'missing' ? "<!-- image missing #{@card.name} -->" : image_tag(source)
+      if source == 'missing'
+        "<!-- image missing #{@card.name} -->"
+      else
+        image_tag(source)
+      end
     end
   end
 
   def preview args
     if !card.new_card? || card.preliminary_upload?
-      content_tag( :div, _render_core(args.merge(size: :medium)).html_safe,
-          class: 'attachment-preview', id: "#{card.attachment.filename}-preview")
+      content_tag :div, _render_core(args.merge(size: :medium)).html_safe,
+                  class: 'attachment-preview',
+                  id: "#{card.attachment.filename}-preview"
     end
   end
 
   view :content_changes do |args|
     out = ''
-    size = args[:diff_type]==:summary ? :icon : :medium
-    if !args[:hide_diff] and args[:action] and last_change = card.last_change_on(:db_content,before: args[:action])
-      card.selected_action_id=last_change.card_action_id
+    size = args[:diff_type] == :summary ? :icon : :medium
+    if !args[:hide_diff] && args[:action] &&
+       (last_change = card.last_change_on(:db_content, before: args[:action]))
+      card.selected_action_id = last_change.card_action_id
       out << Card::Diff.render_deleted_chunk(_render_core(size: size))
     end
-    card.selected_action_id=args[:action].id
-    out <<  Card::Diff.render_added_chunk(_render_core(size: size))
+    card.selected_action_id = args[:action].id
+    out << Card::Diff.render_added_chunk(_render_core(size: size))
     out
   end
-
 end
 
 format :css do
-  view :core do |args|
+  view :core do |_args|
     render_source
   end
 
-  view :content do |args|  #why is this necessary?
+  view :content do |_args|  # why is this necessary?
     render_core
   end
 end
@@ -70,13 +74,16 @@ end
 format :file do
   include File::FileFormat
 
-  view :style do |args|  #should this be in model?
-    ['', 'full'].member?( args[:style].to_s ) ? :original : args[:style]
+  view :style do |args|  # should this be in model?
+    ['', 'full'].member?(args[:style].to_s) ? :original : args[:style]
   end
 
   def selected_file_version
     style = _render_style(style: params[:size]).to_sym
-    (style && style != :original) ? card.attachment.versions[style] : card.attachment
+    if style && style != :original
+      card.attachment.versions[style]
+    else
+      card.attachment
+    end
   end
 end
-

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

@@ -8,9 +8,9 @@ end
 format :html do
   include Html::HtmlFormat
 
-  view :core do |args|
-    with_inclusion_mode :template do
-      process_content ::CodeRay.scan( _render_raw, :html ).div
+  view :core do |_args|
+    with_nest_mode :template do
+      process_content ::CodeRay.scan(_render_raw, :html).div
     end
   end
-end
+end

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

@@ -1,34 +1,34 @@
-event :validate_list_name, before: :validate, on: :save, changed: :name do
+event :validate_list_name, :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
+event :validate_list_item_type_change, :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
+    next unless item_card.type_cardname.key != item_type_name.key
+    errors.add :name,
+               "name conflicts with list items' type; " \
+               'delete content first'
   end
 end
 
-event :validate_list_content, before: :validate, on: :save, changed: :content do
+event :validate_list_content, :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
+    next unless 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
 
-event :create_listed_by_cards,
-      before: :approve, on: :save, changed: :content do
+event :create_listed_by_cards, :prepare_to_validate,
+      on: :save, changed: :content do
   item_names.each do |item_name|
     listed_by_name = "#{item_name}+#{left.type_name}"
+    next if director.main_director.card.key == listed_by_name.to_name.key
     if !Card[listed_by_name]
       add_subcard listed_by_name, type_id: ListedByID
     else
@@ -37,13 +37,13 @@ event :create_listed_by_cards,
   end
 end
 
-event :update_related_listed_by_card_on_create,
-      after: :store, on: :create do
+event :update_related_listed_by_card_on_create, :finalize,
+      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
+event :update_related_listed_by_card_on_content_update, :finalize,
+      on: :update, changed: :content do
   new_items = item_keys
   changed_items =
     if db_content_was
@@ -55,23 +55,18 @@ event :update_related_listed_by_card_on_content_update,
   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
+event :update_related_listed_by_card_on_name_and_type_changes, :finalize,
+      on: :update, changed: [:name, :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
+event :update_related_listed_by_card_on_delete, :finalize,
+      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
+event :cache_type_key, :store,
+      on: :delete, when: proc { |c| c.junction? } do
   @left_type_key = left.type_card.key
 end
 
@@ -89,13 +84,12 @@ def update_listed_by_cache_for item_keys, args={}
 
   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_out
-      else
-        Card::Cache[Card::Set::Type::ListedBy].delete key
-      end
+    next unless Card::Cache[Card::Set::Type::ListedBy].exist? key
+    if (card = Card.fetch(key))
+      card.update_cached_list
+      card.update_references_out
+    else
+      Card::Cache[Card::Set::Type::ListedBy].delete key
     end
   end
 end