wagn 1.13.0 → 1.14.0.pre1

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

@@ -44,8 +44,9 @@ format :json do
   end
 
   view :content do |args|
+    req = controller.request
     {
-      :url       => controller.request.original_url,
+      :url       => (req && req.original_url),
       :timestamp => Time.now.to_s,
       :card      => _render_atom
     }

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

@@ -0,0 +1,27 @@
+def send_action_mails args  
+  setting = "on_#{args[:on]}".to_sym    
+  email_templates_for( setting ) do |mailcard|
+    mailcard.deliver( context: self )
+  end
+end
+
+def email_templates_for setting
+  
+  if email_templates = @email_template_cache ||
+      ( event_card = self.rule_card(setting) and event_card.extended_item_cards )
+    email_templates.each do |mailcard|
+      yield(mailcard)
+    end
+  end
+end
+
+[:create, :update, :delete].each do |action|
+  event "observer_#{action}".to_sym, :after=>:extend, :on=>action do 
+    self.send_action_mails :on=>action
+  end
+end
+
+event :cache_delete_email_templates, :after=>:approve, :on=>:delete do 
+  event_card = self.rule_card(:on_delete)
+  @email_template_cache = event_card && event_card.extended_item_cards
+end

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

@@ -14,7 +14,7 @@ format :html do
   end
 
   view :layout, :perms=>:none do |args|
-    process_content get_layout_content, :content_opts=>{ :chunk_list=>:default }
+    process_content get_layout_content, :content_opts=>{ :chunk_list=>:references }
   end
 
   view :content do |args|
@@ -96,6 +96,7 @@ format :html do
 =end  
 
   view :menu, :tags=>:unknown_ok do |args|
+    return _render_template_closer if args[:menu_hack] == :template_closer
     disc_tagname = Card.fetch(:discussion, :skip_modules=>true).cardname
     disc_card = unless card.new_card? or card.junction? && card.cardname.tag_name.key == disc_tagname.key
       Card.fetch "#{card.name}+#{disc_tagname}", :skip_virtual=>true, :skip_modules=>true, :new=>{}
@@ -348,7 +349,6 @@ format :html do
   end
 
 
-
   view :edit_in_form, :perms=>:update, :tags=>:unknown_ok do |args|
     eform = form_for_multi
     content = content_field eform, args.merge( :nested=>true )
@@ -372,19 +372,6 @@ format :html do
     frame args do
       subformat( current_set ).render_content
     end
-        
-=begin        
-        #{
-          if card.accountable? && !card.account
-            %{
-              <div class="new-account-link">
-                #{ link_to %{Add a sign-in account for "#{card.name}"}, path(:view=>:new_account),
-                   :class=>'slotter new-account-link', :remote=>true }
-              </div>
-            }
-          end
-        }
-=end
   end
 
 
@@ -413,10 +400,9 @@ format :html do
       args[:help_text]
     else
       setting = card.new_card? ? [ :add_help, { :fallback => :help } ] : :help
-
       if help_card = card.rule_card( *setting ) and help_card.ok? :read
         with_inclusion_mode :normal do
-          process_content _render_raw( args.merge :structure=>help_card.name )
+          process_content _render_raw( args.merge :structure=>help_card.name ), :content_opts=>{ :chunk_list=>:references }
           # render help card with current card's format so current card's context is used in help card inclusions
         end
       end
@@ -431,12 +417,20 @@ format :html do
   end
 
   view :conflict, :error_code=>409 do |args|
-    load_revisions
+    # FIXME: hack to get the conflicted update as a proper act for the diff view
+    card.current_act.save
+    action = card.actions.last
+    action.card_act_id = card.current_act.id
+    action.draft = true
+    action.save
+    card.store_changes
+    
     wrap args.merge( :slot_class=>'error-view' ) do
