card 1.17.1 → 1.17.2

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

@@ -3,31 +3,39 @@ class Card
   class Change < ActiveRecord::Base
     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
+    class << self
+      def delete_actionless
+        joins(
+          'LEFT JOIN card_actions '\
+          'ON card_changes.card_action_id = card_actions.id '
+        ).where(
+          'card_actions.id is null'
+        ).find_in_batches do |group|
+          # used to be .delete_all here, but that was failing on large dbs
+          puts 'deleting batch of changes'
+          where("id in (#{group.map(&:id).join ','})").delete_all
+        end
+      end
 
-    def field
-      Card::TRACKED_FIELDS[read_attribute(:field)]
+      def field_index value
+        value.is_a?(Integer) ? value : TRACKED_FIELDS.index(value.to_s)
+      end
+
+      def find_by_field_name value
+        find_by_field field_index(value)
+      end
     end
 
-    def self.delete_actionless
-      Card::Change.where(
-        "card_action_id NOT IN (?)",
-        Card::Action.pluck("id"),
-      ).delete_all
+    def field= value
+      write_attribute(:field, TRACKED_FIELDS.index(value.to_s))
     end
 
-    def find_by_field_name(value)
-      index = value.is_a?(Integer) ? value : Card::TRACKED_FIELDS.index(value.to_s)
-      find_by_field(index)
+    def field
+      TRACKED_FIELDS[read_attribute(:field)]
     end
 
-    def self.find_by_field_name(value)
-      index = value.is_a?(Integer) ? value : Card::TRACKED_FIELDS.index(value.to_s)
-      find_by_field(index)
+    def find_by_field_name value
+      find_by_field self.class.field_index(value)
     end
   end
 end
-
-

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

@@ -227,7 +227,7 @@ format :html do
           %em.label.label-info
             Current
         - elsif act_view == :expanded
-          = rollback_link act.relevant_actions_for(card, draft)
+          = rollback_link act.relevant_actions_for(card)
           = show_or_hide_changes_link hide_diff, act_id: act.id, act_view: act_view, rev_nr: rev_nr, current_rev_nr: current_rev_nr
   .toggle
     = fold_or_unfold_link act_id: act.id, act_view: act_view, rev_nr: rev_nr, current_rev_nr: current_rev_nr

data/mod/04_settings/set/right/structure.rb

@@ -14,7 +14,7 @@ event :update_structurees_references,
       when: proc { |c| c.db_content_changed? || c.action == :delete } do
   return unless (statement = structuree_statement)
   Auth.as_bot do
-    Card::Query.run(statement).each(&:update_references)
+    Card::Query.run(statement).each(&:update_references_out)
   end
 end
 

data/mod/05_email/set/all/notify.rb

@@ -73,7 +73,7 @@ def notable_change?
 end
 
 event :notify_followers_after_save,
-      after: :subsequent, on: :save, when: proc { |ca| ca.notable_change? } do
+      after: :extend, on: :save, when: proc { |ca| ca.notable_change? } do
   notify_followers
 end
 

data/mod/05_email/spec/set/right/followers_spec.rb

@@ -37,7 +37,7 @@ describe Card::Set::Right::Followers do
 
     it 'recognizes card name changes' do
       @card = Card['Look At Me']
-      @card.update_referencers = true
+      @card.update_referers = true
       @card.update_attributes! name: 'Look away'
       is_expected.to eq ['Big Brother']
     end

data/mod/05_standard/set/all/rich_html/editing.rb

@@ -30,22 +30,25 @@ format :html do
       # name is ready and will show up in title
       hidden[:card][:name] ||= card.name
     else
-      # name is not ready; need generic title
-      args[:title] ||= if card.type_id == Card.default_type_id
-                         'New'
-                       else
-                         "New #{card.type_name}"
-                       end
+      args[:title] ||= generic_new_card_title
       # FIXME: - overrides nest args
       unless card.rule_card :autoname
         # prompt for name
