card 1.15.7 → 1.16.0

data/mod/03_machines/set/right/machine_output.rb

@@ -9,12 +9,12 @@ format do
       super args
     end
   end
-  
+
   def update_machine_output_live?
     said = card.selected_action_id
     card.left.kind_of? Machine and                                  # must be a machine
-    !card.left.locked?         and                                  # machine must not already be running    
+    !card.left.locked?         and                                  # machine must not already be running
     ( card.new_card? or !said or said == card.last_action_id )      # must want current output (won't re-output old stuff)
   end
-  
+
 end

data/mod/03_machines/set/type/coffee_script.rb

@@ -14,7 +14,7 @@ rescue =>e
   e
 end
 
-machine_input do 
+machine_input do
   Uglifier.compile( compile_coffee format(:js)._render_raw )
 end
 
@@ -26,31 +26,31 @@ end
 
 
 format do
-  def chunk_list  #turn off autodetection of uri's 
+  def chunk_list  #turn off autodetection of uri's
     :inclusion_only
   end
 end
 
 
 format :html do
-  view :editor, :mod=>PlainText::HtmlFormat
+  view :editor, :mod=>Html::HtmlFormat
 
   view :content_changes do |args|
     %{
       <pre>#{super(args)}</pre>
     }
   end
-  
+
   view :core do |args|
     js = card.compile_coffee _render_raw
     highlighted_js = ::CodeRay.scan( js, :js ).div
     process_content highlighted_js
   end
-  
+
 end
 
 
-format do  
+format do
   view :core do |args|
     process_content card.compile_coffee(_render_raw)
   end

data/mod/03_machines/set/type/css.rb

@@ -33,7 +33,7 @@ format :html do
     { :view => :closed }
   end
 
-  view :editor, :mod=>PlainText::HtmlFormat
+  view :editor, :mod=>Html::HtmlFormat
 
   view :core do |args|
     # FIXME: scan must happen before process for inclusion interactions to work, but this will likely cause

data/mod/03_machines/set/type/java_script.rb

@@ -6,31 +6,30 @@ include MachineInput
 
 store_machine_output :filetype => "js"
 
-machine_input do 
+machine_input do
   Uglifier.compile(format(:js)._render_core)
 end
 
-
 def clean_html?
   false
 end
 
 
 format do
-  def chunk_list  #turn off autodetection of uri's 
+  def chunk_list  #turn off autodetection of uri's
     :inclusion_only
   end
 end
 
 format :html do
-  view :editor, :mod=>PlainText::HtmlFormat
+  view :editor, :mod=>Html::HtmlFormat
   view :content_changes, :mod=>CoffeeScript::HtmlFormat
-  
+
   view :core do |args|
     highlighted_js = ::CodeRay.scan( _render_raw, :js ).div
     process_content highlighted_js
   end
-  
+
 end
 
 def diff_args

data/mod/03_machines/spec/lib/shared_machine_examples.rb

@@ -33,12 +33,14 @@ shared_examples_for 'machine' do |filetype|
 end
 
 shared_examples_for 'content machine' do |filetype|
+
   it_should_behave_like 'machine', that_produces(filetype) do
     let(:machine) { machine_card }
   end
   
-  
   context '+machine_input card' do
+    
+    
     it "points to self" do
       Card::Auth.as_bot do
         machine_card.update_input_card

data/mod/03_machines/spec/set/type/scss_spec.rb

