card 1.19.6 → 1.20.0

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

@@ -11,16 +11,27 @@ module ClassMethods
 end
 
 def initialize args={}
-  args["name"] = args["name"].to_s
-  args["db_content"] = args.delete("content") if args["content"]
-  @supercard = args.delete "supercard" # must come before name =
+  args["name"] = initial_name args["name"]
+  args["db_content"] = args.delete "content" if args["content"]
+  @supercard = args.delete "supercard" # must come before name=
+
+  handle_skip_args args do
+    super args # ActiveRecord #initialize
+  end
+  self
+end
+
+def handle_skip_args args
   skip_modules = args.delete "skip_modules"
   skip_type_lookup = args["skip_type_lookup"]
-
-  super args # ActiveRecord #initialize
+  yield
   self.type_id = get_type_id_from_structure if !type_id && !skip_type_lookup
   include_set_modules unless skip_modules
-  self
+end
+
+def initial_name name
+  name = Card.compose_mark name if name.is_a? Array
+  name.to_s
 end
 
 def include_set_modules

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

@@ -71,7 +71,7 @@ def cardname
 end
 
 def autoname name
-  if Card.exists? name
+  if Card.exists?(name) || ActManager.include?(name)
     autoname name.next
   else
     name
@@ -213,8 +213,7 @@ event :set_autoname, :prepare_to_validate, on: :create do
 end
 
 event :set_name, :store, changed: :name do
-  Card.expire name
-  Card.expire name_was
+  expire
 end
 
 event :set_left_and_right, :store,

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

@@ -46,17 +46,21 @@ def ok! action, opts={}
 end
 
 def who_can action
-  # warn "who_can[#{name}] #{(prc=permission_rule_card(action)).inspect},
-  # #{prc.first.item_cards.map(&:id)}" if action == :update
   permission_rule_card(action).item_cards.map(&:id)
 end
 
+def anyone_can? action
+  who_can(action).include? Card::AnyoneID
+end
+
 def permission_rule_id_and_class action
   direct_rule_id = rule_card_id action
   require_permission_rule! direct_rule_id, action
   direct_rule = Card.fetch direct_rule_id, skip_modules: true
-  [applicable_permission_rule_id(direct_rule, action),
-   direct_rule.rule_class_name]
+  [
+    applicable_permission_rule_id(direct_rule, action),
+    direct_rule.rule_class_name
+  ]
 end
 
 def applicable_permission_rule_id direct_rule, action
@@ -210,8 +214,7 @@ event :update_read_rule do
     self.read_rule_class = rclass
     Card.where(id: id).update_all read_rule_id: rcard_id,
                                   read_rule_class: rclass
-    expire_hard
-
+    expire :hard
     update_field_read_rules
   end
 end
@@ -245,14 +248,19 @@ def track_permission_errors
 end
 
 def recaptcha_on?
-  have_recaptcha_keys? &&
-    Env[:controller]   &&
-    !Auth.signed_in?   &&
-    !Auth.needs_setup? &&
-    !Auth.always_ok?   &&
+  consider_recaptcha?    &&
+    have_recaptcha_keys? &&
+    Env[:controller]     &&
+    !Auth.signed_in?     &&
+    !Auth.needs_setup?   &&
+    !Auth.always_ok?     &&
     Card.toggle(rule(:captcha))
 end
 
+def consider_recaptcha?
+  true
+end
+
 def have_recaptcha_keys?
   @@have_recaptcha_keys =
     if defined?(@@have_recaptcha_keys)

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

@@ -1,6 +1,16 @@
+def state
+  case
+  when !known?     then :unknown
+  when !ok?(:read) then :unknown # anti-fishing
+  when real?       then :real
+  when virtual?    then :virtual
+  else :wtf
+  end
+end
+
 def new_card?
-  new_record? || # not yet in db (from ActiveRecord)
-    !!@from_trash    # in process of restoration from trash, not yet "re-created"
+  new_record? ||       # not yet in db (from ActiveRecord)
+    !@from_trash.nil?  # in process of restoration from trash
 end
 alias_method :new?, :new_card?
 

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

@@ -32,7 +32,7 @@ module ClassMethods
       if Card.exists?(file_id) # double check!
         raise Card::Error, "Narrowly averted deleting current file"
       end