-        hidden[:name_prompt] = true unless hidden.has_key? :name_prompt
+        hidden[:name_prompt] = true unless hidden.key? :name_prompt
         args[:optional_name_formgroup] ||= :show
       end
     end
     args[:optional_name_formgroup] ||= :hide
   end
 
+  def generic_new_card_title
+    if card.type_id == Card.default_type_id
+      "New #{card.type_name}"
+    else
+      'New'
+    end
+  end
+
   def default_new_args_for_type_field args
     if show_type_formgroup?(args)
       args[:optional_type_formgroup] = :show
@@ -63,11 +66,10 @@ format :html do
 
   def default_new_args_buttons args
     cancel_path = !main? && path(view: :missing)
-    args[:buttons] ||= %{
-      #{submit_button class: 'create-submit-button'}
-      #{cancel_button class: 'create-cancel-button',
-                      href: cancel_path}
-    }
+    args[:buttons] ||= [
+      submit_button(class: 'create-submit-button'),
+      cancel_button(class: 'create-cancel-button', href: cancel_path)
+    ].join "\n"
   end
 
   view :edit, perms: :update, tags: :unknown_ok do |args|
@@ -110,49 +112,45 @@ format :html do
     if referers.any? || descendants.any?
       msg << rename_info(referers, descendants)
     end
-    alert 'warning' do
-      msg
-    end
+    alert('warning') { msg }
   end
 
   def rename_info referers, descendants
-    msg = '<h6>This change will...</h6>'
-    msg << '<ul>'
-    if descendants.any?
-      msg << "<li>automatically alter #{descendants.size} related name(s)." \
-             '</li>'
-    end
-    if referers.any?
-      msg << "<li>affect at least #{referers.size} reference(s) to " \
-             "\"#{card.name}\".</li>"
+    effects = []
+    options = ''
+    if descendants.any? # FIXME: count, don't instantiate
+      effects << "automatically alter #{descendants.size} related name(s)."
     end
-    msg << '</ul>'
-    if referers.any?
-      msg << '<p>You may choose to <em>update or ignore</em> the references.' \
-             '</p>'
+    if referers.any? # FIXME: count, don't instantiate
+      count = referers.size
+      refs = count == 1 ? 'reference' : 'references'
+      effects << "affect at least #{count} #{refs} to \"#{card.name}\""
+      options = 'You may choose to <em>update or ignore</em> the referers.'
     end
-    msg
+    effects = effects.map { |effect| "<li>#{effect}</li>" }
+    "<h6>This change will...</h6><ul>#{effects}</ul><p>#{options}</p>"
   end
 
   def default_edit_name_args args
-    referers = args[:referers] = card.extended_referencers
+    referers = args[:referers] = card.family_referers
     args[:hidden] ||= {}
     args[:hidden].reverse_merge!(
       success:  '_self',
       old_name: card.name,
-      referers: referers.size,
-      card:     { update_referencers: false }
+      referers: referers.size, # FIXME: count, don't instantiate
+      card:     { update_referers: false }
     )
     args[:optional_toolbar] ||= :show
-    args[:buttons] =
-      %{
-        #{submit_button text: 'Rename and Update', disable_with: 'Renaming',
-                        class: 'renamer-updater'}
-        #{button_tag 'Rename',
-                     data: { disable_with: 'Renaming' },
-                     class: 'renamer'}
-        #{cancel_button href: path}
-      }
+    args[:buttons] = default_rename_buttons
+  end
+
+  def default_rename_buttons
+    [submit_button(text: 'Rename and Update',
+                   disable_with: 'Renaming',
+                   class: 'renamer-updater'),
+     button_tag('Rename', data: { disable_with: 'Renaming' }, class: 'renamer'),
+     cancel_button(href: path)
+    ].join "\n"
   end
 
   view :edit_type, perms: :update do |args|
@@ -170,10 +168,9 @@ format :html do
     args[:variety] = :edit # YUCK!
     args[:optional_toolbar] ||= :show
     args[:hidden] ||= { success: { view: :edit } }
