card 1.15.7 → 1.16.0

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

@@ -1,13 +1,10 @@
+include Pointer
+
 def history?
   false
 end
 
-event :store_in_session, :after=>:approve, :on=>:create do
-  Env.session[key] = db_content
-  self.db_content = ''
-end
-
-event :update_in_session, :after=>:approve, :on=>:update do
+event :store_in_session, :before=>:standardize_items, :on=>:save do
   if db_content_changed?
     Env.session[key] = db_content
     self.db_content = ''
@@ -23,7 +20,15 @@ def content
   Env.session[key]
 end
 
+format do
+  include Pointer::Format
+end
+
 format :html do
-  view :editor, :mod=>PlainText::HtmlFormat
+  include Pointer::HtmlFormat
+
+  def default_core_args args
+    args[:item] = :name
+  end
 end
 

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

@@ -2,18 +2,63 @@
 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_rule_navbar] ||= :show
+    args[:optional_set_navbar]  ||= :hide
+  end
+
+  def with_label_and_navbars args
     output [
-      _optional_render(:set_label, args, :show),
-      (content_tag(:div, :class=>'panel-group', :id=>'accordion', :role=>'tablist','aria-multiselectable'=>'true') do
+        _optional_render(:set_label,   args, :show),
+        _optional_render(:rule_navbar, args, :hide),
+        _optional_render(:set_navbar,  args, :hide),
+        yield
+      ]
+  end
+
+  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
+    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"
-      end)
-    ]
+      end
+    end
+  end
+
+  view :recent_rules do |args|
+    with_label_and_navbars args.merge(:selected_view =>:recent_rules) do
+      recent_settings = Card[:recent_settings].item_cards.map(&:codename)
+      rules_table (recent_settings.map(&:to_sym) & card.visible_setting_codenames), args
+    end
+  end
+
+  view :common_rules do |args|
+    with_label_and_navbars args.merge(:selected_view =>:common_rules) do
+      rules_table (card.visible_setting_codenames & [:create, :read, :update, :delete, :structure, :default, :style]), args
+    end
+  end
+
+  view :field_related_rules do |args|
+    with_label_and_navbars args.merge(:selected_view =>:field_related_rules) do
+      field_settings = [:default, :help, :structure]
+      field_settings +=  [:input, :options, :options_label] if card.type_id == PointerID
+      rules_table (card.visible_setting_codenames & field_settings), args
+    end
   end
 
   view :set_label do |args|
-    content_tag :h2, card.label, :class=>'set-label'
+    content_tag :h3, card.label, :class=>'set-label'
   end
 
   Card::Setting.groups.keys.each do |group_key|
@@ -32,25 +77,29 @@ format :html do
             end
           end),
           (content_tag :div, :id=>collapse_id, :class=>'panel-collapse collapse', :role=>'tabpanel', 'aria-labelledby'=>heading_id do
-            wrap_with :table, :class=>'set-rules table' do
-              [
-                (content_tag(:tr, :class=>"rule-group") do
-                  wrap_each_with :th, %w(Setting Content Set), :class=>'rule-heading'
-                end),
-                (settings.map do |setting|
-                  if show_view? setting.codename, args
-                    rule_card = card.fetch(:trait=>setting.codename, :new=>{})
-                    nest(rule_card, :view=>:closed_rule).html_safe
-                  end
-                end * "\n")
-              ]
-            end
+            rules_table settings.map(&:codename), args
           end)
         ]
       end
     end
   end
 
+  def rules_table settings, args={}
+    wrap_with :table, :class=>'set-rules table' do
+      [
+        (content_tag(:tr, :class=>"rule-group") do
+          wrap_each_with :th, %w(Trait Content Set), :class=>'rule-heading'
+        end),
+        (settings.map do |setting|
+          if show_view? setting, args
+            rule_card = card.fetch(:trait=>setting, :new=>{})
+            nest(rule_card, :view=>:closed_rule).html_safe
+          end
+        end * "\n")
+      ]
+    end
+  end
+
   view :editor do |args|
     'Cannot currently edit Sets' #ENGLISH
   end
@@ -89,6 +138,58 @@ format :html do
     ''
   end
 
