card 1.15.1 → 1.15.2

data/mod/03_machines/set/self/script_card_menu.rb

@@ -1,3 +1,11 @@
+view :raw do |args|
 
-format { include ScriptAce::Format }
-format(:html) { include ScriptAce::HtmlFormat }
+  Rails.logger.info "reading file: #{Cardio.gem_root}/mod/03_machines/lib/javascript/#{card.codename}.js.coffee"
+  File.read "#{Cardio.gem_root}/mod/03_machines/lib/javascript/#{card.codename}.js.coffee"
+end
+
+format :html do
+  view :editor do |args|
+    "Content is stored in file and can't be edited."
+  end
+end

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

@@ -19,11 +19,10 @@ event :cache_expired_because_of_new_user_rule, :before=>:extend, :when=>proc { |
 end
 
 format do
-    
+
   def follow_link_hash args
     toggle = args[:toggle] || ( card.followed? ? :off : :on )
     hash = { :class => "follow-toggle-#{toggle}" }
-
     case toggle
     when :off
       hash[:content] = '*never'
@@ -34,13 +33,14 @@ format do
       hash[:title]   = "send emails about changes to #{card.follow_label}"
       hash[:verb]    = 'follow'
     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 },
+                       :card=>{ :content=>"[[#{hash[:content]}]]" }
     hash
-      
   end
-  
-  
-end
 
+end
 
 format :json do
   view :follow_status do |args|
@@ -49,7 +49,7 @@ format :json do
 end
 
 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]}]
@@ -62,12 +62,28 @@ format :html do
     }
     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>]
+    follow_rule_card = Card.fetch(card.default_follow_set_card.follow_rule_name( Auth.current.name ), :new=>{})
+    opts = ( args[:html_args] || {} ).clone
+    opts.merge!(
+      :title           => hash[:title],
+      'data-path'      => hash[:path],
+      'data-toggle'    => 'modal',
+      'data-target'    => "#modal-#{card.cardname.safe_key}",
+    )
+    opts[:class] = "follow-link #{opts[:class]}"
+    link_to text, hash[:path], opts
+  end
+
 end
 
 
@@ -91,7 +107,7 @@ def follow_rule_card?
 end
 
 def follow_option?
-  codename && FollowOption.codenames.include?(codename.to_sym) 
+  codename && FollowOption.codenames.include?(codename.to_sym)
 end
 
 # used for the follow menu
@@ -111,7 +127,7 @@ def followed_by? user_id
 end
 
 def followed?
-  followed_by? Auth.current_id 
+  followed_by? Auth.current_id
 end
 
 
@@ -119,9 +135,9 @@ def follow_rule_applies? follower_id
   follow_rule = rule :follow, :user_id=>follower_id
   if follow_rule.present?
     follow_rule.split("\n").each do |value|
-           
+
       value_code = value.to_name.code
