card 1.15.7 → 1.16.0

data/mod/01_core/set/all/view_cache.rb

@@ -0,0 +1,9 @@
+event :clear_view_cache, :after=>:store do
+  Card::ViewCache.reset
+end
+
+format do
+  def view_caching?
+    false
+  end
+end

data/mod/01_core/spec/format/html_format_spec.rb

@@ -116,7 +116,7 @@ describe Card::HtmlFormat do
         Card::Auth.as_bot { @layout_card.save }
 
         rendered = expect(@layout_card.format.render(:layout)).to eq(
-          %{Mainly <div id="main"><div class="CodeRay">\n  <div class="code"><pre>Mainly {{_main|core}}</pre></div>\n</div>\n</div>}
+          %{Mainly <div id="main"><div class="CodeRay">\n  <div class="code"><pre>Mainly {{_main|core}}</pre></div>\n</div>\n</div>\n<div class="modal fade" role="dialog" id="modal-main-slot"><div class="modal-dialog"><div class="modal-content"></div></div></div>}
         )
           #probably better to check that it matches "Mainly" exactly twice.
       end
@@ -129,7 +129,7 @@ describe Card::HtmlFormat do
           Card.create :name=>"outer space", :content=>"{{_main|name}}"
         end
 
-        expect(@layout_card.format.render(:layout)).to eq('Joe User')
+        expect(@layout_card.format.render(:layout)).to eq(%{Joe User\n<div class="modal fade" role="dialog" id="modal-main-slot"><div class="modal-dialog"><div class="modal-content"></div></div></div>})
       end
     end
 

data/mod/01_core/spec/set/all/collection_spec.rb

@@ -70,7 +70,7 @@ describe Card::Set::All::Collection do
       end
     end
     it 'handles links and nest arguments' do
