card 1.96.7 → 1.96.8

data/mod/core/spec/set/all/codename_spec.rb

@@ -3,13 +3,13 @@ describe Card::Set::All::Codename do
     let(:card) { Card["a"] }
 
     it "requires admin permission" do
-      card.update_attributes codename: "structure"
+      card.update codename: "structure"
       expect(card.errors[:codename].first).to match(/only admins/)
     end
 
     it "checks uniqueness" do
       Card::Auth.as_bot do
-        card.update_attributes codename: "structure"
+        card.update codename: "structure"
         expect(card.errors[:codename].first).to match(/already in use/)
       end
     end

data/mod/core/spec/set/all/event_conditions_spec.rb

@@ -18,7 +18,7 @@ RSpec.describe Card::Set::All::EventConditions do
     end
 
     def change_content
-      Card["A"].update_attributes! content: "changed content"
+      Card["A"].update! content: "changed content"
     end
 
     before do
@@ -57,12 +57,11 @@ RSpec.describe Card::Set::All::EventConditions do
           test_event :validate, on: :update, trigger: :required, for: "A" do
             add_to_log "triggered"
           end
-          Card["A"].update_attributes! content: "changed content"
+          Card["A"].update! content: "changed content"
 
           aggregate_failures do
             expect(@log).to be_empty
-            Card["A"].update_attributes! content: "changed content",
-                                         trigger: :test_event_0
+            Card["A"].update! content: "changed content", trigger: :test_event_0
             expect(@log).to contain_exactly "triggered"
           end
         end
@@ -75,11 +74,11 @@ RSpec.describe Card::Set::All::EventConditions do
           test_event :validate, on: :update, skip: :allowed, for: "A" do
             add_to_log "executed"
           end
-          Card["A"].update_attributes! content: "changed content", skip: :test_event_0
+          Card["A"].update! content: "changed content", skip: :test_event_0
 
           aggregate_failures do
             expect(@log).to be_empty
-            Card["A"].update_attributes! content: "changed content"
+            Card["A"].update! content: "changed content"
             expect(@log).to contain_exactly "executed"
           end
         end
@@ -90,14 +89,14 @@ RSpec.describe Card::Set::All::EventConditions do
           test_event :validate, on: :update, skip: :allowed, for: "A+B" do
             add_to_log "not skipped"
           end
-          Card["A"].update_attributes! content: "changed content",
-                                       skip: :test_event_0,
-                                       subcards: { "+B" => "changed +B content" }
+          Card["A"].update! content: "changed content",
+                            skip: :test_event_0,
+                            subcards: { "+B" => "changed +B content" }
 
           aggregate_failures do
             expect(@log).to be_empty
-            Card["A"].update_attributes! content: "changed content",
-                                         subcards: { "+B" => "changed +B content" }
+            Card["A"].update! content: "changed content",
+                              subcards: { "+B" => "changed +B content" }
             expect(@log).to contain_exactly "not skipped"
           end
         end
@@ -108,14 +107,14 @@ RSpec.describe Card::Set::All::EventConditions do
           test_event :validate, on: :update, skip: :allowed do
             add_to_log "#{name} not skipped"
           end
-          Card["A"].update_attributes! content: "changed content",
-                                       skip_in_action: :test_event_0,
-                                       subcards: { "+B" => "changed +B content" }
+          Card["A"].update! content: "changed content",
+                            skip_in_action: :test_event_0,
+                            subcards: { "+B" => "changed +B content" }
 
           aggregate_failures do
             expect(@log).to contain_exactly "A+B not skipped"
-            Card["A"].update_attributes! content: "changed content",
-                                         subcards: { "+B" => "changed +B content" }
+            Card["A"].update! content: "changed content",
+                              subcards: { "+B" => "changed +B content" }
             expect(@log).to contain_exactly "A+B not skipped",
                                             "A not skipped",
                                             "A+B not skipped"

data/mod/core/spec/set/all/name_events_spec.rb

@@ -2,7 +2,7 @@ describe Card::Set::All::NameEvents do
   describe "event: set_name" do
     it "handles case variants" do
       c = Card.create! name: "chump"
-      c.update_attributes! name: "Chump"
+      c.update! name: "Chump"
       expect(c.name).to eq("Chump")
     end
 
@@ -10,7 +10,7 @@ describe Card::Set::All::NameEvents do
       let(:card) { Card.create! name: "four+five" }
 
       before do