-    args[:buttons] = %{
-      #{submit_button}
-      #{cancel_button href: path(view: :edit)}
-    }
+    args[:buttons] = [
+      submit_button, cancel_button(href: path(view: :edit))
+    ].join "\n"
   end
 
   view :edit_rules, tags: :unknown_ok do |args|

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

@@ -32,7 +32,7 @@ event :create_listed_by_cards,
     if !Card[listed_by_name]
       add_subcard listed_by_name, type_id: ListedByID
     else
-      Card[listed_by_name].update_references
+      Card[listed_by_name].update_references_out
     end
   end
 end
@@ -92,7 +92,7 @@ def update_listed_by_cache_for item_keys, args={}
     if Card::Cache[Card::Set::Type::ListedBy].exist? key
       if (card = Card.fetch(key))
         card.update_cached_list
-        card.update_references
+        card.update_references_out
       else
         Card::Cache[Card::Set::Type::ListedBy].delete key
       end

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

@@ -32,11 +32,11 @@ describe Card::Set::Self::All do
     it 'should be trigger reference repair' do
       Card::Auth.as_bot do
         a = Card['A']
-        puts a.references_to.count
+        puts a.references_out.count
         Card::Env.params[:task] = :repair_references
-        puts a.references_to.count
+        puts a.references_out.count
         @all.update_attributes({})
-        puts a.references_to.count
+        puts a.references_out.count
 
       end
     end

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

@@ -66,7 +66,7 @@ describe Card::Set::Type::List do
     context 'when the name of Stam Broker changed to Stam Trader' do
       before do
         Card['Stam Broker'].update_attributes!(
-          name: 'Stam Trader', update_referencers: true
+          name: 'Stam Trader', update_referers: true
         )
       end
       it { is_expected.to eq ['Darles Chickens', 'Stam Trader'] }
@@ -123,7 +123,7 @@ describe Card::Set::Type::List do
   context 'when the name of the cardtype books changed' do
     before do
       Card['book'].update_attributes!(
-        type_id: Card::BasicID, update_referencers: true
+        type_id: Card::BasicID, update_referers: true
       )
     end
     it { is_expected.to eq ['Darles Chickens', 'Stam Broker'] }
@@ -132,7 +132,7 @@ describe Card::Set::Type::List do
   context 'when the name of the cardtype authors changed' do
     before do
       Card['author'].update_attributes!(
-        type_id: Card::BasicID, update_referencers: true
+        type_id: Card::BasicID, update_referers: true
       )
     end
     it { is_expected.to eq ['Darles Chickens', 'Stam Broker'] }

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

@@ -106,7 +106,7 @@ describe Card::Set::Type::ListedBy do
           Card::Auth.as_bot do
             Card['Parry Hotter'].update_attributes!(
               name: 'Parry Moppins',
-              update_referencers: true
+              update_referers: true
             )
           end
         end
@@ -117,7 +117,7 @@ describe Card::Set::Type::ListedBy do
         before do
           Card['Darles Chickens'].update_attributes!(
             name: 'Darles Eggs',
-            update_referencers: true
+            update_referers: true
           )
         end
         subject { Card.fetch('Darles Eggs+books').item_names.sort }

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

@@ -44,7 +44,7 @@ describe Card::Set::Type::SearchType do
     end
 
     it 'updates query if referee changed' do
-      Card['Y'].update_attributes! name: 'YYY', update_referencers: true
+      Card['Y'].update_attributes! name: 'YYY', update_referers: true
       expect(subject.content).to eq '{"name":"YYY"}'
     end
 

data/spec/lib/card/reference_spec.rb

@@ -37,14 +37,14 @@ describe Card::Reference do
     newcard 'Submarine', '[[Yellow]]'
     newcard 'Sun', '[[Yellow]]'
     newcard 'Yellow'
-    yellow_refs = Card['Yellow'].referencers.map(&:name).sort
+    yellow_refs = Card['Yellow'].referers.map(&:name).sort
     expect(yellow_refs).to eq(%w{ Banana Submarine Sun })
 
     y = Card['Yellow']
     y.type_id = Card.fetch_id 'UserForm'
     y.save!
 
