card 1.20.1 → 1.20.2

data/mod/standard/set/type/toggle.rb

@@ -1,12 +1,32 @@
+def checked?
+  content == "1"
+end
 
 view :core do |_args|
   case card.raw_content.to_i
   when 1 then "yes"
   when 0 then "no"
-  else; "?"
+  else
+    "?"
   end
 end
 
-view :editor do
-  check_box :content
+format :html do
+  view :editor do
+    toggle
+  end
+
+  view :labeled_editor do
+    toggle + toggle_label
+  end
+
+  def toggle
+    check_box :content
+  end
+
+  def toggle_label
+    label :content, card.cardname.tag
+  end
 end
+
+

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

@@ -190,24 +190,35 @@ describe Card::Set::Type::EmailTemplate::EmailConfig do
       expect(expected).to include "Nobody expects the Spanish Inquisition"
     end
 
-    it "handles image nests in html message" do
+    it "handles inline image nests in html message  in core view" do
+      Card::Env[:host] = "http://testhost"
       update_field "*html message", content: "Triggered by {{:logo|core}}"
       mail = email.format.render_mail context: context_card
-      expect(mail.parts[0].mime_type).to eq "image/png"
-      url = mail.parts[0].url
-      expect(mail.parts[2].mime_type).to eq "text/html"
-      expect(mail.parts[2].body.raw_source).to include('<img src="cid:')
-      expect(mail.parts[2].body.raw_source).to include("<img src=\"#{url}\"")
-    end
+      expect(mail.parts.size).to eq 2
+      expect(mail.parts[0].mime_type).to eq "text/plain"
+      expect(mail.parts[1].mime_type).to eq "text/html"
+      expect(mail.parts[1].body.raw_source)
+        .to include('<img src="http://testhost/files/:logo/standard-medium.png"')
+    end
+
+    it "handles inline image nests in html message" do
+         update_field "*html message", content: "Triggered by {{:logo|inline}}"
+         mail = email.format.render_mail context: context_card
+         expect(mail.parts[0].mime_type).to eq "image/png"
+         url = mail.parts[0].url
+         expect(mail.parts[2].mime_type).to eq "text/html"
+         expect(mail.parts[2].body.raw_source).to include('<img src="cid:')
+         expect(mail.parts[2].body.raw_source).to include("<img src=\"#{url}\"")
+       end
 
     it "handles image nests in html message in default view" do
-      update_field "*html message", content: "Triggered by {{:logo}}"
+      update_field "*html message", content: "Triggered by {{:logo|core}}"
       mail = email.format.render_mail context: context_card
-      expect(mail.parts[0].mime_type).to eq "image/png"
-      url = mail.parts[0].url
-      expect(mail.parts[2].mime_type).to eq "text/html"
-      expect(mail.parts[2].body.raw_source).to include('<img src="cid:')
-      expect(mail.parts[2].body.raw_source).to include("<img src=\"#{url}\"")
+      expect(mail.parts.size).to eq 2
+      expect(mail.parts[0].mime_type).to eq "text/plain"
+      expect(mail.parts[1].mime_type).to eq "text/html"
+      expect(mail.parts[1].body.raw_source)
+        .to include('<img src="/files/:logo/standard-medium.png"')
     end
 
     it "handles contextual name for attachments" do

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

@@ -6,8 +6,19 @@ describe Card::Set::Type::Toggle do
   end
 
   it "has yes/no as processed content" do
-    expect(render_card(:core, type: "Toggle", content: "0")).to eq("no")
-    expect(render_card(:closed_content, type: "Toggle", content: "1"))
+    expect(render_view(:core, type: "Toggle", content: "0")).to eq("no")
+    expect(render_view(:closed_content, type: "Toggle", content: "1"))
       .to eq("yes")
   end
+
+  describe "view :labeled_editor" do
+    subject { render_view :labeled_editor, type: :toggle, name: "A+toggle" }
+    it "has checkbox label" do
+      is_expected.to have_tag("label", with: { for: "card_content" }) do
+        with_text "toggle"
+      end
+    end
+  end
 end
+
+

data/spec/lib/card/name_spec.rb

@@ -1,105 +1,7 @@
 # -*- encoding : utf-8 -*-
 