+
+  view :set_navbar do |args|
+    id = "rule-navbar-#{card.cardname.safe_key}-#{args[:home_view]}"
+    related_sets =  card.related_sets(true)
+    return '' if related_sets.size <= 1
+    navbar id, :toggle=>'Rules<span class="caret"></span>', :toggle_align=>:left,
+               :class=>'slotter toolbar', :navbar_type=>'inverse', :collapsed_content=>close_link(:class=>'pull-right visible-xs') do
+      [
+        content_tag(:span, 'Set:', :class=>"navbar-text hidden-xs"),
+        (wrap_with :ul, :class=>'nav navbar-nav nav-pills' do
+          related_sets.map do |name, label|
+            link = card_link name, :text=>label, :remote=>true,
+              :path_opts => {
+                :view => @slot_view,
+                :slot => {:subheader=>showname(name), :subframe=>true, :hide=>'header set_label rule_navbar', :show=>'subheader set_navbar'}
+              }
+            li_pill link, name == card.name
+          end
+        end),
+      ]
+    end
+  end
+
+  def li_pill content, active
+    "<li role='presentation' #{"class='active'" if active}>#{content}</li>"
+  end
+
+  view :rule_navbar do |args|
+    id = "rule-navbar-#{card.cardname.safe_key}-#{args[:home_view]}"
+    args.merge!(:path_opts=>{:slot=>{:show=>:rule_navbar}})
+    navbar id, :toggle=>'Rules<span class="caret"></span>', :toggle_align=>:left,
+               :class=>'slotter toolbar', :navbar_type=>'inverse', :collapsed_content=>close_link(:class=>'pull-right visible-xs') do
+      [
+        content_tag(:span, 'Rules:', :class=>"navbar-text hidden-xs"),
+        (wrap_with :ul, :class=>'nav navbar-nav nav-pills' do
+          [
+            (view_link_pill( 'field', :field_related_rules, args) if card.junction?),
+            view_link_pill( 'common', :common_rules, args),
+            view_link_pill( 'by group', :grouped_rules, args),
+            view_link_pill( 'by name', :all_rules, args),
+           (view_link_pill( 'recent', :recent_rules, args) if recently_edited_settings?),
+          ]
+        end),
+      ]
+    end
+  end
+
+  def view_link_pill name, view, args
+    selected_view = args[:selected_view] || @slot_view || args[:home_view]
+    opts = {:class=>'slotter', :role=>'pill', :path_opts=>args[:path_opts]}
+    li_pill view_link(name, view, opts), selected_view == view
+  end
 end
 
 
@@ -184,6 +285,13 @@ def setting_codenames_by_group
   result
 end
 
+def visible_setting_codenames
+  @visible_settings ||=
+    Card::Setting.groups.values.flatten.compact.reject do |setting|
+      !setting.applies_to_cardtype(prototype.type_id)
+    end.map(&:codename)
+end
+
 def visible_settings group
   Card::Setting.groups[group].reject do |setting|
     !setting or !setting.applies_to_cardtype(prototype.type_id)
@@ -227,3 +335,12 @@ def prototype
   opts = subclass_for_set.prototype_args self.cardname.trunk_name
   Card.fetch opts[:name], :new=>opts
 end
+
+def related_sets with_self = false
+  if subclass_for_set.anchorless?
+    prototype.related_sets with_self
+  else
+    left(:new=>{}).related_sets with_self
+  end
+end
+

data/mod/05_standard/spec/chunk/include_spec.rb

@@ -1,13 +1,12 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Chunk::Include, "Inclusion" do
-  include ActionView::Helpers::TextHelper
 
   context "syntax parsing" do
     before do
       @class= Card::Chunk::Include
     end
-    
+
     it "should ignore invisible comments" do
       expect(render_content("{{## now you see nothing}}")).to eq('')
     end
@@ -16,7 +15,7 @@ describe Card::Chunk::Include, "Inclusion" do
       expect(render_content("{{# now you see me}}")).to eq('<!-- # now you see me -->')
       expect(render_content("{{# -->}}")).to eq('<!-- # --&gt; -->')
     end
-    
+
     it "should handle empty inclusions" do
       instance = @class.new( @class.full_match( '{{ }}' ) , nil )
       expect(instance.name).to eq('')