-    yellow_refs = Card['Yellow'].referencers.map(&:name).sort
+    yellow_refs = Card['Yellow'].referers.map(&:name).sort
     expect(yellow_refs).to eq(%w{ Banana Submarine Sun })
   end
 
@@ -61,7 +61,7 @@ describe Card::Reference do
     @e = newcard('Earthman')
     @e.update_attributes! name: 'Ethan' # NOW there is an Ethan card
     #  do we need the links to be caught before reloading the card?
-    expect(Card['Ethan'].referencers.map(&:name).include?('L')).not_to eq(nil)
+    expect(Card['Ethan'].referers.map(&:name).include?('L')).not_to eq(nil)
   end
 
   it 'should update references on rename when requested' do
@@ -70,18 +70,18 @@ describe Card::Reference do
     lew = newcard('Lew', 'likes [[watermelon]] and [[watermelon+seeds|seeds]]')
 
     watermelon = Card['watermelon']
-    watermelon.update_referencers = true
+    watermelon.update_referers = true
     watermelon.name = 'grapefruit'
     watermelon.save!
     result = 'likes [[grapefruit]] and [[grapefruit+seeds|seeds]]'
     expect(lew.reload.content).to eq(result)
   end
 
-  it 'should update referencers on rename when requested (case 2)' do
+  it 'should update referers on rename when requested (case 2)' do
     card = Card['Administrator Menu+*self+*read']
     old_refs = Card::Reference.where(referee_id: Card::AdministratorID)
 
-    card.update_referencers = true
+    card.update_referers = true
     card.name = 'Administrator Menu+*type+*read'
     card.save
 
@@ -90,37 +90,39 @@ describe Card::Reference do
   end
 
   it 'should not update references when not requested' do
-    newcard 'watermelon', 'mmmm'
-    newcard 'watermelon+seeds', 'black'
+    watermelon = newcard 'watermelon', 'mmmm'
+    watermelon_seeds = newcard 'watermelon+seeds', 'black'
     lew = newcard('Lew', 'likes [[watermelon]] and [[watermelon+seeds|seeds]]')
 
-    assert_equal [1, 1, 1, 1], lew.references_to.map(&:present),
-                 'links should not be Wanted before'
+    assert_equal [watermelon.id, watermelon_seeds.id],
+                 lew.references_out.order(:id).map(&:referee_id),
+                 'should store referee ids'
 
     watermelon = Card['watermelon']
-    watermelon.update_referencers = false
+    watermelon.update_referers = false
     watermelon.name = 'grapefruit'
     watermelon.save!
+
     correct_content = 'likes [[watermelon]] and [[watermelon+seeds|seeds]]'
     expect(lew.reload.content).to eq(correct_content)
 
-    ref_types = lew.references_to.order(:id).map(&:ref_type)
-    assert_equal ref_types, ['L', 'P', 'P', 'L'], 'links should be a LINK'
-    refs_are_present = lew.references_to.order(:id).map(&:present)
-    assert_equal refs_are_present, [0, 0, 1, 0],
-                 'only reference to +seeds should be present'
+    ref_types = lew.references_out.order(:id).map(&:ref_type)
+    assert_equal ref_types, %w(L L P), 'need partial references!'
+    actual_referee_ids = lew.references_out.order(:id).map(&:referee_id)
+    assert_equal actual_referee_ids, [nil, nil, Card.fetch_id('seed')],
+                 'only partial reference to "seeds" should have referee_id'
   end
 
   it 'update referencing content on rename junction card' do
     @ab = Card['A+B'] # linked to from X, included by Y
-    @ab.update_attributes! name: 'Peanut+Butter', update_referencers: true
+    @ab.update_attributes! name: 'Peanut+Butter', update_referers: true
     @x = Card['X']
     expect(@x.content).to eq('[[A]] [[Peanut+Butter]] [[T]]')
   end
 
   it 'update referencing content on rename junction card' do
     @ab = Card['A+B'] # linked to from X, included by Y