-describe Card::Name do
-  describe "#key" do
-    it "lowercases and underscores" do
-      expect("This Name".to_name.key).to eq("this_name")
-    end
-
-    it "removes spaces" do
-      expect("this    Name".to_name.key).to eq("this_name")
-    end
-
-    describe "underscores" do
-      it "is treated like spaces" do
-        expect("weird_ combo".to_name.key).to eq("weird  combo".to_name.key)
-      end
-
-      it "does not impede pluralization checks" do
-        expect("Mamas_and_Papas".to_name.key).to(
-          eq("Mamas and Papas".to_name.key)
-        )
-      end
-
-      it "is removed when before first word character" do
-        expect("_This Name".to_name.key).to eq("this_name")
-      end
-    end
-
-    it "singularizes" do
-      expect("ethans".to_name.key).to eq("ethan")
-    end
-
-    it "changes CamelCase to snake case" do
-      expect("ThisThing".to_name.key).to eq("this_thing")
-    end
-
-    it "handles plus cards" do
-      expect("ThisThing+Ethans".to_name.key).to eq("this_thing+ethan")
-    end
-
-    it "retains * for star cards" do
-      expect("*right".to_name.key).to eq("*right")
-    end
-
-    it "does not singularize double s's" do
-      expect("grass".to_name.key).to eq("grass")
-    end
-
-    it "does not singularize letter 'S'" do
-      expect("S".to_name.key).to eq("s")
-    end
-
-    it "handles unicode characters" do
-      expect("Mañana".to_name.key).to eq("mañana")
-    end
-
-    it "handles weird initial characters" do
-      expect("__you motha @\#$".to_name.key).to eq("you_motha")
-      expect("?!_you motha @\#$".to_name.key).to eq("you_motha")
-    end
-
-    it "allows numbers" do
-      expect("3way".to_name.key).to eq("3way")
-    end
-
-    it "internal plurals" do
-      expect("cards hooks label foos".to_name.key).to eq("card_hook_label_foo")
-    end
-
-    it "handles html entities" do
-      # This no longer takes off the s, is singularize broken now?
-      expect("Jean-françois Noubel".to_name.key).to(
-        eq("jean_françoi_noubel")
-      )
-    end
-  end
-
-  describe "#url_key" do
-    cardnames = ["GrassCommons.org", "Oh you @##", "Alice's Restaurant!",
-                 "PB & J", "Mañana"].map(&:to_name)
-
-    cardnames.each do |cardname|
-      it "has the same key as the name" do
-        k = cardname.key
-        k2 = cardname.url_key
-        # warn "cn tok #{cardname.inspect}, #{k.inspect}, #{k2.inspect}"
-        expect(k).to eq(k2.to_name.key)
-      end
-    end
-  end
-
+RSpec.describe Card::Name do
   describe "#valid" do
-    it "accepts valid names" do
-      expect("this+THAT".to_name).to be_valid
-      expect("THE*ONE*AND$!ONLY".to_name).to be_valid
-    end
-
-    it "rejects invalid names" do
-      # 'Tes~sd'.to_name.should_not be_valid
-      expect("TEST/DDER".to_name).not_to be_valid
-    end
-
     it "rejects long names" do
       card = Card.new
       card.name = "1" * 256
@@ -107,48 +9,6 @@ describe Card::Name do
     end
   end
 
-  describe "#left_name" do
-    it "returns nil for non junction" do
-      expect("a".to_name.left_name).to eq(nil)
-    end
-
-    it "returns parent for parent" do
-      expect("a+b+c+d".to_name.left_name).to eq("a+b+c")
-    end
-  end
-
-  describe "#tag_name" do
-    it "returns last part of plus card" do
-      expect("a+b+c".to_name.tag).to eq("c")
-    end
-
-    it "returns name of simple card" do
-      expect("a".to_name.tag).to eq("a")
-    end
-  end
-
-  describe "#safe_key" do
-    it "subs pluses & stars" do
-      expect("Alpha?+*be-ta".to_name.safe_key).to eq("alpha-Xbe_tum")
-    end
-  end
-
-  describe "#replace_part" do
-    it "replaces first name part" do
-      expect("a+b".to_name.replace_part("a", "x").to_s).to eq("x+b")
-    end
-    it "replaces second name part" do
-      expect("a+b".to_name.replace_part("b", "x").to_s).to eq("a+x")
-    end
-    it "replaces two name parts" do
-      expect("a+b+c".to_name.replace_part("a+b", "x").to_s).to eq("x+c")
-      expect("a+b+c+d".to_name.replace_part("a+b", "e+f").to_s).to eq("e+f+c+d")
-    end
-    it "doesn't replace two part tag" do
-      expect("a+b+c".to_name.replace_part("b+c", "x").to_s).to eq("a+b+c")
-    end
-  end
-
   describe "Cardnames star handling" do
     it "recognizes star cards" do
       expect("*a".to_name.star?).to be_truthy