-      result = @list.format.map_nests do |name,args|
+      result = @list.format.map_references_with_args do |name,args|
         [name, args]
       end
       expect(result).to eq [

data/mod/01_history/lib/card/act.rb

@@ -2,7 +2,9 @@
 class Card
   class Act < ActiveRecord::Base
     before_save :set_actor
-    has_many :actions, :foreign_key=>:card_act_id, :inverse_of=> :act, :order => :id, :class_name=> "Card::Action"
+    has_many :actions, -> { order :id },
+      { :foreign_key=>:card_act_id, :inverse_of=> :act, :class_name=> "Card::Action" }
+
     belongs_to :actor, class_name: "Card"
     belongs_to :card
     def set_actor

data/mod/01_history/lib/card/action.rb

@@ -5,7 +5,8 @@ class Card
   class Action < ActiveRecord::Base
     belongs_to :card
     belongs_to :act,  :foreign_key=>:card_act_id, :inverse_of=>:actions
-    has_many   :changes, :foreign_key=>:card_action_id, :inverse_of=>:action, :dependent=>:delete_all
+    has_many   :card_changes, :foreign_key=>:card_action_id, :inverse_of=>:action,
+      :dependent=>:delete_all, :class_name=> "Card::Change"
 
     belongs_to :super_action, :class_name=> "Action", :inverse_of=>:sub_actions
     has_many   :sub_actions,  :class_name=> "Action", :inverse_of=>:super_action
@@ -28,7 +29,7 @@ class Card
 
 
       def delete_cardless
-        Card::Action.where( Card.where( :id=>arel_table[:card_id] ).exists.not ).delete_all
+        Card::Action.joins('LEFT JOIN cards ON card_actions.card_id = cards.id').where('cards.id IS NULL').delete_all
       end
 
       def delete_old
@@ -72,7 +73,8 @@ class Card
     end
 
     def new_values
-      @new_values ||= {
+      @new_values ||=
+      {
         :content  => new_value_for(:db_content),
         :name     => new_value_for(:name),
         :cardtype => ( typecard = Card[new_value_for(:type_id).to_i] and typecard.name.capitalize )
@@ -89,29 +91,37 @@ class Card
     end
 
     def last_value_for field
-       ch = self.card.last_change_on(field, :before=>self) and ch.value
+      ch = self.card.last_change_on(field, :before=>self) and ch.value
     end
 
-    def new_value_for(field)
-       ch = changes.find_by_field(field) and ch.value
+    def field_index field
+      if field.is_a? Integer
+        field
+      else
+        Card::TRACKED_FIELDS.index(field.to_s)
+      end
     end
-    def change_for(field)
-      field_integer = ( field.is_a?(Integer) ? field : Card::TRACKED_FIELDS.index(field.to_s) )
-      changes.where 'card_changes.field = ?', field_integer
+
+    def new_value_for field
+      ch = card_changes.find_by(field: field_index(field)) and ch.value
     end
 
+    def change_for field
+      card_changes.where 'card_changes.field = ?', field_index(field)
+    end
 
     def new_type?
       new_value_for(:type_id)
     end
+
     def new_content?
       new_value_for(:db_content)
     end
+
     def new_name?
       new_value_for(:name)
     end
 
-
     def action_type=(value)
       write_attribute(:action_type, TYPE.index(value))
     end
@@ -136,12 +146,10 @@ class Card
       content_diff_builder.green?
     end
 
-
     # def diff
     #   @diff ||= { :cardtype=>type_diff, :content=>content_diff, :name=>name_diff}
     # end
 
-
     def name_diff opts={}
       if new_name?
         Card::Diff.complete old_values[:name], new_values[:name], opts

data/mod/01_history/lib/card/change.rb

@@ -1,27 +1,31 @@
 # -*- encoding : utf-8 -*-
 class Card
   class Change < ActiveRecord::Base
-    belongs_to :action, :foreign_key=>:card_action_id, :inverse_of=>:changes
-    
-    # replace with enum if we start using rails 4 
+    belongs_to :action, :foreign_key=>:card_action_id, :inverse_of=>:card_changes
+
     def field=(value)
       write_attribute(:field, Card::TRACKED_FIELDS.index(value.to_s))
     end
-    
+
     def field
       Card::TRACKED_FIELDS[read_attribute(:field)]
     end
-    
+
     def self.delete_actionless
       Card::Change.where(
         "card_action_id NOT IN (?)",
         Card::Action.pluck("id"),
       ).delete_all
     end
-    
-    def self.find_by_field(value)
+
+    def find_by_field_name(value)
+      index = value.is_a?(Integer) ? value : Card::TRACKED_FIELDS.index(value.to_s)
+      find_by_field(index)
+    end
+
+    def self.find_by_field_name(value)
       index = value.is_a?(Integer) ? value : Card::TRACKED_FIELDS.index(value.to_s)
-      super(index)
+      find_by_field(index)
     end
   end
 end

data/mod/01_history/set/all/actions.rb

@@ -28,7 +28,7 @@ def revision action
     action = Card::Action.fetch(action)
   end
   action and Card::TRACKED_FIELDS.inject({}) do |attr_changes, field|
-    last_change = action.changes.find_by_field(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
@@ -37,7 +37,7 @@ end
 def delete_old_actions
   Card::TRACKED_FIELDS.each do |field|
     # assign previous changes on each tracked field to the last action
-    if (la=last_action) && !la.change_for(field).present? && (last_change = last_change_on(field))
+    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)
     end

data/mod/01_history/set/all/content_history.rb

@@ -19,7 +19,7 @@ end
 def save_content_draft content
   super
   acts.create do |act|
-    act.actions.build(:draft => true, :card_id=>id).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
 
@@ -125,9 +125,10 @@ def draft_acts
   drafts.created_by(Card::Auth.current_id).map(&:act)
 end
 
-event :detect_conflict, :before=>:approve, :on=>:update 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
 end
 
+

data/mod/01_history/set/all/history.rb

@@ -4,15 +4,61 @@ def history?
   true
 end
 
+event :create_act_and_action_for_save,   :before=>:process_subcards, :on=>:save, :when=>proc {|c| c.history?}  do
+  create_act_and_action
+end
+event :create_act_and_action_for_delete, :before =>:validate_delete_children, :on=>:delete, :when=>proc {|c| c.history? } do
+  create_act_and_action
+end
+
+event :create_card_changes, :after =>:stored, :when=>proc {|c| c.history? } do
+  store_changes
+end
+
+event :finalize_act, :after=>:create_card_changes, :when=>proc {|c| c.history? } do
+  if !@supercard
+    if @current_act.actions(true).empty?
+      @current_act.delete
+      @current_act = nil
+    else
+      @current_act.update_attributes! :card_id=>id
+    end
+  end
+end
+
+
 # must be called on all actions and before :set_name, :process_subcards and :validate_delete_children
 def create_act_and_action
+  @current_act = (@supercard && @supercard.current_act) || Card::Act.create(:ip_address=>Env.ip)
+  @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
+end
+
+def store_changes
+  if @current_action
+    @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
+    elsif @current_action.card_changes(true).empty?
+      @current_action.delete
+      @current_action = nil
+    end
+  end
+end
+
+
+# alternative to #create_act_and_action
+# currently not used
+def build_act_and_action
   @current_act = if @supercard
     @supercard.current_act || @supercard.acts.build(:ip_address=>Env.ip)
   else
     acts.build(:ip_address=>Env.ip)
   end
-
-  @current_action = actions.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)
@@ -22,20 +68,6 @@ end
 
 
 
-event(:create_act_and_action_for_save,   :before=>:process_subcards, :on=>:save, :when=>proc {|c| c.history?} )   { create_act_and_action }
-event(:create_act_and_action_for_delete, :before =>:validate_delete_children, :on=>:delete, :when=>proc {|c| c.history? }) { create_act_and_action }
-
-
-event :remove_empty_act, :after=>:extend, :when=>proc {|c| c.history? } do
-  # if not @supercard and not @current_act.actions.empty?
-  #   @current_act.save
-  # end
-  @current_act.reload
-  if not @supercard and @current_act.actions.empty?
-     @current_act.delete
-     @current_act = nil
-   end
-end
 
 
 
@@ -99,10 +131,16 @@ end
 
 format :html do
   view :history do |args|
-    frame args.merge(:body_class=>"history-slot list-group", :content=>true, :subheader=>revision_subheader ) do
-      _render_revisions
+    frame args.merge(:body_class=>"history-slot list-group", :content=>true) do
+      [
+        history_legend,
+        _render_revisions
+      ]
     end
   end
+  def default_history_args args
+    args[:optional_toolbar] ||= :show
+  end
 
   view :revisions do |args|
     page = params['page'] || 1
@@ -113,7 +151,7 @@ format :html do
     end.join
   end
 
-  def revision_subheader
+  def history_legend
     intr = card.intrusive_acts.page(params['page']).per(REVISIONS_PER_PAGE)
     render_haml :intr=>intr do
       %{

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

@@ -32,13 +32,12 @@ format :rss do
     end
   end
 
+  def raw_feed_items
+    [card]
+  end
+
   view :feed_item_list do |args|
-    items = if card.type_id == Card::SearchTypeID  #FIXME! yuck.
-      card.item_cards( search_params.merge(:default_limit => 25) )
-    else
-      [card]
-    end
-    items.each do |item|
+    raw_feed_items.each do |item|
       @xml.item do
         subformat(item).render_feed_item :view_changes=>(card.id==RecentID)  #FIXME! yuck.
       end

data/mod/{05_standard → 02_basic_types}/set/type/html.rb

@@ -1,6 +1,7 @@
-
-view :editor do |args|
-  text_area :content, :rows=>5, :class=>'card-content', "data-card-type-code"=>card.type_code
+format :html do
+  view :editor do |args|
+    text_area :content, :rows=>5, :class=>'card-content ace-editor-textarea', "data-card-type-code"=>card.type_code
+  end
 end
 
 view :closed_content do |args|

data/mod/02_basic_types/set/type/plain_text.rb

@@ -3,7 +3,7 @@ format :html do
   view :editor do |args|
     text_area :content, :rows=>5, :class=>'card-content', "data-card-type-code"=>card.type_code
   end
-  
+
   view :core do |args|
     process_content_object( CGI.escapeHTML _render_raw )
   end

data/mod/02_basic_types/set/type/pointer.rb

@@ -211,13 +211,18 @@ format :data do
   end
 end
 
-
-event :standardize_items, :before=>:approve, :on=>:save do
+# while a card's card type and content are updated in the same request, 
+# the new module will override the old module's events and functions.
+# this event is only on pointer card. Other type cards do not have this event,
+# so it is not overridden and will be run while updating type and content in the same request. 
+event :standardize_items, :before=>:approve, :on=>:save, :when=>proc{  |c| c.type_id == Card::PointerID  } do
   if db_content_changed?
     self.content = item_names(:context=>:raw).map { |name| "[[#{name}]]" }.join "\n"
   end
 end
 
+
+
 def diff_args
   {:format => :pointer}
 end
@@ -252,8 +257,6 @@ def item_names args={}
 end
 
 
-
-
 def item_ids args={}
   item_names(args).map do |name|
     Card.fetch_id name

data/mod/02_basic_types/spec/set/type/pointer_spec.rb

@@ -45,7 +45,9 @@ describe Card::Set::Type::Pointer do
       pointer.content.should == ""
     end
   end
-   
+
+
+
   describe "html" do
     before do
       Card::Auth.as_bot do
@@ -58,25 +60,27 @@ describe Card::Set::Type::Pointer do
       end
     end
     it "should include nonexistingcardmustnotexistthisistherule in radio options" do
-      option_html ="<input checked=\"checked\" class=\"pointer-radio-button\" id=\"pointer-radio-nonexistingcardmustnotexistthisistherule\" name=\"pointer_radio_button-tp\" type=\"radio\" value=\"nonexistingcardmustnotexistthisistherule\" />"
-      @pointer.format.render_radio.should include(option_html)
-      option_html ="<input checked=\"checked\" class=\"pointer-radio-button\" id=\"pointer-radio-nonexistingcardmustnotexistthisistherule\" name=\"pointer_radio_button-ip\" type=\"radio\" value=\"nonexistingcardmustnotexistthisistherule\" />"
-      @inherit_pointer.format.render_radio.should include(option_html)
+      common_html = 'input[class="pointer-radio-button"][checked="checked"][type="radio"][value="nonexistingcardmustnotexistthisistherule"][id="pointer-radio-nonexistingcardmustnotexistthisistherule"]'
+      option_html = common_html + '[name="pointer_radio_button-tp"]'
+      assert_view_select @pointer.format.render_radio, option_html
+      option_html = common_html + '[name="pointer_radio_button-ip"]'
+      assert_view_select @inherit_pointer.format.render_radio, option_html
     end
+
     it "should include nonexistingcardmustnotexistthisistherule in checkbox options" do
-      option_html = "<input checked=\"checked\" class=\"pointer-checkbox-button\" id=\"pointer-checkbox-nonexistingcardmustnotexistthisistherule\" name=\"pointer_checkbox\" type=\"checkbox\" value=\"nonexistingcardmustnotexistthisistherule\" />"
-      @pointer.format.render_checkbox.should include(option_html)
-      @inherit_pointer.format.render_checkbox.should include(option_html)
+      option_html = 'input[class="pointer-checkbox-button"][checked="checked"][name="pointer_checkbox"][type="checkbox"][value="nonexistingcardmustnotexistthisistherule"][id="pointer-checkbox-nonexistingcardmustnotexistthisistherule"]'
+      assert_view_select @pointer.format.render_checkbox, option_html
+      assert_view_select @inherit_pointer.format.render_checkbox, option_html
     end
     it "should include nonexistingcardmustnotexistthisistherule in select options" do
-      option_html = %{<option value="#{@card_name}" selected="selected">#{@card_name}</option>}
-      @pointer.format.render_select.should include(option_html)
-      @inherit_pointer.format.render_select.should include(option_html)
+      option_html = "option[value='#{@card_name}'][selected='selected']"
+      assert_view_select @pointer.format.render_select, option_html, @card_name
+      assert_view_select @inherit_pointer.format.render_select, option_html, @card_name
     end
     it "should include nonexistingcardmustnotexistthisistherule in multiselect options" do
-      option_html = %{<option value="#{@card_name}" selected="selected">#{@card_name}</option>}
-      @pointer.format.render_multiselect.should include(option_html)
-      @inherit_pointer.format.render_multiselect.should include(option_html)
+      option_html = "option[value='#{@card_name}'][selected='selected']"
+      assert_view_select @pointer.format.render_multiselect, option_html, @card_name
+      assert_view_select @inherit_pointer.format.render_multiselect, option_html, @card_name
     end
   end
   describe "css" do
@@ -85,15 +89,15 @@ describe Card::Set::Type::Pointer do
       Card.create :name=>'my css', :content=> @css
     end
     it "should render CSS of items" do
-      css_list = render_card :content, 
-        { :type=>Card::PointerID, :name=>'my style list', :content=>'[[my css]]' }, 
+      css_list = render_card :content,
+        { :type=>Card::PointerID, :name=>'my style list', :content=>'[[my css]]' },
         :format=>:css
 #      css_list.should =~ /STYLE GROUP\: \"my style list\"/
 #      css_list.should =~ /Style Card\: \"my css\"/
       css_list.should =~ /#{ Regexp.escape @css }/
     end
   end
-  
+
   describe '#standardize_item' do
     it "should handle unlinked items" do
       pointer1 = Card.create! :name=>'pointer1', :type=>'Pointer', :content=>'bracketme'