-      accounted_ids = ( 
+      accounted_ids = (
         @follower_candidate_ids[ value_code ] ||=
           if block = FollowOption.follower_candidate_ids[ value_code ]
             block.call self
@@ -129,17 +145,17 @@ def follow_rule_applies? follower_id
             []
           end
       )
-              
-      applicable = 
+
+      applicable =
         if test = FollowOption.test[ value_code ]
           test.call follower_id, accounted_ids
         else
           accounted_ids.include? follower_id
         end
-      
+
       return value.gsub( /[\[\]]/, '' ) if applicable
     end
-  end 
+  end
   return false
 end
 
@@ -157,7 +173,7 @@ def default_follow_set_card
 end
 
 
-# returns true if according to the follow_field_rule followers of self also 
+# returns true if according to the follow_field_rule followers of self also
 # follow changes of field_card
 def followed_field? field_card
   (follow_field_rule = rule_card(:follow_fields)) || follow_field_rule.item_names.find do |item|
@@ -192,7 +208,7 @@ end
 def direct_follower_ids args={}
   result = ::Set.new
   with_follower_candidate_ids do
-    set_names.each do |set_name| 
+    set_names.each do |set_name|
       set_card = Card.fetch(set_name)
       set_card.all_user_ids_with_rule_for(:follow).each do |user_id|
         if (!result.include? user_id) and self.follow_rule_applies?(user_id)
@@ -205,9 +221,9 @@ def direct_follower_ids args={}
 end
 
 def all_direct_follower_ids_with_reason
-  with_follower_candidate_ids do  
+  with_follower_candidate_ids do
     visited = ::Set.new
-    set_names.each do |set_name| 
+    set_names.each do |set_name|
       set_card = Card.fetch(set_name)
       set_card.all_user_ids_with_rule_for(:follow).each do |user_id|
         if (!visited.include?(user_id)) && (follow_option = self.follow_rule_applies?(user_id))
@@ -243,7 +259,7 @@ module ClassMethods
   def follower_ids_cache
     Card.cache.read(FOLLOWER_IDS_CACHE_KEY) || {}
   end
-  
+
   def write_follower_ids_cache hash
     Card.cache.write FOLLOWER_IDS_CACHE_KEY, hash
   end

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

@@ -1,9 +1,87 @@
 include All::Permissions::Follow
 
-def options 
+def options
   Card::FollowOption.cards.compact
 end
 
 def options_card
   Card.new :name=>'follow_options_card', :type_code=>:pointer, :content=>options.map {|oc| "[[#{oc.title}]]" }.join("\n")
 end
+
+
+format :html do
+  def default_follow_item_args args
+    args[:condition] ||= Env.params[:condition] || '*always'
+  end
+
+  view :follow_item, :tags=>:unknown_ok do |args|
+    if card.new_card? || !card.include_item?(args[:condition])
+      button_view = :add_follow_rule_button
+      form_opts = {:add_item=>args[:condition]}
+    else
+      button_view = :delete_follow_rule_button
+      form_opts = {:drop_item=>args[:condition]}
+    end
+
+    text = if (option_card = Card.fetch args[:condition])
+             option_card.description(card.rule_set)
+           else
+             card.rule_set.follow_label
+           end
+    link_target = if card.rule_set.tag.codename == 'self'
+                    card.rule_set_name.left
+                  else
+                    "#{card.rule_set_name}+by name"
+                  end
+    wrap do
+      card_form({:action=>:update, :name=>card.name, :success=>{:view=>:follow_item}},
+              :hidden=>{:condition=>args[:condition]}.merge(form_opts)) do
+        output [
+          _optional_render(button_view, args),
+          card_link( link_target, :text=>text)
+        ]
+      end
+    end
+  end
+
+  def default_modal_content_args args
+    args[:card_key] ||= card.set_prototype.key
+  end
+
+  view :modal_header do |args|
+    %{
+      #{ 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
+
+
+  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])
+  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"
+    end
+
+  end
+
+  view :add_follow_rule_button do |args|
+    button_tag :type=>:submit, :class=>'btn-xs btn-item-add', 'aria-label'=>'Left Align' do
+      tag :span, :class=>"glyphicon glyphicon-plus", 'aria-hidden'=>"true"
+    end
+  end
+
+end

data/mod/05_email/set/type_plus_right/user/follow.rb

@@ -19,7 +19,7 @@ def virtual?; true end
 
 format() { include Card::Set::Type::Pointer::Format   }
 
- 
+
 format :html do
    include Card::Set::Type::Pointer::HtmlFormat
 
@@ -27,8 +27,8 @@ format :html do
    view :closed_content do |args|
      ''
    end
-   
-   
+
+
    view :core do |args|
      %{
       <div role="tabpanel">
@@ -44,8 +44,8 @@ format :html do
       </div>
      }
    end
- 
- 
+
+
    def followed_by_option
      hash = Hash.new { |h,k| h[k] = [] }
      card.item_cards.each do |follow_rule|
@@ -54,11 +54,11 @@ format :html do
        end
      end
    end
-   
+
    def each_suggestion
      if (suggestions = Card["follow suggestions"])
        suggestions.item_names.each do |sug|
-         if ((set_card = Card.fetch sug.to_name.left) && set_card.type_code == :set) 
+         if ((set_card = Card.fetch sug.to_name.left) && set_card.type_code == :set)
            option_card = Card.fetch(sug.to_name.right) || Card[sug.to_name.right.to_sym]
            option = if option_card.follow_option?
                       option_card.name
@@ -66,13 +66,13 @@ format :html do
                       '*always'
                     end
            yield(set_card, option)
-         elsif ((set_card = Card.fetch sug) && set_card.type_code == :set) 
+         elsif ((set_card = Card.fetch sug) && set_card.type_code == :set)
            yield(set_card, '*always')
          end
        end
      end
    end
-   
+
    # returns hashes with existing and suggested follow options
    # structure:
    # set_pattern_class => [ {:card=>rule_card, :options=>['*always', '*created'] },.... ]
