card 1.15.1 → 1.15.2

data/mod/05_email/spec/set/right/followers_spec.rb

@@ -1,16 +1,16 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Set::Right::Followers do
-  
-  
-  
+
+
+
   describe '#raw_content' do
     it 'returns a pointer list of followers' do
       card = Card.fetch 'All Eyes on me'
-      expect( card.followers_card.raw_content).to eq "[[John]]\n[[Sara]]\n[[Big Brother]]"
+      expect( card.followers_card.item_names.sort).to eq ['Big Brother','John','Sara']
     end
   end
-  
+
   describe 'view :core' do
     it 'contains follower' do
       card = Card.fetch 'All Eyes on me'
@@ -18,30 +18,30 @@ describe Card::Set::Right::Followers do
       expect(view).to include("Sara")
     end
   end
-  
+
   describe 'view :raw' do
     it 'renders a pointer list of followers' do
       card = Card.fetch 'All Eyes on me'
       view = card.followers_card.format.render_raw
-      expect(view).to eq "[[John]]\n[[Sara]]\n[[Big Brother]]"
+      expect(view.split("\n").sort).to eq ['[[Big Brother]]','[[John]]','[[Sara]]']
     end
   end
-  
-  
-  describe 'item_names' do  
-    subject { @card.followers_card.item_names }  
+
+
+  describe 'item_names' do
+    subject { @card.followers_card.item_names.sort }
     it 'is an array of followers' do
       @card = Card['All Eyes On Me']
-      is_expected.to eq ['John','Sara','Big Brother']
+      is_expected.to eq ['Big Brother','John','Sara']
     end
-    
-    it 'recognizes card name changes' do   
-      @card = Card['Look At Me']  
+
+    it 'recognizes card name changes' do
+      @card = Card['Look At Me']
       @card.update_referencers = true
       @card.update_attributes! :name=>'Look away'
       is_expected.to eq ['Big Brother']
     end
-      
+
     it 'recognizes +*following changes' do
       Card::Auth.as_bot do
         card = Card['Joe User'].follow 'Look At Me'
@@ -50,41 +50,41 @@ describe Card::Set::Right::Followers do
       is_expected.to include 'Joe User'
     end
 
-    context 'when following a card' do 
+    context 'when following a card' do
       it 'contains follower' do
         @card = Card['All Eye On Me']
         is_expected.to include('Big Brother')
       end
     end
-    
+
     context 'when following a *self set' do
       it 'contains follower' do
         @card = Card['Look At Me']
         is_expected.to include('Big Brother')
       end
     end
-    
+
     context 'when following a *type set' do
       it 'contains follower' do
         @card = Card.create! :name=>'telescope', :type=>'Optic'
         is_expected.to include('Big Brother')
       end
     end
-    
+
     context 'when following a *right set' do
       it 'contains follower' do
         @card = Card.create! :name=>'telescope+lens'
         is_expected.to include('Big Brother')
       end
     end
-    
+
     context 'when following a *type plus right set' do
       it 'contains follower' do
         @card = Card['Sunglasses+tint']
         is_expected.to include('Big Brother')
       end
     end
-    
+
     context 'when following content I created' do
       it 'contains creator' do
         Card::Auth.current_id = Card['Big Brother'].id
@@ -92,10 +92,10 @@ describe Card::Set::Right::Followers do
         is_expected.to include('Big Brother')
       end
     end
-    
+
     context 'when following content I edited' do
       it 'contains editor' do
-        Card::Auth.as_bot do 
+        Card::Auth.as_bot do
           Card['Sara'].follow '*all', '*edited'
         end
 
@@ -105,22 +105,22 @@ describe Card::Set::Right::Followers do
         is_expected.to include('Sara')
       end
     end
-    
-    
+
+
     context 'for a set card' do
       it 'contains followers of that set' do
         @card = Card['lens+*right']
         is_expected.to include('Big Brother')
       end
     end
-    
+
     context 'for a type card' do
       it 'contains followers of that type' do
         @card = Card['Optic']
         is_expected.to include('Optic fan')
       end
     end
-    
+
   end
-    
+
 end

data/mod/05_standard/set/all/error.rb

@@ -4,7 +4,7 @@ format do
   view :closed_missing, :perms=>:none, :closed=>true do |args|
     ''
   end
-  
+
   view :missing, :perms=>:none do |args|
     ''
   end
