card 1.16.14 → 1.16.15

data/mod/05_standard/set/self/search.rb

@@ -1,43 +1,66 @@
 
 format :html do
-
   view :title do |args|
     vars = root.search_params[:vars]
     if vars && vars[:keyword]
-       args.merge! title: %{Search results for: <span class="search-keyword">#{ vars[:keyword] }</span>}
+      args.merge! title: %{Search results for: <span class="search-keyword">}\
+                         "#{vars[:keyword]}</span>"
     end
     super args
   end
 end
 
-
 format :json do
-
-  view :complete do |args|
-    term = params['_keyword']
-    if term =~ /^\+/ && main = params['main']
-      term = main+term
-    end
-
+  view :complete do
+    term = complete_term
     exact = Card.fetch term, new: {}
-    goto_cards = Card.search goto_wql(term)
-    goto_cards.unshift exact.name if exact.known? && !goto_cards.map{|n| n.to_name.key}.include?(exact.key)
 
     {
-      search: true, # card.ok?( :read ),
-      add:    (exact.new_card? && exact.cardname.valid? && !exact.virtual? && exact.ok?( :create ) && exact.name),
-      new:    (exact.type_id==Card::CardtypeID &&
-                  Card.new(type_id: exact.type_id).ok?(:create) &&
-                  [exact.name, exact.cardname.url_key]
-                 ),
-      goto:   goto_cards.map { |name| [name, highlight(name, term), name.to_name.url_key] }
+      search: true,
+      add: add_item(exact),
+      new: new_item_of_type(exact),
+      goto: goto_items(term, exact)
     }
+  end
+
+  def add_item exact
+    return unless exact.new_card? &&
+                  exact.cardname.valid? &&
+                  !exact.virtual? &&
+                  exact.ok?(:create)
+    exact.name
+  end
 
+  def new_item_of_type exact
+    return unless (exact.type_id == Card::CardtypeID) &&
+                  Card.new(type_id: exact.id).ok?(:create)
+    [exact.name, exact.cardname.url_key]
   end
 
-  #hacky.  here for override
-  def goto_wql(term)
-   { complete: term, limit: 8, sort: 'name', return: 'name' }
+  def goto_items term, exact
+    goto_names = Card.search goto_wql(term), "goto items for term: #{term}"
+    if add_exact_to_goto_names? exact, goto_names
+      goto_names.unshift exact.name
+    end
+    goto_names.map do |name|
+      [name, highlight(name, term), name.to_name.url_key]
+    end
   end
 
+  def add_exact_to_goto_names? exact, goto_names
+    exact.known? && !goto_names.find { |n| n.to_name.key == exact.key }
+  end
+
+  def complete_term
+    term = params['_keyword']
+    if (term =~ /^\+/) && (main = params['main'])
+      term = main + term
+    end
+    term
+  end
+
+  # hacky.  here for override
+  def goto_wql term
+    { complete: term, limit: 8, sort: 'name', return: 'name' }
+  end
 end

data/mod/05_standard/set/type/cardtype.rb

@@ -1,6 +1,5 @@
 
 format :html do
-
   view :type do |args|
     args.merge!(type_class: 'no-edit') if card.cards_of_type_exist?
     super args
@@ -8,7 +7,12 @@ format :html do
 
   view :type_formgroup do |args|
     if card.cards_of_type_exist?
-      %{<div>Sorry, this card must remain a Cardtype so long as there are <strong>#{ card.name }</strong> cards.</div>}
+      %{
+        <div>
+          Sorry, this card must remain a Cardtype so long as there are
+          <strong>#{card.name}</strong> cards.
+        </div>
+      }
     else
       super args
     end
@@ -33,36 +37,34 @@ format :html do
     if args[:params]
       context = ((@parent && @parent.card) || card).name
       Rack::Utils.parse_nested_query(args[:params]).each do |key, value|
-         value = value.to_name.to_absolute(context) if value
-         key   = key.to_name.to_absolute(context)
-         path_args[key] = value
+        value = value.to_name.to_absolute(context) if value
+        key = key.to_name.to_absolute(context)
+        path_args[key] = value
       end
     end
     path_args[:action] = 'new'
     page_path card.cardname, path_args
   end
-
 end
 
-
 include Basic
 
-
 def follow_label
   default_follow_set_card.follow_label
 end
 
-def followed_by? user_id = nil
+def followed_by? user_id=nil
   default_follow_set_card.all_members_followed_by? user_id
 end
 
 def default_follow_set_card
+  # FIXME: use codename
   Card.fetch("#{name}+*type")
 end
 
-
 def cards_of_type_exist?
-  !new_card? and Auth.as_bot { Card.count_by_wql type_id: id } > 0
+  # FIXME: faster test than counting all of type?
+  !new_card? && Auth.as_bot { Card.count_by_wql type_id: id } > 0
 end
 
 event :check_for_cards_of_type, after: :validate_delete do

data/mod/05_standard/set/type/listed_by.rb

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

data/mod/05_standard/set/type/set.rb

@@ -1,14 +1,14 @@
 
 format :html do
-
   view :core do |args|
     _render args[:rule_view], args
   end
+
   def default_core_args args
     args[:rule_view] ||= :common_rules
-    args[:optional_set_label]   ||= :show
+    args[:optional_set_label] ||= :show
+    args[:optional_set_navbar] ||= :hide
     args[:optional_rule_navbar] ||= :show
-    args[:optional_set_navbar]  ||= :hide
   end
 
   def with_label_and_navbars args
@@ -24,16 +24,20 @@ format :html do
 
   view :all_rules do |args|
     with_label_and_navbars args.merge(selected_view: :all_rules) do
-      rules_table (card.visible_setting_codenames.sort & card.visible_setting_codenames), args
+      rules_table card.visible_setting_codenames.sort, args
     end
   end
 
   view :grouped_rules do |args|
     with_label_and_navbars args.merge(selected_view: :grouped_rules) do
-      content_tag(:div, class: 'panel-group', id: 'accordion', role: 'tablist','aria-multiselectable'=>'true') do
-         Card::Setting.groups.keys.map do |group_key|
-           _optional_render(group_key, args, :show)
-         end * "\n"
+      content_tag(:div, class: 'panel-group',
+                        id: 'accordion',
+                        role: 'tablist',
+                        'aria-multiselectable' => 'true'
+                 ) do
+        Card::Setting.groups.keys.map do |group_key|
+          _optional_render(group_key, args, :show)
+        end * "\n"
       end
     end
   end
@@ -201,20 +205,20 @@ def followed_by? user_id = nil
   all_members_followed_by? user_id
 end
 
-
 def default_follow_set_card
   self
 end
 
 def inheritable?
   return true if junction_only?
-  cardname.trunk_name.junction? and cardname.tag_name.key == Card::SelfSet.pattern.key
+  cardname.trunk_name.junction? &&
+    cardname.tag_name.key == Card::SelfSet.pattern.key
 end
 
 def subclass_for_set
-  set_class_key = tag.codename
-  Card.set_patterns.find do |sub|
-    cardname.tag_name.key == sub.pattern.key
+  current_set_pattern_code = tag.codename
+  Card.set_patterns.detect do |set|
+    current_set_pattern_code == set.pattern_code
   end
 end
 

data/mod/05_standard/set/type/signup.rb

@@ -4,8 +4,7 @@ format :html do
     super args
     args.merge!(
       optional_help: :show, # , optional_menu: :never
-      buttons: button_tag(' Submit',
-                          disable_with: 'Submitting', situation: 'primary'),
+      buttons: submit_button,
       account: card.fetch(trait: :account, new: {}),
       title: 'Sign up',
       hidden: {

data/mod/05_standard/set/type/user.rb

@@ -45,7 +45,7 @@ format :html do
   end
 
   def setup_button
-    button_tag 'Set up', disable_with: 'Setting up', situation: 'primary'
+    submit_button text: 'Set up', disable_with: 'Setting up'
   end
 end
 

data/mod/05_standard/spec/set/all/account_spec.rb

@@ -126,7 +126,7 @@ describe Card::Set::All::Account do
 
     it "9 more should apply to Joe Admin" do
       # includes lots of account rules...
-      Card::Auth.as(:joe_admin) do
+      Card::Auth.as('joe_admin') do
         ids = Card::Auth.as_card.read_rules
         expect(ids.length).to eq(@read_rules.size + 9)
       end

data/mod/05_standard/spec/set/all/history_spec.rb

@@ -93,7 +93,7 @@ describe Card::Set::All::History do
         end
 
         it "doesn't create act and actions if subcard fails" do
-          Card::Auth.as(:joe_user) do
+          Card::Auth.as('joe_user') do
             act_count    = Card::Act.count
             action_count = Card::Action.count
             Card.create name: "crete fail", subcards: {'*all+*create'=>''}

data/mod/05_standard/spec/set/type/email_template_spec.rb

@@ -3,7 +3,7 @@ require 'card/mailer'
 
 describe Card::Set::Type::EmailTemplate do
   let(:email_name) { 'a mail template' }
-  let(:email) {Card.fetch(email_name)}
+  let(:email) { Card.fetch(email_name) }
 
   def mailconfig args={}
     Card[email_name].email_config(args)
@@ -19,66 +19,65 @@ describe Card::Set::Type::EmailTemplate do
 
   before do
     Card::Auth.current_id = Card::WagnBotID
-    chunk_test = "Url(wagn.org) Link([[http://wagn.org|Wagn]]) Inclusion({{B|name}}) Card link([[A]])"
+    chunk_test = 'Url(wagn.org) Link([[http://wagn.org|Wagn]])'\
+                 ' Inclusion({{B|name}}) Card link([[A]])'
     Card.create! name: email_name, type: :email_template, subcards: {
-      "+*to"           =>  "joe@user.com",
-      "+*from"         =>  "from@user.com",
-      "+*subject"      =>  "*subject #{chunk_test}",
-      "+*html_message" =>  "*html message #{chunk_test}",
-      "+*text_message" =>  "*text message #{chunk_test}"
+      '+*to'           =>  'joe@user.com',
+      '+*from'         =>  'from@user.com',
+      '+*subject'      =>  "*subject #{chunk_test}",
+      '+*html_message' =>  "*html message #{chunk_test}",
+      '+*text_message' =>  "*text message #{chunk_test}"
     }
   end
 
-  describe "mail view" do
+  describe 'mail view' do
     let(:content_type) do
-      card = Card.create!(name: 'content type test', type: :email_template, subcards: @fields)
+      card = Card.create!(name: 'content type test', type: :email_template,
+                          subcards: @fields)
       email = card.format.render_mail
       email[:content_type].value
     end
 
     it 'renders text email if text message given' do
-      @fields = { "+*text_message" => "text" }
+      @fields = { '+*text_message' => 'text' }
       expect(content_type).to include 'text/plain'
     end
 
     it 'renders html email if html message given' do
-      @fields = { "+*html_message" =>  "text" }
+      @fields = { '+*html_message' =>  'text' }
       expect(content_type).to include 'text/html'
     end
 
     it 'renders multipart email if text and html given' do
-      @fields = {'+*text_message'=>'text', '+*html_message'=>'text'}
+      @fields = { '+*text_message' => 'text', '+*html_message' => 'text' }
       expect(content_type).to include 'multipart/alternative'
     end
-
   end
 
-
-  describe "#email_config" do
-
+  describe '#email_config' do
     describe 'address fields' do
       it 'uses *from field' do
-        expect( mailconfig[:from] ).to eq 'from@user.com'
+        expect(mailconfig[:from]).to eq 'from@user.com'
       end
 
       it 'uses *to field' do
-        expect( mailconfig[:to] ).to eq 'joe@user.com'
+        expect(mailconfig[:to]).to eq 'joe@user.com'
       end
 
       it 'handles pointer values' do
-        create_field '*cc', content: "[[joe@user.com]]", type: 'Pointer'
-        expect( mailconfig[:cc] ).to eq 'joe@user.com'
+        create_field '*cc', content: '[[joe@user.com]]', type: 'Pointer'
+        expect(mailconfig[:cc]).to eq 'joe@user.com'
       end
 
-
-      #it 'handles email syntax in pointer values' do
-      #  create_field '*cc', content: "[[Joe User <joe@user.com>]]", type: 'Pointer'
+      # it 'handles email syntax in pointer values' do
+      #  create_field '*cc', content: "[[Joe User <joe@user.com>]]",
+      #                      type: 'Pointer'
       #  expect( mailconfig[:cc] ).to eq 'Joe User <joe@user.com>'
-      #end
+      # end
 
       it 'handles link to email card' do
-        create_field '*cc', content: "[[Joe User+*email]]", type: 'Pointer'
-        expect( mailconfig[:cc] ).to eq 'joe@user.com'
+        create_field '*cc', content: '[[Joe User+*email]]', type: 'Pointer'
+        expect(mailconfig[:cc]).to eq 'joe@user.com'
       end
 
       # it 'handles link with valid email address' do
@@ -87,120 +86,127 @@ describe Card::Set::Type::EmailTemplate do
       # end
 
       it 'handles search card' do
-        create_field '*bcc', content: '{"name":"Joe Admin","append":"*email"}', type: 'Search'
-        expect( mailconfig[:bcc] ).to eq 'joe@admin.com'
+        create_field '*bcc', content: '{"name":"Joe Admin","append":"*email"}',
+                             type: 'Search'
+        expect(mailconfig[:bcc]).to eq 'joe@admin.com'
       end
-
-      # it 'handles invalid email address' do  #TODO not obvious how to deal with that.
-                                              #      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")
+      # TODO: not obvious how to deal with that.
+      # it 'handles invalid email address' 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")
       # end
     end
 
+    describe 'subject' do
+      subject { mailconfig[:subject] }
 
-     describe 'subject' do
-       subject { mailconfig[:subject] }
-
-       it 'uses *subject field' do
+      it 'uses *subject field' do
         is_expected.to include '*subject'
-       end
-       it 'does not render url' do
-         is_expected.to include 'Url(wagn.org)'
-       end
-       it 'does not render link' do
-         is_expected.to include 'Link([[http://wagn.org|Wagn]])'
-       end
-       it 'renders inclusion' do
-         is_expected.to include 'Inclusion(B)'
-       end
-     end
-
-     describe 'text message' do
-       subject { mailconfig[:text_message] }
-
-       it 'uses *text_message field' do
-         is_expected.to include '*text message'
-       end
-       it 'does not render url' do
-         is_expected.to include 'Url(wagn.org)'
-       end
-       it 'renders link' do
-         is_expected.to include 'Link(Wagn[http://wagn.org])'
-       end
-       it 'renders inclusion' do
-         is_expected.to include 'Inclusion(B)'
-       end
-
-     end
-
-     describe 'html message' do
-       subject { mailconfig[:html_message] }
-
-       it 'uses *html_message field' do
-         is_expected.to include '*html message'
-       end
-       it 'renders url' do
-         is_expected.to include 'Url(<a target="_blank" class="external-link" href="http://wagn.org">wagn.org</a>)'
-       end
-       it 'renders link' do
-         is_expected.to include 'Link(<a target="_blank" class="external-link" href="http://wagn.org">Wagn</a>)'
-       end
-       it 'renders inclusion' do
-         is_expected.to include 'Inclusion(B)'
-       end
-       it "renders absolute urls" do
-         Card::Env[:protocol] = 'http://'
-         Card::Env[:host] = 'www.fake.com'
-         is_expected.to include 'Card link(<a class="known-card" href="http://www.fake.com/A">A</a>)'
-       end
-     end
-
-
-     context 'with context card' do
-       let(:context_card) do
-         Card.create(
-           name:    "Banana",
-           content: "data content [[A]]",
-           subcards: {
-             '+email'      => {content: 'gary@gary.com'},
-             '+subject'    => {type: 'Pointer', content: '[[default subject]]'},
-             '+attachment' => {type: 'File', content: "notreally.txt" }
-           }
-         )
-       end
-       subject {  mailconfig( context: context_card ) }
-
-       it 'handles contextual name in address search' do
-         update_field '*from', content: '{"left":"_self", "right":"email"}', type: 'Search'
-         expect(subject[:from]).to eq "gary@gary.com"
-       end
-
-       it 'handles contextual names and structure rules in subject' do
-         Card.create! name: 'default subject', content: 'a very nutty thang', type: 'Phrase'
-         Card.create! name: "subject search+*right+*structure", content: %{{"referred_to_by":"_left+subject"}}, type: 'Search'
-         update_field '*subject', content: "{{+subject search|core;item:core}}"
-         expect(subject[:subject]).to eq("a very nutty thang")
-       end
-
-       it 'handles _self in html message' do
-          update_field '*html message', content: "Triggered by {{_self|name}}"
-          expect(subject[:html_message]).to  include("Triggered by Banana")
-       end
-
-       it 'handles _left in html message' do
-         update_field '*html_message', content: "Nobody expects {{_left+surprise|core}}"
-         Card.create name: 'Banana+surprise', content: "the Spanish Inquisition"
-         c = Card.create name: "Banana+emailtest", content: "data content"
-         expect( mailconfig( context: c )[:html_message] ).to include 'Nobody expects the Spanish Inquisition'
-
-       end
-
-       it 'handles contextual name for attachments' do
-         create_field '*attach', type: "Pointer", content: "[[_self+attachment]]"
-         expect(subject[:attach]).to eq ['Banana+attachment'.to_name]
-       end
-     end
+      end
+      it 'does not render url' do
+        is_expected.to include 'Url(wagn.org)'
+      end
+      it 'does not render link' do
+        is_expected.to include 'Link([[http://wagn.org|Wagn]])'
+      end
+      it 'renders inclusion' do
+        is_expected.to include 'Inclusion(B)'
+      end
+    end
 
-  end
+    describe 'text message' do
+      subject { mailconfig[:text_message] }
+
+      it 'uses *text_message field' do
+        is_expected.to include '*text message'
+      end
+      it 'does not render url' do
+        is_expected.to include 'Url(wagn.org)'
+      end
+      it 'renders link' do
+        is_expected.to include 'Link(Wagn[http://wagn.org])'
+      end
+      it 'renders inclusion' do
+        is_expected.to include 'Inclusion(B)'
+      end
+    end
+
+    describe 'html message' do
+      subject { mailconfig[:html_message] }
 
+      it 'uses *html_message field' do
+        is_expected.to include '*html message'
+      end
+      it 'renders url' do
+        is_expected.to include 'Url(<a target="_blank" class="external-link" '\
+                               'href="http://wagn.org">wagn.org</a>)'
+      end
+      it 'renders link' do
+        is_expected.to include 'Link(<a target="_blank" class="external-link" '\
+                               'href="http://wagn.org">Wagn</a>)'
+      end
+      it 'renders inclusion' do
+        is_expected.to include 'Inclusion(B)'
+      end
+      it 'renders absolute urls' do
+        Card::Env[:protocol] = 'http://'
+        Card::Env[:host] = 'www.fake.com'
+        is_expected.to include 'Card link(<a class="known-card" '\
+                               'href="http://www.fake.com/A">A</a>)'
+      end
+    end
+
+    context 'with context card' do
+      let(:context_card) do
+        file = File.new(File.join FIXTURES_PATH, 'mao2.jpg')
+        Card.create(
+          name:    'Banana',
+          content: 'data content [[A]]',
+          subcards: {
+            '+email' => { content: 'gary@gary.com' },
+            '+subject' => { type: 'Pointer', content: '[[default subject]]' },
+            '+attachment' => { type: 'File', file: file }
+          }
+        )
+      end
+      subject {  mailconfig(context: context_card) }
+
+      it 'handles contextual name in address search' do
+        update_field '*from', content: '{"left":"_self", "right":"email"}',
+                              type: 'Search'
+        expect(subject[:from]).to eq 'gary@gary.com'
+      end
+
+      it 'handles contextual names and structure rules in subject' do
+        Card.create! name: 'default subject', content: 'a very nutty thang',
+                     type: 'Phrase'
+        Card.create! name: 'subject search+*right+*structure',
+                     content: %{{"referred_to_by":"_left+subject"}},
+                     type: 'Search'
+        update_field '*subject', content: '{{+subject search|core;item:core}}'
+        expect(subject[:subject]).to eq('a very nutty thang')
+      end
+
+      it 'handles _self in html message' do
+        update_field '*html message', content: 'Triggered by {{_self|name}}'
+        expect(subject[:html_message]).to include('Triggered by Banana')
+      end
+
+      it 'handles _left in html message' do
+        update_field '*html_message',
+                     content: 'Nobody expects {{_left+surprise|core}}'
+        Card.create name: 'Banana+surprise', content: 'the Spanish Inquisition'
+        c = Card.create name: 'Banana+emailtest', content: 'data content'
+        expected = mailconfig(context: c)[:html_message]
+        expect(expected).to include 'Nobody expects the Spanish Inquisition'
+      end
+
+      it 'handles contextual name for attachments' do
+        create_field '*attach', type: 'Pointer', content: '[[_self+attachment]]'
+        expect(subject[:attach]).to eq ['Banana+attachment'.to_name]
+      end
+    end
+  end
 end