wagn 1.13.0 → 1.14.0.pre1

data/mod/{standard → 05_standard}/set/type/image.rb

@@ -32,14 +32,15 @@ format :html do
   end
 
 
-  view :diff do |args|
+  view :content_changes do |args|
     out = ''
-    if @show_diff and @previous_revision
-      card.selected_revision_id=@previous_revision.id
-      out << _render_core
+    size = args[:diff_type]==:summary ? :icon : :medium
+    if !args[:hide_diff] and args[:action] and last_change = card.last_change_on(:db_content,:before=>args[:action])
+      card.selected_action_id=last_change.card_action_id
+      out << Card::Diff.render_added_chunk(_render_core(:size=>size))
     end
-    card.selected_revision_id=@revision.id
-    out << _render_core
+    card.selected_action_id=args[:action].id
+    out <<  Card::Diff.render_deleted_chunk(_render_core(:size=>size))
     out
   end
 

data/mod/{standard → 05_standard}/set/type/search_type.rb

@@ -32,7 +32,7 @@ def get_spec params={}
     spec_content = params.delete(:spec) || raw_content
     #warn "get_spec #{name}, #{spec_content}, #{params.inspect}"
     raise("Error in card '#{self.name}':can't run search with empty content") if spec_content.empty?
-    JSON.parse( spec_content )
+    String === spec_content ? JSON.parse( spec_content ) : spec_content
   end
   spec.symbolize_keys!.merge! params.symbolize_keys
   if default_limit = spec.delete(:default_limit) and !spec[:limit]
@@ -52,7 +52,7 @@ format do
 
     case
     when e = search_vars[:error]
