card 1.16.6 → 1.16.7

data/tmpsets/set/mod001-01_core/all/type.rb

@@ -3,13 +3,13 @@ class Card; module Set; module All; module Type; extend Card::Set # ~~~~~~~~~~~
 
 module ClassMethods
   def default_type_id
-    @@default_type_id ||= Card[:all].fetch( :trait=>:default ).type_id
+    @@default_type_id ||= Card[:all].fetch( trait: :default ).type_id
   end
 end
 
 def type_card
   return if type_id.nil?
-  Card.fetch type_id.to_i, :skip_modules=>true
+  Card.fetch type_id.to_i, skip_modules: true
 end
 
 def type_code
@@ -56,13 +56,13 @@ def get_type_id args={}
 end
 
 
-event :validate_type_change, :before=>:approve, :on=>:update, :changed=>:type_id do
+event :validate_type_change, before: :approve, on: :update, changed: :type_id do
   if c = dup and c.action == :create and !c.valid?
     errors.add :type, "of #{ name } can't be changed; errors creating new #{ type_id }: #{ c.errors.full_messages * ', ' }"
   end
 end
 
-event :validate_type, :before=>:approve, :changed=>:type_id do
+event :validate_type, before: :approve, changed: :type_id do
   if !type_name
     errors.add :type, "No such type"
   end
@@ -72,15 +72,15 @@ event :validate_type, :before=>:approve, :changed=>:type_id do
   end
 end
 
-event :reset_type_specific_fields, :after=>:store do
+event :reset_type_specific_fields, after: :store do
   Auth.as_bot do
-    Card.search :left=>{ :left_id=>type_id }, :right=>{:codename=>'type_plus_right'} do |set_card|
+    Card.search left: { left_id: type_id }, right: {codename: 'type_plus_right'} do |set_card|
       set_card.reset_set_patterns
     end
   end
 end
 
-#    Card.search :left_plus=>[ type_name, :right_plus=>{:codename=>'type_plus_right'}] do |right_anchor|
+#    Card.search left_plus: [ type_name, right_plus: {codename: 'type_plus_right'}] do |right_anchor|
 #      Card["#{lef}"]
 #      set_card.reset_set_patterns
 #    end

data/tmpsets/set/mod001-01_core/all/utils.rb

@@ -5,10 +5,11 @@ module ClassMethods
 
   def empty_trash
     Card.delete_trashed_files
-    Card.where(:trash=>true).delete_all
+    Card.where(trash: true).delete_all
     Card::Action.delete_cardless
     Card::Reference.repair_missing_referees
     Card::Reference.delete_missing_referers
+    Card.delete_tmp_files_of_cached_uploads
   end
 
   def delete_trashed_files #deletes any file not associated with a real card.
@@ -19,7 +20,18 @@ module ClassMethods
     file_ids.each do |file_id|
       if trashed_card_ids.member?(file_id)
         raise Card::Error, "Narrowly averted deleting current file" if Card.exists?(file_id) #double check!
