card 1.98.0 → 1.99.1

data/mod/core/set/all/rename.rb

@@ -1,4 +1,4 @@
-event :rename_in_trash, after: :set_name, on: :update do
+event :rename_in_trash, after: :expire_old_name, on: :update do
   existing_card = Card.find_by_key_and_trash name.key, true
   return if !existing_card || existing_card == self
   existing_card.name = existing_card.name + "*trash"
@@ -28,7 +28,8 @@ event :cascade_name_changes, :finalize, on: :update, changed: :name,
     newname = child.name.swap name_before_last_save, name
     # not sure if this is still needed since we attach the children as subcards
     # (it used to be resolved right here without adding subcards)
-    Card.expire child.name
+    ActManager.expirees << child.name
+    child.skip_event! :check_permissions
 
     # superleft has to be the first argument. Otherwise the call of `name=` in
     # `assign_attributes` can cause problems because `left` doesn't find the new left.

data/mod/core/set/all/rules.rb

@@ -113,12 +113,7 @@ def related_sets with_self=false
   # refers to sets that users may configure from the current card -
   # NOT to sets to which the current card belongs
 
-  # FIXME: change to use codenames!!
-
   sets = []
-  if known? && type_id == Card::CardtypeID # FIXME: belongs in type/cardtype
-    sets << ["#{name}+*type", Card::Set::Type.label(name)]
-  end
   sets << ["#{name}+*self", Card::Set::Self.label(name)] if with_self
   if known? && name.simple?
     sets << ["#{name}+*right", Card::Set::Right.label(name)]

data/mod/core/set/all/update_read_rules.rb

@@ -6,25 +6,7 @@ event :update_rule_cache, :finalize, when: :is_rule? do
   self.class.clear_rule_cache
 end
 
-def id_of_set_class set
-  set && (set_class = set.tag) && set_class.id
-end
-
 event :expire_related, :finalize do
-  subcards.keys.each do |key|
-    Card.cache.soft.delete key
-  end
-  expire # FIXME: where do we put this. Here it deletes @stage
   reset_patterns
-  if is_structure?
-    structuree_names.each do |name|
-      Card.expire name
-    end
-  end
-end
-
-event :expire_related_names, before: :expire_related, changed: :name do
-  # FIXME: look for opportunities to avoid instantiating the following
-  descendants.each(&:expire)
-  name_referers.each(&:expire)
+  structuree_names.each { |name| ActManager.expirees << name } if is_structure?
 end

data/mod/core/set_pattern/03_type.rb

@@ -6,6 +6,10 @@ def short_label name
   %(all "#{name}s")
 end
 
+def generic_label
+  "cards of a given type"
+end
+
 def prototype_args anchor
   { type: anchor }
 end

data/mod/core/set_pattern/07_right.rb

@@ -11,6 +11,10 @@ def short_label name
   %(all "+#{name}s")
 end
 
+def generic_label
+  "given field cards"
+end
+
 def prototype_args anchor
   { name: "*dummy+#{anchor}" }
 end

data/mod/core/set_pattern/08_type_plus_right.rb

@@ -16,6 +16,10 @@ def short_label name
   %(all "+#{name.tag}" on "#{name.left}s")
 end
 
