card 1.16.3 → 1.16.4

data/spec/lib/card/success_spec.rb

@@ -0,0 +1,142 @@
+# -*- encoding : utf-8 -*-
+
+describe Card::Success do
+  let(:context) { Card['A'].cardname }
+  let(:previous) { '/B' }
+  let(:home)     { Card['Home'] }
+  def success_params params
+    @success = Card::Success.new(context, params)
+    @success.stub(:previous_location) { previous }
+  end
+  describe '#target' do
+    subject { @success.target }
+
+    context 'initialized with nil' do
+      before do
+        success_params nil
+      end
+      it { is_expected.to eq Card['A'] }
+    end
+
+    context 'initialized with hash' do
+      before do
+        success_params :id=>home.id, :view=>'closed'
+      end
+      it { is_expected.to eq home}
+    end
+
+    context 'initialized with REDIRECT string' do
+      before do
+        success_params 'REDIRECT: Home'
+      end
+      it { is_expected.to eq home}
+    end
+
+    context 'initialized with TEXT string' do
+      before do
+        success_params 'TEXT: Hi'
+      end
+      it { is_expected.to eq 'Hi'}
+    end
+
+    context 'initialized with card object' do
+      before do
+        success_params home
+      end
+      it { is_expected.to eq home}
+    end
+
+    context 'initialized with url' do
+      before do
+        success_params 'http://wagn.org'
+      end
+      it  { is_expected.to eq 'http://wagn.org'}
+    end
+  end
+
+  describe '#to_url' do
+    subject { @success.to_url}
+    context 'with params' do
+      context 'using initilization' do
+        before do
+          success_params :id=>home.id, :view=>'closed', :layout=>'my_layout'
+        end
+        it { is_expected.to eq '/Home?layout=my_layout&view=closed' }
+      end
+      context 'using array assignment' do
+        before do
+          success_params nil
+          @success[:view] = 'closed'
+        end
+        it { is_expected.to eq '/A?view=closed' }
+      end
+      context 'using assignment' do
+        before do
+          success_params nil
+          @success.view = 'closed'
+        end
+        it { is_expected.to eq '/A?view=closed' }
+      end
+      context 'using <<' do
+        before do
+          success_params nil
+          @success << { :card=>home, :view=>'closed'}
+        end
+        it { is_expected.to eq '/Home?view=closed' }
+      end
+    end
+    context 'redirect string' do
+      before do
+        success_params 'REDIRECT: *previous'
+      end
+      it { is_expected.to eq previous}
+    end
+  end
+
+  describe '#soft_redirect?' do
+    it 'returns true if soft_redirect parameter is true' do
+      success_params :soft_redirect=>true
+      expect(@success.soft_redirect?).to be_truthy
+    end
+  end
+
+  describe '#hard_redirect?' do
+    it 'true for "REDIRECT: anywhere"' do
+      success_params "REDIRECT: anywhere"
+      expect(@success.hard_redirect?).to be_truthy
+    end
+  end
+
+  describe '#mark=' do
+    subject { @success.target }
+    before do
+      success_params nil
+    end
+    it 'works with id' do
+      @success.mark = home.id
+      is_expected.to eq home
+    end
+    it 'works with name' do
+      @success.mark = home.name
+      is_expected.to eq home
+    end
+    it 'works with card object' do
+      @success.mark = home
+      is_expected.to eq home
+    end
+  end
+
+  describe 'params' do
+    it 'returns params hash' do
+      success_params :name=>'Home', :view=>'View'
+      @success.layout = 'Layout'
+      @success.apply :script => 'Script'
+      @success << {:structure => 'Structure'}
+      expect(@success.params.keys.sort).to eq [:layout, :script, :structure, :view]
+    end
+    it 'ignores "id", "name", "mark", "card"", target", and "redirect"' do
+      success_params :id=>5, :name=>'Home', :card=>Card['Home'], :mark=>'Home', :target=>'Home', :redirect=>false, :view=>'View'
+      expect(@success.params.keys).to eq [:view]
+    end
+  end
+end

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

@@ -315,7 +315,7 @@ format :html do
     args[:tab_type] ||= 'tabs'
   end
 
-  view :pills_static, :view=>:tabs
+  view :pills_static, :view=>:tabs_static
   def default_tabs_static_args args
     args[:tab_type] ||= 'pills'
   end

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