-        card.update_attributes! name: "nine"
+        card.update! name: "nine"
       end
 
       it "assigns the cardname" do

data/mod/core/spec/set/all/observer_spec.rb

@@ -19,7 +19,7 @@ describe Card::Set::All::Observer do
                    content: "[[mail template]]"
     end
     card = Card.fetch "mail test"
-    expect { Card::Auth.as_bot { card.update_attributes(content: "test") } }
+    expect { Card::Auth.as_bot { card.update(content: "test") } }
       .to change { Mail::TestMailer.deliveries.count }.by(1)
   end
 

data/mod/core/spec/set/all/permissions_spec.rb

@@ -227,7 +227,7 @@ RSpec.describe Card::Set::All::Permissions do
       # set up cards of type TestType, 2 with nil reader, 1 with role1 reader
       Card::Auth.as_bot do
         [@c1, @c2, @c3].each do |c|
-          c.update_attributes content: "WeirdWord"
+          c.update content: "WeirdWord"
         end
         Card.create(name: "c1+*self+*read", type: "Pointer", content: "[[u1]]")
       end
@@ -251,7 +251,7 @@ RSpec.describe Card::Set::All::Permissions do
       # set up cards of type TestType, 2 with nil reader, 1 with role1 reader
       Card::Auth.as_bot do
         [@c1, @c2, @c3].each do |c|
-          c.update_attributes content: "WeirdWord"
+          c.update content: "WeirdWord"
         end
         Card.create(name: "c1+*self+*read", type: "Pointer", content: "[[r3]]")
       end
@@ -374,7 +374,7 @@ RSpec.describe Card::Set::All::Permissions do
     example "changing cardtype needs new cardtype's create permission", with_user: "u2" do
       # u3 can update but not create cardtype b
       c = Card["basicname"]