-        FileUtils.rm_rf "#{dir}/#{file_id}", :secure => true
+        FileUtils.rm_rf "#{dir}/#{file_id}", secure: true
+      end
+    end
+  end
+
+  def delete_tmp_files_of_cached_uploads
+    actions = Card::Action.find_by_sql "SELECT * FROM card_actions
+      INNER JOIN cards ON card_actions.card_id = cards.id
+      WHERE cards.type_id IN (#{Card::FileID}, #{Card::ImageID}) AND card_actions.draft = true"
+    actions.each do |action|
+      if older_than_five_days? action.created_at && card = action.card # we don't want to delete uploads in progress
+        card.delete_files_for_action action
       end
     end
   end
@@ -54,7 +66,7 @@ module ClassMethods
 
   def merge name, attribs={}, opts={}
     puts "merging #{ name }"
-    card = fetch name, :new=>{}
+    card = fetch name, new: {}
 
     if opts[:pristine] && !card.pristine?
       false
@@ -124,7 +136,7 @@ format :html do
       accordions << accordion(title, content, "#{collapse_id}-#{index}")
       index += 1
     end
-    content_tag :div, accordions.html_safe, :class=>"panel-group", :id=>"accordion-#{collapse_id}", :role=>"tablist", 'aria-multiselectable'=>"true"
+    content_tag :div, accordions.html_safe, class: "panel-group", id: "accordion-#{collapse_id}", role: "tablist", 'aria-multiselectable'=>"true"
   end
 
   def accordion title, content, collapse_id=card.cardname.safe_key

data/tmpsets/set/mod001-01_core/all/view_cache.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 class Card; module Set; module All; module ViewCache; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/01_core/set/all/view_cache.rb ~~~~~~~~~~~
-event :clear_view_cache, :after=>:store do
+event :clear_view_cache, after: :store do
   Card::ViewCache.reset
 end
 

data/tmpsets/set/mod002-01_history/all/actions.rb

@@ -35,7 +35,7 @@ def revision action
     action = Card::Action.fetch(action)
   end
   action and Card::TRACKED_FIELDS.inject({}) do |attr_changes, field|
-    last_change = action.card_changes.find_by_field_name(field) || last_change_on(field, :not_after=>action)
+    last_change = action.card_changes.find_by_field_name(field) || last_change_on(field, not_after: action)
     attr_changes[field.to_sym] = (last_change ? last_change.value : self[field])
     attr_changes
   end
@@ -46,7 +46,7 @@ def delete_old_actions
     # assign previous changes on each tracked field to the last action
     if (la = last_action) && !la.change_for(field).present? and (last_change = last_change_on(field))
       last_change = Card::Change.find(last_change.id)   # last_change comes as readonly record
-      last_change.update_attributes!(:card_action_id=>last_action_id)
+      last_change.update_attributes!(card_action_id: last_action_id)
     end
   end
   actions.where('id != ?', last_action_id ).delete_all

data/tmpsets/set/mod002-01_history/all/content_history.rb

@@ -6,7 +6,7 @@ class Card; module Set; module All; module ContentHistory; extend Card::Set # ~~
 def content
   if @selected_action_id
     @selected_content ||= begin
-      (change = last_change_on( :db_content, :not_after=> @selected_action_id, :including_drafts=>true ) and change.value) || db_content
+      (change = last_change_on( :db_content, not_after: @selected_action_id, including_drafts: true ) and change.value) || db_content
     end
   else
     super
@@ -21,7 +21,7 @@ end
 def save_content_draft content
   super
   acts.create do |act|
-    act.actions.build(:draft => true, :card_id=>id).card_changes.build(:field=>:db_content, :value=>content)
+    act.actions.build(draft: true, card_id: id).card_changes.build(field: :db_content, value: content)
   end
 end
 
@@ -42,7 +42,7 @@ def last_change_on(field, opts={})
   action_id = action_arg.kind_of?(Card::Action) ? action_arg.id : action_arg
   field_index = Card::TRACKED_FIELDS.index(field.to_s)
   Change.joins(:action).where( where_sql,
-    {:card_id=>id, :field=>field_index, :action_id=>action_id}
+    {card_id: id, field: field_index, action_id: action_id}
   ).order(:id).last
 end
 
@@ -72,9 +72,13 @@ def with_selected_action_id action_id
 end
 
 def selected_content_action_id
-  @selected_action_id ||
- (@current_action && (new_card? || @current_action.new_content? || db_content_changed?) && @current_action.id) ||
-  last_content_action_id
+  @selected_action_id || new_content_action_id || last_content_action_id
+end
+
+def new_content_action_id
+  if @current_action && (new_card? || @current_action.new_content? || db_content_changed?)
+    @current_action.id
+  end
 end
 
 def last_action_id
@@ -142,7 +146,7 @@ def draft_acts
   drafts.created_by(Card::Auth.current_id).map(&:act)
 end
 
-event :detect_conflict, :before=>:approve, :on=>:update, :when=>proc {|c| c.history? } do
+event :detect_conflict, before: :approve, on: :update, when: proc {|c| c.history? } do
   if last_action_id_before_edit and last_action_id_before_edit.to_i != last_action_id and last_action.act.actor_id != Auth.current_id
     errors.add :conflict, "changes not based on latest revision"
   end

data/tmpsets/set/mod002-01_history/all/history.rb

@@ -7,12 +7,12 @@ def history?
 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?}  do
