card 1.16.6 → 1.16.7

data/tmpsets/set/mod006-05_email/right/follow_fields.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 class Card; module Set; module Right; module FollowFields; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_email/set/right/follow_fields.rb ~~~~~~~~~~~
-event :follow_fields_changed, :before=>:extend do
+event :follow_fields_changed, before: :extend do
   Card.follow_caches_expired
 end
 

data/tmpsets/set/mod006-05_email/right/following.rb

@@ -6,51 +6,60 @@ def virtual?; true end
 
 format :html do
 
-   view :core do |args|
-     if card.left and Auth.signed_in?
-       render_rule_editor args
-     else
-       followers_card = Card.fetch("#{card.cardname.left}+#{Card[:followers].name}") 
-       nest followers_card, :view=>:titled, :item=>:link
-     end
-   end
-   
-   view :status do |args|
-     if rcard = current_follow_rule_card
-       rcard.item_cards.map do |item|
-         %{<div class="alert alert-success" role="alert">
-           <strong>#{rcard.rule_set.follow_label}</strong>: #{item.title}
-          </div>}
-       end.join
-     else
-       "No following preference"
-     end
-   end
-   
-   view :closed_content do |args|
-     ''
-   end
-   
+  view :core do |args|
+    if card.left && Auth.signed_in?
+      render_rule_editor args
+    else
+      fname = "#{card.cardname.left}+#{Card[:followers].name}"
+      fcard = Card.fetch fname
+      nest fcard, view: :titled, item: :link
+    end
+  end
+
+  view :status do |args|
+    if (rcard = current_follow_rule_card)
+      rcard.item_cards.map do |item|
+        %{<div class="alert alert-success" role="alert">
+          <strong>#{rcard.rule_set.follow_label}</strong>: #{item.title}
+         </div>}
+      end.join
+    else
+      'No following preference'
+    end
+  end
+
+  view :closed_content do |args|
+    ''
+  end
+
 =begin
    view :editor do |args|
-     hidden_field( :content, :class=>'card-content', 'no-autosave'=>true) +
+     hidden_field( :content, class: 'card-content', 'no-autosave'=>true) +
         (args.delete(:select_list) ? raw(render_rule_editor(args)) : super(args) )
    end
 =end
-   
-   view :rule_editor do |args|
-     preference_name = "#{card.left.default_follow_set_card.name}+#{Auth.current.name}+#{Card[:follow].name}"
-     rule_context = Card.fetch preference_name, :new=>{:type_id=>PointerID}
-     wrap_with :div, :class=>'edit-rule' do
-       subformat(current_follow_rule_card || rule_context).render_edit_rule :rule_context=>rule_context, 
-         :success=>{ :view=>'status', :id=>card.name }
-     end
-   end
-   
-   def current_follow_rule_card
-     card.left.rule_card :follow, :user=>Auth.current
-   end
-     
+
+  view :rule_editor do |args|
+    preference_name = [
+      card.left.default_follow_set_card.name,
+      Auth.current.name,
+      Card[:follow].name
+    ]*'+'
+    rule_context = Card.fetch preference_name, new: { type_id: PointerID }
+
+    wrap_with :div, class: 'edit-rule' do
+      follow_context = current_follow_rule_card || rule_context
+      subformat(follow_context).render_edit_rule(
+        rule_context: rule_context,
+        success: { view: 'status', id: card.name }
+      )
+    end
+  end
+
+  def current_follow_rule_card
+    card.left.rule_card :follow, user: Auth.current
+  end
+
 end
 
 

data/tmpsets/set/mod006-05_email/self/always.rb

@@ -2,9 +2,9 @@
 class Card; module Set; module Self; module Always; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_email/set/self/always.rb ~~~~~~~~~~~
 include Card::FollowOption
 
-self.follow_opts :position=>2
+follow_opts position: 2
 
-self.follow_test { |follower_id, accounted_ids| true }
+follow_test { |follower_id, accounted_ids| true }
 
 def title
   'Following'