-      c.update_attributes type: "cardtype_b"
+      c.update type: "cardtype_b"
 
       expect(c.errors[:permission_denied])
         .to include(/You don't have permission to change to this type/)

data/mod/core/spec/set/all/references_spec.rb

@@ -46,7 +46,7 @@ RSpec.describe Card::Set::All::References do
 
   describe "event :update_referer_content" do
     it "handles self references" do
-      Card["A"].update_attributes! name: "AAA", update_referers: true
+      Card["A"].update! name: "AAA", update_referers: true
       expect(Card["X"].content).to eq("[[AAA]] [[AAA+B]] [[T]]")
     end
   end

data/mod/core/spec/set/all/rename_spec.rb

@@ -107,7 +107,7 @@ RSpec.describe Card::Set::All::Rename do
     end
 
     c = Card["Joe Card"]
-    c.update_attributes! name: "Card of Joe", update_referers: true
+    c.update! name: "Card of Joe", update_referers: true
     assert_equal "[[Card of Joe]]", Card["Admin Card"].content
   end
 
@@ -118,7 +118,7 @@ RSpec.describe Card::Set::All::Rename do
       Card.create! name: "Fruit+*type+*structure", content: "this [[Pit]]"
 
       assert_equal "this [[Pit]]", Card["Orange"].content
-      c.update_attributes! name: "Seed", update_referers: true
+      c.update! name: "Seed", update_referers: true
       assert_equal "this [[Seed]]", Card["Orange"].content
     end
   end

data/mod/core/spec/set/all/trash_spec.rb

@@ -66,7 +66,7 @@ describe Card::Set::All::Trash do
     # @signup =
     #   create_signup "born to die",
     #                 "+*account" => { "+*email" => "wolf@wagn.org", "+*password" => "wolf" }
-    # @signup.update_attributes!({})
+    # @signup.update!({})
     # Card::Cache.reset_all
     #
     # Card::Auth.as_bot do

data/mod/follow/set/all/follow/follow_link.rb

@@ -1,6 +1,12 @@
 format do
   def show_follow?
-    Auth.signed_in? && !card.new_card? && card.followable?
+    follower? && !card.new_card? && card.followable?
+  end
+
+  def follower?
+    # only User cards can follow until preferences are generalized to all
+    # accounted cards.
+    Auth.signed_in? && Auth.current.type_id == UserID
   end
 
   def follow_link_hash

data/mod/follow/spec/set/all/notify_spec.rb

@@ -149,11 +149,11 @@ RSpec.describe Card::Set::All::Notify do
     end
 
     def update card_name, new_content="updated content"
-      Card[card_name].update_attributes! content: new_content
+      Card[card_name].update! content: new_content
     end
 
     def update_name card_name, new_name="updated content"
-      Card[card_name].update_attributes! name: new_name, update_referers: true
+      Card[card_name].update! name: new_name, update_referers: true
     end
 
     def self.notify_on_create user, trigger, create_name

data/mod/follow/spec/set/right/account_spec.rb

@@ -32,8 +32,8 @@ describe "#send_change_notice" do
       u2.add_item "A"
 
       a = Card.fetch "A"
-      a.update_attributes(content: "new content",
-                          subcards: { "+B" => { content: "hidden content" } })
+      a.update content: "new content",
+               subcards: { "+B" => { content: "hidden content" } }
     end
 
     it "sends no email if changes not visible" do

data/mod/follow/spec/set/right/followers_spec.rb

@@ -39,7 +39,7 @@ RSpec.describe Card::Set::Right::Followers do
     it "recognizes card name changes" do
       card = Card["Look At Me"]
       card.update_referers = true
-      card.update_attributes! name: "Look away"
+      card.update! name: "Look away"
       expect(followers_of(card)).to eq ["Big Brother"]
     end
 
@@ -96,7 +96,7 @@ RSpec.describe Card::Set::Right::Followers do
 
         card = Card.create! name: "edited by Sara"
         Card::Auth.current_id = Card["Sara"].id
-        card.update_attributes! content: "some content"
+        card.update! content: "some content"
         expect(followers_of(card)).to include("Sara")
       end
     end

data/mod/follow/spec/set/self/follow_defaults_spec.rb

@@ -6,7 +6,7 @@ describe Card::Set::Self::FollowDefaults do
       Card::Auth.as_bot do
         card = Card[:follow_defaults]
         card.update_all_users = true
-        card.update_attributes! content: "[[A+*self+*always]]"
+        card.update! content: "[[A+*self+*always]]"
       end
     end
 

data/mod/follow/spec/set/type/notification_template_spec.rb

@@ -27,7 +27,7 @@ RSpec.describe Card::Set::Type::NotificationTemplate do
       it "is called on update" do
         notify_card = Card["success"]
         allow(notify_card).to receive(:deliver)
-        Card["A"].update_attributes! content: "change"
+        Card["A"].update! content: "change"
         expect(notify_card).to have_received(:deliver).once
       end
     end

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

@@ -39,7 +39,7 @@ end
 def make_last_action_the_initial_action
   delete_all_changes
   old_actions.delete_all
-  last_action.update_attributes! action_type: :create
+  last_action.update! action_type: :create
 end
 
 def clear_history

data/mod/history/set/all/history/act_listing.rb

@@ -23,8 +23,9 @@ format :html do
   end
 
   def act_list acts, context
+    fmt = context == :relative ? self : act.card.format(:html)
     act_accordion acts, context do |act, seq|
-      act.card.format(:html).act_listing act, seq, context
+      fmt.act_listing act, seq, context
     end
   end
 

data/mod/history/set/all/history/events.rb

@@ -33,7 +33,7 @@ end
 # removes the action if there are no changes
 event :finalize_action, :finalize, when: :finalize_action? do
   if changed_fields.present?
-    @current_action.update_attributes! card_id: id
+    @current_action.update! card_id: id
 
     # Note: #last_change_on uses the id to sort by date
     # so the changes for the create changes have to be created before the first change
@@ -75,13 +75,13 @@ end
 event :rollback_actions, :prepare_to_validate, on: :update, when: :rollback_request? do
   update_args = process_revert_actions
   Env.params["revert_actions"] = nil
-  update_attributes! update_args
+  update! update_args
   clear_drafts
   abort :success
 end
 
 event :finalize_act, after: :finalize_action, when: :act_card? do
-  Card::ActManager.act.update_attributes! card_id: id
+  Card::ActManager.act.update! card_id: id
 end
 
 event :remove_empty_act, :integrate_with_delay_final, when: :remove_empty_act? do

data/mod/machines/lib/stylesheets/style_cards.scss

@@ -259,11 +259,13 @@ $d-yellow-2: #ffa;
   display: inline;
 }
 
-
 .navbox-item-label {
   float: left;
   position: relative;
 }
+.navbox-item-value mark {
+  padding: 0.2em 0;
+}
 
 
 /*-- misc --*/
@@ -888,24 +890,23 @@ html>body .open-view {
   }
 }
 