@@ -32,7 +32,7 @@ format do
 
   view :too_slow, :perms=>:none, :closed=>true do |args|
     %{ Timed out! #{ showname } took too long to load. }
-  end 
+  end
 end
 
 
@@ -44,13 +44,13 @@ format :html do
     else                               super
     end
   end
-  
+
   def commentable? view, args
-    self.class.tagged view, :comment                                   and 
+    self.class.tagged view, :comment                                   and
     show_view? :comment_box, args.merge( :default_visibility=>:hide )  and #developer or wagneer has overridden default
     ok? :comment
   end
-  
+
   def rendering_error exception, view
     details = if Auth.always_ok?
                 card_link(error_cardname, :class=>'render-error-link') +
@@ -58,16 +58,13 @@ format :html do
                       %{
                         <h3>Error message (visible to admin only)</h3>
                         <p><strong>#{ exception.message }</strong></p>
-                        <div>
-                          #{exception.backtrace * "<br>\n"}
-                        </div>
-                        </div>
+                        <div>#{exception.backtrace * "<br>\n"}</div>
                       }
                   end
               else
                 error_cardname
               end
-                 
+
     content_tag :span, :class=>'render-error alert alert-danger' do
       [
         'error rendering',
@@ -80,7 +77,7 @@ format :html do
   def unsupported_view view
     "<strong>view <em>#{view}</em> not supported for <em>#{error_cardname}</em></strong>"
   end
-  
+
   view :message, :perms=>:none, :tags=>:unknown_ok do |args|
     frame args do
       params[:message]
@@ -102,9 +99,9 @@ format :html do
   view :closed_missing, :perms=>:none do |args|
     %{<span class="faint"> #{ showname } </span>}
   end
-  
-  
-  
+
+
+
   view :conflict, :error_code=>409 do |args|
     # FIXME: hack to get the conflicted update as a proper act for the diff view
     card.current_act.save
@@ -112,7 +109,7 @@ format :html do
     action.card_act_id = card.current_act.id
     action.draft = true
     action.save
-    card.store_changes  # deletes action if there are no changes 
+    card.store_changes  # deletes action if there are no changes
 
     # as a consequence card.current_act.actions can be empty when both users made exactly the same changes
     # but an act is always supposed to have at least one action, so we have to delete the act to avoid bad things
@@ -134,22 +131,22 @@ format :html do
                 "No difference between your changes and #{card.last_action.act.actor.name}'s version."
               end
             end
-           } 
+           }
         }
       end
     end
   end
-  
+
   view :errors, :perms=>:none do |args|
     if card.errors.any?
       title = %{ Problems #{%{ with #{card.name} } unless card.name.blank?} }
-      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
         card.errors.map do |attrib, msg|
           msg = "<strong>#{attrib.to_s.upcase}:</strong> #{msg}" unless attrib == :abort
           alert 'warning', :dismissible=>true, :alert_class=>'card-error-msg' do
             msg
           end
-        end  
+        end
       end
     end
   end
@@ -210,5 +207,5 @@ format :html do
     </body>
     }
   end
-  
+
 end

data/mod/05_standard/set/all/links.rb

@@ -6,7 +6,7 @@ format do
   # (and is overridden in other formats)
   def link_to text, href, opts={}
     href = interpret_href href
-    
+
     if text and href != text
       "#{text}[#{href}]"
     else
@@ -26,7 +26,7 @@ format do
       else
         return card_link href, opts
       end
-    add_class opts, new_class        
+    add_class opts, new_class
     link_to text, href, opts
   end
 
@@ -38,15 +38,14 @@ format do
            when Card   then name_or_card.cardname
            else             name_or_card
            end
-    
+
     path_opts = opts.delete( :path_opts ) || {}
     path_opts[:name ] = name
-    path_opts[:known] = opts[:known].nil? ? Card.known?(name) : opts.delete(:known) 
+    path_opts[:known] = opts[:known].nil? ? Card.known?(name) : opts.delete(:known)
     add_class opts, ( path_opts[:known] ? 'known-card' : 'wanted-card' )
     link_to text, path_opts, opts
   end
 
-
   # link to a specific view (defaults to current card)
   # this is generally used for ajax calls
   def view_link text, view, opts={}
@@ -54,30 +53,44 @@ format do
     path_opts[:view] = view unless view == :home
     opts[:remote] = true
     opts[:rel] = 'nofollow'
-    
+
     link_to text, path_opts, opts
   end
 
+  def related_link name_or_card, opts={}
+    name = case name_or_card
+           when Symbol then Card.fetch( name_or_card, :skip_modules=>true ).cardname
+           when Card   then name_or_card.cardname
+           else             name_or_card
+           end
+   opts[:path_opts] ||= {:view=>:related}
+   opts[:path_opts][:related] = {:name=>"+#{name}"}
+   opts[:path_opts][:related].merge! opts[:related_opts] if opts[:related_opts]
+   view_link( opts[:text] || name, :related, opts)
+  end
+
+
+
   def path opts={}
     name = opts.delete(:name) || card.name
     base = opts[:action] ? "card/#{ opts.delete :action }/" : ''
-    
+
     opts[:no_id] = true if [:new, :create].member? opts[:action]
     #generalize. dislike hardcoding views/actions here
-    
+
     linkname = name.to_name.url_key
     unless name.empty? || opts.delete(:no_id)
       base += ( opts[:id] ? "~#{ opts.delete :id }" : linkname )
     end
-    
-    opts[:card] = {}
+
+    opts[:card] ||= {}
     opts[:card][:name] = name if opts.delete(:known)==false && name.present? && name.to_s != linkname
-    
+
     if type = opts.delete(:type) and Card.known?( type )
       opts[:card][:type] = type
     end
     opts.delete(:card) if opts[:card].empty?
-    
+
     query = opts.empty? ? '' : "?#{opts.to_param}"
     internal_url( base + query )
   end