@@ -24,27 +23,27 @@ describe Card::Chunk::Include, "Inclusion" do
       instance1 = @class.new( @class.full_match( '{{|}}' ) , nil )
       expect(instance1.name).to eq('')
       expect(instance1.options[:inc_syntax]).to eq('|')
-      
+
     end
-    
+
     it "should handle no pipes" do
       instance = @class.new( @class.full_match( '{{toy}}') , nil )
       expect(instance.name).to eq('toy')
       expect(instance.options[:inc_name]).to eq('toy')
       expect(instance.options.key?(:view)).to eq(false)
     end
-    
+
     it "should strip the name" do
       expect(@class.new( @class.full_match( '{{ toy }}') , nil ).name).to eq('toy')
     end
-    
+
     it 'should strip html tags' do
       expect(@class.new( @class.full_match( '{{ <span>toy</span> }}') , nil ).name).to eq('toy')
       instance = @class.new( @class.full_match( '{{ <span>toy|open</span> }}') , nil )
       expect(instance.name).to eq('toy')
       expect(instance.options[:view]).to eq('open')
     end
-    
+
     it "should handle single pipe" do
       options = @class.new( @class.full_match('{{toy|view:link;hide:me}}'), nil ).options
       expect(options[:inc_name]).to eq('toy')
@@ -52,13 +51,13 @@ describe Card::Chunk::Include, "Inclusion" do
       expect(options[:hide]).to eq('me')
       expect(options.key?(:items)).to eq(false)
     end
-    
+
     it "should handle multiple pipes" do
       options = @class.new( @class.full_match('{{box|open|closed}}'), nil ).options
       expect(options[:inc_name]).to eq('box')
       expect(options[:view]).to eq('open')
       expect(options[:items][:view]).to eq('closed')
-      expect(options[:items].key?(:items)).to eq(false)      
+      expect(options[:items].key?(:items)).to eq(false)
     end
 
     it "should handle multiple pipes with blank lists" do
@@ -67,7 +66,7 @@ describe Card::Chunk::Include, "Inclusion" do
       expect(options[:view]).to eq(nil)
       expect(options[:items][:view]).to eq('closed')
     end
-    
+
     it "should treat :item as view of next level" do
       options = @class.new( @class.full_match('{{toy|link;item:name}}'), nil ).options
       expect(options[:inc_name]).to eq('toy')
@@ -91,7 +90,7 @@ describe Card::Chunk::Include, "Inclusion" do
       alpha_beta = Card.create :name=>"#{alpha.name}#{Card::Name.joint}Beta", :content=>"Woot"
       assert_view_select alpha.format.render_core, 'div[class~=card-content]', "Woot"
     end
-    
+
     it "should handle complex relative names" do
       bob_city = Card.create! :name=>'bob+city', :content=> "Sparta"
       Card::Auth.as_bot { address_tmpl = Card.create! :name=>'address+*right+*structure', :content =>"{{_left+city}}" }
@@ -115,11 +114,11 @@ describe Card::Chunk::Include, "Inclusion" do
     it "should handle options when nesting" do
       Card.create! :type=>'Pointer', :name=>'Livable', :content=>'[[Earth]]'
       Card.create! :name=>'Earth'
-      
+
       expect(render_content('{{Livable|core;item:link}}')).to eq(render_content('{{Livable|core|link}}'))
       expect(render_content('{{Livable|core;item:name}}')).to eq(render_content('{{Livable|core|name}}'))
     end
-    
+
     it "should prevent recursion" do
       oak = Card.create! :name=>'Oak', :content=>'{{Quentin}}'
       qnt = Card.create! :name=>'Quentin', :content=>'{{Admin}}'
@@ -139,12 +138,12 @@ describe Card::Chunk::Include, "Inclusion" do
       age = newcard('age')
       template = Card['*template']
       specialtype = Card.create :type_code=>'Cardtype', :name=>'SpecialType'
-    
+
       specialtype_template = specialtype.fetch(:trait=>:type,:new=>{}).fetch(:trait=>:structure,:new=>{})
       specialtype_template.content = "{{#{Card::Name.joint}age}}"
       Card::Auth.as_bot { specialtype_template.save! }
       assert_equal "{{#{Card::Name.joint}age}}", specialtype_template.format.render_raw