@@ -191,76 +51,6 @@ describe Card::Name do
   end
 
   describe "#to_absolute" do
-    it "handles _self, _whole, _" do
-      expect("_self".to_name.to_absolute("foo")).to eq("foo")
-      expect("_whole".to_name.to_absolute("foo")).to eq("foo")
-      expect("_".to_name.to_absolute("foo")).to eq("foo")
-    end
-
-    it "handles _left" do
-      expect("_left+Z".to_name.to_absolute("A+B+C")).to eq("A+B+Z")
-    end
-
-    it "handles white space" do
-      expect("_left + Z".to_name.to_absolute("A+B+C")).to eq("A+B+Z")
-    end
-
-    it "handles _right" do
-      expect("_right+bang".to_name.to_absolute("nutter+butter")).to(
-        eq("butter+bang")
-      )
-      expect("C+_right".to_name.to_absolute("B+A")).to eq("C+A")
-    end
-
-    it "handles leading +" do
-      expect("+bug".to_name.to_absolute("hum")).to eq("hum+bug")
-    end
-
-    it "handles trailing +" do
-      expect("bug+".to_name.to_absolute("tracks")).to eq("bug+tracks")
-    end
-
-    it "handles _(numbers)" do
-      expect("_1".to_name.to_absolute("A+B+C")).to eq("A")
-      expect("_1+_2".to_name.to_absolute("A+B+C")).to eq("A+B")
-      expect("_2+_3".to_name.to_absolute("A+B+C")).to eq("B+C")
-    end
-
-    it "handles _LLR etc" do
-      expect("_R".to_name.to_absolute("A+B+C+D+E")).to    eq("E")
-      expect("_L".to_name.to_absolute("A+B+C+D+E")).to    eq("A+B+C+D")
-      expect("_LR".to_name.to_absolute("A+B+C+D+E")).to   eq("D")
-      expect("_LL".to_name.to_absolute("A+B+C+D+E")).to   eq("A+B+C")
-      expect("_LLR".to_name.to_absolute("A+B+C+D+E")).to  eq("C")
-      expect("_LLL".to_name.to_absolute("A+B+C+D+E")).to  eq("A+B")
-      expect("_LLLR".to_name.to_absolute("A+B+C+D+E")).to eq("B")
-      expect("_LLLL".to_name.to_absolute("A+B+C+D+E")).to eq("A")
-    end
-
-    context "mismatched requests" do
-      it "returns _self for _left or _right on simple cards" do
-        expect("_left+Z".to_name.to_absolute("A")).to eq("A+Z")
-        expect("_right+Z".to_name.to_absolute("A")).to eq("A+Z")
-      end
-
-      it "handles bogus numbers" do
-        expect("_1".to_name.to_absolute("A")).to eq("A")
-        expect("_1+_2".to_name.to_absolute("A")).to eq("A+A")
-        expect("_2+_3".to_name.to_absolute("A")).to eq("A+A")
-      end
-
-      it "handles bogus _llr requests" do
-        expect("_R".to_name.to_absolute("A")).to eq("A")
-        expect("_L".to_name.to_absolute("A")).to eq("A")
-        expect("_LR".to_name.to_absolute("A")).to eq("A")
-        expect("_LL".to_name.to_absolute("A")).to eq("A")
-        expect("_LLR".to_name.to_absolute("A")).to eq("A")
-        expect("_LLL".to_name.to_absolute("A")).to eq("A")
-        expect("_LLLR".to_name.to_absolute("A")).to eq("A")
-        expect("_LLLL".to_name.to_absolute("A")).to eq("A")
-      end
-    end
-
     it "does session user substitution" do
       expect("_user".to_name.to_absolute("A")).to eq(Card::Auth.current.name)
       Card::Auth.as_bot do
