card 1.91 → 1.92

data/mod/machines/lib/javascript/decko.js.coffee

@@ -400,3 +400,12 @@ warn = (stuff) -> console.log stuff if console?
 decko.slotReady (slot) ->
   slot.find('._disappear').delay(5000).animate(
     height: 0, 1000, -> $(this).hide())
+
+  if slot.hasClass("_refresh-timer")
+    setTimeout(
+      -> $.get slot.data("refresh-url"), (data, status) ->
+        slot.setSlotContent data
+        #new_slot = slot.replaceWith data
+        #new_slot.trigger('slotReady')
+      2000
+    )

data/mod/machines/lib/javascript/decko_mod.js.coffee

@@ -17,6 +17,9 @@ window.decko ||= {} #needed to run w/o *head.  eg. jasmine
 #  initfunc()
 
 $(window).ready ->
+  $('body').on 'click', '._stop_propagation', (event)->
+    event.stopPropagation()
+
   #pointer mod
   $('body').on 'click', '.pointer-item-add', (event)->
     last_item = $(this).closest('.content-editor').find '.pointer-li:last'

data/mod/machines/lib/stylesheets/style_cards.scss

@@ -421,19 +421,15 @@ textarea {
 .pointer-list-editor {
   margin: 0px;
   padding: 0px;
-  input {
-    margin-right: 10px;
-    width: 65%;
-  }
   li {
     list-style: none;
     white-space: nowrap;
   }
-  .pointer-item-delete {
-    margin-left: 4px;
-    vertical-align: middle;
-    display: inline-block;
-    position: relative;
+
+  .input-group-btn {
+    .btn {
+      border-bottom-width: 1px;
+    }
   }
 
   .pointer-item-add {
@@ -543,26 +539,26 @@ ul.action-list {
   list-style-type: none;
   padding-left: 15px;
   li:before {
-    font-family: 'Glyphicons Halflings';
+    font-family: 'Material Icons';
     float: left;
     margin-top: 4px;
     margin-left: -17px;
   }
 
   li.update:before {
-    content: "\270f";
+    content: "edit";
   }
 
   li.create:before {
-    content: "\2b";
+    content: "add";
   }
 
   li.delete:before {
-    content: "\e020";
+    content: "delete";
   }
 
   li.draft:before {
-    content: "\e136";
+    content: "build";
   }
 }
 

data/mod/machines/set/abstract/machine.rb

@@ -205,7 +205,7 @@ def make_machine_output_coded mod=:machines
   Auth.as_bot do
     output_codename =
       machine_output_card.cardname.parts.map do |part|
-        Card[part].codename || Card[part].cardname.safe_key
+        Card[part].codename.to_s || Card[part].cardname.safe_key
       end.join "_"
     machine_output_card.update_attributes! codename: output_codename,
                                            storage_type: :coded,

data/mod/machines/spec/set/abstract/machine_spec.rb

@@ -4,7 +4,7 @@ describe Card::Set::Abstract::Machine do
   describe "#make_machine_output_coded" do
     it "creates coded file" do
       Card[:all, :script].make_machine_output_coded
-      mod_path = Card::Mod::Loader.mod_dirs.path "machines"
+      mod_path = Card::Mod.dirs.path "machines"
       path = File.join mod_path, "file", "all_script_machine_output", "file.js"
       expect(File.exist?(path)).to be_truthy
     end

data/mod/machines/spec/set/type/scss_spec.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 
-describe Card::Set::Type::Scss do
+RSpec.describe Card::Set::Type::Scss do
   let(:scss) do
     <<-SCSS
       $link_color: #abcdef;
@@ -45,12 +45,10 @@ describe Card::Set::Type::Scss do
     end
   end
 
-  it "processes links and nests but not urls" do
-    Card::Auth.as_bot do
-      scss = ".TYPE-X.no-citations {\n  color: #BA5B5B;\n}\n"
-      card = Card.create! name: "minimal css", type: "scss", content: scss
-      card.format(:css).render_core.should == scss
-    end
+  it "processes links and nests but not urls", as_bot: true do
+    scss = ".TYPE-X.no-citations {\n  color: #BA5B5B;\n}\n"
+    card = Card.create! name: "minimal css", type: "scss", content: scss
+    card.format(:css).render_core.should == scss
   end
 
   it_behaves_like "content machine", that_produces: :css do

data/mod/machines/spec/shared_examples/machine.rb

@@ -68,12 +68,12 @@ shared_examples_for "pointer machine" do |args|
     #
 
     change_machine = machine_card
-    @depth = 2
+    depth = 2
     @leaf_items = []
     @expected_items = expected_input_items || []
     start = @expected_items.size
     Card::Auth.as_bot do
-      @depth.times do |i|
+      depth.times do |i|
         @leaf_items << Card.fetch("level #{i} basic 1",
                                   new: { type: Card::BasicID })
         @leaf_items.last.save
@@ -84,7 +84,7 @@ shared_examples_for "pointer machine" do |args|
 
       # we build the tree from bottom up
       last_level = false
-      (@depth - 1).downto(0) do |i|
+      (depth - 1).downto(0) do |i|
         next_level = Card.fetch("level #{i} #{filetype} ",
                                 new: { type: :pointer })
         next_level.content = ""

data/mod/notifications/set/all/follow.rb

@@ -53,7 +53,7 @@ format :json do
 end
 
 format :html do
-  view :follow_link, tags: :unknown_ok, perms: :none do |args|
+  view :follow_link, tags: :unknown_ok, perms: :none, cache: :never do |args|
     hash = follow_link_hash args
     text = args[:icon] ? icon_tag(:flag) : ""
     span_attrs = "follow-verb menu-item-label"
@@ -94,7 +94,7 @@ def follow_rule_card?
 end
 
 def follow_option?
-  codename && FollowOption.codenames.include?(codename.to_sym)
+  codename && FollowOption.codenames.include?(codename)
 end
 
 # used for the follow menu overwritten in type/set.rb and type/cardtype.rb

data/mod/notifications/set/all/send_notifications.rb

@@ -129,23 +129,30 @@ rescue => e
   notable_exception_raised
 end
 
+
+
 format do
-  view :list_of_changes, denial: :blank do |args|
+  view :list_of_changes, denial: :blank, cache: :never do |args|
     action = get_action(args)
 
-    relevant_fields =
-      case action.action_type
-      when :create then %i[cardtype content]
-      when :update then %i[name cardtype content]
-      when :delete then [:content]
-      end
 
-    relevant_fields.map do |type|
+    relevant_fields(action).map do |type|
       edit_info_for(type, action)
     end.compact.join
   end
 
-  view :subedits, perms: :none do |args|
+  def relevant_fields action
+    case action.action_type
+    when :create then
+      %i[cardtype content]
+    when :update then
+      %i[name cardtype content]
+    when :delete then
+      [:content]
+    end
+  end
+
+  view :subedits, perms: :none, cache: :never do |args|
     subedits =
       get_act(args).actions_affecting(card).map do |action|
         if action.card_id != card.id
@@ -161,7 +168,7 @@ format do
     end
   end
 
-  view :subedit_notice, denial: :blank do |args|
+  view :subedit_notice, denial: :blank, cache: :never do |args|
     action = get_action(args)
     name_before_action =
       (action.value(:name) && action.previous_value(:name)) || card.name
@@ -198,7 +205,7 @@ format do
     set_card.follow_rule_name voo.closest_live_option(:follower)
   end
 
-  view :unfollow_url, perms: :none, closed: true do |_args|
+  view :unfollow_url, perms: :none, closed: true, cache: :never do |_args|
     if (rule_name = live_follow_rule_name)
       target_name = "#{voo.closest_live_option :follower}+#{Card[:follow].name}"
       update_path = page_path target_name, action: :update,
@@ -219,7 +226,6 @@ format do
       else ""
       end
     item_title += "#{field}: "
-
     item_value =
       if action.action_type == :delete
         action.previous_value field
@@ -259,20 +265,20 @@ format do
 end
 
 format do
-  view :last_action_verb do |args|
+  view :last_action_verb, cache: :never do |args|
     act = get_act(args)
     "#{act.main_action.action_type}d"
   end
 end
 
 format :email_text do
-  view :last_action, perms: :none do |args|
+  view :last_action, perms: :none, cache: :never do |args|
     _render_last_action_verb args
   end
 end
 
 format :email_html do
-  view :last_action, perms: :none do |args|
+  view :last_action, perms: :none, cache: :never do |args|
     _render_last_action_verb args
   end
 

data/mod/notifications/set/right/bcc.rb

@@ -24,7 +24,7 @@ format :email_text do
       # note that context is processed twice here because pointers absolutize
       # item_names by default while other types can return relative names.
       # That's poor default behavior and should be fixed!
-      item_name = item_name.to_name.to_absolute(context).to_s
+      item_name = item_name.to_name.absolute(context).to_s
       if item_name =~ /.+\@.+\..+/
         item_name
       elsif (item_card = Card.fetch(item_name))

data/mod/notifications/set/right/follow.rb

@@ -51,7 +51,7 @@ format :html do
   def follow_item_link_target
     set = card.rule_set
     setname = set.cardname
-    set.tag.codename == "self" ? setname.left : setname.field("by name")
+    set.tag.codename == :self ? setname.left : setname.field("by name")
   end
 
   def follow_item_link_text condition

data/mod/notifications/set/right/html_message.rb

@@ -3,3 +3,9 @@ include_set Abstract::TestContext
 def clean_html?
   false
 end
+
+format :email_html do
+  def view_caching?
+    false
+  end
+end

data/mod/notifications/set/right/text_message.rb

@@ -1 +1,7 @@
 include_set Abstract::TestContext
+
+format :text do
+  def view_caching?
+    false
+  end
+end

data/mod/notifications/spec/set/all/notify_spec.rb

@@ -1,179 +1,112 @@
 # -*- encoding : utf-8 -*-
 
 shared_examples_for "notifications" do
-  describe "#list_of_changes" do
-    name = "subedit notice"
-    content = "new content"
+  let(:created) { Card["Created card"] }
+  let(:updated) { Card["Updated card"] }
+  let(:deleted) { Card.fetch("Deleted card", look_in_trash: true) }
 
-    before do
-      @card = Card.create!(name: name, content: content)
+  describe "#list_of_changes" do
+    def list_of_changes card, args={}
+      card.format(format: format).render_list_of_changes(args)
     end
-    subject { @card.format(format: format).render_list_of_changes }
 
-    context "for a new card" do
-      it { is_expected.to include "content: #{content}" }
-      it { is_expected.to include "cardtype: Basic" }
-    end
-    context "for a updated card" do
-      before do
-        @card.update_attributes!(
-          name: "bnn card", type: :pointer, content: "changed content"
-        )
-      end
-      it { is_expected.to include "new content: [[changed content]]" }
-      it { is_expected.to include "new cardtype: Pointer" }
-      it { is_expected.to include "new name: bnn card" }
+    example "for a new card" do
+      expect(list_of_changes(created))
+        .to include("content: new content", "cardtype: Basic")
     end
-    context "for a deleted card" do
-      before { @card.delete }
-      it { is_expected.to be_empty }
+
+    example "for a updated card" do
+      expect(list_of_changes(updated))
+        .to include("new content: [[changed content]]",
+                    "new cardtype: Pointer",
+                    "new name: Updated card")
     end
 
-    context "for a given action" do
-      subject do
-        action = @card.last_action
-        @card.update_attributes!(
-          name: "bnn card", type: :pointer, content: "changed content"
-        )
-        @card.format(format: format).render_list_of_changes(action: action)
-      end
+    example "for a deleted card" do
+      expect(list_of_changes(deleted)).to be_empty
+    end
 
-      it { is_expected.to include "content: #{content}" }
+    example "for a given action" do
+      action = updated.create_action
+      expect(list_of_changes(updated, action: action))
+        .to include "content: new content"
     end
-    context "for a given action id" do
-      subject do
-        action_id = @card.last_action.id
-        @card.update_attributes!(
-          name: "bnn card", type: :pointer, content: "changed content"
-        )
-        @card.format(format: format)
-             .render_list_of_changes(action_id: action_id)
-      end
 
-      it { is_expected.to include "content: #{content}" }
+    example "for a given action id" do
+      action_id = updated.create_action.id
+      expect(list_of_changes(updated, action_id: action_id))
+              .to include "content: new content"
     end
   end
 
   describe "subedit_notice" do
-    def list_of_changes_for card
-      card.db_content
+    def subedit_notice card
+      card.format(format: format).render_subedit_notice
     end
-    name = "subedit notice card"
-    content = "new content"
-    before do
-      @card = Card.create!(name: name, content: content)
-    end
-    subject { @card.format(format: format).render_subedit_notice }
 
-    context "for a new card" do
-      it { is_expected.to include name }
-      it { is_expected.to include "created" }
-      it { is_expected.to include list_of_changes_for @card }
+    example "for a created card" do
+      expect(subedit_notice(created))
+        .to include("Created card", "created", "new content")
     end
 
-    context "for a updated card" do
-      changed_name = "changed subedit notice"
-      changed_content = "changed content"
-      before do
-        @card.update_attributes!(name: changed_name, content: changed_content)
-      end
-      it { is_expected.to include changed_name }
-      it { is_expected.to include "updated" }
-      it { is_expected.to include list_of_changes_for @card }
+    example "for an updated card" do
+      expect(subedit_notice(updated))
+        .to include("Updated card", "updated", "changed content")
     end
 
-    context "for a deleted card" do
-      before { @card.delete }
-      it { is_expected.to include name }
-      it { is_expected.to include "deleted" }
+    example "for a deleted card" do
+      expect(subedit_notice(deleted))
+        .to include("Deleted card", "deleted")
     end
   end
 end
 
-describe Card::Set::All::SendNotifications do
+RSpec.describe Card::Set::All::SendNotifications do
   before do
     ::Card.any_instance.stub(:'silent_change?').and_return(false)
   end
 
+  def notification_email_for card_name, followed_set: "#{card_name}+*self"
+    Card[:follower_notification_email].format.render_mail(
+      context:   Card[card_name].refresh(true),
+      to:        Card["Joe User"].email,
+      follower:  Card["Joe User"].name,
+      followed_set:  followed_set,
+      follow_option: "*always"
+    ).text_part.body.raw_source
+  end
+
+
   describe "content of notification email" do
+
+
     context "for new card with subcards" do
-      name = "another card with subcards"
-      content = "main content {{+s1}}  {{+s2}}"
-      sub1_content = "new content of subcard 1"
-      sub2_content = "new content of subcard 2"
-      before do
-        Card::Auth.as_bot do
-          @card = Card.create!(name: name, content: content,
-                               subcards: { "+s1" => { content: sub1_content },
-                                           "+s2" => { content: sub2_content } })
-        end
+      specify do
+        expect(notification_email_for "card with fields")
+          .to include("main content", "content of field 1" , "content of field 2")
       end
-      subject do
-        Card[:follower_notification_email].format.render_mail(
-          context:   @card.refresh(true),
-          to:        Card["Joe User"].email,
-          follower:  Card["Joe User"].name,
-          followed_set:  "#{@card.name}+*self",
-          follow_option: "*always"
-        ).text_part.body.raw_source
-      end
-
-      it { is_expected.to include content }
-      it { is_expected.to include sub1_content }
-      it { is_expected.to include sub2_content }
 
       context "and missing permissions" do
-        context "for subcard" do
-          before do
-            create_or_update! "#{name}+s1+*self+*read",
-                              type: "Pointer", content: "[[Administrator]]"
-          end
-          it "excludes subcard content" do
-            is_expected.not_to include sub1_content
-            is_expected.to include sub2_content
-          end
+        example "for a field" do
+            expect(notification_email_for("card with fields and admin fields"))
+              .to not_include("content of admin field 1")
+                    .and include("content of field 1")
         end
-        context "for main card" do
-          subject do
-            Card[:follower_notification_email].format.render_mail(
-              context:   @card.refresh(true),
-              to:        Card["Joe User"].email,
-              follower:  Card["Joe User"].name,
-              followed_set:  @card.name + "+s1+*self",
-              follow_option: "*always"
-            ).text_part.body.raw_source
-          end
 
-          before do
-            create_or_update! "#{name}+*self+*read",
-                              type: "Pointer", content: "[[Administrator]]"
-            create_or_update! "#{name}+s1+*self+*read",
-                              type: "Pointer", content: "[[Anyone]]"
-          end
-          it "includes subcard content" do
-            is_expected.to include sub1_content
-          end
-          it "excludes maincard content" do
-            is_expected.not_to include content
-            is_expected.not_to be_empty
-          end
+        example "for main card" do
+          card_name = "admin card with fields and admin fields"
+          email = notification_email_for card_name,
+                                         followed_set: "#{card_name}+field 1+*self"
+          expect(email).to include("content of field 1").and not_include("main content")
         end
-        context "for all parts" do
-          before do
-            create_or_update! "#{name}+s1+*self+*read",
-                              type: "Pointer", content: "[[Administrator]]"
-            create_or_update! "#{name}+s2+*self+*read",
-                              type: "Pointer", content: "[[Administrator]]"
-            create_or_update! "#{name}+*self+*read",
-                              type: "Pointer", content: "[[Administrator]]"
-          end
-          it { is_expected.not_to include content }
-          it { is_expected.not_to include sub1_content }
-          it { is_expected.not_to include sub2_content }
-          it "will not be send" do
-            expect(Card["Joe User"].account.changes_visible?(@card.acts.last))
-              .to be_falsey
-          end
+
+        example "for all parts" do
+          card = Card["admin card with admin fields"]
+            expect("admin card with admin fields")
+              .to not_include("main content").and not_include("content of admin field 1")
+                                             .and not_include("content of admin field 2")
+            expect(Card["Joe User"].account.changes_visible?(card.acts.last))
+                          .to be_falsey
         end
       end
     end
@@ -191,53 +124,41 @@ describe Card::Set::All::SendNotifications do
     end
 
     it "creates well formatted text message" do
-      name = "another card with subcards"
-      content = "main content {{+s1}}  {{+s2}}"
-      sub1_content = "new content of subcard 1"
-      sub2_content = "new content of subcard 2"
-      Card::Auth.as_bot do
-        @card = Card.create!(name: name, content: content,
-                             subcards: { "+s1" => { content: sub1_content },
-                                         "+s2" => { content: sub2_content } })
-      end
-      result = Card[:follower_notification_email].format.render_mail(
-        context:   @card,
-        to:        Card["Joe User"].email,
-        follower:  Card["Joe User"].name,
-        followed_set:  "#{@card.name}+*self",
-        follow_option: "*always"
-      ).text_part.body.raw_source
       unfollow_link =
-        "/update/Joe_User+*follow?card%5Bsubcards%5D%5Banother+"\
-        "card+with+subcards%2B%2Aself%2BJoe+User%2B%2Afollow%5D=%2Anever"
-      expect(result)
-        .to eq(%("another card with subcards" was just created by Joe User.
+        "/update/Joe_User+*follow?card%5Bsubcards%5D%5B"\
+        "card+with+fields%2B%2Aself%2BJoe+User%2B%2Afollow%5D=%2Anever"
+
+      expect(notification_email_for("card with fields"))
+        .to eq(
+      <<-TEXT
+"card with fields" was just created by Joe User.
 
    cardtype: Basic
-   content: main content {{+s1}}  {{+s2}}
+   content: main content {{+field 1}}  {{+field 2}}
 
 
 
 This update included the following changes:
 
-another card with subcards+s1 created
+card with fields+field 1 created
    cardtype: Basic
-   content: new content of subcard 1
+   content: content of field 1
 
 
-another card with subcards+s2 created
+card with fields+field 2 created
    cardtype: Basic
-   content: new content of subcard 2
+   content: content of field 2
 
 
 
 
-See the card: /another_card_with_subcards
+See the card: /card_with_fields
 
-You received this email because you're following "another card with subcards".
+You received this email because you're following "card with fields".
 
 Use this link to unfollow #{unfollow_link}
-))
+TEXT
+)
     end
   end