card 1.16.1 → 1.16.2

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

@@ -20,7 +20,7 @@ def initialize args={}
     :type_code => args.delete('type_code'),
     :type_id   => args[       'type_id'  ]
   }
-  
+
   args['db_content'] = args.delete('content') if args['content']
 
   #FIXME -- too much of the above is duplicated by assign_attributes (tracked_attributes.rb)
@@ -29,11 +29,11 @@ def initialize args={}
   skip_modules = args.delete 'skip_modules'
 
   super args # ActiveRecord #initialize
-  
+
   if tid = get_type_id( @type_args )
     self.type_id = tid
   end
-  
+
   include_set_modules unless skip_modules
   self
 end
@@ -43,6 +43,7 @@ def include_set_modules
     set_modules.each do |m|
       singleton_class.send :include, m
     end
+    assign_set_specific_attributes
     @set_mods_loaded=true
   end
   self

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

@@ -116,8 +116,10 @@ def event_applies? opts
   if opts[:on]
     return false unless Array.wrap( opts[:on] ).member? @action
   end
-  if opts[:changed]
-    return false if @action == :delete or !changes[ opts[:changed].to_s ]
+  if changed_field = opts[:changed]
+
+    changed_field = 'db_content' if changed_field.to_sym == :content
+    return false if @action == :delete or !changes[ changed_field.to_s ]
   end
   if opts[:when]
     return false unless opts[:when].call self
@@ -142,12 +144,14 @@ event :process_subcards, :after=>:approve, :on=>:save do
 
     opts[:supercard] = self
 
-    subcard = if known_card = Card[ab_name]
-      known_card.refresh.assign_attributes opts
-      known_card
-    elsif opts['subcards'].present? or (opts['content'].present? and opts['content'].strip.present?)
-      Card.new opts.reverse_merge 'name' => sub_name
-    end
+    subcard =
+      if known_card = Card[ab_name]
+        known_card.refresh.assign_attributes opts
+        known_card
+      elsif (opts['content'].present? && opts['content'].strip.present?) ||
+        opts['subcards'].present? || opts['file'].present? || opts['image'].present?
+        Card.new opts.reverse_merge 'name' => sub_name
+      end
 
     if subcard
       @subcards[sub_name] = subcard

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

@@ -9,9 +9,10 @@ def extended_referencers
   (dependents + [self]).map(&:referencers).flatten.uniq
 end
 
+
+# replace references in card content
 def replace_references old_name, new_name
   obj_content = Card::Content.new raw_content, card=self
-
   obj_content.find_chunks( Card::Chunk::Reference ).select do |chunk|
     if old_ref_name = chunk.referee_name and new_ref_name = old_ref_name.replace_part(old_name, new_name)
       chunk.referee_name = chunk.replace_reference old_name, new_name
@@ -22,6 +23,7 @@ def replace_references old_name, new_name
   obj_content.to_s
 end
 
+# update entries in reference table
 def update_references rendered_content = nil, refresh = false
   raise "update references should not be called on new cards" if id.nil?
 
@@ -37,7 +39,6 @@ def update_references rendered_content = nil, refresh = false
   expire if refresh
 
   rendered_content ||= Card::Content.new(raw_content, card=self)
-
   rendered_content.find_chunks(Card::Chunk::Reference).each do |chunk|
     if referee_name = chunk.referee_name # name is referenced (not true of commented inclusions)
       referee_id = chunk.referee_id
@@ -52,13 +53,18 @@ def update_references rendered_content = nil, refresh = false
             # L = link
             # I = inclusion
             # P = partial (i.e. the name is part of a compound name that is referenced by a link or inclusion)
+
             # The partial type is needed to keep track of references of virtual cards.
             # For example a link [[A+*self]] won't make it to the reference table because A+*self is virtual and
             # doesn't have an id but when A's name is changed we have to find and update that link.