-  @current_act = (@supercard && @supercard.current_act) || Card::Act.create(:ip_address=>Env.ip)
+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
-  @current_action = Card::Action.create(:card_act_id=>@current_act.id, :action_type=>@action, :draft=>(Env.params['draft'] == 'true') )
+event :assign_action, after: :assign_act do
+  @current_action = Card::Action.create(card_act_id: @current_act.id, action_type: @action, draft: (Env.params['draft'] == 'true') )
   if (@supercard and @supercard !=self)
     @current_action.super_action = @supercard.current_action
   end
@@ -21,29 +21,29 @@ 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.history? && c.current_action} do
+event :finalize_action, after: :stored, when: proc {|c| (c.history? || c.respond_to?(:attachment)) && c.current_action} do
   @changed_fields = Card::TRACKED_FIELDS.select{ |f| changed_attributes.member? f }
   if @changed_fields.present?
-    @changed_fields.each{ |f| Card::Change.create :field => f, :value => self[f], :card_action_id=>@current_action.id }
-    @current_action.update_attributes! :card_id => id
+    @changed_fields.each{ |f| Card::Change.create field: f, value: self[f], card_action_id: @current_action.id }
+    @current_action.update_attributes! card_id: id
   elsif @current_action.card_changes(true).empty?
     @current_action.delete
     @current_action = nil
   end
 end
 
-event :finalize_act, :after=>:finalize_action, :when=>proc {|c| c.history? && !c.supercard } do
+event :finalize_act, after: :finalize_action, when: proc {|c| !c.supercard } do
   if @current_act.actions(true).empty?
     @current_act.delete
     @current_act = nil
   else
-    @current_act.update_attributes! :card_id=>id
+    @current_act.update_attributes! card_id: id
   end
 end
 
 
-event :rollback_actions, :before=>:approve, :on=>:update, :when=>proc{ |c| c.rollback_request? } do
-  revision = { :subcards => {}}
+event :rollback_actions, before: :approve, on: :update, when: proc{ |c| c.rollback_request? } do
+  revision = { subcards: {}}
   rollback_actions = Env.params['action_ids'].map do |a_id|
     Action.fetch(a_id) || nil
   end
@@ -71,11 +71,11 @@ end
 # stopped working with Rails 4
 # def build_act_and_action
 #   @current_act = if @supercard
-#     @supercard.current_act || @supercard.acts.build(:ip_address=>Env.ip)
+#     @supercard.current_act || @supercard.acts.build(ip_address: Env.ip)
 #   else
-#     acts.build(:ip_address=>Env.ip)
+#     acts.build(ip_address: Env.ip)
 #   end
-#   @current_action = actions(true).build(:action_type=>@action, :draft=>(Env.params['draft'] == 'true') )
+#   @current_action = actions(true).build(action_type: @action, draft: (Env.params['draft'] == 'true') )
 #   @current_action.act = @current_act
 #
 #   if (@supercard and @supercard !=self)
@@ -90,7 +90,7 @@ def intrusive_family_acts args={}   # all acts with actions on self and on cards
   end
 end
 
-def intrusive_acts  args={:with_drafts=>true} # all acts with actions on self and on cards included in self
+def intrusive_acts  args={with_drafts: true} # all acts with actions on self and on cards included in self
   @intrusive_acts ||= begin
     Act.find_all_with_actions_on( (included_card_ids << id), args)
   end
@@ -103,7 +103,7 @@ def current_rev_nr
 end
 
 def included_card_ids
-  Card::Reference.select(:referee_id).where( :ref_type => 'I', :referer_id=>id ).pluck('referee_id').compact.uniq
+  Card::Reference.select(:referee_id).where( ref_type: 'I', referer_id: id ).pluck('referee_id').compact.uniq
 end
 
 def descendant_card_ids parent_ids=[id]
@@ -121,7 +121,7 @@ end
 
 format :html do
   view :history do |args|
