card 1.20.4 → 1.21.0

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

@@ -1,3 +1,8 @@
+include_set Abstract::WqlSearch
+
+def wql_hash
+  { type_id: id }
+end
 
 format :html do
   view :type do |args|
@@ -31,7 +36,7 @@ format :html do
     card_url _render_add_path(args)
   end
 
-  view :add_path do |args|
+  view :add_path do |_args|
     path_args = {}
     if voo.params
       context = ((@parent && @parent.card) || card).name
@@ -62,8 +67,7 @@ def default_follow_set_card
 end
 
 def cards_of_type_exist?
-  # FIXME: faster test than counting all of type?
-  !new_card? && Auth.as_bot { Card.count_by_wql type_id: id } > 0
+  !new_card? && Card.where(trash: false, type_id: id).exists?
 end
 
 def create_ok?

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

@@ -1,8 +1,6 @@
 
 format :html do
-  # what is this for?  Can't you just use TYPE-date and editor
-  # to match this cas, no special view needed?
-  view :editor do
-    text_field :content, class: "date-editor"
+  def editor
+    :calendar
   end
 end

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

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 include_set Type::Html
 
 format :html do

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

@@ -58,7 +58,7 @@ event :update_related_listed_by_card_on_content_update, :finalize,
 end
 
 event :update_related_listed_by_card_on_name_and_type_changes, :finalize,
-      on: :update, changed: [:name, :type_id] do
+      on: :update, changed: %i[name type_id] do
   update_all_items
 end
 

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

@@ -60,8 +60,7 @@ end
 def listed_by
   Card.search(
     { type: "list", right: trunk.type_name,
-      left: { type: cardname.tag }, refer_to: cardname.trunk, return: :name
-      }, "listed_by" # better wql comment would be...better
+      left: { type: cardname.tag }, refer_to: cardname.trunk, return: :name }, "listed_by" # better wql comment would be...better
   )
 end
 

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

@@ -1,6 +1,8 @@
 
-view :editor do
-  text_field :content, class: "card-content"
+format :html do
+  def editor
+    :text_field
+  end
 end
 
 event :validate_number, :validate do

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

@@ -1,3 +1,5 @@
-view :editor do
-  text_field :content, class: "card-content"
+format :html do
+  def editor
+    :text_field
+  end
 end

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

@@ -1,4 +1,3 @@
-include_set Abstract::AceEditor
 include_set Abstract::WqlSearch
 
 format do
@@ -53,6 +52,11 @@ format :rss do
 end
 
 format :html do
+  view :closed do
+    voo.hide :closed_content
+    super()
+  end
+
   view :closed_content, cache: :never do
     if @depth > max_depth
       "..."
@@ -64,7 +68,11 @@ format :html do
     end
   end
 
-  def default_editor_args args
-    args[:ace_mode] = "json"
+  def editor
+    :ace_editor
+  end
+
+  def ace_mode
+    :json
   end
 end

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

@@ -3,9 +3,9 @@ include_set Type::SearchType
 
 format :html do
   COMMON_RULE_SETTINGS =
-    [:create, :read, :update, :delete, :structure, :default, :style].freeze
+    %i[create read update delete structure default style].freeze
 
-  view :core, cache: :never do |args|
+  view :core, cache: :never do
     voo.show :set_label, :rule_navbar
     voo.hide :set_navbar
     rule_view = params[:rule_view] || :common_rules
@@ -59,10 +59,10 @@ format :html do
 
   view :field_related_rules do
     with_label_and_navbars :field_related_rules do
-      field_settings = [:default, :help, :structure]
+      field_settings = %i[default help structure]
       if card.type_id == PointerID
         # FIXME: should be done with override in pointer set module
-        field_settings += [:input, :options, :options_label]
+        field_settings += %i[input options options_label]
       end
       settings = card.visible_setting_codenames & field_settings
       rules_table settings
@@ -127,7 +127,7 @@ format :html do
 
   def rules_table_headings
     wrap_with :tr, class: "rule-group" do
-      wrap_each_with :th, %w(Trait Content Set), class: "rule-heading"
+      wrap_each_with :th, %w[Trait Content Set], class: "rule-heading"
     end
   end
 
@@ -180,7 +180,7 @@ format :html do
     ""
   end
 
-  view :set_navbar do |args|
+  view :set_navbar do |_args|
     id = "rule-navbar-#{card.cardname.safe_key}-#{voo.home_view}"
     related_sets = card.related_sets(true)
     return "" if related_sets.size <= 1
@@ -329,8 +329,8 @@ end
 
 def visible_setting_codenames
   @visible_settings ||=