@@ -85,16 +98,16 @@ format do
   def internal_url relative_path
     card_path relative_path
   end
-  
+
   def interpret_href href
     Hash===href ? path(href) : href
   end
-    
+
 end
 
 format :html do
-  
-  
+
+
   def link_to text, href, opts={}
     href = interpret_href href
 
@@ -103,8 +116,8 @@ format :html do
         opts["data-#{key}"] = val
       end
     end
-    
+
     content_tag :a, raw(text), opts.merge(:href=>href)
   end
-  
+
 end

data/mod/05_standard/set/all/rich_html/content.rb

@@ -25,7 +25,7 @@ format :html do
       ]
     end
   end
-  
+
   view :content_panel do |args|
     wrap args.reverse_merge(:slot_class=>'card-content panel panel-default') do
       wrap_with :div, :class=>'panel-body' do
@@ -38,7 +38,7 @@ format :html do
   end
 
   view :titled, :tags=>:comment do |args|
-    wrap args do   
+    wrap args do
       [
         _render_header( args ),
         wrap_body( :content=>true ) { _render_core args },
@@ -60,8 +60,10 @@ format :html do
   end
 
   view :title do |args|
-    title = fancy_title args[:title]
-    title = _optional_render( :title_link, args.merge( :title_ready=>title ), :hide ) || title
+    title = fancy_title args[:title], args[:title_class]
+    title =  _optional_render( :title_toolbar, args, (show_view?(:toolbar,args.merge(:default_visibility=>:hide)) ? :show : :hide)) ||
+             _optional_render( :title_link, args.merge( :title_ready=>title ), :hide )       ||
+             title
     add_name_context
     title
   end
@@ -70,6 +72,20 @@ format :html do
     card_link card.cardname, :text=>( args[:title_ready] || showname(args[:title]) )
   end
 
+  view :title_toolbar do |args|
+    links = card.cardname.parts.map do |name|
+      card_link name
+    end
+    res = links.shift
+    links.each_with_index do |link, index|
+      res += card_link card.cardname.parts[0..index+1].join('+'), :text=>glyphicon('plus','header-icon')
+      res += link
+    end
+    res += ' '
+    res.concat view_link(glyphicon('edit','header-icon'),:edit_name, :class=>'slotter', 'data-toggle'=>'tooltip', :title=>'edit name')
+    res
+  end
+
   view :open, :tags=>:comment do |args|
     args[:optional_toggle] ||= main? ? :hide : :show
     frame args.merge(:content=>true) do
@@ -80,13 +96,13 @@ format :html do
     end
   end
 
-  
-  
-=begin  
+
+
+=begin
   view :anchor, :perms=>:none, :tags=>:unknown_ok do |args|
     %{ <a id="#{card.cardname.url_key}" name="#{card.cardname.url_key}"></a> }
   end
-=end  
+=end
 
   view :type do |args|
     klasses = ['cardtype']
@@ -113,13 +129,18 @@ format :html do
   end
 
   view :options, :tags=>:unknown_ok do |args|
-    current_set = Card.fetch( params[:current_set] || card.related_sets[0][0] )
-
     frame args do
-      subformat( current_set ).render_content
+      subformat( current_set_card ).render_content args
     end
   end
 
+  def current_set_card
+    set_name = params[:current_set]
+    set_name ||= "#{card.name}+*type" if card.known? && card.type_id==Card::CardtypeID
+    set_name ||= "#{card.name}+*self"
+    Card.fetch(set_name)
+  end
+
 
   view :related do |args|
     if rparams = params[:related]
@@ -130,9 +151,11 @@ format :html do
         :view          => ( rparams[:view] || :open ),
         :optional_toggle => :hide,
         :optional_help => :show,
-        :optional_menu => :show
+        :optional_menu => :show,
+        :parent => card
       }
-      
+      nest_args.merge! ( rparams[:slot] || {} ).deep_symbolize_keys
+
       nest_args[:optional_comment_box] = :show if rparams[:name] == '+discussion' #fixme.  yuck!
 
       frame args do
@@ -140,7 +163,7 @@ format :html do
       end
     end
   end
-  
+
   view :help, :tags=>:unknown_ok do |args|
     text = if args[:help_text]
       args[:help_text]
@@ -157,7 +180,7 @@ format :html do
     %{<div class="#{klass}">#{raw text}</div>} if text
   end
 
-  
+
   view :last_action do |args|
     action_type = case ( action = card.last_act.action_on(card.id) and action.action_type )
     when :create then 'added'
@@ -171,14 +194,14 @@ format :html do
         #{ _render_acted_at }
         ago by
         #{ subformat(card.last_actor)._render_link }
-      </span> 
+      </span>
     }
   end
 
   private
 
-  def fancy_title title=nil
-    raw %{<span class="card-title">#{ showname(title).to_name.parts.join %{<span class="joint">+</span>} }</span>}
+  def fancy_title title=nil, title_class=nil
+    raw %{<span class="card-title#{" #{title_class}"if title_class}">#{ showname(title).to_name.parts.join %{<span class="joint">+</span>} }</span>}
   end
 end