card 1.16.4 → 1.16.5

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

@@ -8,19 +8,14 @@ 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
   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)
-
   success << {
-    :target => (new_card? ? upload_cache_card : '_self'),
+    :target => (new_card? ? upload_cache_card : self),
     :type=> type_name,
     :view => 'preview_editor',
     :rev_id => current_action.id
@@ -28,26 +23,25 @@ event :upload_attachment, :before=>:validate_name, :on=>:save, :when=>proc { |c|
   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
@@ -60,26 +54,33 @@ event :correct_identifier, :after=>:store, :on=>:create do
   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 :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
@@ -104,12 +105,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
@@ -117,20 +124,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
@@ -150,18 +189,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

data/mod/05_standard/set/all/error.rb

@@ -166,7 +166,7 @@ format :html do
           or_signup = if Card.new(:type_id=>Card::SignupID).ok? :create
             "or #{ link_to 'sign up', card_url('new/:signup') }"
           end
-          save_interrupted_action(request.env['REQUEST_URI'])
+          Env.save_interrupted_action(request.env['REQUEST_URI'])
           "Please #{ link_to 'sign in', card_url(':signin') } #{or_signup} #{to_task}"
         end
 

data/mod/05_standard/set/all/links.rb

@@ -45,6 +45,7 @@ format do
       else
         return card_link href, opts
       end
+    opts[:target] = "_blank" if new_class == 'external-link'
     add_class opts, new_class
     link_to text, href, opts
   end

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

@@ -31,7 +31,7 @@ format :html do
   view :core do |args|
     account = card.fetch :trait=>:account, :new=>{}
     form_args = {
-      :hidden => { :success=>"REDIRECT: #{interrupted_action || '*previous'}" },
+      :hidden => { :success=>"REDIRECT: #{Env.interrupted_action || '*previous'}" },
       :recaptcha => :off
     }
 

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

@@ -1,5 +1,20 @@
 attachment :file, :uploader=>FileUploader
 
+module SelectedAction
+  def select_action_by_params params
+    # skip action table lookups for current revision
+    rev_id = params[:rev_id]
+    super unless rev_id && rev_id == last_content_action_id
+  end
+
+  def last_content_action_id
+    # find action id from content (saves lookups)
+    db_content.to_s.split(/[\/\.]/)[1]
+  end
+
+end
+include SelectedAction
+
 format do
   view :source do |args|
     card.attachment.url
@@ -109,7 +124,7 @@ format :html do
         <span class="btn btn-success fileinput-button">
             <i class="glyphicon glyphicon-cloud-upload"></i>
             <span>
-                #{@slot_view == :edit ? 'Replace' : 'Add'} #{card.attachment_name}...
+                #{card.new_card? ? 'Add' : 'Replace'} #{card.attachment_name}...
             </span>
              #{file_field card.attachment_name, :class=>'file-upload slotter'}
         </span>

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

@@ -1,5 +1,7 @@
 attachment :image, :uploader=>ImageUploader
 
+include File::SelectedAction
+
 format do
 
   include File::Format

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

@@ -36,7 +36,7 @@ def get_query params={}
   if default_limit = query.delete(:default_limit) and !query[:limit]
     query[:limit] = default_limit
   end
-  query[:context] ||= (cardname.junction? ? cardname.left_name : cardname)
+  query[:context] ||= cardname
   query
 end
 
@@ -190,7 +190,7 @@ format :rss do
     case raw_feed_items args
     when Exception ; @xml.item { render :search_error }
     when Integer   ; @xml.item { render :search_count }
-    else super
+    else super args
     end
   end
 

data/mod/05_standard/spec/chunk/link_spec.rb

@@ -1,60 +1,70 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Chunk::Link do
+  def assert_link target, args
+    text = args.delete(:text)
+    format_args = args.delete(:format_args)
+    assert_args = ['a']
+    args.each_pair do |key,val|
+      assert_args[0] << "[#{key}=\"#{val}\"]"
+    end
+    assert_args << { :text=>text } if text
+    assert_view_select render_content(target, (format_args || {})), *assert_args
+  end
 
-  it "should handle unknown cards" do
-    expect(render_content('[[Nixon]]')).to eq('<a class="wanted-card" href="/Nixon">Nixon</a>')
+  it "handles unknown cards" do
+    assert_link '[[Nixon]]', :class=>"wanted-card", :href=>"/Nixon", :text=>'Nixon'
   end
 
-  it 'should handle known cards' do
-    expect(render_content("[[A]]")).to eq('<a class="known-card" href="/A">A</a>')
+  it 'handles known cards' do
+    assert_link "[[A]]", :class=>"known-card", :href=>"/A", :text=>'A'
   end
-  
-  it 'should handle custom text' do
-    expect(render_content('[[Baines|Lyndon]]')).to eq('<a class="wanted-card" href="/Baines">Lyndon</a>')
+
+
+  it 'handles custom text' do
+    assert_link '[[Baines|Lyndon]]', :class=>"wanted-card", :href=>"/Baines", :text=>'Lyndon'
   end
 
-  it "should handle relative names" do
+  it "handles relative names" do
     @card = Card.new :name=>'Kennedy'
-    expect(render_content('[[+Monroe]]'     )).to eq('<a class="wanted-card" href="/Kennedy+Monroe">Kennedy+Monroe</a>')
-    expect(render_content('[[_self+Exner]]' )).to eq('<a class="wanted-card" href="/Kennedy+Exner">Kennedy+Exner</a>')
-    expect(render_content('[[Onassis+]]'    )).to eq('<a class="wanted-card" href="/Onassis+Kennedy">Onassis+Kennedy</a>')
+    assert_link '[[+Monroe]]'    , :class=>"wanted-card", :href=>"/Kennedy+Monroe", :text=>'Kennedy+Monroe'
+    assert_link '[[_self+Exner]]', :class=>"wanted-card", :href=>"/Kennedy+Exner",  :text=>'Kennedy+Exner'
+    assert_link '[[Onassis+]]'   , :class=>"wanted-card", :href=>"/Onassis+Kennedy",:text=>'Onassis+Kennedy'
   end
 
-  it "should handle relative names in context" do
+  it "handles relative names in context" do
     @card = Card.new :name=>'Kennedy'
     format_args = { :context_names => [ 'Kennedy'.to_name ] }
-    expect(render_content('[[+Monroe]]'    , format_args )).to eq('<a class="wanted-card" href="/Kennedy+Monroe">+Monroe</a>')
-    expect(render_content('[[_self+Exner]]', format_args )).to eq('<a class="wanted-card" href="/Kennedy+Exner">+Exner</a>')
-    expect(render_content('[[Onassis+]]'   , format_args )).to eq('<a class="wanted-card" href="/Onassis+Kennedy">Onassis</a>')
+    assert_link '[[+Monroe]]'    , :format_args=>format_args, :class=>"wanted-card", :href=>"/Kennedy+Monroe", :text=>'+Monroe'
+    assert_link '[[_self+Exner]]', :format_args=>format_args, :class=>"wanted-card", :href=>"/Kennedy+Exner", :text=>'+Exner'
+    assert_link '[[Onassis+]]'   , :format_args=>format_args, :class=>"wanted-card", :href=>"/Onassis+Kennedy", :text=>'Onassis'
   end
 
-  it "should handle relative urls" do
-    expect(render_content('[[/recent]]')).to eq('<a class="internal-link" href="/recent">/recent</a>')
+  it "handles relative urls" do
+    assert_link '[[/recent]]', :class=>"internal-link", :href=>"/recent", :text=>'/recent'
   end
 
-  it "should handle absolute urls" do
-    expect(render_content('[[http://google.com]]')).to eq('<a class="external-link" href="http://google.com">http://google.com</a>')
+  it "handles absolute urls" do
+    assert_link '[[http://google.com]]', :class=>'external-link', :target=>'_blank', :href=>'http://google.com', :text=> 'http://google.com'
   end
 
   it "should escape spaces in cardnames with %20 (not +)" do
-    expect(render_content('[[Marie "Mad Dog" Deatherage|Marie]]')).to eq(
-      '<a class="wanted-card" href="/Marie_Mad_Dog_Deatherage?card%5Bname%5D=Marie+%22Mad+Dog%22+Deatherage">Marie</a>'
-    )
+    assert_link '[[Marie "Mad Dog" Deatherage|Marie]]', :class=>"wanted-card", :href=>"/Marie_Mad_Dog_Deatherage?card%5Bname%5D=Marie+%22Mad+Dog%22+Deatherage", :text=>'Marie'
   end
 
-  it "should not escape content outside of link" do
-    expect(render_content('wgw&nbsp; [[http://www.google.com|google]] &nbsp;  <br>')).to eq( 
-      "wgw&nbsp; <a class=\"external-link\" href=\"http://www.google.com\">google</a> &nbsp;  <br>"
-    )
+
+  it "doesn't escape content outside of link" do
+    content = render_content('wgw&nbsp; [[http://www.google.com|google]] &nbsp;  <br>')
+    expect(content).to eq "wgw&nbsp; <a target=\"_blank\" class=\"external-link\" href=\"http://www.google.com\">google</a> &nbsp;  <br>"
   end
-  
-  it "should handle inclusions in link text" do
-    expect(render_content('[[linkies|{{namies|name}}]]')).to eq('<a class="wanted-card" href="/linkies">namies</a>')
+
+  it "handles inclusions in link text" do
+    assert_link '[[linkies|{{namies|name}}]]', :class=>"wanted-card", :href=>"/linkies", :text=>'namies'
   end
-  
-  it "should handle dot (.) in missing cardlink" do
-    expect(render_content("[[Wagn 1.10.12]]")).to eq('<a class="wanted-card" href="/Wagn_1_10_12?card%5Bname%5D=Wagn+1.10.12">Wagn 1.10.12</a>')
+
+  it "handles dot (.) in missing cardlink" do
+    assert_link "[[Wagn 1.10.12]]", :class=>"wanted-card", :href=>"/Wagn_1_10_12?card%5Bname%5D=Wagn+1.10.12", :text=>'Wagn 1.10.12'
+
   end
 
 end

data/mod/05_standard/spec/set/all/links_spec.rb

@@ -0,0 +1,15 @@
+# -*- encoding : utf-8 -*-
+describe Card::Set::All::Links do
+  require 'card'
+  describe '#web_link' do
+    it 'opens external link in new tab' do
+      link = Card['Home'].format.web_link("http://example.com")
+      assert_view_select link, 'a[class="external-link"][target="_blank"][href="http://example.com"]'
+    end
+
+    it 'opens interal link in same tab' do
+      link = Card['Home'].format.web_link("/Home")
+      assert_view_select link, 'a[target="_blank"]', false
+    end
+  end
+end

data/mod/05_standard/spec/set/self/head_spec.rb

@@ -4,14 +4,14 @@ describe Card::Set::Self::Head do
   it "should have a javascript tag" do
     assert_view_select render_card(:raw, :name=>'*head'), 'script[type="text/javascript"]'
   end
-  
+
   context 'tinyMCE config' do
     before do
       @tinyMCE = Card[:tiny_mce]
     end
     it 'should handle tinyMCE configuration errors' do
-    
+
     end
   end
-  
+
 end

data/mod/05_standard/spec/set/type/email_template_spec.rb

@@ -4,19 +4,19 @@ require 'card/mailer'
 describe Card::Set::Type::EmailTemplate do
   let(:email_name) { 'a mail template' }
   let(:email) {Card.fetch(email_name)}
-  
+
   def mailconfig args={}
     Card[email_name].email_config(args)
   end
-  
+
   def update_field name, args={}
     Card["#{email_name}+#{name}"].update_attributes! args
   end
-  
+
   def create_field name, args={}
     Card.create! args.merge(:name=>"#{email_name}+#{name}")
   end
-  
+
   before do
     Card::Auth.current_id = Card::WagnBotID
     chunk_test = "Url(wagn.org) Link([[http://wagn.org|Wagn]]) Inclusion({{B|name}}) Card link([[A]])"
@@ -28,96 +28,96 @@ describe Card::Set::Type::EmailTemplate do
       "+*text_message" =>  "*text message #{chunk_test}"
     }
   end
-  
+
   describe "mail view" do
     let(:content_type) do
       card = Card.create!(:name => 'content type test', :type=>:email_template, :subcards=>@fields)
       email = card.format.render_mail
       email[:content_type].value
     end
-   
+
     it 'renders text email if text message given' do
       @fields = { "+*text_message" => "text" }
       expect(content_type).to include 'text/plain'
     end
-    
+
     it 'renders html email if html message given' do
       @fields = { "+*html_message" =>  "text" }
       expect(content_type).to include 'text/html'
     end
-    
+
     it 'renders multipart email if text and html given' do
       @fields = {'+*text_message'=>'text', '+*html_message'=>'text'}
       expect(content_type).to include 'multipart/alternative'
     end
-    
+
   end
-  
-  
+
+
   describe "#email_config" do
 
     describe 'address fields' do
       it 'uses *from field' do
         expect( mailconfig[:from] ).to eq 'from@user.com'
       end
-      
+
       it 'uses *to field' do
         expect( mailconfig[:to] ).to eq 'joe@user.com'
       end
-      
+
       it 'handles pointer values' do
         create_field '*cc', :content => "[[joe@user.com]]", :type=>'Pointer'
         expect( mailconfig[:cc] ).to eq 'joe@user.com'
       end
-      
+
 
       #it 'handles email syntax in pointer values' do
       #  create_field '*cc', :content => "[[Joe User <joe@user.com>]]", :type=>'Pointer'
       #  expect( mailconfig[:cc] ).to eq 'Joe User <joe@user.com>'
       #end
-      
+
       it 'handles link to email card' do
         create_field '*cc', :content => "[[Joe User+*email]]", :type=>'Pointer'
         expect( mailconfig[:cc] ).to eq 'joe@user.com'
       end
-      
+
       # it 'handles link with valid email address' do
       #   create_field '*cc', :content => "[[joe@admin.com|Joe]]", :type=>'Phrase'
       #   expect( mailconfig[:cc] ).to eq 'Joe<joe@user.com>'
       # end
-      
+
       it 'handles search card' do
         create_field '*bcc', :content => '{"name":"Joe Admin","append":"*email"}', :type=>'Search'
         expect( mailconfig[:bcc] ).to eq 'joe@admin.com'
       end
-      
+
       # it 'handles invalid email address' do  #TODO not obvious how to deal with that.
                                               #      we can't decided whether a email address like [[_left]] is valid; depends on the context
       #   Card.fetch("a mail template+*to").update_attributes(:content=>"invalid mail address")
       # end
     end
-    
+
 
      describe 'subject' do
        subject { mailconfig[:subject] }
-       
+
        it 'uses *subject field' do
         is_expected.to include '*subject'
-       end       
+       end
        it 'does not render url' do
          is_expected.to include 'Url(wagn.org)'
-       end     
+       end
        it 'does not render link' do
          is_expected.to include 'Link([[http://wagn.org|Wagn]])'
-       end     
+       end
        it 'renders inclusion' do
          is_expected.to include 'Inclusion(B)'
        end
      end
-     
+
      describe 'text message' do
        subject { mailconfig[:text_message] }
-       
+
        it 'uses *text_message field' do
          is_expected.to include '*text message'
        end
@@ -126,25 +126,25 @@ describe Card::Set::Type::EmailTemplate do
        end
        it 'renders link' do
          is_expected.to include 'Link(Wagn[http://wagn.org])'
-       end    
+       end
        it 'renders inclusion' do
          is_expected.to include 'Inclusion(B)'
        end
-      
+
      end
-     
+
      describe 'html message' do
        subject { mailconfig[:html_message] }
-      
+
        it 'uses *html_message field' do
          is_expected.to include '*html message'
-       end      
+       end
        it 'renders url' do
-         is_expected.to include 'Url(<a class="external-link" href="http://wagn.org">wagn.org</a>)'
-       end   
+         is_expected.to include 'Url(<a target="_blank" class="external-link" href="http://wagn.org">wagn.org</a>)'
+       end
        it 'renders link' do
-         is_expected.to include 'Link(<a class="external-link" href="http://wagn.org">Wagn</a>)'
-       end   
+         is_expected.to include 'Link(<a target="_blank" class="external-link" href="http://wagn.org">Wagn</a>)'
+       end
        it 'renders inclusion' do
          is_expected.to include 'Inclusion(B)'
        end
@@ -154,8 +154,8 @@ describe Card::Set::Type::EmailTemplate do
          is_expected.to include 'Card link(<a class="known-card" href="http://www.fake.com/A">A</a>)'
        end
      end
-     
-     
+
+
      context 'with context card' do
        let(:context_card) do
          Card.create(
@@ -172,14 +172,14 @@ describe Card::Set::Type::EmailTemplate do
 
        it 'handles contextual name in address search' do
          update_field '*from', :content => '{"left":"_self", "right":"email"}', :type=>'Search'
-         update_field '*from', :content => '{"left":"_self", "right":"email"}'                  #FIXME: have to do this twice to get the right content. 
+         update_field '*from', :content => '{"left":"_self", "right":"email"}'                  #FIXME: have to do this twice to get the right content.
                                                                                                 #       After the first update the content is empty
          expect(subject[:from]).to eq "gary@gary.com"
        end
 
        it 'handles contextual names and structure rules in subject' do
          Card.create! :name => 'default subject', :content=>'a very nutty thang', :type=>'Phrase'
-         Card.create! :name => "subject search+*right+*structure", :content => %{{"referred_to_by":"_self+subject"}}, :type=>'Search'
+         Card.create! :name => "subject search+*right+*structure", :content => %{{"referred_to_by":"_left+subject"}}, :type=>'Search'
          update_field '*subject', :content => "{{+subject search|core;item:core}}"
          expect(subject[:subject]).to eq("a very nutty thang")
        end
@@ -194,7 +194,7 @@ describe Card::Set::Type::EmailTemplate do
          Card.create :name=>'Banana+surprise', :content=>"the Spanish Inquisition"
          c = Card.create :name => "Banana+emailtest", :content => "data content"
          expect( mailconfig( context: c )[:html_message] ).to include 'Nobody expects the Spanish Inquisition'
-         
+
        end
 
        it 'handles contextual name for attachments' do