@@ -83,8 +83,8 @@ format :html do
        options = follow_rule.item_names.reject { |item| item == never}
        res[follow_rule.rule_set.subclass_for_set] << { :card=>follow_rule, :options=>options }
      end
-     
-     if Auth.signed_in? && Auth.current_id == card.left.id 
+
+     if Auth.signed_in? && Auth.current_id == card.left.id
        each_suggestion do |set_card, option|
          suggested_rule_name = set_card.follow_rule_name(card.trunk)
          if (rule = res[set_card.subclass_for_set].find { |rule| rule[:card].name == suggested_rule_name })
@@ -94,39 +94,39 @@ format :html do
          else
            rule_card =  Card.new(:name=>suggested_rule_name)
            res[set_card.subclass_for_set] << {:card=>rule_card, :options=>[option]}
-         end          
+         end
        end
      end
      res
    end
-   
-   
+
+
    view :following_list do |args|
-     if !Auth.signed_in? || Auth.current_id != card.left.id 
-       hide_buttons = [:delete_button, :add_button]
+     if !Auth.signed_in? || Auth.current_id != card.left.id
+       hide_buttons = [:delete_follow_rule_button, :add_follow_rule_button]
      end
-     
+
      sets = followed_by_set
      wrap_with :div, :class=>'pointer-list-editor' do
-       wrap_with :ul, :class=>'delete-list list-group' do 
-         
+       wrap_with :ul, :class=>'delete-list list-group' do
+
          Card.set_patterns.select{|p| sets[p]}.reverse.map do |set_pattern|
            sets[set_pattern].map do |rule|
              rule[:options].map do |option|
-      
+
                  content_tag :li, :class=>'list-group-item' do
                    subformat(rule[:card]).render_follow_item :condition=>option, :hide=>hide_buttons
                  end
-                
+
              end.join("\n")
            end.join("\n")
          end.join("\n")
-         
+
        end
      end
    end
-   
-   
+
+
    view :ignoring_list do |args|
      ignore_list = []
      card.item_cards.each do |follow_rule|
@@ -137,32 +137,32 @@ format :html do
        end
      end
      if !Auth.signed_in? || Auth.current_id != card.left.id
-       hide_buttons = [:delete_button, :add_button]
+       hide_buttons = [:delete_follow_rule_button, :add_follow_rule_button]
      end
      never = Card[:never].name
      wrap_with :div, :class=>'pointer-list-editor' do
        wrap_with :ul, :class=>'delete-list list-group' do
-         
+
          ignore_list.map do |rule_card|
            content_tag :li, :class=>'list-group-item' do
              subformat(rule_card).render_follow_item :condition=>never, :hide=>hide_buttons
            end
          end.join "\n"
-         
+
        end
      end
    end
-   
+
    view :pointer_items, :tags=>:unknown_ok do |args|
      super(args.merge(:item=>:link))
    end
-   
+
    view :errors, :perms=>:none do |args|
      if card.errors.any?
        if card.errors.find { |attrib,msg| attrib == :permission_denied }
          save_interrupted_action(request.env['REQUEST_URI'])
          title = "Problems with #{card.name}"
-         frame args.merge(:slot_class=>"panel panel-warning", :title=>title, :hide=>'menu' ) do
+         frame args.merge(:panel_class=>"panel panel-warning", :title=>title, :hide=>'menu' ) do
            "You have to #{ link_to 'sign in', card_url(':signin') }" #" #{to_task}"
          end
        else
@@ -170,7 +170,7 @@ format :html do
        end
      end
    end
-   
+
 end
 
 format(:css ) { include Card::Set::Type::Pointer::CssFormat  }

data/mod/05_email/spec/set/all/follow_spec.rb

@@ -4,9 +4,12 @@ describe "Card::Set::All::Follow" do
   def follow_view card_name
     render_card :follow_link, :name=>card_name
   end
-   
+  def follow_modal_view card_name
+    render_card :follow_modal_link, :name=>card_name
+  end
+
   describe "follower_ids" do
-    
+
     context 'when a new +*follow rule created' do
       it 'contains id of a new follower' do
         Card::Auth.as_bot do
@@ -15,35 +18,35 @@ describe "Card::Set::All::Follow" do
         end
       end
     end
-    
-    
+
+
     subject { Card[cardname].follower_names.sort }
     context 'followers of No One Sees Me' do
       let(:cardname) {'No One Sees Me'}
       it { is_expected.to eq([]) }
     end
-    
+
     context 'followers of Magnifier' do