-.closed-content a.external-link,
 a.external-link {
-  color: #03998d !important;
-  background: none !important;
-  padding-right: 2px !important;
-  position: relative;
+  // color: $warning;
+  &:after {
+    content: "\f08e";
+    right: -2px;
+    position: relative;
+    bottom: 4px;
+    font-family: fontAwesome;
+    font-size: 8px;
+    text-decoration: none !important;
+    display: inline;
+  }
 }
 
-.closed-content a.external-link:after,
-a.external-link:after {
-  content: "\f08e";
-  right: -2px;
-  position: relative;
-  bottom: 4px;
-  font-family: fontAwesome;
-  font-size: 8px;
-  text-decoration: none !important;
-  display: inline;
+a.external-link,
+.closed-content a.external-link {
+  padding-right: 2px !important;
 }
 
 /*-------------------------- */

data/mod/machines/set/abstract/machine.rb

@@ -164,8 +164,9 @@ end
 def make_machine_output_coded mod=:machines
   update_machine_output
   Card::Auth.as_bot do
-    machine_output_card.update_attributes! storage_type: :coded, mod: mod,
-                                           codename: machine_output_codename
+    machine_output_card.update! storage_type: :coded,
+                                mod: mod,
+                                codename: machine_output_codename
   end
 end
 

data/mod/machines/set/abstract/machine/output_cache.rb

@@ -11,6 +11,6 @@ def cache_output_part input_card, output
     input_card.save! if input_card.new_card?
 
     cache_card = fetch_cache_card(input_card, true)
-    cache_card.update_attributes! content: output
+    cache_card.update! content: output
   end
 end

data/mod/machines/set/abstract/machine_input.rb

@@ -67,6 +67,6 @@ def expire_machine_cache
               return: :name).each do |machine_name|
     cache_card = Card.fetch(name, machine_name, :machine_cache)
     next unless cache_card&.content?
-    Auth.as_bot { cache_card.update_attributes! trash: true }
+    Auth.as_bot { cache_card.update! trash: true }
   end
 end

data/mod/machines/spec/set/right/machine_cache_spec.rb

@@ -24,7 +24,7 @@ RSpec.describe Card::Set::Right::MachineCache, as_bot: true do
   end
 
   def update_virtual
-    Card.fetch(:all, :machine_cache).update_attributes! content: virtual_content
+    Card.fetch(:all, :machine_cache).update! content: virtual_content
   end
 
   context "when content is updated" do
@@ -41,7 +41,7 @@ RSpec.describe Card::Set::Right::MachineCache, as_bot: true do
     before do
       create_virtual
       card = Card.fetch(:all, :machine_cache)
-      card.update_attributes! trash: true
+      card.update! trash: true
     end
 
     it "deletes content in virtual table" do

data/mod/machines/spec/set/type/skin_spec.rb

@@ -49,9 +49,9 @@ describe Card::Set::Type::Skin do
       skin.putty
 
       Card::Auth.as_bot do
-        Card["skin_item"].update_attributes content: changed_css
+        Card["skin_item"].update content: changed_css
         machine.machine_output_url
-        Card["skin_item"].update_attributes content: new_css
+        Card["skin_item"].update content: new_css
       end
       updated_machine = Card.gimme machine.name
       path = updated_machine.machine_output_path

data/mod/pointer/spec/set/abstract/pointer/events_spec.rb

@@ -5,7 +5,7 @@ describe Card::Set::Abstract::Pointer do
   end
 
   def pointer_update content
-    -> { Card["tp"].update_attributes! content: content }
+    -> { Card["tp"].update! content: content }
   end
 
   describe "#added_item_names" do
@@ -72,7 +72,7 @@ describe Card::Set::Abstract::Pointer do
 
   describe "#standardize_item" do
     it "handles unlinked items" do
-      pointer.update_attributes! content: "bracketme"
+      pointer.update! content: "bracketme"
       expect(pointer.content).to eq("[[bracketme]]")
     end
 

data/mod/search/set/abstract/01_filter_form_helper.rb

@@ -83,6 +83,10 @@ format :html do
     type_card = Card[type_codename]
     res = Card.search type_id: type_card.id, return: :name, sort: "name", dir: order
     return res unless max_length
-    res.map { |i| i.size > max_length ? "#{i[0..max_length]}..." : i }
+    res.map { |i| [trim_option(i, max_length), i] }
+  end
+
+  def trim_option option, max_length
+    option.size > max_length ? "#{option[0..max_length]}..." : option
   end
 end