-    frame args.merge(:body_class=>"history-slot list-group", :content=>true) do
+    frame args.merge(body_class: "history-slot list-group", content: true) do
       [
         history_legend,
         _render_revisions
@@ -137,17 +137,17 @@ format :html do
     count = card.intrusive_acts.size+1-(page.to_i-1)*REVISIONS_PER_PAGE
     card.intrusive_acts.page(page).per(REVISIONS_PER_PAGE).map do |act|
       count -= 1
-      render_act_summary args.merge(:act=>act,:rev_nr=>count)
+      render_act_summary args.merge(act: act,rev_nr: count)
     end.join
   end
 
   def history_legend
     intr = card.intrusive_acts.page(params['page']).per(REVISIONS_PER_PAGE)
-    render_haml :intr=>intr do
+    render_haml intr: intr do
       <<-HAML
 .history-header
   %span.slotter
-    = paginate intr, :remote=>true, :theme=>'twitter-bootstrap-3'
+    = paginate intr, remote: true, theme: 'twitter-bootstrap-3'
   %div.history-legend
     %span.glyphicon.glyphicon-plus-sign.diff-green
     %span
@@ -173,12 +173,12 @@ format :html do
     rev_nr = params['rev_nr'] || args[:rev_nr]
     current_rev_nr = params['current_rev_nr'] || args[:current_rev_nr] || card.current_rev_nr
     hide_diff = (params["hide_diff"]=="true") || args[:hide_diff]
-    wrap( args.merge(:slot_class=>"revision-#{act.id} history-slot list-group-item") ) do
-      render_haml :card=>card, :act=>act, :act_view=>act_view,
-                  :current_rev_nr=>current_rev_nr, :rev_nr=>rev_nr,
-                  :hide_diff=> hide_diff do
+    wrap( args.merge(slot_class: "revision-#{act.id} history-slot list-group-item") ) do
+      render_haml card: card, act: act, act_view: act_view,
+                  current_rev_nr: current_rev_nr, rev_nr: rev_nr,
+                  hide_diff: hide_diff do
         <<-HAML
-.act{:style=>"clear:both;"}
+.act{style: "clear:both;"}
   .head
     .nr
       = "##{rev_nr}"
@@ -197,13 +197,13 @@ format :html do
             Current
         - elsif act_view == :expanded
           = rollback_link act.relevant_actions_for(card, act.actions.last.draft)
-          = show_or_hide_changes_link hide_diff, :act_id=>act.id, :act_view=>act_view, :rev_nr=>rev_nr, :current_rev_nr=>current_rev_nr
+          = show_or_hide_changes_link hide_diff, act_id: act.id, act_view: act_view, rev_nr: rev_nr, current_rev_nr: current_rev_nr
   .toggle
-    = fold_or_unfold_link :act_id=>act.id, :act_view=>act_view, :rev_nr=>rev_nr, :current_rev_nr=>current_rev_nr
+    = fold_or_unfold_link act_id: act.id, act_view: act_view, rev_nr: rev_nr, current_rev_nr: current_rev_nr
 
-  .action-container{:style=>("clear: left;" if act_view == :expanded)}
+  .action-container{style: ("clear: left;" if act_view == :expanded)}
     - act.relevant_actions_for(card).each do |action|
-      = send("_render_action_#{ act_view }", :action=>action )
+      = send("_render_action_#{ act_view }", action: action )
 HAML
       end
     end
@@ -225,10 +225,10 @@ HAML
         name_changes(action, hide_diff)
       else
         link_to name_changes(action, hide_diff),
-                path(:view=>:related, :related=>{:view=>"history",:name=>action.card.name}),
-                :class=>'slotter label label-default',
+                path(view: :related, related: {view: "history",name: action.card.name}),
+                class: 'slotter label label-default',
                 'data-slot-selector'=>".card-slot.history-view",
-                :remote=>true
+                remote: true
       end
 
     type_diff =
@@ -237,13 +237,13 @@ HAML
 
     content_diff =
         action.new_content? &&
-        action.card.format.render_content_changes(:action=>action, :diff_type=>action_view, :hide_diff=>hide_diff)
+        action.card.format.render_content_changes(action: action, diff_type: action_view, hide_diff: hide_diff)
 
-    render_haml :action => action,
-                :action_view => action_view,
-                :name_diff => name_diff,
-                :type_diff => type_diff,
-                :content_diff => content_diff do
+    render_haml action: action,
+                action_view: action_view,
+                name_diff: name_diff,
+                type_diff: type_diff,
+                content_diff: content_diff do
       <<-HAML
 .action
   .summary
@@ -307,8 +307,8 @@ HAML
   def rollback_link actions
     not_current = actions.select { |action| action.card.last_action_id != action.id }
     if card.ok?(:update) && not_current.present?
-      "| " + link_to('Save as current', path(:action=>:update, :view=>:open, :action_ids=>not_current),
-        :class=>'slotter','data-slot-selector'=>'.card-slot.history-view', :remote=>true, :method=>:post, :rel=>'nofollow')
+      "| " + link_to('Save as current', path(action: :update, view: :open, action_ids: not_current),
+        class: 'slotter','data-slot-selector'=>'.card-slot.history-view', remote: true, method: :post, rel: 'nofollow')
     end
   end
 
@@ -318,20 +318,20 @@ HAML
     else
       toggled_view = :act_expanded
     end
-    link_to '', args.merge(:view=>toggled_view),
-              :class=>"slotter revision-#{args[:act_id]} #{ args[:act_view]==:expanded ? "arrow-down" : "arrow-right"}",
-              :remote=>true
+    link_to '', args.merge(view: toggled_view),
+              class: "slotter revision-#{args[:act_id]} #{ args[:act_view]==:expanded ? "arrow-down" : "arrow-right"}",
+              remote: true
   end
 
   def show_or_hide_changes_link hide_diff, args
     "| " +  view_link( (hide_diff ? "Show" : "Hide") + " changes", :act_expanded,
-      :path_opts=>args.merge(:hide_diff=>!hide_diff),
-      :class=>'slotter', :remote=>true )
+      path_opts: args.merge(hide_diff: !hide_diff),
+      class: 'slotter', remote: true )
   end
 end
 
 def diff_args
