card 1.96.7 → 1.96.8

data/mod/search/set/abstract/search/views.rb

@@ -65,7 +65,7 @@ format :json do
 
   def match_wql not_names
     wql = { name_match: term_param }
-    wql["not in"] = not_names if not_names.any?
+    wql[:name] = ["not in"] + not_names if not_names.any?
     wql
   end
 

data/mod/settings/spec/set/right/comment_spec.rb

@@ -31,7 +31,7 @@ describe Card::Set::Right::Comment do
       Card::Auth.as_bot do
         Card.create name: "basicname+*self+*comment",
                     content: "[[Anyone Signed In]]"
-        Card["basicname"].update_attributes! comment: " and more\n  \nsome lines\n\n"
+        Card["basicname"].update! comment: " and more\n  \nsome lines\n\n"
       end
       expect(Card["basicname"].content).to match(%r{\<p\>some lines\</p\>})
     end

data/mod/solid_cache/set/right/solid_cache.rb

@@ -15,7 +15,7 @@ end
 def write! new_content
   lock do
     if new_card?
-      update_attributes! content: new_content
+      update! content: new_content
     elsif new_content != solid_cache_card.content
       update_column :db_content, new_content
       expire

data/mod/solid_cache/spec/set/abstract/solid_cache_spec.rb

@@ -20,7 +20,7 @@ describe Card::Set::Abstract::SolidCache do
       it "uses solid cache card content as core view" do
         @card.format_with_set(described_class) do |format|
           Card::Auth.as_bot do
-            Card["A"].solid_cache_card.update_attributes! content: "cache"
+            Card["A"].solid_cache_card.update! content: "cache"
           end
           expect(format._render_core).to eq "cache"
         end
@@ -31,7 +31,7 @@ describe Card::Set::Abstract::SolidCache do
       it "ignores solid cache card content" do
         @card.format_with_set(described_class) do |format|
           Card::Auth.as_bot do
-            Card["A"].solid_cache_card.update_attributes! content: "cache"
+            Card["A"].solid_cache_card.update! content: "cache"
           end
           expect(format._render_core(hide: :solid_cache)).to eq core_view
         end
@@ -65,7 +65,7 @@ describe Card::Set::Abstract::SolidCache do
 
       it "updates solid cache card" do
         Card::Auth.as_bot do
-          Card["volatile"].update_attributes! content: "changing"
+          Card["volatile"].update! content: "changing"
         end
         expect(Card["cached", :solid_cache].content)
           .to eq "chopping and changing"
@@ -89,7 +89,7 @@ describe Card::Set::Abstract::SolidCache do
         Card["cached"].format(:html)._render_core
         expect(Card["cached", :solid_cache]).to be_instance_of Card
         Card::Auth.as_bot do
-          Card["volatile"].update_attributes! content: "changing"
+          Card["volatile"].update! content: "changing"
         end
         expect(Card["cached", :solid_cache]).to be_falsey
       end

data/mod/standard/set/self/activity_toolbar_button.rb

@@ -6,7 +6,7 @@ format :html do
       {
         history: (subject._render_history_link if card.history?),
         discussion: subject.link_to_related(:discussion, "discuss", class: "dropdown-item"),
-        follow:  subject.follow_link(class: "dropdown-item"),
+        follow: (subject.follow_link(class: "dropdown-item") if show_follow?),
         editors: subject.link_to_related(:editors, "editors", class: "dropdown-item")
       }
     end

data/mod/standard/spec/content/chunk/include_spec.rb

@@ -153,7 +153,7 @@ describe Card::Content::Chunk::Nest, "Inclusion" do
       create! "Oak", "{{Quentin}}"
       create! "Quentin", "{{Admin}}"
       adm = Card["Quentin"]
-      adm.update_attributes content: "{{Oak}}"
+      adm.update content: "{{Oak}}"
       expect { adm.format.render_core }.to raise_error(Card::Error::UserError, /too deep/)
     end
 

data/mod/standard/spec/set/all/history_spec.rb

@@ -65,15 +65,15 @@ RSpec.describe Card::Set::All::History do
       context "when updated" do
         it "adds no act if nothing changed" do
           pending "act handling upgrade"
-          @card.update_attributes name: "single card", content: content
+          @card.update name: "single card", content: content
           expect(Card::Act.count).to eq(act_start_cnt + 1)
         end
         it "adds new act" do
-          @card.update_attributes content: "new content"
+          @card.update content: "new content"
           expect(Card::Act.count).to eq(act_start_cnt + 2)
         end
         it "adds changes to create action" do
-          @card.update_attributes content: "new content"
+          @card.update content: "new content"
           expect(@card.actions.first.changed_values).to eq INITIAL_VALUES
         end
       end
@@ -174,7 +174,7 @@ RSpec.describe Card::Set::All::History do
 
       context "when updated" do
         it "adds act for left card" do