-    Card::Setting.groups.values.flatten.compact.reject do |setting|
-      !setting.applies_to_cardtype(prototype.type_id)
+    Card::Setting.groups.values.flatten.compact.select do |setting|
+      setting.applies_to_cardtype(prototype.type_id)
     end.map(&:codename)
 end
 

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

@@ -2,7 +2,7 @@ def checked?
   content == "1"
 end
 
-view :core do |_args|
+view :core do
   case card.raw_content.to_i
   when 1 then "yes"
   when 0 then "no"
@@ -28,5 +28,3 @@ format :html do
     label :content, card.cardname.tag
   end
 end
-
-

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

@@ -1,6 +1,4 @@
 format do
-  include Phrase::Format
-
   view :core do
     link_to_resource _render_raw, render_title
   end
@@ -9,3 +7,9 @@ format do
     link_to_resource _render_raw
   end
 end
+
+format :html do
+  def editor
+    :text_field
+  end
+end

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

@@ -11,6 +11,7 @@ describe Card::Content::Chunk::Nest, "Inclusion" do
     end
     let(:options) { instance.options }
     let(:name) { instance.name }
+
     it "ignores invisible comments" do
       expect(render_content("{{## now you see nothing}}")).to eq("")
     end
@@ -94,9 +95,9 @@ describe Card::Content::Chunk::Nest, "Inclusion" do
       expect { |b| instance.send(:each_option, "", &b) }.not_to yield_control
       expect { |b| instance.send(:each_option, nil, &b) }.not_to yield_control
       expect { |b| instance.send(:each_option, "a:b;c:4", &b) }
-        .to yield_successive_args(%w(a b), %w(c 4))
+        .to yield_successive_args(%w[a b], %w[c 4])
       expect { |b| instance.send(:each_option, "d:b;e:4; ", &b) }
-        .to yield_successive_args(%w(d b), %w(e 4))
+        .to yield_successive_args(%w[d b], %w[e 4])
     end
   end
 

data/mod/standard/spec/chunk/query_reference_spec.rb

@@ -6,13 +6,13 @@ describe Card::Content::Chunk::QueryReference, "QueryReference" do
       @class = Card::Content::Chunk::QueryReference
     end
 
+    subject { query_refs.first.name }
+
     let :query_refs do
       content = Card::Content.new @content, Card.new(type: "Search")
       content.find_chunks(Card::Content::Chunk::QueryReference)
     end
 
-    subject { query_refs.first.name }
-
     it "handles simple search" do
       @content = '{"name":"Waldo"}'
       is_expected.to eq "Waldo"

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

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 describe Card::Set::All::History do
   context "history view" do
     # before do

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

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 describe Card::Set::All::Links do
   require "card"
   describe "#link_to_resource" do

data/mod/standard/spec/set/all/rich_html/toolbar_spec.rb

@@ -3,6 +3,7 @@ describe Card::Set::All::RichHtml::Toolbar do
     subject do
       render_content "{{A|edit}}"
     end
+
     it "renders toolbar" do
       is_expected.to have_tag "div", with: { class: "SELF-a edit-view" } do
         with_tag "nav", with: { class: "toolbar" }
@@ -13,6 +14,7 @@ describe Card::Set::All::RichHtml::Toolbar do
     subject do
       render_content "{{A|edit; hide: toolbar}}"
     end
+
     it "hides toolbar" do
       is_expected.to have_tag "div", with: { class: "SELF-a edit-view" } do
         without_tag "nav", with: { class: "toolbar" }

data/mod/standard/spec/set/self/activity_toolbar_button_spec.rb

@@ -0,0 +1,22 @@
+# -*- encoding : utf-8 -*-
+
+describe Card::Set::Self::ActivityToolbarButton do
+  subject do
+    render_view :edit, name: "A"
+  end
+
+  it "is rendered in toolbar" do
+    is_expected.to include "activity"
+  end
+
+  it "can be hidden with read rule" do
+    Card::Auth.as_bot do
+      ensure_card %i[activity_toolbar_button self read],
+                  content: "Administrator"
+    end
+
+    with_user "Joe User" do
+      is_expected.not_to include "activity"
+    end
+  end
+end

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

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 require "card/mailer"
 
 describe Card::Set::Type::EmailTemplate::EmailConfig do
@@ -143,6 +144,7 @@ describe Card::Set::Type::EmailTemplate::EmailConfig do
 
   context "with context card" do
     subject(:config) { mailconfig(context: context_card) }