@@ -235,7 +235,7 @@ end
 
 
 event :cascade_name_changes, :after=>:store, :on=>:update, :changed=>:name do
-  Rails.logger.debug "-------------------#{name_was}- CASCADE #{self.name} -------------------------------------"
+  #Rails.logger.info "------------------- #{name_was} CASCADE #{self.name} -------------------------------------"
 
   self.update_referencers = false if self.update_referencers == 'false' #handle strings from cgi
   Card::Reference.update_on_rename self, name, self.update_referencers
@@ -247,6 +247,7 @@ event :cascade_name_changes, :after=>:store, :on=>:update, :changed=>:name do
 
   deps.each do |dep|
     # here we specifically want NOT to invoke recursive cascades on these cards, have to go this low level to avoid callbacks.
+    Rails.logger.info "cascading name: #{dep.name}"
     Card.expire dep.name #old name
     newname = dep.cardname.replace_part name_was, name
     Card.where( :id=> dep.id ).update_all :name => newname.to_s, :key => newname.key

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

@@ -13,7 +13,7 @@ def abort status, msg='action canceled'
   if status == :failure && errors.empty?
     errors.add :abort, msg
   elsif Hash === status and status[:success]
-    Env.params[:success] = status[:success]
+    success << status[:success]
     status = :success
   end
   raise Card::Abort.new( status, msg)
@@ -51,11 +51,18 @@ end
 # perhaps above should be in separate module?
 #~~~~~~
 
-def approve
+def prepare
   @action = identify_action
   # the following should really happen when type, name etc are changed
   reset_patterns
   include_set_modules
+  run_callbacks :prepare
+rescue =>e
+  rescue_event e
+end
+
+def approve
+  @action ||= identify_action
   run_callbacks :approve
   expire_pieces if errors.any?
   errors.empty?
@@ -180,6 +187,9 @@ event :store_subcards, :after=>:store do
   end
 end
 
+def success
+  Env[:success] ||= Card::Success.new(cardname)
+end
 
 
 

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

@@ -30,7 +30,7 @@ end
 
 def get_type_id args={}
   return if args[:type_id] # type_id was set explicitly.  no need to set again.
-  
+
   type_id = case
     when args[:type_code]
       if code=args[:type_code]
@@ -62,11 +62,11 @@ event :validate_type_change, :before=>:approve, :on=>:update, :changed=>:type_id
   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
-  
+
   if rt = structure and rt.assigns_type? and type_id!=rt.type_id
     errors.add :type, "can't be changed because #{name} is hard templated to #{rt.type_name}"
   end
@@ -74,7 +74,7 @@ end
 
 event :reset_type_specific_fields, :after=>:store do
   Auth.as_bot do
-    Card.search :left=>{ :left=>type_name }, :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
@@ -84,7 +84,7 @@ end
 #      Card["#{lef}"]
 #      set_card.reset_set_patterns
 #    end
-  
+
 
 
 # ~~~~~~~~~~~ below autogenerated; above pulled from /Users/ethan/dev/wagn/gem/card/mod/01_core/set/all/type.rb ~~~~~~~~~~~

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

@@ -3,13 +3,17 @@ class Card; module Set; module All; module Actions; extend Card::Set # ~~~~~~~~~
 # -*- encoding : utf-8 -*-
 
 def select_action_by_params params
-  action = find_action_by_params(params) and self.selected_action_id = action.id
+  if (action = find_action_by_params(params))
+    run_callbacks :select_action do
+      self.selected_action_id = action.id
+    end
+  end
 end
 
 def find_action_by_params args
   if args[:rev]
     nth_action args[:rev]
-  elsif args[:rev_id] =~ /^\d+$/
+  elsif Integer === args[:rev_id] || args[:rev_id] =~ /^\d+$/
     if action = Action.fetch(args[:rev_id]) and action.card_id == id
       action
     end

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 ) 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
@@ -26,7 +26,10 @@ def save_content_draft content
 end
 
 def last_change_on(field, opts={})
-  where_sql =  'card_actions.card_id = :card_id AND field = :field AND (draft is not true) '
+  where_sql =  'card_actions.card_id = :card_id AND field = :field '
+  if !opts[:including_drafts]
+    where_sql += 'AND (draft is not true) '
+  end
   where_sql += if opts[:before]
     'AND card_action_id < :action_id'
   elsif opts[:not_after]