@@ -1,16 +1,16 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Set::Type::Scss do
-  let(:scss) { 
+  let(:scss) {
     %{
       $link_color: #abcdef;
-      a { color: $link_color; }  
+      a { color: $link_color; }
     }
   }
   let(:compressed_css) {  "a{color:#abcdef}\n" }
-  let(:changed_scss) { 
+  let(:changed_scss) {
     %{
-      $link_color: #fedcba; 
+      $link_color: #fedcba;
       a { color: $link_color; }
     }
   }
@@ -18,22 +18,21 @@ describe Card::Set::Type::Scss do
   before do
     @scss_card = Card[:style_cards]
   end
-  
-  
+
   it 'should highlight code in html' do
     assert_view_select @scss_card.format(:html).render_core, 'div[class=CodeRay]'
   end
-  
+
   it 'should not highlight code in css' do
     expect(@scss_card.format(:css).render_core).not_to match(/CodeRay/)
   end
-  
+
   it_should_behave_like "machine input"  do
     let(:create_machine_input_card) { Card.gimme! "test scss", :type => :scss, :content => scss }
     let(:create_another_machine_input_card) { Card.gimme! "more scss", :type => :scss, :content => scss }
     let(:create_machine_card)  { Card.gimme! "style with scss+*style", :type => :pointer }
     let(:card_content) do
-       { in:       scss,         out:     compressed_css, 
+       { in:       scss,         out:     compressed_css,
          changed_in:   changed_scss, changed_out: compressed_changed_css }
     end
   end
@@ -49,7 +48,7 @@ describe Card::Set::Type::Scss do
   it_should_behave_like 'content machine', that_produces_css do
     let(:machine_card) {  Card.gimme! "test scss", :type => :scss, :content => scss }
     let(:card_content) do
-       { in:       scss,         out:     compressed_css, 
+       { in:       scss,         out:     compressed_css,
          changed_in:   changed_scss, changed_out: compressed_changed_css }
     end
   end

data/mod/04_settings/lib/card/setting.rb

@@ -8,34 +8,36 @@ class Card
     #     E = Card::Set::Self::Create (module extended with M)
     #     O = Card["*create"]         (object)
     attr_accessor :codename                                                # accessible in E
-    mattr_accessor :groups, :group_names, :user_specific                   # accessible in E and M 
-    def self.extended(host_class)     
+    mattr_accessor :groups, :group_names, :user_specific                   # accessible in E and M
+    def self.extended(host_class)
        host_class.mattr_accessor :restricted_to_type, :rule_type_editable  # accessible in E and O
     end
-    
-    @@groups = { :permission =>[], :look_and_feel=>[], :communication => [], :pointer=>[], :other =>[] }
+
     @@group_names = {
-      :permission    => "Permission",
-      :look_and_feel => "Look and Feel",
-      :communication => "Communication",
+      :templating    => "Templating",
+      :permission    => "Permissions",
+      :webpage       => "Webpage",
       :pointer       => "Pointer",
-      :other         => "Other"  
+      :editing_cue   => "Editing cues",
+      :event         => "Events",
+      :other         => "Other"
     }
+    @@groups = @@group_names.keys.each_with_object({}) { |key, groups| groups[key] = [] }
     @@user_specific = ::Set.new
 
     def self.user_specific? codename
       @@user_specific.include? codename
     end
-    
+
     def to_type_id type
       type.is_a?(Fixnum) ? type : Card::Codename[type]
     end
-    
+
     # usage:
-    # setting_opts :group              => :permission | :look_and_feel | ...
+    # setting_opts :group              => :permission | :event | ...
     #              :position           => <Fixnum> (starting at 1, default: add to end)
     #              :rule_type_editable => true | false (default: false)
-    #              :restricted_to_type => <cardtype> | [ <cardtype>, ...] 
+    #              :restricted_to_type => <cardtype> | [ <cardtype>, ...]
     def setting_opts opts
       group = opts[:group] || :other
       @@groups[group] ||= []
@@ -48,7 +50,7 @@ class Card
       else
         @@groups[group] << self
       end
-  
+
       @codename = opts[:codename] || self.name.match(/::(\w+)$/)[1].underscore.to_sym
       self.rule_type_editable = opts[:rule_type_editable]
       self.restricted_to_type = opts[:restricted_to_type] ? ::Set.new([opts[:restricted_to_type]].flatten.map{ |cardtype| to_type_id(cardtype) }) : false
@@ -56,7 +58,7 @@ class Card
         @@user_specific << @codename
       end
     end
-    
+
     def applies_to_cardtype type_id
       !self.restricted_to_type or self.restricted_to_type.include? type_id
     end

data/mod/04_settings/set/right/structure.rb

@@ -1,4 +1,10 @@
 
+format :rss do
+  def raw_feed_items
+    [card]
+  end 
+end
+
 format :html do
   include AddHelp::HtmlFormat
 end

data/mod/04_settings/set/self/add_help.rb

@@ -1,2 +1,2 @@
 extend Card::Setting
-setting_opts  :group=>:communication, :position=>2, :rule_type_editable => true
+setting_opts  :group=>:editing_cue, :position=>2, :rule_type_editable => true

data/mod/04_settings/set/self/autoname.rb

@@ -1,2 +1,2 @@
 extend Card::Setting
-setting_opts :group=>:other, :position=>1
+setting_opts :group=>:templating, :position=>3

data/mod/04_settings/set/self/captcha.rb

@@ -1,2 +1,2 @@
 extend Card::Setting
-setting_opts :group=>:other, :position=>3
+setting_opts :group=>:permission, :position=>5

data/mod/04_settings/set/self/default.rb

@@ -1,2 +1,2 @@
 extend Card::Setting
-setting_opts :group=> :look_and_feel, :position=>1, :rule_type_editable => true
+setting_opts :group=> :templating, :position=>2, :rule_type_editable => true

data/mod/04_settings/set/self/help.rb

@@ -1,2 +1,2 @@
 extend Card::Setting
-setting_opts :group=>:communication, :position=>1, :rule_type_editable => true
+setting_opts :group=>:editing_cue, :position=>1, :rule_type_editable => true

data/mod/04_settings/set/self/input.rb

@@ -1,2 +1,2 @@
 extend Card::Setting
-setting_opts :group=>:pointer, :position=>3, :restricted_to_type => :pointer, :rule_type_editable => false
+setting_opts :group=>:pointer, :position=>3, :restricted_to_type => [:pointer,:session], :rule_type_editable => false

data/mod/04_settings/set/self/layout.rb

@@ -1,2 +1,2 @@
 extend Card::Setting
-setting_opts :group=>:look_and_feel, :position=>3, :rule_type_editable => false
+setting_opts :group=>:webpage, :position=>3, :rule_type_editable => false

data/mod/04_settings/set/self/on_create.rb

@@ -1,2 +1,2 @@
 extend Card::Setting
-setting_opts :group=>:communication, :position=>4 , :rule_type_editable => false
+setting_opts :group=>:event, :position=>1 , :rule_type_editable => false

data/mod/04_settings/set/self/on_delete.rb

@@ -1,2 +1,2 @@
 extend Card::Setting
-setting_opts :group=>:communication, :position=>5, :rule_type_editable => false
+setting_opts :group=>:event, :position=>3, :rule_type_editable => false

data/mod/04_settings/set/self/on_update.rb

@@ -1,2 +1,2 @@
 extend Card::Setting
-setting_opts :group=>:communication, :position=>4, :rule_type_editable => false
+setting_opts :group=>:event, :position=>2, :rule_type_editable => false

data/mod/04_settings/set/self/options.rb

@@ -1,2 +1,2 @@
 extend Card::Setting
-setting_opts :group=>:pointer, :position=>1, :restricted_to_type => :pointer, :rule_type_editable=>true
+setting_opts :group=>:pointer, :position=>1, :restricted_to_type => [:pointer,:session], :rule_type_editable=>true

data/mod/04_settings/set/self/options_label.rb

@@ -1,2 +1,2 @@
 extend Card::Setting
-setting_opts :group=>:pointer, :position=>2, :restricted_to_type => :pointer, :rule_type_editable => false
+setting_opts :group=>:pointer, :position=>2, :restricted_to_type => [:pointer,:session], :rule_type_editable => false

data/mod/04_settings/set/self/script.rb

@@ -1,2 +1,2 @@
 extend Card::Setting
-setting_opts :group=> :look_and_feel, :position=>5
+setting_opts :group=>:webpage, :position=>5

data/mod/04_settings/set/self/structure.rb

@@ -1,2 +1,2 @@
 extend Card::Setting
-setting_opts :group=> :look_and_feel, :position=>2, :rule_type_editable => true
+setting_opts :group=> :templating, :position=>2, :rule_type_editable => true

data/mod/04_settings/set/self/style.rb

@@ -1,2 +1,2 @@
 extend Card::Setting
-setting_opts :group=>:look_and_feel, :position=>4
+setting_opts :group=>:webpage, :position=>4

data/mod/04_settings/set/self/table_of_contents.rb

@@ -1,2 +1,2 @@
 extend Card::Setting
-setting_opts :group=> :look_and_feel, :position=>6, :rule_type_editable=>false
+setting_opts :group=> :other, :position=>1, :rule_type_editable=>false

data/mod/04_settings/set/self/thanks.rb

@@ -1,2 +1,2 @@
 extend Card::Setting
-setting_opts :group=>:communication, :position=>3, :rule_type_editable => false
+setting_opts :group=>:other, :position=>3, :rule_type_editable => false

data/mod/05_email/set/all/follow.rb

@@ -35,7 +35,7 @@ format do
     end
     follow_rule_name = card.default_follow_set_card.follow_rule_name( Auth.current.name )
     hash[:path] = path :name=>follow_rule_name, :action=>:update,
-                       :success=>{ :view=>:modal_content },
+                       :success=>{ :layout=>:modal, :view=>:follow_status },
                        :card=>{ :content=>"[[#{hash[:content]}]]" }
     hash
   end
@@ -52,26 +52,8 @@ format :html do
 
   view :follow_link, :tags=>:unknown_ok, :perms=>:none do |args|
     hash = follow_link_hash args
-    text = %[<span class="follow-verb">#{hash[:verb]}</span> #{args[:label]}]
-    opts = {
-      :title           => hash[:title],
-      :class           => "follow-toggle #{hash[:class]}",
-      'data-follow'    => JSON(hash),
-      'data-rule_name' => card.default_follow_set_card.follow_rule_name( Auth.current.name ).to_name.url_key,
-      'data-card_key'  => card.key
-    }
-    link_to text, '', opts
-  end
-
-  def default_follow_link_args args
-    args[:toggle] ||=  card.followed? ? :off : :on
-    args[:label]  ||=  card.follow_label
-  end
-
-
-  view :follow_modal_link, :tags=>:unknown_ok, :perms=>:none do |args|
-    hash = follow_link_hash args
-    text = %[#{glyphicon 'flag'}<span class="follow-verb menu-item-label">#{hash[:verb]}</span>]
+    text = args[:icon] ? glyphicon('flag') : ''
+    text += %[<span class="follow-verb menu-item-label">#{hash[:verb]}</span>].html_safe
     follow_rule_card = Card.fetch(card.default_follow_set_card.follow_rule_name( Auth.current.name ), :new=>{})
     opts = ( args[:html_args] || {} ).clone
     opts.merge!(

data/mod/05_email/set/all/notify.rb

@@ -57,15 +57,31 @@ def act_card
   @supercard || self
 end
 
+
+def followable?
+  true
+end
+
+def notable_change?
+  !supercard && current_act && Card::Auth.current_id != WagnBotID && followable?
+end
+
+event :notify_followers_after_save, :after=>:subsequent, :on=>:save, :when=>proc{ |ca| ca.notable_change? } do
+  notify_followers
+end
+
+# in the delete case we have to calculate the follower_stash beforehand
+# but we can't pass the follower_stash through the ActiveJob queue.
+# We have to deal with the notifications in the extend phase instead of the subsequent phase
 event :stash_followers, :after=>:approve, :on=>:delete do
   act_card.follower_stash ||=  FollowerStash.new
   act_card.follower_stash.add_affected_card self
 end
+event :notify_followers_after_delete, :after=>:extend, :on=>:delete, :when=>proc{ |ca| ca.notable_change? } do
+  notify_followers
+end
 
-event :notify_followers, :after=>:extend, :when=>proc{ |c|
-    !c.supercard and c.current_act and Card::Auth.current_id != WagnBotID
-  }  do
-
+def notify_followers
   begin
     @current_act.reload
     @follower_stash ||= FollowerStash.new

data/mod/05_email/set/right/follow.rb

@@ -44,33 +44,31 @@ format :html do
     end
   end
 
-  def default_modal_content_args args
+  def default_follow_status_args args
     args[:card_key] ||= card.set_prototype.key
   end
 
-  view :modal_header do |args|
+  view :follow_status do |args|
+    #          #{ link_to '×', '', 'aria-hidden'=>true, :class=>'close update-follow-link', 'data-dismiss'=>'modal', 'data-card_key'=>args[:card_key] }
     %{
-      #{ link_to '×', '', 'aria-hidden'=>true, :class=>'close update-follow-link', 'data-dismiss'=>'modal', 'data-card_key'=>args[:card_key] }
-       <h4 class="modal-title">Get notified about changes</h4>
-    }
-  end
 
-  view :modal_body do |args|
-    wrap_with :ul, :class=>'delete-list list-group' do
-      card.item_names.map do |option|
-        content_tag :li, :class=>'list-group-item' do
-          subformat(card).render_follow_item :condition=>(option == '*never' ? '*always' : option)
-        end
-      end.join "\n"
-    end
-  end
+      <h4>Get notified about changes</h4>
 
+      #{
+        wrap_with( :ul, :class=>'delete-list list-group') do
+          card.item_names.map do |option|
+            content_tag :li, :class=>'list-group-item' do
+              subformat(card).render_follow_item :condition=>(option == '*never' ? '*always' : option)
+            end
+          end.join "\n"
+        end
+      }
 
-  view :modal_footer do |args|
-    card_link(args[:card_key], :text=>'more options', :path_opts=>{:view=>:related, :related=>{:name=>card.name,:view=>:related_edit_rule}}, :class=>'btn update-follow-link', 'data-card_key'=>args[:card_key]) +
-      link_to('Close', '', :class=>'btn btn-default update-follow-link', 'data-dismiss'=>'modal', 'data-card_key'=>args[:card_key])
+      #{ card_link(args[:card_key], :text=>'more options', :path_opts=>{:view=>:related, :related=>{:name=>card.name,:view=>:related_edit_rule}}, :class=>'btn update-follow-link', 'data-card_key'=>args[:card_key]) }
+    }
   end
 
+
   view :delete_follow_rule_button do |args|
     button_tag :type=>:submit, :class=>'btn-xs btn-item-delete btn-primary', 'aria-label'=>'Left Align' do
       tag :span, :class=>"glyphicon glyphicon-ok", 'aria-hidden'=>"true"