-      let(:cardname) {'Magnifier'} 
+      let(:cardname) {'Magnifier'}
       it { is_expected.to eq([])}
     end
-    
+
     context 'followers of Magnifier+lens' do
-      let(:cardname) {'Magnifier+lens'} 
+      let(:cardname) {'Magnifier+lens'}
       it { is_expected.to eq ['Big Brother','Narcissist']}
     end
-    
+
     context 'followers of Sunglasses' do
-      let(:cardname) {'Sunglasses'} 
+      let(:cardname) {'Sunglasses'}
       it { is_expected.to eq ['Big Brother', 'Narcissist', 'Optic fan', 'Sara', 'Sunglasses fan']}
     end
     context 'followers of Sunglasses+tint' do
-      let(:cardname) {'Sunglasses+tint'} 
+      let(:cardname) {'Sunglasses+tint'}
       it { is_expected.to eq ['Big Brother', 'Narcissist', 'Optic fan', 'Sara', 'Sunglasses fan']}
     end
-    
+
     context 'followers of Google glass' do
-      let(:cardname) {'Google glass'} 
+      let(:cardname) {'Google glass'}
       it { is_expected.to eq ['Big Brother', 'Optic fan', 'Sara']}
     end
   end
@@ -51,34 +54,40 @@ describe "Card::Set::All::Follow" do
 
 
 
-   
-  describe "view: follow" do
+
+  describe "view: follow_link" do
     before do
       Card::Auth.current_id = Card['Big Brother'].id
     end
-      
+
     def assert_following_view name, args
       assert_follow_view name, args.reverse_merge(:following => true, :text=>"unfollow #{name}")
     end
-  
+
 #  href="/card/update/Home+*self+philipp+*follow?card%5Bcontent%5D=%5B%5Bnever%5D%5D&success%5Bid%5D=Home&success%5Bview%5D=follow"
     def assert_follow_view name, args
       args[:user] ||= "Big_Brother"
       #      href = "/card/update/#{args[:add_set].to_name.url_key}+#{args[:user]}+*follow?"
       #      href += CGI.escape("card[content]") + '='
-      #      href += 
-      #        if args[:following] 
+      #      href +=
+      #        if args[:following]
       #          link_class = "follow-toggle-off"
       #          CGI.escape("[[*never]]")
       #        else
       #          link_class = "follow-toggle-on"
       #          CGI.escape("[[*always]]")
       #        end
+
       link_class = args[:following] ? "follow-toggle-off" : "follow-toggle-on"
       assert_view_select follow_view(name), "a[class~=#{link_class}][href*='']", args[:text] || "follow #{name}"
     end
 
-      
+    def assert_follow_modal_view card_name
+      href_part = args[:following] ? "never" : "always"
+      assert_view_select follow_view(name), "a[class~=follow-link][href*=#{href_part}]", args[:text] || "follow #{name}"
+    end
+
+
     context "when not following" do
       it 'renders follow link' do
         assert_follow_view 'No One Sees Me', :add_set=>'No One Sees Me+*self'
@@ -90,38 +99,38 @@ describe "Card::Set::All::Follow" do
         assert_following_view 'Look At Me', :add_set=>'Look at me+*self'
       end
     end
-  
+
     context "when following *type" do
       it 'renders following link' do
         assert_following_view 'Sunglasses', :add_set=>'Sunglasses+*self'
       end
     end
-    
+
     context "when following cardtype card" do
       it 'renders following all link' do
         assert_following_view 'Optic', :add_set=>'Optic+*type', :text=>'unfollow all "Optics"'
       end
     end
-    
+
     context "when not following cardtype card" do
       it "renders 'follow all' link" do
         assert_follow_view 'Basic', :add_set=>'Basic+*type', :text=>'follow all "Basics"'
       end
     end
-  
+
     context "when following *right" do
       it "renders following link" do
         assert_following_view 'Magnifier+lens', :add_set=>'Magnifier+lens+*self'
       end
     end
-  
+
     context 'when following content I created' do
       before { Card::Auth.current_id = Card['Narcissist'].id }
       it "renders following link" do
         assert_following_view 'Sunglasses', :add_set=>'Sunglasses+*self', :user=>'Narcissist'
       end
     end
-  
+
     context 'when following content I edited' do
       before { Card::Auth.current_id = Card['Narcissist'].id }
       it "renders following link" do
@@ -129,5 +138,5 @@ describe "Card::Set::All::Follow" do
       end
     end
   end
- 
-end
+
+end