-    
+
       wooga = Card.create! :name=>'Wooga', :type=>'SpecialType'
       wooga_age = Card.create!( :name=>"#{wooga.name}#{Card::Name.joint}age", :content=> "39" )
       expect(wooga_age.format.render_core).to eq("39")

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

@@ -2,7 +2,7 @@
 
 describe Card::Set::All::Account do
   describe 'accountable?' do
-    
+
     it 'should be false for cards with *accountable rule off' do
       expect(Card['A'].accountable?).to eq(false)
     end
@@ -14,16 +14,16 @@ describe Card::Set::All::Account do
       end
       expect(Card['A'].accountable?).to eq(true)
     end
-    
+
   end
-  
+
   describe "parties" do
-  
+
     it "for Wagn Bot" do
       Card::Auth.current_id = Card::WagnBotID
       expect(Card::Auth.current.parties.sort).to eq([Card::WagnBotID, Card::AnyoneSignedInID, Card::AdministratorID])
     end
-    
+
     it "for Anonymous" do
       Card::Auth.current_id = Card::AnonymousID
       expect(Card::Auth.current.parties.sort).to eq([Card::AnonymousID])
@@ -38,33 +38,33 @@ describe Card::Set::All::Account do
       it "should initially have only auth and self " do
         expect(@parties).to eq([Card::AnyoneSignedInID, @joe_user_card.id])
       end
-      
+
       it 'should update when new roles are set' do
         roles_card = @joe_user_card.fetch :trait=>:roles, :new=>{}
         r1 = Card['r1']
 
-        Card::Auth.as_bot { roles_card.items = [ r1.id ] }        
-        expect(Card['Joe User'].parties).to eq(@parties)            # local cache still has old parties (permission does not change mid-request)        
-                                                               
+        Card::Auth.as_bot { roles_card.items = [ r1.id ] }
+        expect(Card['Joe User'].parties).to eq(@parties)            # local cache still has old parties (permission does not change mid-request)
+
         Card::Cache.restore                                    # simulate new request -- clears local cache, where, eg, @parties would still be cached on card
         Card::Auth.current_id = Card::Auth.current_id                # simulate new request -- current_id assignment clears several class variables
-        
+
         new_parties = [ Card::AnyoneSignedInID, r1.id, @joe_user_card.id ]
         expect(Card['Joe User'].parties).to eq(new_parties)         # @parties regenerated, now with correct values
         expect(Card::Auth.current. parties).to eq(new_parties)
-        
+
         # @joe_user_card.refresh(force=true).parties.should == new_parties   # should work, but now superfluous?
       end
     end
-    
+
   end
-  
+
   describe 'among?' do
     it 'should be true for self' do
       expect(Card::Auth.current.among?([Card::Auth.current_id])).to be_truthy
     end
   end
-  
+
 
   describe "'+*email'" do
     it 'should create a card and account card' do
@@ -77,10 +77,10 @@ describe Card::Set::All::Account do
 
       c = Card['Joe New']
       u = Card::Auth[ 'joe@new.com' ]
-      
+
       expect(c).to eq(u)
       expect(c.type_id).to eq(Card::UserID)
-=begin      
+=begin
       email = ActionMailer::Base.deliveries.last
       email.to.should == ['joe@new.com']
       email.subject.should == 'Hey Joe!'
@@ -88,7 +88,7 @@ describe Card::Set::All::Account do
 =end
     end
   end
-  
+
   context 'updates' do
     before do
       @card = Card['Joe User']
@@ -97,15 +97,15 @@ describe Card::Set::All::Account do
       @card.update_attributes! '+*account'=>{ '+*email'=>'joe@user.co.uk' }
       expect(@card.account.email).to eq('joe@user.co.uk')
     end
-  
+
     it "should let Wagn Bot block accounts" do
       Card::Auth.as_bot do
         @card.account.status_card.update_attributes! :content => 'blocked'
         expect(@card.account.blocked?).to be_truthy
       end
     end
-    
-    
+
+
     it "should not allow a user to block or unblock himself" do
       expect do
         @card.account.status_card.update_attributes! :content => 'blocked'
@@ -113,7 +113,7 @@ describe Card::Set::All::Account do
       expect(@card.account.blocked?).to be_falsey
     end
   end
-  
+
   describe "#read_rules" do
     before(:all) do
       @read_rules = Card['joe_user'].read_rules