@@ -56,6 +59,18 @@ def selected_action
   selected_action_id and Action.fetch(selected_action_id)
 end
 
+def with_selected_action_id action_id
+  current_action_id = @selected_action_id
+  run_callbacks :select_action do
+    self.selected_action_id = action_id
+  end
+  result = yield
+  run_callbacks :select_action do
+    self.selected_action_id = current_action_id
+  end
+  result
+end
+
 def selected_content_action_id
   @selected_action_id ||
  (@current_action && (new_card? || @current_action.new_content? || db_content_changed?) && @current_action.id) ||

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

@@ -7,7 +7,7 @@ def history?
 end
 
 # must be called on all actions and before :set_name, :process_subcards and :validate_delete_children
-event :assign_act,  :before=>:approve, :when=>proc {|c| c.history?}  do
+event :assign_act,  :before=>:prepare, :when=>proc {|c| c.history?}  do
   @current_act = (@supercard && @supercard.current_act) || Card::Act.create(:ip_address=>Env.ip)
 end
 

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

@@ -1,29 +1,5 @@
 # -*- encoding : utf-8 -*-
 class Card; module Set; module All; module File; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/02_basic_types/set/all/file.rb ~~~~~~~~~~~
-# FIXME: these methods should move to type/file.rb but some machine stuff is failing if it's not in a "all" set
-def store_dir
-  if (mod = mod_file?)
-    "#{ Cardio.gem_root}/mod/#{mod}/file/#{codename}"
-  elsif id
-    "#{ Card.paths['files'].existent.first }/#{id}"
-  else
-    tmp_store_dir
-  end
-end
-
-def tmp_store_dir
-  "#{ Card.paths['files'].existent.first }/#{key}"
-end
-
-def mod_file?
-  # when db_content was changed assume that it's no longer a mod file
-  if !db_content_changed? && content.present? && content =~ /^:[^\/]+\/([^.]+)/
-    $1
-  end
-end
-
-
-
 format :file do
 
   view :core do |args|

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

@@ -8,11 +8,10 @@ format :rss do
 
   def initialize card, args
     super
-    @xml = @parent.xml if @parent
+    @xml = @parent ? @parent.xml : ::Builder::XmlMarkup.new
   end
 
   def show view, args
-    @xml = ::Builder::XmlMarkup.new
     view ||= :feed
     render view, args
   end
@@ -26,7 +25,7 @@ format :rss do
           @xml.title       render_feed_title
           @xml.description render_feed_description
           @xml.link        render_url
-          render_feed_item_list
+          render_feed_body
         end
       end
     rescue =>e
@@ -34,12 +33,16 @@ format :rss do
     end
   end
 
-  def raw_feed_items
+  def raw_feed_items args
     [card]
   end
 
+  view :feed_body do |args|
+    render_feed_item_list
+  end
+
   view :feed_item_list do |args|
-    raw_feed_items.each do |item|
+    raw_feed_items(args).each do |item|
       @xml.item do
         subformat(item).render_feed_item :view_changes=>(card.id==RecentID)  #FIXME! yuck.
       end

data/tmpsets/set/mod003-02_basic_types/type/pointer.rb

@@ -187,7 +187,7 @@ format :css do
 
   view :core do |args|
     card.item_cards.map do |item|
-      nest item, :view=>(params[:item] || args[:item] || :content)
+      nest item, :view=>(args[:item] || :content)
     end.join "\n\n"
   end
 
@@ -199,7 +199,7 @@ end
 format :js do
   view :core do |args|
     card.item_cards.map do |item|
-      nest item, :view=>(params[:item] || args[:item] || :core)
+      nest item, :view=>( args[:item] || :core)
     end.join "\n\n"
   end
 end

data/tmpsets/set/mod005-04_settings/right/structure.rb

@@ -2,13 +2,18 @@
 class Card; module Set; module Right; module Structure; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/04_settings/set/right/structure.rb ~~~~~~~~~~~
 
 format :rss do
-  def raw_feed_items
+  def raw_feed_items args
     [card]
-  end 
+  end
 end
 
 format :html do
   include AddHelp::HtmlFormat