-      %{#{e.class.to_s} :: #{e.message} :: #{card.content}}
+      %{#{e.class.to_s} :: #{e.message} :: #{card.raw_content}}
     when search_vars[:spec][:return] =='count'
       search_vars[:results].to_s
     when @mode == :template
@@ -136,7 +136,7 @@ format :html do
     paging = _optional_render :paging, args
 
     if search_vars[:results].empty?
-      %{<div class="search-no-results"></div>}
+      render_no_search_results(args) 
     else
       %{
         #{paging}
@@ -172,6 +172,9 @@ format :html do
     form.text_area :content, :rows=>5
   end
 
+  view :no_search_results do |args|
+    %{<div class="search-no-results"></div>}
+  end
 
   view :paging do |args|
     s = card.spec search_params

data/mod/{standard → 05_standard}/set/type/set.rb

@@ -2,15 +2,16 @@
 format :html do
 
   view :core do |args|
-    body = card.setting_codes_by_group.map do |group_name, data|
-      next if group_name.nil? || data.nil?
+    body = card.setting_codenames_by_group.map do |group, data|
+      next if group.nil? || data.nil?
+      group_name = Card::Setting.group_names[group] || group.to_s
       content_tag(:tr, :class=>"rule-group") do
         (["#{group_name} Rules"]+%w{Content Set}).map do |heading|
           content_tag(:th, :class=>'rule-heading') { heading }
         end * "\n"
       end +
-      raw( data.map do |setting_code|
-        rule_card = card.fetch(:trait=>setting_code, :new=>{})
+      raw( data.map do |setting|
+        rule_card = card.fetch(:trait=>setting, :new=>{})
         nest rule_card, :view=>:closed_rule
       end * "\n" )
     end.compact * ''
@@ -47,7 +48,7 @@ format :html do
         <div class="template-editor-left">{{</div> 
         <div class="template-editor-main">
           #{
-            frame :no_slot=>true, :title=>card.label, :optional_menu_view=>:template_closer do
+            frame :no_slot=>true, :title=>card.label, :menu_hack=>:template_closer do
               _render_core args.merge(:unlabeled=>true)
             end
           }
@@ -99,10 +100,16 @@ def label
   end
 end
 
-def setting_codes_by_group
-  is_pointer = prototype.type_id == Card::PointerID
-  s = Card::Set::Type::Setting
-  s::SETTING_GROUPS.reject { |k,v| !is_pointer && k == s::POINTER_KEY }
+
+def setting_codenames_by_group
+  result = {}
+  Card::Setting.groups.each do |group, settings| 
+    visible_settings = settings.reject { |s| !s or !s.applies_to_cardtype(prototype.type_id) }
+    unless visible_settings.empty?
+      result[group] = visible_settings.map { |s| s.codename }
+    end
+  end
+  result
 end
 
 def prototype

data/mod/{standard → 05_standard}/set/type/signup.rb

@@ -1,20 +1,24 @@
 
+include Wagn::Location
+
 format :html do
   
   def default_new_args args
     super args
     args.merge!(
       :optional_help => :show, #, :optional_menu=>:never
-      :buttons => button_tag( 'Submit' ),
+      :buttons => button_tag( 'Submit', :disable_with=>'Submitting' ),
       :account => card.fetch( :trait=>:account, :new=>{} ),
-      :hidden => {
+      :title   => 'Sign up',
+      :hidden  => {
         :success => (card.rule(:thanks) || '_self'),
         'card[type_id]' => card.type_id
       }
     )
     
     if Auth.signed_in? and args[:account].confirm_ok?
-      args[:buttons] = button_tag 'Send Sign-up Token'
+      args[:title] = 'Invite'
+      args[:buttons] = button_tag 'Send Invitation'
       args[:hidden][:success] = '_self'
     end
   end
@@ -48,12 +52,12 @@ format :html do
       if account = card.account
         token_action = 'Send'
         if account.token
-          headings << "An activation token has been sent #{ "to #{account.email}" if account.email_card.ok? :read }"
+          headings << "A verification email has been sent #{ "to #{account.email}" if account.email_card.ok? :read }"
           token_action = 'Resend'
         end
         if account.confirm_ok?
-          links << link_to( "#{token_action} token", wagn_path("/update/~#{card.id}?approve_token=true"  ) )
-          links << link_to( "Approve without token", wagn_path("/update/~#{card.id}?approve_without_token=true") )
+          links << link_to( "#{token_action} verification email", wagn_path("/update/~#{card.id}?approve_with_token=true"  ) )
+          links << link_to( "Approve without verification", wagn_path("/update/~#{card.id}?approve_without_token=true") )
         end
         if card.ok? :delete
           links << link_to( "Deny and delete", wagn_path("/delete/~#{card.id}") )
@@ -85,7 +89,7 @@ event :activate_by_token, :before=>:approve, :on=>:update, :when=>proc{ |c| c.ha
     resend_activation_token
     abort :success
   else
-    abort :failure, "signup activation error: #{authentication_result}" # bad token or account
+    abort :failure, "signup activation error: #{result}" # bad token or account
   end
 end
 
@@ -98,10 +102,10 @@ event :activate_account do
   self.type_id = Card.default_accounted_type_id
 end
 
-event :approve_token, :on=>:update, :before=>:approve, :when=>proc {|c| Env.params[:approve_token] } do
+event :approve_with_token, :on=>:update, :before=>:approve, :when=>proc {|c| Env.params[:approve_with_token] } do
   abort :failure, 'illegal approval' unless account.confirm_ok?
   account.reset_token
-  account.send_account_confirmation_email
+  account.send_account_verification_email
 end
 
 event :approve_without_token, :on=>:update, :before=>:approve, :when=>proc {|c| Env.params[:approve_without_token] } do
@@ -111,7 +115,7 @@ end
 
 event :resend_activation_token do
   account.reset_token
-  account.send_account_confirmation_email
+  account.send_account_verification_email
   Env.params[:success] = {
     :id => '_self',
     :view => 'message',
@@ -127,7 +131,6 @@ event :redirect_to_edit_password, :on=>:update, :after=>:store, :when=>proc {|c|
   Env.params[:success] = account.edit_password_success_args  
 end
 
-
 event :preprocess_account_subcards, :before=>:process_subcards, :on=>:create do
   #FIXME: use codenames!
   email, password = subcards.delete('+*account+*email'), subcards.delete('+*account+*password')
@@ -136,11 +139,7 @@ event :preprocess_account_subcards, :before=>:process_subcards, :on=>:create do
   subcards['+*account']['+*password' ]=password if password
 end
 
-send_signup_notifications = proc do |c|
-  !Auth.signed_in? and c.account and c.account.pending? and Card.setting '*request+*to'
-end
-
-event :signup_notifications, :after=>:extend, :on=>:create, :when=>send_signup_notifications do
-  Mailer.signup_alert(self).deliver
+event :act_as_current_for_extend_phase, :before=>:extend, :on=>:create do
+  Auth.current_id = self.id
 end
 

data/mod/{standard → 05_standard}/set/type/user.rb

@@ -6,11 +6,15 @@ attr_accessor :email
 format :html do
 
   view :setup, :tags=>:unknown_ok, :perms=>lambda { |r| Auth.needs_setup? } do |args|
+    help_text = 'To get started, set up an account.'
+    if Wagn.config.action_mailer.perform_deliveries == false 
+      help_text += '<br>WARNING: Email delivery is turned off. Change settings in config/application.rb to send sign up notifications.'
+    end
     args.merge!( {
       :title=>'Welcome, Wagneer!',
       :optional_help=>:show,
       :optional_menu=>:never, 
-      :help_text=>'To get started, set up an account.',
+      :help_text=>help_text,
       :buttons => button_tag( 'Set up', :disable_with=>'Setting up' ),
       :hidden => { 
         :success => "REDIRECT: #{ Card.path_setting '/' }",
@@ -33,22 +37,17 @@ format :html do
   end
 end
 
-=begin
-def ok_to_create
-  unless Auth.needs_setup?
-    deny_because "You cannot create a #{type_name} directly; you must create a #{Card[:signup].name} first"
-  end
-end
-=end
 
 event :setup_as_bot, :before=>:check_permissions, :on=>:create, :when=>proc{ |c| Card::Env.params[:setup] } do
-  # is this still needed, even with the #ok_to_create call?
-  abort :failure unless Auth.needs_setup?
+  abort :failure unless Auth.needs_setup? 
   Auth.as_bot
+  # we need bot authority to set the initial administrator roles
+  # this is granted and inspected here as a separate event for 
+  # flexibility and security when configuring initial setups
 end  
 
 event :setup_first_user, :before=>:process_subcards, :on=>:create, :when=>proc{ |c| Card::Env.params[:setup] } do
-  subcards['*request+*to'] = subcards['+*account+*email']
+  subcards['signup alert email+*to'] = name
   subcards['+*roles'] = { :content => Card[:administrator].name }
   
   email, password = subcards.delete('+*account+*email'), subcards.delete('+*account+*password')

data/{spec/mod/standard → mod/05_standard/spec}/chunk/include_spec.rb

@@ -9,70 +9,70 @@ describe Card::Chunk::Include, "Inclusion" do
     end
     
     it "should ignore invisible comments" do
-      render_content("{{## now you see nothing}}").should==''
+      expect(render_content("{{## now you see nothing}}")).to eq('')
     end
 
     it "should handle visible comments" do
-      render_content("{{# now you see me}}").should == '<!-- # now you see me -->'
-      render_content("{{# -->}}").should == '<!-- # --&gt; -->'
+      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 )
-      instance.name.should == ''
-      instance.options[:inc_syntax].should == ' '
+      expect(instance.name).to eq('')
+      expect(instance.options[:inc_syntax]).to eq(' ')
       instance1 = @class.new( @class.full_match( '{{|}}' ) , nil )
-      instance1.name.should == ''
-      instance1.options[:inc_syntax].should == '|'
+      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 )
-      instance.name.should == 'toy'
-      instance.options[:inc_name].should == 'toy'
-      instance.options.key?(:view).should == false
+      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
-      @class.new( @class.full_match( '{{ toy }}') , nil ).name.should == 'toy'
+      expect(@class.new( @class.full_match( '{{ toy }}') , nil ).name).to eq('toy')
     end
     
     it 'should strip html tags' do
-      @class.new( @class.full_match( '{{ <span>toy</span> }}') , nil ).name.should == 'toy'
+      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 )
-      instance.name.should == 'toy'
-      instance.options[:view].should == 'open'
+      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
-      options[:inc_name].should == 'toy'
-      options[:view].should == 'link'
-      options[:hide].should == 'me'
-      options.key?(:items).should == false
+      expect(options[:inc_name]).to eq('toy')
+      expect(options[:view]).to eq('link')
+      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
-      options[:inc_name].should == 'box'
-      options[:view].should == 'open'
-      options[:items][:view].should == 'closed'
-      options[:items].key?(:items).should == false      
+      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)      
     end
 
     it "should handle multiple pipes with blank lists" do
       options = @class.new( @class.full_match('{{box||closed}}'), nil ).options
-      options[:inc_name].should == 'box'
-      options[:view].should == nil
-      options[:items][:view].should == 'closed'
+      expect(options[:inc_name]).to eq('box')
+      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
-      options[:inc_name].should == 'toy'
-      options[:view].should == 'link'
-      options[:items][:view].should == 'name'
+      expect(options[:inc_name]).to eq('toy')
+      expect(options[:view]).to eq('link')
+      expect(options[:items][:view]).to eq('name')
     end
   end
 
@@ -99,7 +99,7 @@ describe Card::Chunk::Include, "Inclusion" do
 
       r=bob_address.reload.format.render_core
       assert_view_select r, 'div[class~=card-content]', "Sparta"
-      Card.fetch("bob+address").includees.map(&:name).should == [bob_city.name]
+      expect(Card.fetch("bob+address").includees.map(&:name)).to eq([bob_city.name])
     end
 
     it "should handle nesting" do
@@ -109,15 +109,15 @@ describe Card::Chunk::Include, "Inclusion" do
       r= alpha .format.render_core
       #warn "r=#{r}"
       assert_view_select r, 'div[class~=card-content]'
-      r.should =~ /Booya/
+      expect(r).to match(/Booya/)
     end
 
     it "should handle options when nesting" do
       Card.create! :type=>'Pointer', :name=>'Livable', :content=>'[[Earth]]'
       Card.create! :name=>'Earth'
       
-      render_content('{{Livable|core;item:link}}').should == render_content('{{Livable|core|link}}')
-      render_content('{{Livable|core;item:name}}').should == render_content('{{Livable|core|name}}')
+      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
@@ -126,7 +126,7 @@ describe Card::Chunk::Include, "Inclusion" do
       adm = Card['Quentin']
       adm.update_attributes :content => "{{Oak}}"
       result = adm.format.render_core
-      result.should match('too deep')
+      expect(result).to match('too deep')
     end
 
     it "should handle missing cards" do
@@ -147,9 +147,9 @@ describe Card::Chunk::Include, "Inclusion" do
     
       wooga = Card.create! :name=>'Wooga', :type=>'SpecialType'
       wooga_age = Card.create!( :name=>"#{wooga.name}#{Card::Name.joint}age", :content=> "39" )
-      wooga_age.format.render_core.should == "39"
+      expect(wooga_age.format.render_core).to eq("39")
       #warn "cards #{wooga.inspect}, #{wooga_age.inspect}"
-      wooga_age.includers.map(&:name).should == ['Wooga']
+      expect(wooga_age.includers.map(&:name)).to eq(['Wooga'])
     end
 
     it "should handle shading" do
@@ -175,10 +175,10 @@ describe Card::Chunk::Include, "Inclusion" do
 
     #FIXME - should move code and test to core_ext or some such
     it 'Hash.new_from_semicolon_attr_list should work' do
-      Hash.new_from_semicolon_attr_list("").should == {}
-      Hash.new_from_semicolon_attr_list(nil).should == {}
-      Hash.new_from_semicolon_attr_list("a:b;c:4"  ).should == {:a=>'b', :c=>'4'}
-      Hash.new_from_semicolon_attr_list("d:b;e:4; ").should == {:d=>'b', :e=>'4'}
+      expect(Hash.new_from_semicolon_attr_list("")).to eq({})
+      expect(Hash.new_from_semicolon_attr_list(nil)).to eq({})
+      expect(Hash.new_from_semicolon_attr_list("a:b;c:4"  )).to eq({:a=>'b', :c=>'4'})
+      expect(Hash.new_from_semicolon_attr_list("d:b;e:4; ")).to eq({:d=>'b', :e=>'4'})
     end
 
   end

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

@@ -0,0 +1,61 @@
+# -*- encoding : utf-8 -*-
+
+describe Card::Chunk::Link do
+
+  it "should handle unknown cards" do
+    expect(render_content('[[Nixon]]')).to eq('<a class="wanted-card" href="/Nixon">Nixon</a>')
+  end
+
+  it 'should handle known cards' do
+    expect(render_content("[[A]]")).to eq('<a class="known-card" href="/A">A</a>')
+  end
+  
+  it 'should handle custom text' do
+    expect(render_content('[[Baines|Lyndon]]')).to eq('<a class="wanted-card" href="/Baines">Lyndon</a>')
+  end
+
+  it "should handle relative names" do
+    @card = Card.new :name=>'Kennedy'
+    expect(render_content('[[+Monroe]]'     )).to eq('<a class="wanted-card" href="/Kennedy+Monroe">Kennedy+Monroe</a>')
+    expect(render_content('[[_self+Exner]]' )).to eq('<a class="wanted-card" href="/Kennedy+Exner">Kennedy+Exner</a>')
+    expect(render_content('[[Onassis+]]'    )).to eq('<a class="wanted-card" href="/Onassis+Kennedy">Onassis+Kennedy</a>')
+  end
+
+  it "should handle relative names in context" do
+    @card = Card.new :name=>'Kennedy'
+    format_args = { :context_names => [ 'Kennedy'.to_name ] }
+    expect(render_content('[[+Monroe]]'    , format_args )).to eq('<a class="wanted-card" href="/Kennedy+Monroe">+Monroe</a>')
+    expect(render_content('[[_self+Exner]]', format_args )).to eq('<a class="wanted-card" href="/Kennedy+Exner">+Exner</a>')
+    expect(render_content('[[Onassis+]]'   , format_args )).to eq('<a class="wanted-card" href="/Onassis+Kennedy">Onassis</a>')
+  end
+
+  it "should handle relative urls" do
+    expect(render_content('[[/recent]]')).to eq('<a class="internal-link" href="/recent">/recent</a>')
+  end
+
+  it "should handle absolute urls" do
+    expect(render_content('[[http://google.com]]')).to eq('<a class="external-link" href="http://google.com">http://google.com</a>')
+  end
+
+  it "should escape spaces in cardnames with %20 (not +)" do
+    expect(render_content('[[Marie "Mad Dog" Deatherage|Marie]]')).to eq(
+      '<a class="wanted-card" href="/Marie_Mad_Dog_Deatherage?card%5Bname%5D=Marie+%22Mad+Dog%22+Deatherage">Marie</a>'
+    )
+  end
+
+  it "should not escape content outside of link" do
+    expect(render_content('wgw&nbsp; [[http://www.google.com|google]] &nbsp;  <br>')).to eq( 
+      "wgw&nbsp; <a class=\"external-link\" href=\"http://www.google.com\">google</a> &nbsp;  <br>"
+    )
+  end
+  
+  it "should handle inclusions in link text" do
+    expect(render_content('[[linkies|{{namies|name}}]]')).to eq('<a class="wanted-card" href="/linkies">namies</a>')
+  end
+  
+  it "should handle dot (.) in missing cardlink" do
+    expect(render_content("[[Wagn 1.10.12]]")).to eq('<a class="wanted-card" href="/Wagn_1_10_12?card%5Bname%5D=Wagn+1.10.12">Wagn 1.10.12</a>')
+  end
+
+end
+