-      FileUtils.rm_rf "#{dir}/#{file_id}", secure: true
+      ::FileUtils.rm_rf "#{dir}/#{file_id}", secure: true
     end
   end
 

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

@@ -18,6 +18,8 @@ def type_name
   type_card.try :name
 end
 
+alias_method :type, :type_name
+
 def type_name_or_default
   type_card.try(:name) || Card.quick_fetch(Card.default_type_id).name
 end

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

@@ -10,10 +10,11 @@ module ClassMethods
   def merge_list attribs, opts={}
     unmerged = []
     attribs.each do |row|
-      result = begin
-        merge row["name"], row, opts
+      if merge row["name"], row, opts
+        Rails.logger.info "merged #{row['name']}"
+      else
+        unmerged.push row
       end
-      unmerged.push row unless result == true
     end
 
     if unmerged.empty?

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

@@ -1,12 +1,12 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Content::Chunk::EscapedLiteral, "literal chunk tests" do
-  it "should handle escaped link" do
+  it "handles escaped link" do
     expect(render_content('write this: \[[text]]'))
       .to eq("write this: <span>[</span>[text]]")
   end
 
-  it "should handle escaped nest" do
+  it "handles escaped nest" do
     expect(render_content('write this: \{{cardname}}'))
       .to eq("write this: <span>{</span>{cardname}}")
   end

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

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Content::Chunk::URI, "URI chunk tests" do
-  it "should test_non_matches" do
+  it "test_non_matches" do
     no_match_uri "There is no URI here"
     no_match_uri "One gemstone is the garnet:reddish in colour, like ruby"
   end
@@ -45,7 +45,7 @@ describe Card::Content::Chunk::URI, "URI chunk tests" do
                    text: "example.com",
                    link_text: "http://example.com"
   end
-  it 'should match "unusual" base domain (was a bug in an early version)' do
+  it 'matches "unusual" base domain (was a bug in an early version)' do
     match_http_uri "http://example.com.au/",
                    host: "example.com.au"
   end
@@ -104,24 +104,24 @@ describe Card::Content::Chunk::URI, "URI chunk tests" do
               link_text: "irc://irc.freenode.net#recentchangescamp"
   end
 
-  it "should see HTTPS" do
+  it "sees HTTPS" do
     match_uri "https://www.example.com",
               scheme: "https", host: "www.example.com", port: 443,
               path: "", query: nil
   end
-  it "should see FTP" do
+  it "sees FTP" do
     match_uri "ftp://www.example.com",
               scheme: "ftp", host: "www.example.com", port: 21,
               path: "", query: nil
   end
-  it "should handle mailto:" do
+  it "handles mailto:" do
     match_uri "mailto:jdoe123@example.com",
               scheme: "mailto", host: nil, port: nil,
               path: nil, query: nil,
               to: "jdoe123@example.com"
   end
 