+def generic_label
+  "given field cards on a given type"
+end
+
 def prototype_args anchor
   {
     name: "+#{anchor.tag}",

data/mod/core/set_pattern/09_self.rb

@@ -6,6 +6,10 @@ def short_label name
   name
 end
 
+def generic_label
+  "a single card"
+end
+
 def prototype_args anchor
   { name: anchor }
 end

data/mod/core/spec/chunk/link_spec.rb

@@ -62,6 +62,12 @@ RSpec.describe Card::Content::Chunk::Link do
                                 text: "/*recent"
   end
 
+  it "handles names with slashes" do
+    assert_link "[[he/she]]", class: "wanted-card",
+                              href: "/he_she?card%5Bname%5D=he%2Fshe",
+                              text: "he/she"
+  end
+
   it "handles absolute urls" do
     assert_link "[[http://google.com]]",
                 class: "external-link", target: "_blank",

data/mod/core/spec/chunk/nest_spec.rb

@@ -166,11 +166,11 @@ RSpec.describe Card::Content::Chunk::Nest do
       expect { adm.format.render_core }.to raise_error(Card::Error::UserError, /too deep/)
     end
 
-    it "handles missing cards" do
+    it "handles unknown cards" do
       @a = create! "boo", "hey {{+there}}"
       r = @a.format.render_core
       assert_view_select(
-        r, 'div[data-card-name="boo+there"][class~="missing-view"]'
+        r, 'div[data-card-name="boo+there"][class~="unknown-view"]'
       )
     end
 

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

@@ -160,57 +160,55 @@ RSpec.describe Card::Set::All::EventConditions do
     end
 
     describe "skip option" do
-      specify "skip_event condition" do
+      def expect_skipping changes, log1, log2,
+                          for_name: nil, skip_key: :skip, allowed: :allowed, force: false
         with_test_events do
-          test_event :validate, on: :update, skip: :allowed, for: "A" do
-            add_to_log "executed"
-          end
-          Card["A"].update! content: "changed content", skip: :test_event_0
+          add_logging_test_event allowed, for_name
+          update_with_skip force, changes, skip_key
 
           aggregate_failures do
-            expect(@log).to be_empty
-            Card["A"].update! content: "changed content"
-            expect(@log).to contain_exactly "executed"
+            expect(@log).to eq(log1)                              # logging with skip
+            Card["A"].update! changes                             # update without skip
+            expect(@log).to contain_exactly(*log2)                # logging without skip
           end
         end
       end
 
-      specify "skip_event condition in subcard" do
-        with_test_events do
-          test_event :validate, on: :update, skip: :allowed, for: "A+B" do
-            add_to_log "not skipped"
-          end
-          Card["A"].update! content: "changed content",
-                            skip: :test_event_0,
-                            subcards: { "+B" => "changed +B content" }
+      def add_logging_test_event allowed, for_name
+        event_args = { on: :update, skip: allowed }
+        event_args[:for] = for_name if for_name
+        test_event(:validate, event_args) { add_to_log "#{name} executed" }
+      end
 
-          aggregate_failures do
-            expect(@log).to be_empty
-            Card["A"].update! content: "changed content",
-                              subcards: { "+B" => "changed +B content" }
-            expect(@log).to contain_exactly "not skipped"
-          end
+      def update_with_skip force, changes, skip_key
+        skip_card = Card["A"]
+        if force
+          skip_card.skip_event! :test_event_0
+          skip_card.update! changes
+        else
+          skip_card.update! changes.merge(skip_key => :test_event_0)
         end
       end
 
+      specify "skip_event condition" do
+        expect_skipping({ content: "changed" }, [], "A executed", for_name: "A")
+      end
+
+      specify "skip_event condition in subcard" do
+        expect_skipping({ content: "changed", subcards: { "+B" => "changed +B" } },
+                        [], "A+B executed", for_name: "A+B")
+      end
+
       specify "skip_event_in_action condition" do
-        with_test_events do
-          test_event :validate, on: :update, skip: :allowed do
-            add_to_log "#{name} not skipped"
-          end
-          Card["A"].update! content: "changed content",
-                            skip_in_action: :test_event_0,
-                            subcards: { "+B" => "changed +B content" }
+        expect_skipping({ content: "changed", subcards: { "+B" => "changed +B" } },
+                        ["A+B executed"],
+                        ["A executed", "A+B executed", "A+B executed"],
+                        skip_key: :skip_in_action)
+      end
 
-          aggregate_failures do
-            expect(@log).to contain_exactly "A+B not skipped"
-            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"
-          end
-        end
+      specify "force skip" do
+        expect_skipping({ content: "changed" }, [], "A executed",
+                        force: true, for_name: "A")
       end
     end
   end

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

@@ -1,4 +1,4 @@
-describe Card::Set::All::NameEvents do
+RSpec.describe Card::Set::All::NameEvents do
   describe "event: set_name" do
     it "handles case variants" do
       c = Card.create! name: "chump"

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

@@ -86,17 +86,7 @@ RSpec.describe Card::Set::All::Permissions do
       end
     end
 
-    it "is granted to admin if to anybody" do
-      Card::Auth.as_bot do
-        c1 = Card["c1"]
-        Card.create! name: "c1+*self+*comment", type: "Pointer",
-                     content: "[[r1]]"
-        expect(c1.who_can(:comment)).to eq([Card["r1"].id])
-        expect(c1.ok?(:comment)).to be_truthy
-      end
-    end
-
-    it "reader setting" do
+    it "reader setting", aggregate_failures: true do
       Card.where(trash: false).each do |ca|
         rule_id, rule_class = ca.permission_rule_id_and_class :read
         expect(ca.read_rule_class).to eq(rule_class),

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

@@ -14,19 +14,9 @@ describe Card::Set::All::Rules do
 
   describe "#rule" do
     it "retrieves Set based value" do
-      Card.create name: "Book+*type+*add help", content: "authorize"
-      add_help_rule = Card.new(type: "Book").rule(:add_help, fallback: :help)
-      expect(add_help_rule).to eq("authorize")
-    end
-
-    it "retrieves default values" do
-      # Card.create name: 'all Basic cards', type: 'Set',
-      #            content: "{\"type\": \"Basic\'}'
-      # defaults should work when other Sets are present
-      assert Card.create(name: "*all+*add help", content: "lobotomize")
-      # Card.default_rule(:add_help, fallback: :help).should == 'lobotomize'
-      add_help_rule = Card.new(type_id: Card::BasicID).rule(:add_help, fallback: :help)
-      expect(add_help_rule).to eq("lobotomize")
+      Card.create name: "Book+*type+*help", content: "authorize"
+      help_rule = Card.new(type: "Book").rule(:help)
+      expect(help_rule).to eq("authorize")
     end
 
     it "retrieves single values" do
@@ -38,19 +28,19 @@ describe Card::Set::All::Rules do
       before do
         Card.create name: "*all+*help", content: "edit any kind of card"
       end
-      subject { Card.new(type: "Book").rule(:add_help, fallback: :help) }
+      subject { Card.new(type: "Book").rule(:csv_structure, fallback: :help) }
 
       it "retrieves default setting" do
         expect(subject).to eq("edit any kind of card")
       end
 
       it "retrieves primary setting" do
-        Card.create name: "*all+*add help", content: "add any kind of card"
+        Card.create name: "*all+*csv_structure", content: "add any kind of card"
         expect(subject).to eq("add any kind of card")
       end
 
       it "retrieves more specific default setting" do
-        Card.create name: "*all+*add help", content: "add any kind of card"
+        Card.create name: "*all+*csv_structure", content: "add any kind of card"
         Card.create name: "*Book+*type+*help", content: "edit a Book"
         expect(subject).to eq("add any kind of card")
       end

data/mod/date/set/all/calendar.rb

@@ -4,6 +4,6 @@ format :html do
   def calendar_input
     text_field :content, class: "date-editor datetimepicker-input",
                          "data-toggle": "datetimepicker",
-                         "data-target": "##{form_prefix}_content"
+                         "data-target": "##{form_prefix}_content.date-editor"
   end
 end

data/mod/date/set/self/datepicker.rb

@@ -0,0 +1,6 @@
+def raw_help_text
+  <<-TEXT
+    Configure the date select tool using these available 
+    [[https://tempusdominus.github.io/bootstrap-4/Options/|options]]
+  TEXT
+end

data/mod/date/set/type/date.rb

@@ -1,5 +1,5 @@
 format :html do
-  def editor
+  def input_type
     :calendar
   end
 end

data/mod/date/spec/set/type/date_spec.rb

@@ -2,6 +2,6 @@
 
 describe Card::Set::Type::Date do
   it "has special editor" do
-    assert_view_select render_editor("Date"), 'input[class~="date-editor"]'
+    assert_view_select render_input("Date"), 'input[class~="date-editor"]'
   end
 end

data/mod/date/vendor/moment/CHANGELOG.md

@@ -1,6 +1,14 @@
 Changelog
 =========
 
+### 2.22.2 [See full changelog](https://gist.github.com/marwahaha/4d992c13c2dbc0f59d4d8acae1dc6d3a)
+
+* Release May 31, 2018
+
+* [#4564](https://github.com/moment/moment/pull/4564) [bugfix] Avoid using trim()
+* [#4453](https://github.com/moment/moment/pull/4453) [bugfix] Treat periods as periods, not regex-anything period, for weekday parsing in strict mode.
+* Minor locale improvements (pa-in, be, az)
+
 ### 2.22.1 [See full changelog](https://gist.github.com/marwahaha/ff2cd13d0eda08afb7a237b10aae558c)
 
 * Release Apr 14, 2018

data/mod/date/vendor/moment/Moment.js.nuspec

@@ -2,16 +2,16 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>Moment.js</id>
-        <version>2.22.1</version>
+        <version>2.22.2</version>
         <authors>Tim Wood, Iskren Chernev, Moment.js contributors</authors>
         <owners>Cory Deppen, Iskren Chernev</owners>
         <description>A lightweight JavaScript date library for parsing, manipulating, and formatting dates.</description>
         <releaseNotes>
-            * Release Apr 14, 2018 
+            * Release May 31, 2018
 
-            * [#4495](https://github.com/moment/moment/pull/4495) [bugfix] Added HTML5_FMT to moment.d.ts
-            * Minor locale improvements
-            * QUnit upgrade and coveralls reporting
+            * [#4564](https://github.com/moment/moment/pull/4564) [bugfix] Avoid using trim()
+            * [#4453](https://github.com/moment/moment/pull/4453) [bugfix] Treat periods as periods, not regex-anything period, for weekday parsing in strict mode.
+            * Minor locale improvements (pa-in, be, az)
         </releaseNotes>
         <projectUrl>http://momentjs.com/</projectUrl>
         <iconUrl>http://pbs.twimg.com/profile_images/482670411402858496/Xrtdc94q_normal.png</iconUrl>

data/mod/date/vendor/moment/component.json

@@ -1,6 +1,6 @@
 {
   "name": "moment",
-  "version": "2.22.1",
+  "version": "2.22.2",
   "main": "moment.js",
   "description": "Parse, validate, manipulate, and display dates in JavaScript.",
   "files": [

data/mod/date/vendor/moment/locale/az.js

@@ -55,7 +55,7 @@
         relativeTime : {
             future : '%s sonra',
             past : '%s əvvəl',
-            s : 'birneçə saniyyə',
+            s : 'birneçə saniyə',
             ss : '%d saniyə',
             m : 'bir dəqiqə',
             mm : '%d dəqiqə',

data/mod/date/vendor/moment/locale/be.js

@@ -41,7 +41,7 @@
         weekdays : {
             format: 'нядзелю_панядзелак_аўторак_сераду_чацвер_пятніцу_суботу'.split('_'),
             standalone: 'нядзеля_панядзелак_аўторак_серада_чацвер_пятніца_субота'.split('_'),
-            isFormat: /\[ ?[Вв] ?(?:мінулую|наступную)? ?\] ?dddd/
+            isFormat: /\[ ?[Ууў] ?(?:мінулую|наступную)? ?\] ?dddd/
         },
         weekdaysShort : 'нд_пн_ат_ср_чц_пт_сб'.split('_'),
         weekdaysMin : 'нд_пн_ат_ср_чц_пт_сб'.split('_'),

data/mod/date/vendor/moment/locale/pa-in.js

@@ -51,7 +51,7 @@
         calendar : {
             sameDay : '[ਅਜ] LT',
             nextDay : '[ਕਲ] LT',
-            nextWeek : 'dddd, LT',
+            nextWeek : '[ਅਗਲਾ] dddd, LT',
             lastDay : '[ਕਲ] LT',
             lastWeek : '[ਪਿਛਲੇ] dddd, LT',
             sameElse : 'L'

data/mod/date/vendor/moment/meteor/moment.js

@@ -1 +1 @@
-mod/date/vendor/moment/meteor/../moment.js
+../moment.js

data/mod/date/vendor/moment/meteor/package.js

@@ -6,7 +6,7 @@ var packageName = 'momentjs:moment';  // https://atmospherejs.com/momentjs/momen
 Package.describe({
   name: packageName,
   summary: 'Moment.js (official): parse, validate, manipulate, and display dates - official Meteor packaging',
-  version: '2.22.1',
+  version: '2.22.2',
   git: 'https://github.com/moment/moment.git'
 });
 

data/mod/date/vendor/moment/min/locales.js

@@ -628,7 +628,7 @@
         relativeTime : {
             future : '%s sonra',
             past : '%s əvvəl',
-            s : 'birneçə saniyyə',
+            s : 'birneçə saniyə',
             ss : '%d saniyə',
             m : 'bir dəqiqə',
             mm : '%d dəqiqə',
@@ -707,7 +707,7 @@
         weekdays : {
             format: 'нядзелю_панядзелак_аўторак_сераду_чацвер_пятніцу_суботу'.split('_'),
             standalone: 'нядзеля_панядзелак_аўторак_серада_чацвер_пятніца_субота'.split('_'),
-            isFormat: /\[ ?[Вв] ?(?:мінулую|наступную)? ?\] ?dddd/
+            isFormat: /\[ ?[Ууў] ?(?:мінулую|наступную)? ?\] ?dddd/
         },
         weekdaysShort : 'нд_пн_ат_ср_чц_пт_сб'.split('_'),
         weekdaysMin : 'нд_пн_ат_ср_чц_пт_сб'.split('_'),
@@ -5919,7 +5919,7 @@
 
     //! moment.js locale configuration
 
-    var symbolMap$10 = {
+    var symbolMap$a = {
         '1': '१',
         '2': '२',
         '3': '३',
@@ -6028,7 +6028,7 @@
         },
         postformat: function (string) {
             return string.replace(/\d/g, function (match) {
-                return symbolMap$10[match];
+                return symbolMap$a[match];
             });
         },
         meridiemParse: /रात्री|सकाळी|दुपारी|सायंकाळी/,
@@ -6255,7 +6255,7 @@
 
     //! moment.js locale configuration
 
-    var symbolMap$11 = {
+    var symbolMap$b = {
         '1': '၁',
         '2': '၂',
         '3': '၃',
@@ -6266,7 +6266,7 @@
         '8': '၈',
         '9': '၉',
         '0': '၀'
-    }, numberMap$10 = {
+    }, numberMap$a = {
         '၁': '1',
         '၂': '2',
         '၃': '3',
@@ -6320,12 +6320,12 @@
         },
         preparse: function (string) {
             return string.replace(/[၁၂၃၄၅၆၇၈၉၀]/g, function (match) {
-                return numberMap$10[match];
+                return numberMap$a[match];
             });
         },
         postformat: function (string) {
             return string.replace(/\d/g, function (match) {
-                return symbolMap$11[match];
+                return symbolMap$b[match];
             });
         },
         week: {
@@ -6386,7 +6386,7 @@
 
     //! moment.js locale configuration
 
-    var symbolMap$12 = {
+    var symbolMap$c = {
         '1': '१',
         '2': '२',
         '3': '३',
@@ -6398,7 +6398,7 @@
         '9': '९',
         '0': '०'
     },
-    numberMap$11 = {
+    numberMap$b = {
         '१': '1',
         '२': '2',
         '३': '3',
@@ -6429,12 +6429,12 @@
         },
         preparse: function (string) {
             return string.replace(/[१२३४५६७८९०]/g, function (match) {
-                return numberMap$11[match];
+                return numberMap$b[match];
             });
         },
         postformat: function (string) {
             return string.replace(/\d/g, function (match) {
-                return symbolMap$12[match];
+                return symbolMap$c[match];
             });
         },
         meridiemParse: /राति|बिहान|दिउँसो|साँझ/,
@@ -6695,7 +6695,7 @@
 
     //! moment.js locale configuration
 
-    var symbolMap$13 = {
+    var symbolMap$d = {
         '1': '੧',
         '2': '੨',
         '3': '੩',
@@ -6707,7 +6707,7 @@
         '9': '੯',
         '0': '੦'
     },
-    numberMap$12 = {
+    numberMap$c = {
         '੧': '1',
         '੨': '2',
         '੩': '3',
@@ -6738,7 +6738,7 @@
         calendar : {
             sameDay : '[ਅਜ] LT',
             nextDay : '[ਕਲ] LT',
-            nextWeek : 'dddd, LT',
+            nextWeek : '[ਅਗਲਾ] dddd, LT',
             lastDay : '[ਕਲ] LT',
             lastWeek : '[ਪਿਛਲੇ] dddd, LT',
             sameElse : 'L'
@@ -6761,12 +6761,12 @@
         },
         preparse: function (string) {
             return string.replace(/[੧੨੩੪੫੬੭੮੯੦]/g, function (match) {
-                return numberMap$12[match];
+                return numberMap$c[match];
             });
         },
         postformat: function (string) {
             return string.replace(/\d/g, function (match) {
-                return symbolMap$13[match];
+                return symbolMap$d[match];
             });
         },
         // Punjabi notation for meridiems are quite fuzzy in practice. While there exists
@@ -8188,7 +8188,7 @@
 
     //! moment.js locale configuration
 
-    var symbolMap$14 = {
+    var symbolMap$e = {
         '1': '௧',
         '2': '௨',
         '3': '௩',
@@ -8199,7 +8199,7 @@
         '8': '௮',
         '9': '௯',
         '0': '௦'
-    }, numberMap$13 = {
+    }, numberMap$d = {
         '௧': '1',
         '௨': '2',
         '௩': '3',
@@ -8256,12 +8256,12 @@
         },
         preparse: function (string) {
             return string.replace(/[௧௨௩௪௫௬௭௮௯௦]/g, function (match) {
-                return numberMap$13[match];
+                return numberMap$d[match];
             });
         },
         postformat: function (string) {
             return string.replace(/\d/g, function (match) {
-                return symbolMap$14[match];
+                return symbolMap$e[match];
             });
         },
         // refer http://ta.wikipedia.org/s/1er1
@@ -8672,7 +8672,7 @@
         return time;
     }
 
-    function translate$10(number, withoutSuffix, string, isFuture) {
+    function translate$a(number, withoutSuffix, string, isFuture) {
         var numberNoun = numberAsNoun(number);
         switch (string) {
             case 'ss':
@@ -8734,17 +8734,17 @@
             future : translateFuture,
             past : translatePast,
             s : 'puS lup',
-            ss : translate$10,
+            ss : translate$a,
             m : 'wa’ tup',
-            mm : translate$10,
+            mm : translate$a,
             h : 'wa’ rep',
-            hh : translate$10,
+            hh : translate$a,
             d : 'wa’ jaj',
-            dd : translate$10,
+            dd : translate$a,
             M : 'wa’ jar',
-            MM : translate$10,
+            MM : translate$a,
             y : 'wa’ DIS',
-            yy : translate$10
+            yy : translate$a
         },
         dayOfMonthOrdinalParse: /\d{1,2}\./,
         ordinal : '%d.',