-      %{<strong>Conflict!</strong><span class="new-current-revision-id">#{@revision.id}</span>
-        <div>#{ link_to_page @revision.creator.name } has also been making changes.</div>
+      %{<strong>Conflict!</strong><span class="new-current-revision-id">#{card.last_action_id}</span>
+        <div>#{ link_to_page card.last_action.act.actor.name } has also been making changes.</div>
         <div>Please examine below, resolve above, and re-submit.</div>
-        #{ wrap do |args| _render_diff end } }
+        #{ wrap do |args| _render_act_expanded :act=>card.current_act, :current_rev_nr => 0 end } 
+      }
     end
   end
 
@@ -453,12 +447,11 @@ format :html do
   
   
   view :last_action do |args|
-    rev = card.current_revision
-    action = case card.updated_at.to_s
-      when card.created_at.to_s; 'added'
-      when rev.created_at.to_s;  link_to('edited', path(:view=>:history), :class=>'last-edited', :rel=>'nofollow')
-      else; 'updated'
-      end
+    action = case card.last_action.action_type
+    when :create; 'added'
+    when :update; link_to('edited', path(:view=>:history), :class=>'last-edited', :rel=>'nofollow')
+    when :delete; 'deleted'
+    end
     %{
       <span class="last-update">
         #{ action }
@@ -470,7 +463,6 @@ format :html do
   end
           
   view :errors, :perms=>:none do |args|
-    #Rails.logger.debug "errors #{args.inspect}, #{card.inspect}, #{caller[0..3]*", "}"
     if card.errors.any?
       title = %{ Problems #{%{ with #{card.name} } unless card.name.blank?} }
       frame args.merge( :title=>title ) do
@@ -517,6 +509,7 @@ format :html do
           or_signup = if Card.new(:type_id=>Card::SignupID).ok? :create
             "or #{ link_to 'sign up', wagn_url('account/signup') }"
           end
+          save_interrupted_action(request.env['REQUEST_URI'])
           "You have to #{ link_to 'sign in', wagn_url(':signin') } #{or_signup} #{to_task}"
         end
 

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

@@ -1,5 +1,6 @@
 
 include All::Permissions::Accounts
+include Wagn::Location
 
 card_accessor :email
 card_accessor :password
@@ -23,6 +24,24 @@ def authenticate_by_token val
 end
 
 
+format do
+  view :verify_url do |args|
+    wagn_url "/update/#{card.cardname.left_name.url_key}?token=#{card.token}"
+  end
+
+  view :verify_days do |args|
+    ( Wagn.config.token_expiry / 1.day ).to_s
+  end
+
+  view :reset_password_url do |args|
+    wagn_url "/update/#{card.cardname.url_key}?reset_token=#{card.token_card.refresh(true).content}"
+  end
+
+  view :reset_password_days do |args|
+    ( Wagn.config.token_expiry / 1.day ).to_s
+  end
+end
+
 
 format :html do
 
@@ -60,7 +79,7 @@ event :set_default_salt, :on=>:create, :before=>:process_subcards do
 end
 
 event :set_default_status, :on=>:create, :before=>:process_subcards do
-  default_status = ( Auth.signed_in? || Auth.needs_setup? ? 'active' : 'pending' )
+  default_status = ( Auth.needs_setup? ? 'active' : 'pending' )
   subcards["+#{Card[:status].name}"] = { :content => default_status }
 end
 
@@ -110,17 +129,44 @@ event :reset_token do
 end
   
 
-event :send_account_confirmation_email, :on=>:create, :after=>:extend do
-  if self.email.present?
-    Mailer.confirmation_email( self ).deliver
-  end
+event :send_account_verification_email, :on=>:create, :after=>:extend, :when=>proc{ |c| c.token.present? } do
+  Card[:verification_email].deliver( :context => self, :to => self.email )
 end
 
 event :send_reset_password_token do
-  reset_token
-  Mailer.password_reset(self).deliver
+  Auth.as_bot do
+    token_card.update_attributes! :content => generate_token
+  end
+  Card[:password_reset_email].deliver( :context => self, :to => self.email )
 end
 
 def ok_to_read
   is_own_account? ? true : super
 end
+
+
+def changes_visible? act
+  act.relevant_actions_for(act.card).each do |action|
+    return true if action.card.ok? :read
+  end
+  return false
+end
+
+def send_change_notice act, followed_card_name
+  if changes_visible?(act) 
+    Card[:follower_notification_email].deliver(
+      :context   => act.card,
+      :to        => email,
+      :follower  => left.name, 
+      :followed  => followed_card_name,
+    )
+  end
+end
+
+
+format :email do  
+  view :mail do |args|
+    args[:to] ||= card.email
+    super args
+  end
+end

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

@@ -2,7 +2,6 @@
 include All::Permissions::Accounts
 
 view :raw do |args|
-  
   case
   when card.real?          ; card.content
   when card.left.account   ; card.left.account.email #this supports legacy behavior (should be moved to User+*email+*type plus right)

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

@@ -17,7 +17,7 @@ event :encrypt_password, :on=>:save, :after=>:process_subcards do
     #errors.add :password, 'need a valid salt'
     # turns out we have a lot of existing account without a salt.  not sure when that broke??
   end
-  if updates.for :content
+  if db_content_changed?
     unless Card::Env[:no_password_encryptions] # hack for import - fix with api for ignoring events
       self.content = Auth.encrypt content, salt
     end

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

@@ -10,7 +10,7 @@ view :core do |args|
         %{<table class="show-cache">
             <tr><th>Field</th><th>Cache Val</th><th>Database Val</th></tr>
             #{
-              [ :name, :updated_at, :updater_id, :current_revision_id, :content ].map do |field|
+              [ :name, :updated_at, :updater_id, :content ].map do |field|
                 %{<tr>#{ [ field, cache_card.send(field), db_card.send(field) ].map() { |cell| "<td>#{cell}</td>"}.join }</tr>}
               end.join
             }

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

@@ -1,4 +1,3 @@
-
 format :html do
 
   view :closed_rule, :tags=>:unknown_ok do |args|
@@ -51,7 +50,7 @@ format :html do
         current_rule.assign_attributes card_args
         current_rule.include_set_modules
       end
-      set_selected = card_args[:name].to_name.left_name.to_s
+      set_selected = card_args[:name].to_name.left
       edit_mode = true
     end
 
@@ -149,11 +148,13 @@ format :html do
 
         <div class="card-editor">
           #{
-            fieldset 'type', type_field(
-              :href         => path(:card=>open_rule, :view=>:open_rule, :type_reload=>true),
-              :class        => 'type-field rule-type-field live-type-field',
-              'data-remote' => true
-            ), :editor=>'type'
+            if card.right.rule_type_editable
+              fieldset 'type', type_field(
+                :href         => path(:card=>open_rule, :view=>:open_rule, :type_reload=>true),
+                :class        => 'type-field rule-type-field live-type-field',
+                'data-remote' => true
+              ), :editor=>'type'
+            end
           }
           
           #{ fieldset 'content', content_field( form, args.merge(:skip_rev_id=>true) ), :editor=>'content' }

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

@@ -6,7 +6,7 @@ event :admin_tasks, :on=>:update, :before=>:approve do
       when :clear_cache           ;  Wagn::Cache.reset_global
       when :repair_references     ;  Card::Reference.repair_all
       when :empty_trash           ;  Card.empty_trash
-      when :delete_old_revisions  ;  Card::Revision.delete_old
+      when :delete_old_revisions  ;  Card::Action.delete_old
       when :delete_old_sessions
         if months = Env.params[:months].to_i and months > 0
           ActiveRecord::SessionStore::Session.delete_all ["updated_at < ?", months.months.ago]

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

@@ -29,7 +29,7 @@ format :html do
   def head_buttons
     bits = []
     [:favicon, :logo].each do |name|
-      if c = Card[name] and c.type_id == ImageID and !c.content.blank?
+      if c = Card[name] and c.type_id == ImageID and !c.db_content.blank?
         bits << %{<link rel="shortcut icon" href="#{ subformat(c)._render_source :size=>:icon }" />}
         break
       end
@@ -48,13 +48,14 @@ format :html do
         bits << %{<link rel="alternate" type="application/rss+xml" title="RSS" href=#{page_path root.card.name, opts} />}
       end
     end
+    bits << '<link href="//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css" rel="stylesheet">'
     bits.join "\n      "
   end
   
   def head_stylesheets
     manual_style = params[:style]
     style_card   = Card[manual_style] if manual_style
-    style_card ||= card.rule_card :style
+    style_card ||= root.card.rule_card :style
     
     @css_path = if params[:debug] == 'style'
       page_path( style_card.name, :item => :import, :format => :css) 
@@ -76,13 +77,27 @@ format :html do
     c=Card[:double_click] and !Card.toggle c.content and varvals << 'wagn.noDoubleClick=true'
     @css_path                                        and varvals << "wagn.cssPath='#{@css_path}'"
     
-    script_card = root.card.rule_card :script
+    manual_script = params[:script]
+    script_card   = Card[manual_script] if manual_script
+    script_card ||= root.card.rule_card :script 
+    
+    @js_tag = if params[:debug] == 'script'
+      script_card.format(:format=>:js).render_core :item => :include_tag
+    elsif script_card
+      javascript_include_tag script_card.machine_output_url
+    end 
+
     ie9_card    = Card[:script_html5shiv_printshiv]
-    %(#{ javascript_tag do varvals * ';' end  }      
-      #{ javascript_include_tag script_card.machine_output_url if script_card }
+    %(#{ javascript_tag do varvals * ';' end  }
+      #{ @js_tag if @js_tag }
       <!--[if lt IE 9]>#{ javascript_include_tag ie9_card.machine_output_url if ie9_card }<![endif]-->
       #{ javascript_tag { "wagn.setTinyMCEConfig('#{ escape_javascript Card.setting(:tiny_mce).to_s }')" } }
-      #{ google_analytics_head_javascript })
+      #{ google_analytics_head_javascript }
+      <script type="text/javascript">
+        $('document').ready(function() {
+          $('.card-slot').trigger('slotReady');
+        })
+      </script>)
   end
     
   

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

@@ -30,7 +30,7 @@ format :html do
     account = card.fetch :trait=>:account, :new=>{}
   
     form_args = {
-      :hidden => { :success=>'REDIRECT: *previous' },
+      :hidden => { :success=>"REDIRECT: #{interrupted_action || '*previous'}" },
       :recaptcha => :off
     }
   

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

@@ -21,8 +21,8 @@ format :html do
           <td>#{link_to 'delete all', wagn_path( 'update/:all?task=empty_trash' )}</td>
         </tr>
         <tr>
-          <td>revisions</td>
-          <td>#{ Card::Revision.count }</td>
+          <td>actions</td>
+          <td>#{ Card::Action.count }</td>
           <td>#{link_to 'delete old', wagn_path( 'update/:all?task=delete_old_revisions' ) }</td>
         </tr>
           <tr><td>references</td>

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

@@ -16,14 +16,12 @@ format :html do
 
   view :watch do |args|
     wrap args do
-      #type_link = card.watching_type? ? "#{watching_type_cards} | " : ""
-      link_args = if card.watching?
-        ["following", :off, "stop sending emails about changes to #{card.cardname}", { :hover_content=> 'unfollow' } ]
+      link_args = if card.watched? 
+        [card, "following", :off, "stop sending emails", { :hover_content=> 'unfollow' } ]
       else
-        ["follow all", :on, "send emails about changes to #{card.cardname}"]
+        [card, "follow all", :on, "send emails"]
       end
-      link_args[2] += ' cards'
-      #type_link + 
+      link_args[3] += " about changes to #{card.cardname} cards"
       watch_link( *link_args )
     end
   end