card 1.16.8 → 1.16.9

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

@@ -7,38 +7,37 @@ format do
 
   # NAME VIEWS
 
-  view :name,     closed: true, perms: :none do |args| card.name                           end
-  view :key,      closed: true, perms: :none do |args| card.key                            end
-  view :title,    closed: true, perms: :none do |args| args[:title] || card.name           end
-
-  view :linkname, closed: true, perms: :none do |args| card.cardname.url_key               end
-  view :url,      closed: true, perms: :none do |args| card_url _render_linkname           end
-  view :url_link, closed: true, perms: :none do |args| web_link card_url(_render_linkname) end
+  simple_args = { closed: true, perms: :none }
+  view(:name,     simple_args) { card.name                           }
+  view(:key,      simple_args) { card.key                            }
+  view(:title,    simple_args) { |args| args[:title] || card.name    }
+  view(:linkname, simple_args) { card.cardname.url_key               }
+  view(:url,      simple_args) { card_url _render_linkname           }
+  view(:url_link, simple_args) { web_link card_url(_render_linkname) }
 
   view :link, closed: true, perms: :none do |args|
-    card_link( card.name,
-      text: showname( args[:title] ),
+    card_link(
+      card.name,
+      text: showname(args[:title]),
       known: card.known?,
       path_opts: { type: args[:type] }
     )
   end
 
-  view :codename, closed: true do |args| card.codename.to_s  end
-  view :id,       closed: true do |args| card.id             end
-  view :type,     closed: true do |args| card.type_name      end
-
+  view(:codename, closed: true) { card.codename.to_s }
+  view(:id,       closed: true) { card.id            }
+  view(:type,     closed: true) { card.type_name     }
 
   # DATE VIEWS
 
-  view :created_at, closed: true do |args| time_ago_in_words card.created_at end
-  view :updated_at, closed: true do |args| time_ago_in_words card.updated_at end
-  view :acted_at,   closed: true do |args| time_ago_in_words card.acted_at   end
-
+  view(:created_at, closed: true) { time_ago_in_words card.created_at }
+  view(:updated_at, closed: true) { time_ago_in_words card.updated_at }
+  view(:acted_at,   closed: true) { time_ago_in_words card.acted_at   }
 
   # CONTENT VIEWS
 
   view :raw do |args|
-    scard = args[:structure] ? Card[ args[:structure] ] : card
+    scard = args[:structure] ? Card[args[:structure]] : card
     scard ? scard.raw_content : _render_blank
   end
 
@@ -55,32 +54,30 @@ format do
   end
 
   view :closed_content, closed: true do |args|
-    Card::Content.truncatewords_with_closing_tags _render_core(args) #{ yield }
+    Card::Content.truncatewords_with_closing_tags _render_core(args)
   end
 
-  view :blank, closed: true, perms: :none do |args|
+  view :blank, closed: true, perms: :none do
     ''
   end
 
-
-  # note: content and open_content may look like they should be aliased to core, but it's important that they render
-  # core explicitly so that core view overrides work.  the titled and labeled views below, however, are not intended
-  # for frequent override, so this shortcut is fine.
-
+  # note: content and open_content may look like they should be aliased to
+  # core, but it's important that they render core explicitly so that core view
+  # overrides work.  the titled and labeled views below, however, are not
+  # intended for frequent override, so this shortcut is fine.
 
   # NAME + CONTENT VIEWS
 
   view :titled do |args|
-    "#{ card.name }\n\n#{ _render_core args }"
+    "#{card.name}\n\n#{_render_core args}"
   end
   view :open, :titled
 
   view :labeled do |args|
-    "#{ card.name }: #{ _render_closed_content args }"
+    "#{card.name}: #{_render_closed_content args}"
   end
   view :closed, :labeled
 
-
   # SPECIAL VIEWS
 
   view :array do |args|
@@ -89,34 +86,38 @@ format do
     end.inspect
   end
 
-
-
-  #none of the below belongs here!!
-
+  # none of the below belongs here!!
 
   view :template_rule, tags: :unknown_ok do |args|
-    #FIXME - relativity should be handled in smartname
+    # FIXME: - relativity should be handled in smartname
+    return '' unless args[:inc_name]
+    name = args[:inc_name].to_name
+    stripped_name = name.stripped.to_name
 
-    name = args[:inc_name] or return ''
-    regexp = /\b_(left|right|whole|self|user|main|\d+|L*R?)\b/
-    absolute = name !~ regexp && name !~ /^\+/
-
-    tname = name.gsub regexp, ''
-    if tname !~ /^\+/ and !absolute
+    if name.relative? && !stripped_name.starts_with_joint?
+      # not a simple relative name; just return the original syntax
       "{{#{args[:inc_syntax]}}}"
     else
-      set_name = if absolute # find the most appropriate set to use as prototype for inclusion
-        "#{name}+#{Card[:self].name}"
-      else
-        tmpl_set_name = parent.card.cardname.trunk_name
-        if tmpl_set_class_name = tmpl_set_name.tag_name and Card[tmpl_set_class_name].codename == 'type'
-          "#{tmpl_set_name.left_name}#{name}+#{Card[:type_plus_right].name}"  # *type plus right
+      set_name =
+        case
+        when name.absolute?
+          "#{name}+#{Card[:self].name}" # *self set
+        when type = on_type_set
+          "#{type}#{name}+#{Card[:type_plus_right].name}" # *type plus right
         else
-          "#{tname.gsub /^\+/,''}+#{Card[:right].name}"                                      # *right
+          "#{stripped_name.gsub(/^\+/, '')}+#{Card[:right].name}" # *right
         end
-      end
-
-      subformat( Card.fetch(set_name) ).render_template_link args
+      subformat(Card.fetch set_name).render_template_link args
     end
   end
+
+  def on_type_set
+    return unless
+      (tmpl_set_name = parent.card.cardname.trunk_name) &&
+      (tmpl_set_class_name = tmpl_set_name.tag_name) &&
+      (tmpl_set_class_card = Card[tmpl_set_class_name]) &&
+      (tmpl_set_class_card.codename == 'type')
+
+    tmpl_set_name.left_name
+  end
 end

data/mod/03_machines/lib/card/machine.rb

@@ -116,7 +116,8 @@ class Card
         event_suffix = host_class.name.gsub ':', '_'
         host_class.event(
           "reset_machine_output_#{ event_suffix }".to_sym,
-          after: :store_subcards, on: :save
+          after: :expire_related, on: :save
+          #after: :store_subcards, on: :save
         ) do
           reset_machine_output!
         end

data/mod/03_machines/lib/javascript/wagn_mod.js.coffee

@@ -4,27 +4,65 @@ window.wagn ||= {} #needed to run w/o *head.  eg. jasmine
 
 $.extend wagn,
   editorContentFunctionMap: {
-    '.ace-editor-textarea'   : -> ace_editor_content this[0]
-    '.tinymce-textarea'      : -> tinyMCE.get(@[0].id).getContent()
-    '.pointer-select'        : -> pointerContent @val()
-    '.pointer-multiselect'   : -> pointerContent @val()
-    '.pointer-radio-list'    : -> pointerContent @find('input:checked').val()
-    '.pointer-list-ul'       : -> pointerContent @find('input'        ).map( -> $(this).val() )
-    '.pointer-checkbox-list' : -> pointerContent @find('input:checked').map( -> $(this).val() )
-    '.pointer-select-list'   : -> pointerContent @find('.pointer-select select').map( -> $(this).val() )
-    '.pointer-mixed'         : -> pointerContent @find('.pointer-checkbox-sublist input:checked, .pointer-sublist-ul input').map( -> $(this).val() )
-    '.perm-editor'           : -> permissionsContent this # must happen after pointer-list-ul, I think
+    '.ace-editor-textarea' : -> ace_editor_content this[0]
+    '.tinymce-textarea' : -> tinyMCE.get(@[0].id).getContent()
+    '.pointer-select' : -> pointerContent @val()
+    '.pointer-multiselect' : -> pointerContent @val()
+    '.pointer-radio-list' : -> pointerContent @find('input:checked').val()
+    '.pointer-list-ul' : -> 
+      pointerContent @find('input').map( -> $(this).val() )
+    '.pointer-checkbox-list' : -> 
+      pointerContent @find('input:checked').map( -> $(this).val() )
+    '.pointer-select-list' : -> 
+      pointerContent @find('.pointer-select select').map( -> $(this).val() )
+    '.pointer-mixed' : -> 
+      element = '.pointer-checkbox-sublist input:checked,\
+                .pointer-sublist-ul input'
+      pointerContent @find(element).map( -> $(this).val() )
+    # must happen after pointer-list-ul, I think
+    '.perm-editor' : -> permissionsContent this 
   }
 
   editorInitFunctionMap: {
-    '.date-editor'           : -> @datepicker { dateFormat: 'yy-mm-dd' }
-    'textarea'               : -> $(this).autosize()
-    '.ace-editor-textarea'   : -> wagn.initAce $(this)
-    '.tinymce-textarea'      : -> wagn.initTinyMCE @[0].id
-    '.pointer-list-editor'   : -> @sortable({handle: '.handle', cancel: ''}); wagn.initPointerList @find('input')
-    '.file-upload'           : -> @fileupload( dataType: 'html', done: wagn.doneFile, add: wagn.chooseFile, progressall: wagn.progressallFile )#, forceIframeTransport: true )
-    '.etherpad-textarea'     : -> $(this).closest('form').find('.edit-submit-button').attr('class', 'etherpad-submit-button')
+    '.date-editor' : -> @datepicker { dateFormat : 'yy-mm-dd' }
+    'textarea' : -> $(this).autosize()
+    '.ace-editor-textarea' : -> wagn.initAce $(this)
+    '.tinymce-textarea' : -> wagn.initTinyMCE @[0].id
+    '.pointer-list-editor' : -> 
+      @sortable({handle : '.handle', cancel : ''})
+      wagn.initPointerList @find('input')
+    '.file-upload' : -> wagn.upload_file(this)
+    '.etherpad-textarea' : ->
+      $(this).closest('form')
+      .find('.edit-submit-button')
+      .attr('class', 'etherpad-submit-button')
   }
+  upload_file: (fileupload) ->
+    # for file as a subcard in a form,
+    # excess parameters are inlcuded in the request which cause errors.
+    # only the file, type_id and attachment_card_name are needed
+    # attachment_card_name is the original card name, 
+    # ex: card[subcards][+logo][image], card[file]
+    $(fileupload).bind 'fileuploadsubmit', (e,data) ->
+      $_this = $(this)
+      card_name = $_this.siblings(".attachment_card_name:first").attr("name")
+      type_id = $_this.siblings("#attachment_type_id").val()
+      data.formData = {
+        "card[type_id]" : type_id,
+        "attachment_upload" : card_name
+      }
+    $_fileupload = $(fileupload)
+    if $_fileupload.closest("form").attr("action").indexOf("update") > -1
+      url = "/card/update/"+$(fileupload).siblings("#file_card_name").val()
+    else
+      url = "/card/create"
+    $(fileupload).fileupload(
+      url : url,
+      dataType : 'html',
+      done : wagn.doneFile,
+      add : wagn.chooseFile,
+      progressall : wagn.progressallFile
+    )#, forceIframeTransport: true )
 
   initPointerList: (input)->
     optionsCard = input.closest('ul').data('options-card')

data/mod/03_machines/spec/set/type/javascript_spec.rb

@@ -6,23 +6,29 @@ describe Card::Set::Type::JavaScript do
   let(:changed_js)            { 'alert( "Hello" );' }
   let(:compressed_changed_js) { 'alert("Hello");'   }
 
-
   it_should_behave_like 'content machine', that_produces_js do
-    let(:machine_card)  { Card.gimme! "test javascript", type: :java_script, content: js}
+    let(:machine_card) do
+      Card.gimme! 'test javascript', type: :java_script, content: js
+    end
     let(:card_content) do
-       { in:       js,         out:     compressed_js,
-         changed_in:   changed_js, changed_out: compressed_changed_js }
+      { in:         js,         out:     compressed_js,
+        changed_in: changed_js, changed_out: compressed_changed_js }
     end
   end
 
-  it_behaves_like "machine input"  do
-    let(:create_machine_input_card) { Card.gimme! "test javascript", type: :java_script, content: js }
-    let(:create_another_machine_input_card) { Card.gimme! "more javascript", type: :java_script, content: js }
-    let(:create_machine_card)  { Card.gimme! "script with js+*script", type: :pointer }
+  it_behaves_like 'machine input' do
+    let(:create_machine_input_card) do
+      Card.gimme! 'test javascript', type: :java_script, content: js
+    end
+    let(:create_another_machine_input_card) do
+      Card.gimme! 'more javascript', type: :java_script, content: js
+    end
+    let(:create_machine_card) do
+      Card.gimme! 'script with js+*script', type: :pointer
+    end
     let(:card_content) do
-       { in:       js,         out:     compressed_js,
-         changed_in:   changed_js, changed_out: compressed_changed_js }
+      { in:         js,         out:     compressed_js,
+        changed_in: changed_js, changed_out: compressed_changed_js }
     end
   end
-
-end
+end

data/mod/05_email/set/right/followers.rb

@@ -7,8 +7,8 @@ def raw_content
     items = if (left.type_id == SetID) || (left.type_id == CardtypeID)
               left.default_follow_set_card.all_user_ids_with_rule_for(:follow).map do |user_id|
                 if left.followed_by?(user_id) && (user = Card.find(user_id))
-                  user.name 
-                else 
+                  user.name
+                else
                   nil
                 end
               end.compact
@@ -21,10 +21,10 @@ def raw_content
   end
 end
 
-def virtual?; true end
+def virtual?; !real? end
 
-format() do 
-  include Card::Set::Type::Pointer::Format     
+format() do
+  include Card::Set::Type::Pointer::Format
 end
 
 format(:html)  { include Card::Set::Type::Pointer::HtmlFormat }

data/mod/05_email/set/right/following.rb

@@ -1,5 +1,5 @@
 
-def virtual?; true end
+def virtual?; !real? end
 
 
 format :html do

data/mod/05_email/set/type_plus_right/user/follow.rb

@@ -13,7 +13,7 @@ def raw_content
     end
 end
 
-def virtual?; true end
+def virtual?; !real? end
 
 
 

data/mod/05_standard/lib/carrier_wave/cardmount.rb

@@ -4,7 +4,6 @@ module CarrierWave
   module CardMount
     include CarrierWave::Mount
 
-
     def uploaders
       Card.uploaders ||= {}
     end
@@ -13,26 +12,33 @@ module CarrierWave
       Card.uploader_options ||= {}
     end
 
-    def mount_uploader(column, uploader=nil, options={}, &block)
+    def mount_uploader column, uploader=nil, options={}, &block
       options[:mount_on] ||= :db_content
       super
 
-      class_eval <<-RUBY, __FILE__, __LINE__+1
+      class_eval <<-RUBY, __FILE__, __LINE__ + 1
         event :store_#{column}_event, on: :save, after: :store do
           store_#{column}!
         end
 
         # remove files only if card has no history
-        event :remove_#{column}_event, on: :delete, after: :stored, when: proc { |c| !c.history? } do
+        event :remove_#{column}_event,
+              on: :delete, after: :stored, when: proc { |c| !c.history? } do
           remove_#{column}!
         end
-        event :mark_remove_#{column}_false_event, on: :update, after: :stored do
+        event :mark_remove_#{column}_false_event,
+              on: :update, after: :stored do
           mark_remove_#{column}_false
         end
-        event :store_previous_model_for_#{column}_event, on: :update, before: :store, when: proc { |c| !c.history? } do
+        event :store_previous_model_for_#{column}_event,
+              on: :update, before: :store, when: proc { |c| !c.history? } do
           store_previous_model_for_#{column}
         end
-        event :remove_previously_stored_#{column}_event, on: :update, after: :store, when: proc { |c| !c.history?} do
+        event :remove_previously_stored_#{column}_event,
+              on: :update, after: :store, when: proc { |c| !c.history?} do
+          if @previous_model_for_#{column}
+            @previous_model_for_#{column}.include_set_modules
+          end
           remove_previously_stored_#{column}
         end
 
@@ -87,11 +93,14 @@ module CarrierWave
         def serializable_hash(options=nil)
           hash = {}
 
-          except = options && options[:except] && Array.wrap(options[:except]).map(&:to_s)
-          only   = options && options[:only]   && Array.wrap(options[:only]).map(&:to_s)
+          except = options && options[:except] &&
+                   Array.wrap(options[:except]).map(&:to_s)
+          only   = options && options[:only]   &&
+                   Array.wrap(options[:only]).map(&:to_s)
 
           self.class.uploaders.each do |column, uploader|
-            if (!only && !except) || (only && only.include?(column.to_s)) || (!only && except && !except.include?(column.to_s))
+            if (!only && !except) || (only && only.include?(column.to_s)) ||
+               (!only && except && !except.include?(column.to_s))
               hash[column.to_s] = _mounter(column).uploader.serializable_hash
             end
           end
@@ -99,6 +108,5 @@ module CarrierWave
         end
       RUBY
     end
-
   end
 end

data/mod/05_standard/lib/file_uploader.rb

@@ -146,7 +146,7 @@ class FileUploader < CarrierWave::Uploader::Base
   end
 
   def mod_file?
-    @mod ||= model.mod_file?
+    model.mod_file?
   end
 
   def action_id

data/mod/05_standard/set/abstract/attachment.rb

@@ -24,15 +24,16 @@ event :upload_attachment, before: :validate_name, on: :save, when: proc { |c| c.
 end
 
 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]))