-  it "should run more basic cases" do
+  it "runs more basic cases" do
     # from *css (with () around the URI)
     # so, now this doesn't even match because I fixed the suspiciou* stuff
     no_match_uri(
@@ -147,23 +147,23 @@ describe Card::Content::Chunk::URI, "URI chunk tests" do
               path: "/default.aspx", query: "scid=kb;en-us;234562"
   end
 
-  it "should test_email_uri" do
+  it "test_email_uri" do
     match_uri "mail@example.com",
               to: "mail@example.com", host: nil,
               text: "mail@example.com",
               link_text: "mailto:mail@example.com"
   end
 
-  it "should test_non_email" do
+  it "test_non_email" do
     # The @ is part of the normal text, but 'example.com' is marked up.
     match_uri "Not an email: @example.com", uri: "http://example.com"
   end
 
-  it "should test_textile_image" do
+  it "test_textile_image" do
     no_match_uri "This !http://hobix.com/sample.jpg! is a Textile image link."
   end
 
-  it "should test_textile_link" do
+  it "test_textile_link" do
     no_match_uri(
       'This "hobix (hobix)":http://hobix.com/sample.jpg is a Textile link.'
     )
@@ -172,12 +172,12 @@ describe Card::Content::Chunk::URI, "URI chunk tests" do
               link_text: "http://hobix.com/sample.jpg"
   end
 
-  it "should test_inline_html" do
+  it "test_inline_html" do
     no_match_uri "<img src='http://hobix.com/sample.jpg'/>"
     no_match_uri '<IMG SRC="http://hobix.com/sample.jpg">'
   end
 
-  it "should test_non_uri" do
+  it "test_non_uri" do
     # "so" is a valid country code; "libproxy.so" is a valid url
     match_uri "libproxy.so", host: "libproxy.so",
                              text: "libproxy.so",
@@ -195,7 +195,7 @@ describe Card::Content::Chunk::URI, "URI chunk tests" do
     no_match_uri "file.ps"
   end
 
-  it "should test_uri_in_text" do
+  it "test_uri_in_text" do
     match_uri "Go to: http://www.example.com/",
               host: "www.example.com", path: "/"
     match_uri "http://www.example.com/ is a link.", host: "www.example.com"
@@ -208,7 +208,7 @@ describe Card::Content::Chunk::URI, "URI chunk tests" do
     no_match_uri '"link":http://fake.link.com.'
   end
 
-  it "should test_uri_in_parentheses" do
+  it "test_uri_in_parentheses" do
     match_uri "URI (http://brackets.com.de) in brackets",
               host: "brackets.com.de"
     match_uri "because (as shown at research.net) the results",
@@ -218,7 +218,7 @@ describe Card::Content::Chunk::URI, "URI chunk tests" do
               query: "WhatIsWiki"
   end
 
-  it "should test_uri_list_item" do
+  it "test_uri_list_item" do
     match_chunk(
       Card::Content::Chunk::URI,
       "* http://www.btinternet.com/~mail2minh/SonyEricssonP80xPlatform.sis",
@@ -226,7 +226,7 @@ describe Card::Content::Chunk::URI, "URI chunk tests" do
     )
   end
 
-  it "should test_interesting_uri_with__comma" do
+  it "test_interesting_uri_with__comma" do
     # Counter-intuitively, this URL matches, but the query part includes the
     # trailing comma.
     # It has no way to know that the query does not include the comma.
@@ -241,7 +241,7 @@ describe Card::Content::Chunk::URI, "URI chunk tests" do
   end
 
   describe Card::Content::Chunk::URI, "URI chunk tests" do
-    it "should test_local_urls" do
+    it "test_local_urls" do
       # normal
       match_http_uri "http://perforce:8001/toto.html",
                      host: "perforce", port: 8001

data/mod/core/spec/format/html_format_spec.rb

@@ -3,18 +3,16 @@
 describe Card::Format::HtmlFormat do
   describe "views" do
     it "content" do
-      result = render_card(:content, name: "A+B")
       assert_view_select(
-        result,
-        'div[class="card-slot content-view card-content ALL ALL_PLUS ' \
-        'TYPE-basic RIGHT-b TYPE_PLUS_RIGHT-basic-b SELF-a-b"]'
+        render_card(:content, name: "A+B"),
+        'div[class="card-slot content-view ALL ALL_PLUS TYPE-basic '\
+        'RIGHT-b TYPE_PLUS_RIGHT-basic-b SELF-a-b card-content"]'
       )
     end
 
     it "nests in multi edit" do
       c = Card.new name: "ABook", type: "Book"
-      rendered = c.format.render(:edit)
-
+      rendered = c.format.render :edit
       assert_view_select rendered, "fieldset" do
         assert_select 'div[class~="prosemirror-editor"]' do
           assert_select "input[name=?]", "card[subcards][+illustrator][content]"
@@ -65,8 +63,8 @@ describe Card::Format::HtmlFormat do
       it "renders card content" do
         assert_view_select(
           @simple_page,
-          'div[class="card-body panel-body card-content ALL ALL_PLUS ' \
-          'TYPE-basic RIGHT-b TYPE_PLUS_RIGHT-basic-b SELF-a-b"]',
+          'div[class="card-body card-content ALL ALL_PLUS ' \
+          'TYPE-basic RIGHT-b TYPE_PLUS_RIGHT-basic-b SELF-a-b panel-body"]',
           "AlphaBeta"
         )
       end
@@ -93,14 +91,14 @@ describe Card::Format::HtmlFormat do
         # warn "lay #{@layout_card.inspect}, #{@main_card.inspect}"
       end
 
-      #      it "should default to core view when in layout mode" do
+      #      it "defaults to core view when in layout mode" do
       #        @layout_card.content = "Hi {{A}}"
       #        Card::Auth.as_bot { @layout_card.save }
       #
       #        expect(@main_card.format.render(:layout)).to match('Hi Alpha')
       #      end
 
-      #      it "should default to open view for main card" do
+      #      it "defaults to open view for main card" do
       #        @layout_card.content='Open up {{_main}}'
       #        Card::Auth.as_bot { @layout_card.save }
       #
@@ -119,7 +117,7 @@ describe Card::Format::HtmlFormat do
         expect(result).not_to match(/card-header/)
       end
 
-      it "shouldn't recurse" do
+      it "does not recurse" do
         @layout_card.content = "Mainly {{_main|core}}"
         Card::Auth.as_bot { @layout_card.save }
 
@@ -141,8 +139,8 @@ describe Card::Format::HtmlFormat do
           Card.create name: "outer space", content: "{{_main|name}}"
         end
 
-        expect(@layout_card.format.render(:layout)).to eq(
-          "Joe User\n" \
+        expect(@main_card.format.render(:layout)).to eq(
+          '<div id="main">Joe User</div>' + "\n" \
           '<div class="modal fade" role="dialog" id="modal-main-slot">' \
           '<div class="modal-dialog"><div class="modal-content">' \
           "</div></div></div>"

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

@@ -8,11 +8,11 @@
 #       end
 #     end
 #
-#     it "should have updates" do
+#     it "has updates" do
 #       described_class::Updates.should === @c.updates
 #     end
 #
-#     it "should track changes" do
+#     it "tracks changes" do
 #       @c.name.should == 'New Card'
 #       @c.name = 'Old Card'
 #       @c.name.should == 'Old Card'

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

@@ -72,29 +72,6 @@ describe Card::Set::All::Collection do
     end
   end
 
-  describe "#map_nests" do
-    before do
-      Card::Auth.as_bot do
-        @list = Card.create!(
-          name: "mixed list",
-          content: "[[A]]\n{{B}}\n[[C|link C]]\n{{D|name;title:nest D}}"
-        )
-      end
-    end
-    it "handles links and nest arguments" do
-      result = @list.format.map_references_with_args do |name, args|
-        [name, args]
-      end
-      expect(result).to eq [
-        ["A", { view: :closed }],
-        ["B", { view: :closed, inc_name: "B", inc_syntax: "B" }],
-        ["C", { view: :closed, title: "link C" }],
-        ["D", { view: "name", title: "nest D", inc_name: "D",
-                inc_syntax: "D|name;title:nest D" }]
-      ]
-    end
-  end
-
   describe "tabs view" do
     it "renders tab panel" do
       tabs = render_card :tabs, content: "[[A]]\n[[B]]\n[[C]]", type: "pointer"
@@ -138,6 +115,26 @@ describe Card::Set::All::Collection do
         assert_select %(li > a[data-toggle="tab"][data-url="#{path}"])
       end
     end
+
+    it "handles contextual titles" do
+      create name: "tabs card", type: "pointer",
+             content: "[[A+B]]\n[[One+Two+Three]]\n[[Four+One+Five]]"
+      tabs = render_content  "{{tabs card|tabs|closed;title:_left}}"
+      assert_view_select tabs, "div[role=tabpanel]" do
+        assert_select 'li > a[data-toggle="tab"]', "A"
+        assert_select 'li > a[data-toggle="tab"]', "One+Two"
+      end
+    end
+
+    it "handles contextual titles" do
+      create name: "tabs card", content: "[[A+B]]\n[[One+Two+Three]]\n[[Four+One+Five]]", type: "pointer"
+      tabs = render_content  "{{tabs card|tabs|closed;title:_left;show:title_link}}"
+      assert_view_select tabs, "div[role=tabpanel]" do
+        assert_select 'li > a[data-toggle="tab"]', "A"
+        assert_select 'li > a[data-toggle="tab"]', "One+Two"
+      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}}"
@@ -150,7 +147,7 @@ describe Card::Set::All::Collection do
 
     it "works with search cards" do
       Card.create type: "Search", name: "Asearch", content: '{"type":"User"}'
-      tabs = render_content("{{Asearch|tabs;item:name}}")
+      tabs = render_content("{{Asearch|tabs|name}}")
       assert_view_select tabs, "div[role=tabpanel]" do
         assert_select(
           'li > a[data-toggle=tab][href="#asearch-joe_admin"] span.card-title',