-  {:format=>:text}
+  {format: :text}
 end
 
 

data/tmpsets/set/mod003-02_basic_types/all/all_css.rb

@@ -1,36 +1,36 @@
 # -*- encoding : utf-8 -*-
 class Card; module Set; module All; module AllCss; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/02_basic_types/set/all/all_css.rb ~~~~~~~~~~~
-    
+
 format :css do
 
   def get_inclusion_defaults nested_card
-    { :view => :raw }
+    { view: :raw }
   end
 
   def show view, args
     view ||= :content
     render view, args
   end
-  
+
   view :titled do |args|
     major_comment( %{ Style Card: "#{ card.name }" } ) +
     _render_core( args )
   end
-  
+
   view :content do |args|
    _render_core( args )
   end
-  
+
   view :missing do |args|
     major_comment "MISSING Style Card: #{card.name}"
   end
-  
+
   view :import do |args|
-    %{\n@import url("#{ _render_url :item=>:import }");\n}
+    %{\n@import url("#{ _render_url item: :import }");\n}
   end
-  
-  view :url, :perms=>:none do |args|
-    page_path card.cardname, :format=>:css, :item=>args[:item]
+
+  view :url, perms: :none do |args|
+    page_path card.cardname, format: :css, item: args[:item]
 #    card_url _render_linkname
   end
 

data/tmpsets/set/mod003-02_basic_types/all/all_csv.rb

@@ -4,19 +4,19 @@ require 'csv'
 
 format :csv  do
   def get_inclusion_defaults nested_card
-    { :view => :core }
+    { view: :core }
   end
-  
-  def default_item_view 
+
+  def default_item_view
     @depth == 0 ? :csv_row : :name
   end
 
-  
+
   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
   end
@@ -29,7 +29,7 @@ format :csv  do
     #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__
         titles = parsed_content.map do |chunk|
@@ -42,7 +42,7 @@ format :csv  do
           end
         end.compact.map {|title| title.to_s.upcase }
         CSV.generate_line titles
-        
+
       else
         ''
       end