+  if (action = Card::Action.fetch(@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
   end
 end
 
-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]))
+event :assign_attachment_on_update, after: :prepare, on: :update,
+      when:  proc { |c| c.save_preliminary_upload? } do
+  if (action = Card::Action.fetch(@cached_upload))
     uploaded_file =
        with_selected_action_id(action.id) do
          attachment.file
@@ -53,15 +54,15 @@ 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
+
   if @current_action
     @current_action.update_attributes! comment: original_filename
   end
 end
 
 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]))
+  if (action = Card::Action.fetch(@cached_upload))
     upload_cache_card.delete_files_for_action action
     action.delete
   end
@@ -69,7 +70,7 @@ event :delete_cached_upload_file_on_create, after: :extend, on: :create, when: p
 end
 
 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]))
+  if (action = Card::Action.fetch(@cached_upload))
     delete_files_for_action action
     action.delete
   end
@@ -89,12 +90,16 @@ def original_filename
   attachment.original_filename
 end
 
+def unfilled?
+  !attachment.present? && !save_preliminary_upload? && super
+end
+
 def preliminary_upload?
   Card::Env && Card::Env.params[:attachment_upload]
 end
 
 def save_preliminary_upload?
-  Card::Env.params[:cached_upload].present?
+  @cached_upload.present?
 end
 
 def attachment_changed?
@@ -110,6 +115,14 @@ def upload_cache_card
   @upload_cache_card ||= Card["new_#{attachment_name}".to_sym ]
 end
 
+# action id of the cached upload
+def cached_upload= value
+  @cached_upload = value
+end
+
+def cached_upload
+  @cached_upload
+end
 
 def load_from_mod= value
   @mod = value
@@ -164,7 +177,6 @@ def mod_dir
   end
 end
 
-
 def mod_file?
   if @store_in_mod
     return @mod