-    @ab.update_attributes! name: 'Peanut+Butter', update_referencers: false
+    @ab.update_attributes! name: 'Peanut+Butter', update_referers: false
     @x = Card['X']
     expect(@x.content).to eq('[[A]] [[A+B]] [[T]]')
   end
@@ -139,7 +141,7 @@ describe Card::Reference do
   it 'simple link' do
     Card.create name: 'alpha'
     Card.create name: 'beta', content: 'I link to [[alpha]]'
-    expect(Card['alpha'].referencers.map(&:name)).to eq(['beta'])
+    expect(Card['alpha'].referers.map(&:name)).to eq(['beta'])
     expect(Card['beta'].referees.map(&:name)).to eq(['alpha'])
   end
 
@@ -147,7 +149,7 @@ describe Card::Reference do
     Card.create! name: 'alpha card'
     Card.create! name: 'beta card', content: 'I link to [[alpha_card]]'
     expect(Card['beta card'].referees.map(&:name)).to eq(['alpha card'])
-    expect(Card['alpha card'].referencers.map(&:name)).to eq(['beta card'])
+    expect(Card['alpha card'].referers.map(&:name)).to eq(['beta card'])
   end
 
   it 'simple inclusion' do
@@ -161,7 +163,7 @@ describe Card::Reference do
     Card.create name: 'alpha'
     Card.create name: 'beta', content: 'I link to [[alpha|ALPHA]]'
     expect(Card['beta'].referees.map(&:name)).to eq(['alpha'])
-    expect(Card['alpha'].referencers.map(&:name)).to eq(['beta'])
+    expect(Card['alpha'].referers.map(&:name)).to eq(['beta'])
   end
 
   it 'query' do
@@ -170,8 +172,8 @@ describe Card::Reference do
       name: 'search with references',
       content: '{"name":"X", "right_plus":["Y",{"content":["in","A","B"]}]}'
     )
-    y_referencers = Card['Y'].referencers.map &:name
-    expect(y_referencers).to include('search with references')
+    y_referers = Card['Y'].referers.map(&:name)
+    expect(y_referers).to include('search with references')
 
     search_referees = Card['search with references'].referees.map(&:name).sort
     expect(search_referees).to eq(%w{ A B X Y })
@@ -179,13 +181,13 @@ describe Card::Reference do
 
   it 'handles contextual names in Basic cards' do
     Card.create type: 'Basic', name: 'basic w refs', content: '{{_+A}}'
-    Card['A'].update_attributes! name: 'AAA', update_referencers: true
+    Card['A'].update_attributes! name: 'AAA', update_referers: true
     expect(Card['basic w refs'].content).to eq '{{_+AAA}}'
   end
 
   it 'handles contextual names in Search cards' do
     Card.create type: 'Search', name: 'search w refs', content: '{"name":"_+A"}'
-    Card['A'].update_attributes! name: 'AAA', update_referencers: true
+    Card['A'].update_attributes! name: 'AAA', update_referers: true
     expect(Card['search w refs'].content).to eq '{"name":"_+AAA"}'
   end
 
@@ -197,8 +199,8 @@ describe Card::Reference do
   it 'pickup new links on create' do
     @l = newcard('woof', '[[Lewdog]]')  # no Lewdog card yet...
     @e = newcard('Lewdog')              # now there is
-    # NOTE @e.referencers does not work, you have to reload
-    expect(@e.reload.referencers.map(&:name).include?('woof')).not_to eq(nil)
+    # NOTE @e.referers does not work, you have to reload
+    expect(@e.reload.referers.map(&:name).include?('woof')).not_to eq(nil)
   end
 
   it 'pickup new inclusions on create' do
@@ -206,6 +208,6 @@ describe Card::Reference do
     # no Lewdog card yet...
     @e = Card.new name: 'Lewdog', content: 'grrr'
     # now it's inititated
-    expect(@e.name_referencers.map(&:name).include?('woof')).not_to eq(nil)
+    expect(@e.name_referers.map(&:name).include?('woof')).not_to eq(nil)
   end
 end