+
     let(:context_card) do
       file = File.new(File.join(FIXTURES_PATH, "mao2.jpg"))
       Card.create(
@@ -202,14 +204,14 @@ describe Card::Set::Type::EmailTemplate::EmailConfig do
     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
+      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|core}}"

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

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 require "card/mailer"
 
 describe Card::Set::Type::EmailTemplate do

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

@@ -2,6 +2,7 @@
 
 describe Card::Set::Type::List do
   subject { Card.fetch("Parry Hotter+authors").item_names.sort }
+
   before do
     Card::Auth.as_bot do
       Card.create! name: "Stam Broker+books", type: "listed by"
@@ -60,6 +61,7 @@ describe Card::Set::Type::List do
       subject do
         Card.fetch("Parry Moppins+authors").item_names.sort
       end
+
       it { is_expected.to eq ["Darles Chickens", "Stam Broker"] }
     end
 

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

@@ -2,6 +2,7 @@
 
 describe Card::Set::Type::ListedBy do
   let(:listed_by) { Card.fetch("Darles Chickens+books").item_names.sort }
+
   before do
     Card::Auth.as_bot do
       Card.create!(
@@ -28,6 +29,7 @@ describe Card::Set::Type::ListedBy do
            "Parry Hotter" and "50 grades of shy"' do
     describe "Darles Chickens+books" do
       subject { listed_by }
+
       it { is_expected.to eq ["50 grades of shy", "Parry Hotter"] }
 
       it "is recorded in the reference table" do
@@ -122,6 +124,7 @@ describe Card::Set::Type::ListedBy do
           )
         end
         subject { Card.fetch("Darles Eggs+books").item_names.sort }
+
         it { is_expected.to eq ["50 grades of shy", "Parry Hotter"] }
       end
       context "when the cartype of Darles Chickens changed" do
@@ -133,6 +136,7 @@ describe Card::Set::Type::ListedBy do
       end
       context "when the name of Darles Chickens+books changed" do
         subject { Card.fetch("Darles Chickens+authors").item_names.sort }
+
         before do
           Card["Darles Chickens+books"].update_attributes!(
             name: "Darles Chickens+authors"
@@ -145,6 +149,7 @@ describe Card::Set::Type::ListedBy do
           Card["book"].update_attributes! name: "literature"
         end
         subject { Card.fetch("Darles Chickens+literature").item_names.sort }
+
         it { is_expected.to eq ["50 grades of shy", "Parry Hotter"] }
       end
       context "when the name of the cardtype authors changed" do

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

@@ -89,7 +89,7 @@ describe Card::Set::Type::SearchType do
       subject do
         Card::Env.params[:item] = :name_with_fields
         render_card_with_args :core, { name: "Book+*type+by name" },
-                    { format: :csv },  items: { view: :name_with_fields }
+                              { format: :csv },  items: { view: :name_with_fields }
       end
 
       it "has title row item name and field names" do

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

@@ -13,6 +13,7 @@ describe Card::Set::Type::Toggle do
 
   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"
@@ -20,5 +21,3 @@ describe Card::Set::Type::Toggle do
     end
   end
 end
-
-

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

@@ -21,7 +21,6 @@ describe Card::Set::Type::Uri do
     card = Card.create(type: "URI", name: "A URI card",
                        content: "http://wagn.org/Home")
 
-
     assert_view_select(
       card.format.render("core", title: "My Title"),
       'a[class="external-link"][href="http://wagn.org/Home"]'

data/mod/tinymce_editor/db/migrate_cards/20160804112560_add_tinymce_cards.rb

@@ -25,13 +25,15 @@ class AddTinymceCards < Card::Migration
     ensure_card name: "*TinyMCE", type_id: Card::PlainTextID,
                 codename: "tiny_mce",
                 content: TINYMCE_CONFIG
+    Card::Cache.reset_all
     create_or_update(
       name: "*TinyMCE+*self+*help",
       content: "Configure [[http://tinymce.com|TinyMCE]], Wagn's default "\
                "[[http://en.wikipedia.org/wiki/Wysiwyg|wysiwyg]] editor. "\
                "[[http://wagn.org/TinyMCE|more]]"
     )
-    ensure_card name: "script: tinymce", type_id: Card::JavaScriptID,
+    ensure_card name: "script: tinymce",
+                type_id: Card::JavaScriptID,
                 codename: "script_tinymce"
     ensure_card name: "script: tinymce config",
                 type_id: Card::CoffeeScriptID,

data/mod/tinymce_editor/set/abstract/tinymce_editor.rb

@@ -1,5 +1,5 @@
 format :html do
-  view :editor do
+  def tinymce_editor_input
     text_area :content, rows: 3, class: "tinymce-textarea card-content",
                         id: unique_id
   end