data/tmpsets/set/mod006-05_email/self/created.rb

@@ -2,7 +2,7 @@
 class Card; module Set; module Self; module Created; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_email/set/self/created.rb ~~~~~~~~~~~
 include Card::FollowOption
 
-self.restrictive_follow_opts :position=>1
+self.restrictive_follow_opts position: 1
 
 self.follower_candidate_ids do |card|
   [ card.creator_id ]

data/tmpsets/set/mod006-05_email/self/edited.rb

@@ -2,22 +2,22 @@
 class Card; module Set; module Self; module Edited; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_email/set/self/edited.rb ~~~~~~~~~~~
 include Card::FollowOption
 
-self.restrictive_follow_opts :position=>2
+self.restrictive_follow_opts position: 2
 
 self.follower_candidate_ids do |card|
   # FIXME? - could optimize by not using cards table...
-  Card.search :editor_of=>card.name, :return=>:id
+  Card.search editor_of: card.name, return: :id
 end
 
 
-def title 
+def title
   'Following content you edited'
 end
 
 def label
   "follow if I edited"
 end
-  
+
 def description set_card
   "#{set_card.follow_label} I edited"
 end

data/tmpsets/set/mod006-05_email/self/follow.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 class Card; module Set; module Self; module Follow; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_email/set/self/follow.rb ~~~~~~~~~~~
 extend Card::Setting
-setting_opts :group=>:other, :position=>7, :rule_type_editable => false, :user_specific=>true
+setting_opts group: :other, position: 7, rule_type_editable: false, user_specific: true
 
 
 # ~~~~~~~~~~~ below autogenerated; above pulled from /Users/ethan/dev/wagn/gem/card/mod/05_email/set/self/follow.rb ~~~~~~~~~~~

data/tmpsets/set/mod006-05_email/self/follow_defaults.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 class Card; module Set; module Self; module FollowDefaults; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_email/set/self/follow_defaults.rb ~~~~~~~~~~~
-event :update_follow_rules, :after=>:store, :on=>:save, :when=> proc { |c| c.update_all_users } do
+event :update_follow_rules, after: :store, on: :save, when: proc { |c| c.update_all_users } do
   defaults = item_names.map do |item|
     if ((set_card = Card.fetch item.to_name.left) && set_card.type_code == :set)
       option_card = Card.fetch(item.to_name.right) || Card[item.to_name.right.to_sym]