-          @card.update_attributes subcards: {
+          @card.update subcards: {
             "+right" => {
               content: "New content", db_content: "New Content"
             }
@@ -183,7 +183,7 @@ RSpec.describe Card::Set::All::History do
           expect(act.card).to eq(@card)
         end
         it "adds action for subcard" do
-          @card.update_attributes subcards: {
+          @card.update subcards: {
             "+right" => { content: "New Content" }
           }
           act = @card.acts.last

data/mod/standard/spec/set/type/email_template/email_config_spec.rb

@@ -12,7 +12,7 @@ describe Card::Set::Type::EmailTemplate::EmailConfig do
   end
 
   def update_field name, args={}
-    Card["#{email_name}+#{name}"].update_attributes! args
+    Card["#{email_name}+#{name}"].update! args
   end
 
   def create_field name, args={}
@@ -71,7 +71,7 @@ describe Card::Set::Type::EmailTemplate::EmailConfig do
     #      we can't decided whether a email address like [[_left]] is valid;
     #      depends on the context
     #   Card.fetch("a mail template+*to").
-    #     update_attributes(content: "invalid mail address")
+    #     update(content: "invalid mail address")
     # end
   end
 

data/mod/standard/spec/set/type/list_spec.rb

@@ -50,7 +50,7 @@ RSpec.describe Card::Set::Type::List do
     context "when the cardtype of Stam Broker changed" do
       it "raises an error" do
         @card = Card["Stam Broker"]
-        @card.update_attributes type_id: Card::BasicID
+        @card.update type_id: Card::BasicID
         expect(@card.errors[:type].first).to match(
           /can't be changed because .+ is referenced by list/
         )
@@ -58,7 +58,7 @@ RSpec.describe Card::Set::Type::List do
     end
     context "when the name of Parry Hotter changed to Parry Moppins" do
       before do
-        Card["Parry Hotter"].update_attributes! name: "Parry Moppins"
+        Card["Parry Hotter"].update! name: "Parry Moppins"
       end
       subject do
         Card.fetch("Parry Moppins+authors").item_names.sort
@@ -70,7 +70,7 @@ RSpec.describe Card::Set::Type::List do
     context "when the name of Stam Broker changed to Stam Trader" do
       before do
         Card::Auth.as_bot do
-        Card["Stam Broker"].update_attributes!(
+        Card["Stam Broker"].update!(
           name: "Stam Trader", update_referers: true
         )
         end
@@ -83,7 +83,7 @@ RSpec.describe Card::Set::Type::List do
       it "raises error because content is invalid" do
         # FIXME: - bad description; content is not changed
         expect do
-          Card["Stam Broker+books"].update_attributes! name: "Stam Broker+poems"
+          Card["Stam Broker+books"].update! name: "Stam Broker+poems"
         end.to raise_error(ActiveRecord::RecordInvalid,
                            /Name must have a cardtype name as right part/)
       end
@@ -91,7 +91,7 @@ RSpec.describe Card::Set::Type::List do
     context "when Stam Broker+books changes to Stam Broker+not a type" do
       it "raises error because name needs cardtype name as right part" do
         expect do
-          Card["Stam Broker+books"].update_attributes!(
+          Card["Stam Broker+books"].update!(
             name: "Stam Broker+not a type"
           )
         end.to raise_error(ActiveRecord::RecordInvalid,
@@ -101,14 +101,14 @@ RSpec.describe Card::Set::Type::List do
 
     context "when the cartype of Parry Hotter changed" do
       before do
-        Card["Parry Hotter"].update_attributes! type_id: Card::BasicID
+        Card["Parry Hotter"].update! type_id: Card::BasicID
       end
       it { is_expected.to eq ["Darles Chickens", "Stam Broker"] }
     end
     context "when Parry Hotter+authors to Parry Hotter+basics" do
       it "raises error because content is invalid" do
         expect do
-          Card["Parry Hotter+authors"].update_attributes!(
+          Card["Parry Hotter+authors"].update!(
             name: "Parry Hotter+basics"
           )
         end.to raise_error(ActiveRecord::RecordInvalid,
@@ -132,7 +132,7 @@ RSpec.describe Card::Set::Type::List do
 
   context "when the name of the cardtype books changed" do
     before do
-      Card["book"].update_attributes!(
+      Card["book"].update!(
         name: "film", update_referers: true
       )
     end
@@ -141,7 +141,7 @@ RSpec.describe Card::Set::Type::List do
 
   context "when the name of the cardtype authors changed" do
     before do
-      Card["author"].update_attributes!(
+      Card["author"].update!(
         name: "publisher", update_referers: true
       )
     end

data/mod/standard/spec/set/type/listed_by_spec.rb

@@ -19,7 +19,7 @@ RSpec.describe Card::Set::Type::ListedBy do
   end
   it "doesn't allow non-cardtype as right part" do
     expect do
-      Card["Parry Hotter+authors"].update_attributes!(
+      Card["Parry Hotter+authors"].update!(
         name: "Parry Hotter+hidden"
       )
     end.to raise_error(ActiveRecord::RecordInvalid,
@@ -43,7 +43,7 @@ RSpec.describe Card::Set::Type::ListedBy do
 
       context "when Darles Chickens is removed from Parry Hotter's list" do
         before do
-          Card["Parry Hotter+authors"].update_attributes!(
+          Card["Parry Hotter+authors"].update!(
             content: "[[Stam Broker]]"
           )
         end
@@ -85,7 +85,7 @@ RSpec.describe Card::Set::Type::ListedBy do
               }
             )
             Card.fetch("Adventures of Buckleharry Finn+authors")
-                .update_attributes!(content: "[[Darles Chickens]]")
+                .update!(content: "[[Darles Chickens]]")
           end
         end
         it do
@@ -101,14 +101,14 @@ RSpec.describe Card::Set::Type::ListedBy do
 
       context "when the cardtype of Parry Hotter changed" do
         before do
-          Card["Parry Hotter"].update_attributes! type_id: Card::BasicID
+          Card["Parry Hotter"].update! type_id: Card::BasicID
         end
         it { is_expected.to eq ["50 grades of shy"] }
       end
       context "when the name of Parry Hotter changed to Parry Moppins" do
         before do
           Card::Auth.as_bot do
-            Card["Parry Hotter"].update_attributes!(
+            Card["Parry Hotter"].update!(
               name: "Parry Moppins",
               update_referers: true
             )
@@ -119,7 +119,7 @@ RSpec.describe Card::Set::Type::ListedBy do
 
       context "when the name of Darles Chickens changed" do
         before do
-          Card["Darles Chickens"].update_attributes!(
+          Card["Darles Chickens"].update!(
             name: "Darles Eggs",
             update_referers: true
           )
@@ -131,7 +131,7 @@ RSpec.describe Card::Set::Type::ListedBy do
       context "when the cartype of Darles Chickens changed" do
         it "raises error" do
           expect do
-            Card["Darles Chickens"].update_attributes! type_id: Card::BasicID
+            Card["Darles Chickens"].update! type_id: Card::BasicID
           end.to raise_error(ActiveRecord::RecordInvalid, /Type can\'t be changed/)
         end
       end
@@ -139,7 +139,7 @@ RSpec.describe Card::Set::Type::ListedBy do
         subject { Card.fetch("Darles Chickens+authors").item_names.sort }
 
         before do
-          Card["Darles Chickens+books"].update_attributes!(
+          Card["Darles Chickens+books"].update!(
             name: "Darles Chickens+authors"
           )
         end
@@ -147,7 +147,7 @@ RSpec.describe Card::Set::Type::ListedBy do
       end
       context "when the name of the cardtype books changed" do
         before do
-          Card["book"].update_attributes! name: "literature"
+          Card["book"].update! name: "literature"
         end
         subject { Card.fetch("Darles Chickens+literature").item_names.sort }
 

data/mod/standard/spec/set/type/search_type_spec.rb

@@ -35,8 +35,7 @@ RSpec.describe Card::Set::Type::SearchType do
 
   it "handles type update from pointer" do
     pointer_card = create_pointer "PointerToSearches"
-    pointer_card.update_attributes! type_id: Card::SearchTypeID,
-                                    content: %({"type":"User"})
+    pointer_card.update! type_id: Card::SearchTypeID, content: %({"type":"User"})
     expect(pointer_card.content).to eq(%({"type":"User"}))
   end
 
@@ -49,7 +48,7 @@ RSpec.describe Card::Set::Type::SearchType do
     end
 
     it "updates query if referee changed" do
-      Card["Y"].update_attributes! name: "YYY", update_referers: true
+      Card["Y"].update! name: "YYY", update_referers: true
       expect(subject.content).to eq '{"name":"YYY"}'
     end
   end

data/mod/virtual/lib/card/virtual.rb

@@ -6,7 +6,7 @@ class Card
   # the card_virtuals table.
   class Virtual < ApplicationRecord
     def update new_content
-      update_attributes! content: new_content
+      update! content: new_content
       new_content
     end
 

data/mod/virtual/set/abstract/virtual_cache.rb

@@ -34,10 +34,10 @@ end
 
 def delete
   # delete although it's new
-  update_attributes trash: true
+  update trash: true
 end
 
 def delete!
   # delete although it's new
-  update_attributes! trash: true
+  update! trash: true
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card
 version: !ruby/object:Gem::Version
-  version: 1.96.7
+  version: 1.96.8
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-18 00:00:00.000000000 Z
+date: 2019-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cardname
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.7
+        version: 0.6.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.6.7
+        version: 0.6.8
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -3866,6 +3866,7 @@ files:
 - mod/core/set/all/codename.rb
 - mod/core/set/all/collection.rb
 - mod/core/set/all/content.rb
+- mod/core/set/all/contextual_content.rb
 - mod/core/set/all/debug.rb
 - mod/core/set/all/erb.rb
 - mod/core/set/all/event_conditions.rb