@@ -269,19 +59,6 @@ describe Card::Name do
     end
   end
 
-  describe "#to_show" do
-    it "ignores ignorables" do
-      expect("you+awe".to_name.to_show("you")).to eq("+awe")
-      # HMMM..... what should this do?
-      expect("me+you+awe".to_name.to_show("you")).to eq("me+awe")
-      expect("me+you+awe".to_name.to_show("me")).to eq("+you+awe")
-      expect("me+you+awe".to_name.to_show("me", "you")).to eq("+awe")
-      expect("me+you".to_name.to_show("me", "you")).to eq("me+you")
-      expect("?a?+awe".to_name.to_show("A")).to eq("+awe")
-      expect("+awe".to_name.to_show).to eq("+awe")
-    end
-  end
-
   describe "part creation" do
     it "creates parts" do
       Card::Auth.as_bot do

data/spec/lib/card/query_spec.rb

@@ -1,6 +1,7 @@
 # -*- encoding : utf-8 -*-
 
-describe Card::Query do
+
+RSpec.describe Card::Query do
   A_JOINEES = %w(B C D E F).freeze
   CARDS_MATCHING_TWO = ["Joe User", "One+Two", "One+Two+Three",
                         "script: slot+*all+*script+*machine cache",
@@ -168,6 +169,40 @@ describe Card::Query do
     end
   end
 
+  describe "updated_by/updater_of" do
+    it "finds card updated by Narcissist" do
+      @query = { updated_by: "Narcissist" }
+      is_expected.to eq(%w(Magnifier+lens))
+    end
+
+    it "finds Narcississt as the card's updater" do
+      @query = { updater_of: "Magnifier+lens" }
+      is_expected.to eq(%w(Narcissist))
+    end
+
+    it "does not give duplicate results for multiple updates" do
+      @query = { updater_of: "First" }
+      is_expected.to eq(["Wagn Bot"])
+    end
+
+    it "does not give results if not updated" do
+      @query = { updater_of: "Sunglasses+price" }
+      is_expected.to be_empty
+    end
+
+    it "'or' doesn't mess up updated_by SQL" do
+      @query = { or: { updated_by: "Narcissist" } }
+      puts Card::Query.new(@query).sql
+      is_expected.to eq(%w(Magnifier+lens))
+    end
+
+    it "'or' doesn't mess up updater_of SQL" do
+      @query = { or: { updater_of: "First" } }
+      puts Card::Query.new(@query).sql
+      is_expected.to eq(["Wagn Bot"])
+    end
+  end
+
   describe "created_by/creator_of" do
     before do
       Card.create name: "Create Test", content: "sufficiently distinctive"
@@ -580,4 +615,24 @@ describe Card::Query do
       expect(perm_count).to eq(2)
     end
   end
+
+  describe "return part of name" do
+    subject do
+      Card::Query.run right: "C", return: @return, sort: :name
+    end
+    it "handles _left" do
+      @return = "_left"
+      is_expected.to eq %w(A+B A)
+    end
+
+    it "handles _right" do
+      @return = "_right"
+      is_expected.to eq %w(C C)
+    end
+
+    it "handles _LL" do
+      @return = "_LL"
+      is_expected.to eq ["A", ""]
+    end
+  end
 end

data/spec/lib/card/stage_director_spec.rb

@@ -354,6 +354,10 @@ describe Card::ActManager::StageDirector do
       }
     end
 
+    def create_single_card
+      Card.create! name: "single card"
+    end
+
     it "has correct name if supercard's name get changed" do
       Card::Auth.as_bot do
         changed = false
@@ -385,6 +389,21 @@ describe Card::ActManager::StageDirector do
       end
     end
 
+    it "load type_plus_right set module" do
+      Card::Auth.as_bot do
+        in_stage :prepare_to_validate,
+                 on: :create,
+                 for: "single card",
+                 trigger: :create_single_card do
+
+          u_card = attach_subfield "a user", type_id: Card::UserID
+          f_card = u_card.attach_subfield "*follow"
+          expect(f_card.set_modules)
+            .to include(Card::Set::TypePlusRight::User::Follow)
+        end
+      end
+    end
+
     it "adds subsubcard to correct subdirector" do
       Card::Auth.as_bot do
         in_stage :prepare_to_store,