+
+  view :core do |args|
+    render_raw args
+  end
+
 end
 
 

data/tmpsets/set/mod006-05_email/all/notify.rb

@@ -65,7 +65,7 @@ def followable?
 end
 
 def notable_change?
-  !supercard && current_act && Card::Auth.current_id != WagnBotID && followable?
+  !silent_change && !supercard && current_act && Card::Auth.current_id != WagnBotID && followable?
 end
 
 event :notify_followers_after_save, :after=>:subsequent, :on=>:save, :when=>proc{ |ca| ca.notable_change? } do

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

@@ -1,34 +1,87 @@
 # -*- encoding : utf-8 -*-
 class Card; module Set; module Abstract; module Attachment; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/abstract/attachment.rb ~~~~~~~~~~~
 require 'carrier_wave/cardmount'
+
 def self.included host_class
   host_class.extend CarrierWave::CardMount
 end
 
+event :select_file_revision, :after=>:select_action do
+  attachment.retrieve_from_store!(attachment.identifier)
+end
 
-event :write_identifier, :after=>:assign_action do
-  self.content = attachment.db_content
+event :determine_store_place, :before=>:prepare, :on=>:update do
+  @store_place = load_from_mod || :deck
 end
 
-event :save_original_filename, :before=>:finalize_action do
-  if @current_action
-    @current_action.update_attributes! :comment=>original_filename
+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'),
+    :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]))
+    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 :move_file_to_store_dir, :after=>:store, :on=>:create do
-  if ::File.exist? tmp_store_dir
-    if ::File.exist? store_dir
-      FileUtils.rm_rf store_dir
-    end
-    FileUtils.mv tmp_store_dir, store_dir
+event :assign_attachment_on_update, :after=>:prepare, :on=>:update do
+  if save_preliminary_upload? && (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
-  if !(content =~ /^[:~]/)
-    update_column(:db_content,attachment.db_content)
-    expire
+end
+
+def assign_attachment file, original_filename
+  send "#{attachment_name}=", file
+  write_identifier
+  @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))
+  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)
+end
+
+
+def upload_cache_card
+  @upload_cache_card ||= Card["new_#{attachment_name}".to_sym ]
+end
+
+def tmp_store_dir action_id=nil
+  "#{ Card.paths['files'].existent.first }/#{upload_cache_card.id}"
+end
+
 def item_names(args={})  # needed for flexmail attachments.  hacky.
   [self.cardname]
 end
@@ -37,6 +90,60 @@ def original_filename
   attachment.original_filename
 end
 
+def preliminary_upload?
+  Card::Env && Card::Env.params[:attachment_upload]
+end
+
+def save_preliminary_upload?
+  Card::Env.params[:cached_upload].present?
+end
+
+def attachment_changed?
+  send "#{attachment_name}_changed?"
+end
+
+def create_versions?
+  true
+end
+
+def store_place
+  @store_place ||= mod_file? || :deck
+end
+
+def load_from_mod= value
+  @mod = value
+end
+
+def load_from_mod
+  @mod
+end
+
+def store_dir
+  if (store_place == :deck)
+    if id
+      "#{ Card.paths['files'].existent.first }/#{id}"
+    else
+      tmp_store_dir
+    end
+  else
+    "#{ Cardio.gem_root}/mod/#{store_place}/file/#{codename}"
+  end
+end
+
+def mod_file?
+  # when db_content was changed assume that it's no longer a mod file
+  if @store_place != :deck && !db_content_changed? && content.present?
+    case content
+    when /^:[^\/]+\/([^.]+)/ ; $1     # current mod_file format
+    when /^\~/               ; false  # current id file format
+    else
+      if lines = content.split("\n") and lines.size == 4 # old format, still used in card_changes.
+        lines.last
+      end
+    end
+  end
+end
+
 
 def assign_set_specific_attributes
   if @set_specific && @set_specific.present?
@@ -45,6 +152,17 @@ def assign_set_specific_attributes
   super
 end
 
+def clear_upload_tmp_dir
+  Dir.entries(tmp_store_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
+        FileUtils.rm path
+      end
+    end
+  end
+end
 
 def symlink_to(prior_action_id) # create filesystem links to files from prior action
   if prior_action_id != last_action_id