-            ref_type = if name == referee_name
-                Card::Chunk::Link===chunk ? 'L' : 'I'
-              else
-                'P'
+            ref_type =
+              if name == referee_name
+                case chunk
+                when Card::Chunk::Link then 'L'
+                when Card::Chunk::QueryReference then 'Q'
+                else 'I'
+                end
+              else 'P'
               end
             Card::Reference.create!(
               :referer_id  => id,

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

@@ -1,3 +1,7 @@
+
+
+
+
 RuleSQL = %{
   select rules.id as rule_id, settings.id as setting_id, sets.id as set_id, sets.left_id as anchor_id, sets.right_id as set_tag_id
   from cards rules
@@ -17,10 +21,9 @@ ReadRuleSQL = %{
   where read_rules.right_id = #{Card::ReadID} and read_rules.trash is false and sets.type_id = #{Card::SetID};
 }
 
-
-def is_rule?
-  is_standard_rule? || is_user_rule?
-end
+ def is_rule?
+   is_standard_rule? || is_user_rule?
+ end
 
 def is_standard_rule?
   (r = right( :skip_modules=>true )) &&
@@ -56,7 +59,7 @@ def rule_card_id setting_code, options={}
   if Card::Setting.user_specific? setting_code
     user_id = options[:user_id] || (options[:user] and options[:user].id) || Auth.current_id
     if user_id
-      fallback = "#{setting_code}+#{Card[:all].id}"
+      fallback = "#{setting_code}+#{AllID}"
       setting_code = "#{setting_code}+#{user_id}"
     end
   end
@@ -135,11 +138,11 @@ module ClassMethods
   end
 
   def cache_key row
-    setting_code = Card::Codename[ row['setting_id'].to_i ] or return false
+    setting_code = Codename[ row['setting_id'].to_i ] or return false
 
     anchor_id = row['anchor_id']
     set_class_id = anchor_id.nil? ? row['set_id'] : row['set_tag_id']
-    set_class_code = Card::Codename[ set_class_id.to_i ] or return false
+    set_class_code = Codename[ set_class_id.to_i ] or return false
 
     key_base = [ anchor_id, set_class_code, setting_code].compact.map( &:to_s ) * '+'
   end
@@ -174,15 +177,15 @@ module ClassMethods
 
   def all_user_ids_with_rule_for set_card, setting_code
     key = if (l=set_card.left) and (r=set_card.right)
-        set_class_code = Card::Codename[ r.id ]
+        set_class_code = Codename[ r.id ]
         "#{l.id}+#{set_class_code}+#{setting_code}"
       else
-        set_class_code = Card::Codename[ set_card.id ]
+        set_class_code = Codename[ set_card.id ]
         "#{set_class_code}+#{setting_code}"
       end
     user_ids = user_ids_cache[key] || []
-    if user_ids.include? Card[:all].id  # rule for all -> return all user ids
-      Card.where(:type_id=>Card::UserID).pluck(:id)
+    if user_ids.include? AllID  # rule for all -> return all user ids
+      Card.where(:type_id=>UserID).pluck(:id)
     else
       user_ids
     end

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

@@ -1,5 +1,6 @@
 def new_card?
-  new_record? || !!@from_trash
+  new_record? ||   # not yet in db (from ActiveRecord)
+  !!@from_trash    # in process of restoration from trash, not yet "re-created"
 end
 alias_method :new?, :new_card?
 

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

@@ -2,6 +2,12 @@
 def assign_attributes args={}
   if args
     args = args.stringify_keys
+
+    @set_specific = {}
+    Card.set_specific_attributes.each do |key|
+      @set_specific[key] = args.delete(key) if args[key]
+    end
+
     if newtype = args.delete('type')
       args['type_id'] = Card.fetch_id newtype
     end
@@ -13,6 +19,14 @@ def assign_attributes args={}
   super params
 end
 
+def assign_set_specific_attributes
+  if @set_specific && @set_specific.present?
+    @set_specific.each_pair do |name, value|
+      self.send "#{name}=", value
+    end
+  end
+end
+
 def extract_subcard_args! args={}
   extracted_subcards = args.delete('subcards') || {}
   args.keys.each do |key|

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

@@ -94,7 +94,7 @@ describe Card::Set::All::Collection do
       tabs = render_card :tabs, :content=>"[[A]]\n[[B]]\n[[C]]", :type=>'pointer'
       assert_view_select tabs, 'div[role=tabpanel]' do
         assert_select 'div.tab-pane#tempo_rary-a  .card-slot#A'
-        assert_select 'li > a.load[data-toggle=tab][href=#tempo_rary-b]'
+        assert_select 'li > a.load[data-toggle=tab][href="#tempo_rary-b"]'
         assert_select 'div.tab-pane#tempo_rary-b', ''
       end
     end
@@ -118,15 +118,15 @@ describe Card::Set::All::Collection do
 
     it 'handles item params' do
       tabs = render_content '{{Fruit+*type+*create|tabs|name;structure:Home}}'
-      path = "/Anyone?#{ {:view=>:name,:slot=>{:structure=>'Home'}}.to_param}"
+      path = "/Anyone?#{ {:slot=>{:structure=>'Home'},:view=>:name}.to_param}"
       assert_view_select tabs, 'div[role=tabpanel]' do
-        assert_select "li > a[data-toggle=tab][data-url=#{path}]"
+        assert_select %{li > a[data-toggle="tab"][data-url="#{path}"]}
       end
     end
     it 'handles nests as items' do
       tabs = render_card :tabs, :name=>'tab_test', :type_id=>Card::PlainTextID, :content=>"{{A|type;title:my tab title}}"
       assert_view_select tabs, 'div[role=tabpanel]' do
-        assert_select 'li > a[data-toggle=tab][href=#tab_test-a]', 'my tab title'
+        assert_select 'li > a[data-toggle=tab][href="#tab_test-a"]', 'my tab title'
         assert_select 'div.tab-pane#tab_test-a', 'Basic'
       end
     end
@@ -135,7 +135,7 @@ describe Card::Set::All::Collection do
       Card.create :type=>'Search', :name=>'Asearch', :content=>%{{"type":"User"}}
       tabs=render_content("{{Asearch|tabs;item:name}}")
       assert_view_select tabs, 'div[role=tabpanel]' do
-        assert_select 'li > a[data-toggle=tab][href=#asearch-joe_admin] span.card-title', 'Joe Admin'
+        assert_select 'li > a[data-toggle=tab][href="#asearch-joe_admin"] span.card-title', 'Joe Admin'
       end
     end
   end

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

@@ -26,32 +26,32 @@ describe Card::Set::All::Name do
       expect(b1.name).to eq('b1')
     end
   end
-  
+
   describe 'codename' do
     before :each do
       @card = Card['a']
     end
-    
+
     it 'should require admin permission' do
       @card.update_attributes :codename=>'structure'
       expect(@card.errors[:codename].first).to match(/only admins/)
     end
-    
+
     it 'should check uniqueness' do
       Card::Auth.as_bot do
         @card.update_attributes :codename=>'structure'
         expect(@card.errors[:codename].first).to match(/already in use/)
       end
     end
-    
+
   end
-  
+
   describe 'repair_key' do
     it 'should fix broken keys' do
       a = Card['a']
       a.update_column 'key', 'broken_a'
       a.expire
-      
+
       a = Card.find a.id
       expect(a.key).to eq('broken_a')
       a.repair_key

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

@@ -47,13 +47,13 @@ class Card
 
     def relevant_drafts_for card
       drafts.select do |action|
-        card.included_card_ids.include?(action.card_id) || (card == action.card)
+        card.included_card_ids.include?(action.card_id) || (card.id == action.card_id)
       end
     end
 
     def relevant_actions_for card, with_drafts=false
       actions.select do |action|
-        card.included_card_ids.include?(action.card_id) || (card == action.card)
+        card.included_card_ids.include?(action.card_id) || (card.id == action.card_id)
       end
     end
 

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

@@ -16,6 +16,12 @@ class Card
     # replace with enum if we start using rails 4
     TYPE = [:create, :update, :delete]
 
+    def expire
+      self.class.cache.delete id.to_s
+    end
+
+    after_save :expire
+
     class << self
       def cache
         Card::Cache[Action]
@@ -27,7 +33,6 @@ class Card
         end
       end
 
-
       def delete_cardless
         Card::Action.joins('LEFT JOIN cards ON card_actions.card_id = cards.id').where('cards.id IS NULL').delete_all
       end
@@ -174,10 +179,14 @@ class Card
 
     def content_diff_builder opts=nil
       @content_diff_builder ||= begin
-        Card::Diff::DiffBuilder.new(old_values[:content], new_values[:content], opts || card.diff_args)
+        Card::Diff::DiffBuilder.new(old_values[:content], new_values[:content], opts || card.include_set_modules.diff_args)
       end
     end
 
+    def card
+      Card.fetch card_id, look_in_trash: true
+    end
+
   end
 end
 

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

@@ -5,13 +5,14 @@ def select_action_by_params params
 end
 
 def find_action_by_params args
-  case
-  when args[:rev]
+  if args[:rev]
     nth_action args[:rev]
-  when args[:rev_id]
+  elsif args[:rev_id] =~ /^\d+$/
     if action = Action.fetch(args[:rev_id]) and action.card_id == id
       action
     end
+  elsif args[:rev_id]  # revision id is probalby a mod (e.g. if you request files/:logo/05_standard.png)
+    last_action
   end
 end
 

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

@@ -56,7 +56,7 @@ end
 
 def selected_content_action_id
   @selected_action_id ||
-  (@current_action and @current_action.new_content? and @current_action.id) ||
+ (@current_action && (new_card? || @current_action.new_content? || db_content_changed?) && @current_action.id) ||
   last_content_action_id
 end
 

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

@@ -4,74 +4,43 @@ 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
+event :assign_act,  :before=>:approve, :when=>proc {|c| c.history?}  do
   @current_act = (@supercard && @supercard.current_act) || Card::Act.create(:ip_address=>Env.ip)
+end
+
+event :assign_action, :after=>:assign_act do
   @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
+
+# stores changes in the changes table and assigns them to the current action
+# removes the action if there are no changes
+event :finalize_action, :after =>:stored, :when=>proc {|c| c.history? && c.current_action} do
+  @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
 
-
-# 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)
+event :finalize_act, :after=>:finalize_action, :when=>proc {|c| c.history? && !c.supercard } do
+  if @current_act.actions(true).empty?
+    @current_act.delete
+    @current_act = nil
   else
-    acts.build(:ip_address=>Env.ip)
-  end
-  @current_action = actions(true).build(:action_type=>@action, :draft=>(Env.params['draft'] == 'true') )
-  @current_action.act = @current_act
-
-  if (@supercard and @supercard !=self)
-    @current_action.super_action = @supercard.current_action
+    @current_act.update_attributes! :card_id=>id
   end
 end
 
 
-
-
-
-
-event :rollback_actions, :before=>:approve, :on=>:update, :when=>proc{ |c| c.history? && Env && Env.params['action_ids'] && Env.params['action_ids'].class == Array} do
+event :rollback_actions, :before=>:approve, :on=>:update, :when=>proc{ |c| c.rollback_request? } do
   revision = { :subcards => {}}
   rollback_actions = Env.params['action_ids'].map do |a_id|
     Action.fetch(a_id) || nil
@@ -86,12 +55,31 @@ event :rollback_actions, :before=>:approve, :on=>:update, :when=>proc{ |c| c.his
   Env.params['action_ids'] = nil
   update_attributes! revision
   rollback_actions.each do |action|
-    action.card.attachment_symlink_to action.id
+    action.card.try :symlink_to, action.id
   end
   clear_drafts
   abort :success
 end
 
+def rollback_request?
+  history? && Env && Env.params['action_ids'] && Env.params['action_ids'].class == Array
+end
+
+# alternative approach to handle act and action that doesn't change the database in the beginning
+# stopped working with Rails 4
+# 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(true).build(:action_type=>@action, :draft=>(Env.params['draft'] == 'true') )
+#   @current_action.act = @current_act
+#
+#   if (@supercard and @supercard !=self)
+#     @current_action.super_action = @supercard.current_action
+#   end
+# end
 
 
 def intrusive_family_acts args={}   # all acts with actions on self and on cards that are descendants of self and included in self
@@ -108,7 +96,7 @@ end
 
 def current_rev_nr
   @current_rev_nr ||= begin
-    @intrusive_acts.first.actions.last.draft ? @intrusive_acts.size - 1 : @intrusive_acts.size
+    intrusive_acts.first.actions.last.draft ? @intrusive_acts.size - 1 : @intrusive_acts.size
   end
 end
 
@@ -154,7 +142,7 @@ format :html do
   def history_legend
     intr = card.intrusive_acts.page(params['page']).per(REVISIONS_PER_PAGE)
     render_haml :intr=>intr do
-      %{
+      <<-HAML
 .history-header
   %span.slotter
     = paginate intr, :remote=>true, :theme=>'twitter-bootstrap-3'
@@ -166,7 +154,7 @@ format :html do
     %span.glyphicon.glyphicon-minus-sign.diff-red
     %span
       = Card::Diff.render_deleted_chunk("Deleted")
-      }
+      HAML
     end
   end
 
@@ -187,7 +175,7 @@ format :html do
       render_haml :card=>card, :act=>act, :act_view=>act_view,
                   :current_rev_nr=>current_rev_nr, :rev_nr=>rev_nr,
                   :hide_diff=> hide_diff do
-        %{
+        <<-HAML
 .act{:style=>"clear:both;"}
   .head
     .nr
@@ -214,7 +202,7 @@ format :html do
   .action-container{:style=>("clear: left;" if act_view == :expanded)}
     - act.relevant_actions_for(card).each do |action|
       = send("_render_action_#{ act_view }", :action=>action )
-      }
+HAML
       end
     end
   end
@@ -236,7 +224,7 @@ format :html do
       else
         link_to name_changes(action, hide_diff),
                 path(:view=>:related, :related=>{:view=>"history",:name=>action.card.name}),
-                :class=>'slotter label-label-default',
+                :class=>'slotter label label-default',
                 'data-slot-selector'=>".card-slot.history-view",
                 :remote=>true
       end
@@ -254,14 +242,14 @@ format :html do
                 :name_diff => name_diff,
                 :type_diff => type_diff,
                 :content_diff => content_diff do
-      %{
+      <<-HAML
 .action
   .summary
     %span.ampel
       = glyphicon 'minus-sign', (action.red? ? 'diff-red' : 'diff-invisible')
       = glyphicon 'plus-sign', (action.green? ? 'diff-green' : 'diff-invisible')
     = wrap_diff :name, name_diff
-    = wrap_diff :type, type_diff if type_diff
+    = wrap_diff :type, type_diff
     -if content_diff
       = glyphicon 'arrow-right', 'arrow'
       -if action_view == :summary
@@ -269,14 +257,14 @@ format :html do
   -if content_diff and action_view == :expanded
     .expanded
       = wrap_diff :content, content_diff
-       }
+HAML
     end
   end
 
   def wrap_diff field, content
     if content.present?
       %{
-         <span class="#{field}-diff#{ ' label label-default' if field == :name }">
+         <span class="#{field}-diff">
          #{content}
          </span>
       }
@@ -314,9 +302,10 @@ format :html do
     end
   end
 
-  def rollback_link action_ids
-    if card.ok?(:update)
-      "| " + link_to('Save as current', path(:action=>:update, :view=>:open, :action_ids=>action_ids),
+  def rollback_link actions
+    not_current = actions.select { |action| action.card.last_action_id != action.id }
+    if card.ok?(:update) && not_current.present?
+      "| " + link_to('Save as current', path(:action=>:update, :view=>:open, :action_ids=>not_current),
         :class=>'slotter','data-slot-selector'=>'.card-slot.history-view', :remote=>true, :method=>:post, :rel=>'nofollow')
     end
   end