@@ -15,9 +15,9 @@ event :update_follow_rules, :after=>:store, :on=>:save, :when=> proc { |c| c.upd
     end
   end.compact
   Auth.as_bot do
-    Card.search(:type=>'user').each do |user|
+    Card.search(type: 'user').each do |user|
       defaults.each do |set_card, option|
-        if (follow_rule = Card.fetch(set_card.follow_rule_name(user.name), :new=>{}))
+        if (follow_rule = Card.fetch(set_card.follow_rule_name(user.name), new: {}))
          follow_rule.drop_item "*never"
          follow_rule.drop_item "*always"
          follow_rule.add_item option
@@ -30,7 +30,7 @@ event :update_follow_rules, :after=>:store, :on=>:save, :when=> proc { |c| c.upd
 end
 
 format :html do
-  view :edit, :perms=>:update, :tags=>:unknown_ok do |args|
+  view :edit, perms: :update, tags: :unknown_ok do |args|
     frame_and_form :update, args do
       [
         _optional_render( :content_formgroup, args ),
@@ -55,13 +55,13 @@ format :html do
   def default_edit_args args
     args[:hidden] ||= {}
     args[:hidden].reverse_merge!(
-      :success  => '_self',
-      :card     => { :update_all_users => false }
+      success: '_self',
+      card:    { update_all_users: false }
     )
     args[:buttons] = %{
-      #{ button_tag 'Submit and update all users', :disable_with=>'Updating', :class=>'follow-updater', :situation=>'primary' }
-      #{ button_tag 'Submit', :class=>'follow'         }
-      #{ button_tag 'Cancel', :class=>'slotter', :type=>'button', :href=>path(:view=>:edit, :id=>card.id)}
+      #{ button_tag 'Submit and update all users', disable_with: 'Updating', class: 'follow-updater', situation: 'primary' }
+      #{ button_tag 'Submit', class: 'follow'         }
+      #{ button_tag 'Cancel', class: 'slotter', type: 'button', href: path(view: :edit, id: card.id)}
     }
 
   end

data/tmpsets/set/mod006-05_email/self/never.rb

@@ -2,7 +2,7 @@
 class Card; module Set; module Self; module Never; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_email/set/self/never.rb ~~~~~~~~~~~
 include Card::FollowOption
 
-self.follow_opts :position=>3
+self.follow_opts position: 3
 
 self.follow_test { |follower_id, accounted_ids| false }
 

data/tmpsets/set/mod006-05_email/type/email_template.rb

@@ -18,7 +18,7 @@ def process_email_field field, config, args
   config[field] =
     if args[field]
       args[field]
-    elsif field_card = fetch(:trait=>field)
+    elsif field_card = fetch(trait: field)
       # configuration can be anything visible to configurer
       user = ( args[:follower] and Card.fetch(args[:follower]) ) || field_card.updater
       Auth.as( user ) do
@@ -33,7 +33,7 @@ def process_message_field field, config, args, format, special_args=nil
   process_email_field( field, config, args ) do |field_card|
     content_args = args.clone
     content_args.merge! special_args if special_args
-    field_card.contextual_content args[:context], { :format=>format }, content_args
+    field_card.contextual_content args[:context], { format: format }, content_args
   end
 end
 
@@ -43,13 +43,13 @@ def email_config args={}
 
   [:to, :from, :cc, :bcc].each do |field_name|
     process_email_field( field_name, config, args ) do |field_card|
-      field_card.process_email_addresses args[:context], {:format=>'email_text'}, args
+      field_card.process_email_addresses args[:context], {format: 'email_text'}, args
     end
   end
   process_email_field( :attach, config, args ) do |field_card|
     field_card.extended_item_contents args[:context]
   end
-  process_message_field :subject,      config, args, 'email_text', :content_opts=>{ :chunk_list=>:inclusion_only }
+  process_message_field :subject,      config, args, 'email_text', content_opts: { chunk_list: :inclusion_only }
   process_message_field :text_message, config, args, 'email_text'
   process_message_field :html_message, config, args, 'email_html'
   config[:html_message] = Card::Mailer.layout config[:html_message] if config[:html_message].present?
@@ -68,7 +68,7 @@ end
 
 
 format do
-  view :mail, :perms=>:none do |args|
+  view :mail, perms: :none do |args|
     args = card.email_config(args)
     text_message = args.delete(:text_message)
     html_message = args.delete(:html_message)
@@ -78,11 +78,11 @@ format do
       if alternative
         if attachment_list and !attachment_list.empty?
           content_type 'multipart/mixed'
-          part :content_type => 'multipart/alternative' do |copy|
-            copy.part :content_type => 'text/plain' do |plain|
+          part content_type: 'multipart/alternative' do |copy|
+            copy.part content_type: 'text/plain' do |plain|
               plain.body = text_message
             end
-            copy.part :content_type => 'text/html' do |html|
+            copy.part content_type: 'text/html' do |html|
               html.body = html_message
             end
           end
@@ -104,7 +104,7 @@ format do
       if attachment_list
         attachment_list.each_with_index do |cardname, i|
           if c = Card[ cardname ] and c.respond_to?(:attachment)
-            add_file :filename => "attachment-#{i + 1}.#{c.attachment.extension}", :content => File.read( c.attachment.path )
+            add_file filename: "attachment-#{i + 1}.#{c.attachment.extension}", content: File.read( c.attachment.path )
           end
         end
       end

data/tmpsets/set/mod006-05_email/type_plus_right/user/follow.rb

@@ -77,13 +77,13 @@ format :html do
 
    # returns hashes with existing and suggested follow options
    # structure:
-   # set_pattern_class => [ {:card=>rule_card, :options=>['*always', '*created'] },.... ]
+   # set_pattern_class => [ {card: rule_card, options: ['*always', '*created'] },.... ]
    def followed_by_set
      res = Hash.new { |h,k| h[k] = [] }
      never = Card[:never].name
      card.item_cards.each do |follow_rule|
        options = follow_rule.item_names.reject { |item| item == never}
-       res[follow_rule.rule_set.subclass_for_set] << { :card=>follow_rule, :options=>options }
+       res[follow_rule.rule_set.subclass_for_set] << { card: follow_rule, options: options }
      end
 
      if Auth.signed_in? && Auth.current_id == card.left.id
@@ -94,8 +94,8 @@ format :html do
              rule[:options] << option
            end
          else
-           rule_card =  Card.new(:name=>suggested_rule_name)
-           res[set_card.subclass_for_set] << {:card=>rule_card, :options=>[option]}
+           rule_card =  Card.new(name: suggested_rule_name)
+           res[set_card.subclass_for_set] << {card: rule_card, options: [option]}
          end
        end
      end
@@ -109,15 +109,15 @@ format :html do
      end
 
      sets = followed_by_set
-     wrap_with :div, :class=>'pointer-list-editor' do
-       wrap_with :ul, :class=>'delete-list list-group' do
+     wrap_with :div, class: 'pointer-list-editor' do
+       wrap_with :ul, class: 'delete-list list-group' do
 
          Card.set_patterns.select{|p| sets[p]}.reverse.map do |set_pattern|
            sets[set_pattern].map do |rule|
              rule[:options].map do |option|
 
-                 content_tag :li, :class=>'list-group-item' do
-                   subformat(rule[:card]).render_follow_item :condition=>option, :hide=>hide_buttons
+                 content_tag :li, class: 'list-group-item' do
+                   subformat(rule[:card]).render_follow_item condition: option, hide: hide_buttons
                  end
 
              end.join("\n")
@@ -142,12 +142,12 @@ format :html do
        hide_buttons = [:delete_follow_rule_button, :add_follow_rule_button]
      end
      never = Card[:never].name
-     wrap_with :div, :class=>'pointer-list-editor' do
-       wrap_with :ul, :class=>'delete-list list-group' do
+     wrap_with :div, class: 'pointer-list-editor' do
+       wrap_with :ul, class: 'delete-list list-group' do
 
          ignore_list.map do |rule_card|
-           content_tag :li, :class=>'list-group-item' do
-             subformat(rule_card).render_follow_item :condition=>never, :hide=>hide_buttons
+           content_tag :li, class: 'list-group-item' do
+             subformat(rule_card).render_follow_item condition: never, hide: hide_buttons
            end
          end.join "\n"
 
@@ -155,16 +155,16 @@ format :html do
      end
    end
 
-   view :pointer_items, :tags=>:unknown_ok do |args|
-     super(args.merge(:item=>:link))
+   view :pointer_items, tags: :unknown_ok do |args|
+     super(args.merge(item: :link))
    end
 
-   view :errors, :perms=>:none do |args|
+   view :errors, perms: :none do |args|
      if card.errors.any?
        if card.errors.find { |attrib,msg| attrib == :permission_denied }
-         save_interrupted_action(request.env['REQUEST_URI'])
+         Env.save_interrupted_action(request.env['REQUEST_URI'])
          title = "Problems with #{card.name}"
-         frame args.merge(:panel_class=>"panel panel-warning", :title=>title, :hide=>'menu' ) do
+         frame args.merge(panel_class: "panel panel-warning", title: title, hide: 'menu' ) do
            "Please #{ link_to 'sign in', card_url(':signin') }" #" #{to_task}"
          end
        else

data/tmpsets/set/mod007-05_standard/abstract/attachment.rb

@@ -6,82 +6,83 @@ def self.included host_class
   host_class.extend CarrierWave::CardMount
 end
 
-event :select_file_revision, :after=>:select_action do
+event :select_file_revision, after: :select_action do
   attachment.retrieve_from_store!(attachment.identifier)
 end
 
-event :determine_store_place, :before=>:prepare, :on=>:update do
-  @store_place = load_from_mod || :deck
-end
-
-event :upload_attachment, :before=>:validate_name, :on=>:save, :when=>proc { |c| c.preliminary_upload? } do
+event :upload_attachment, before: :validate_name, on: :save, when: proc { |c| c.preliminary_upload? } do
   save_original_filename  # save original filename as comment in action
   write_identifier        # set db_content (needs original filename to determine extension)
   store_attachment!
   finalize_action         # create Card::Change entry for db_content
-  @current_action.update_attributes! :draft => true, :card_id => (new_card? ? upload_cache_card.id : id)
-
+  @current_action.update_attributes! draft: true, card_id: (new_card? ? upload_cache_card.id : id)
   success << {
-    :target => (new_card? ? upload_cache_card : '_self'),
-    :type=> type_name,
-    :view => 'preview_editor',
-    :rev_id => current_action.id
+    target: (new_card? ? upload_cache_card : self),
+    type: type_name,
+    view: 'preview_editor',
+    rev_id: current_action.id
   }
   abort :success
 end
 
-event :assign_attachment_on_create, :after=>:prepare, :on=>:create do
-  if save_preliminary_upload? && (action = Card::Action.fetch(Card::Env.params[:cached_upload]))
+event :assign_attachment_on_create, after: :prepare, on: :create, when: proc { |c| c.save_preliminary_upload? } do
+  if (action = Card::Action.fetch(Card::Env.params[:cached_upload]))
     upload_cache_card.selected_action_id = action.id
     upload_cache_card.select_file_revision
     assign_attachment upload_cache_card.attachment.file, action.comment
-    action.delete # TODO: delete files too
   end
 end
 
-event :assign_attachment_on_update, :after=>:prepare, :on=>:update do
-  if save_preliminary_upload? && (action = Card::Action.fetch(Card::Env.params[:cached_upload]))
+event :assign_attachment_on_update, after: :prepare, on: :update, when: proc { |c| c.save_preliminary_upload? } do
+  if (action = Card::Action.fetch(Card::Env.params[:cached_upload]))
     uploaded_file =
        with_selected_action_id(action.id) do
          attachment.file
        end
     assign_attachment uploaded_file, action.comment
-    action.delete
   end
 end
 
+
 def assign_attachment file, original_filename
   send "#{attachment_name}=", file
   write_identifier
-  @current_action.update_attributes! :comment=>original_filename
+  @current_action.update_attributes! comment: original_filename
 end
 
 # we need a card id for the path so we have to update db_content when we got an id
-event :correct_identifier, :after=>:store, :on=>:create do
-  update_column(:db_content,attachment.db_content(:mod=>load_from_mod))
+event :correct_identifier, after: :store, on: :create do
+  update_column(:db_content,attachment.db_content(mod: load_from_mod))
   expire
 end
 
-
-event :save_original_filename, :after=>:validate_name, :when => proc {|c| !c.preliminary_upload? && !c.save_preliminary_upload? && c.attachment_changed?} do
+event :save_original_filename, after: :validate_name, when: proc {|c| !c.preliminary_upload? && !c.save_preliminary_upload? && c.attachment_changed?} do
   if @current_action
-    @current_action.update_attributes! :comment=>original_filename
+    @current_action.update_attributes! comment: original_filename
   end
 end
 
-event :write_identifier, :after=>:save_original_filename do
-  self.content = attachment.db_content(:mod=>load_from_mod)
+event :delete_cached_upload_file_on_create, after: :extend, on: :create, when: proc { |c| c.save_preliminary_upload? } do
+  if (action = Card::Action.fetch(Card::Env.params[:cached_upload]))
+    upload_cache_card.delete_files_for_action action
+    action.delete
+  end
+  clear_upload_cache_dir_for_new_cards
 end
 
-
-def upload_cache_card
-  @upload_cache_card ||= Card["new_#{attachment_name}".to_sym ]
+event :delete_cached_upload_file_on_update, after: :extend, on: :update, when: proc { |c| c.save_preliminary_upload? } do
+  if (action = Card::Action.fetch(Card::Env.params[:cached_upload]))
+    delete_files_for_action action
+    action.delete
+  end
 end
 
-def tmp_store_dir action_id=nil
-  "#{ Card.paths['files'].existent.first }/#{upload_cache_card.id}"
+
+event :write_identifier, after: :save_original_filename do
+  self.content = attachment.db_content(mod: load_from_mod)
 end
 
+
 def item_names(args={})  # needed for flexmail attachments.  hacky.
   [self.cardname]
 end
@@ -106,12 +107,18 @@ def create_versions?
   true
 end
 
-def store_place
-  @store_place ||= mod_file? || :deck
+# used for uploads for new cards until the new card is created
+def upload_cache_card
+  @upload_cache_card ||= Card["new_#{attachment_name}".to_sym ]
 end
 
+
 def load_from_mod= value
   @mod = value
+  write_identifier
+  if value
+    @store_in_mod = true
+  end
 end
 
 def load_from_mod
@@ -119,20 +126,52 @@ def load_from_mod
 end
 
 def store_dir
-  if (store_place == :deck)
-    if id
-      "#{ Card.paths['files'].existent.first }/#{id}"
-    else
-      tmp_store_dir
-    end
+  if @store_in_mod
+    mod_dir
   else
-    "#{ Cardio.gem_root}/mod/#{store_place}/file/#{codename}"
+    upload_dir
   end
 end
 
+def retrieve_dir
+  if mod_file?
+    mod_dir
+  else
+    upload_dir
+  end
+end
+
+# place for files of regular file cards
+def upload_dir
+  if id
+    "#{ Card.paths['files'].existent.first }/#{id}"
+  else
+    tmp_upload_dir
+  end
+end
+
+# place for files if card doesn't have an id yet
+def tmp_upload_dir action_id=nil
+  "#{ Card.paths['files'].existent.first }/#{upload_cache_card.id}"
+end
+
+# place for files of mod file cards
+def mod_dir
+  mod = @mod || mod_file?
+  Card.paths['mod'].to_a.each do |mod_path|
+    dir = File.join(mod_path, mod, 'file', codename )
+    if Dir.exist? dir
+      return dir
+    end
+  end
+end
+
+
 def mod_file?
+  if @store_in_mod
+    return @mod
   # when db_content was changed assume that it's no longer a mod file
-  if @store_place != :deck && !db_content_changed? && content.present?
+  elsif !db_content_changed? && content.present?
     case content
     when /^:[^\/]+\/([^.]+)/ ; $1     # current mod_file format
     when /^\~/               ; false  # current id file format
@@ -152,18 +191,31 @@ def assign_set_specific_attributes
   super
 end
 
-def clear_upload_tmp_dir
-  Dir.entries(tmp_store_dir).each do |filename|
+def clear_upload_cache_dir_for_new_cards
+  Dir.entries(tmp_upload_dir).each do |filename|
     if filename =~/^\d+/
-      path = File.join(tmp_store_dir, filename )
-      older_than_five_days = ( DateTime.now - File.ctime(path) > 432000)
-      if older_than_five_days
+      path = File.join(tmp_upload_dir, filename )
+      if older_than_five_days? File.ctime(path)
         FileUtils.rm path
       end
     end
   end
 end
 
+def older_than_five_days? time
+  Time.now - time > 432000
+end
+
+def delete_files_for_action action
+  with_selected_action_id(action.id) do
+    FileUtils.rm attachment.file.path
+    attachment.versions.each_value do |version|
+      FileUtils.rm version.path
+    end
+  end
+end
+
+
 def symlink_to(prior_action_id) # create filesystem links to files from prior action
   if prior_action_id != last_action_id
     save_action_id = selected_action_id