wagn 1.12.13 → 1.13.0.pre

data/mods/standard/sets/all/history.rb

@@ -1,17 +1,15 @@
-# -*- encoding : utf-8 -*-
 
 format :html do
 
   view :history do |args|
     load_revisions
     if @revision
-      frame args.merge(:content=>true, :subheader=>_render_revision_subheader ) do
+      frame args.merge( :content=>true, :subheader=>_render_revision_subheader ) do
         _render_diff
       end
     end
   end
 
-
   view :diff do |args|
     load_revisions
     if @show_diff and @previous_revision
@@ -44,7 +42,6 @@ format :html do
       <div class="revision-navigation">#{ revision_menu }</div>
     }
   end
-
   
   def load_revisions
     unless @revision_number
@@ -55,7 +52,6 @@ format :html do
     end
   end
 
-
   def revision_link text, revision, name, accesskey='', mode=nil
     link_to text, path(:view=>:history, :rev=>revision, :mode=>(mode || params[:mode] || true) ),
       :class=>"slotter", :remote=>true, :rel=>'nofollow'
@@ -77,7 +73,7 @@ format :html do
 
   def revision_menu_items
     items = [back_for_revision, forward, see_or_hide_changes_for_revision]
-    items << rollback unless Wagn::Env[:recaptcha_on]
+    items << rollback unless Card::Env.recaptcha_on?
     items
   end
 
@@ -108,5 +104,4 @@ format :html do
      revision_link("Autosaved Draft", card.revisions.count, 'to autosave')
   end
 
-
 end

data/mods/standard/sets/all/json.rb

@@ -1,4 +1,4 @@
-# -*- encoding : utf-8 -*-
+
 format :json do
 
   def get_inclusion_defaults
@@ -13,18 +13,13 @@ format :json do
     params[:max_depth] || 1
   end
   
-  def default_search_params
-    { :default_limit => 0 }
-  end
-  
-
-  def show args
-    view = args[:view] || :content
+  def show view, args
+    view ||= :content
     raw = render view, args
     case
-    when String === raw  ;  raw
-    when params[:pretty] ;  JSON.pretty_generate raw
-    else                 ;  JSON( raw )
+    when String === raw    ;  raw
+    when params[:compress] ;  JSON( raw )
+    else                   ;  JSON.pretty_generate raw
     end
   end
 

data/mods/standard/sets/all/rich_html.rb

@@ -1,20 +1,20 @@
-# -*- encoding : utf-8 -*-
 
 format :html do
   
-  def show args
-    @main_view = args[:view] || args[:home_view]
-
-    if ajax_call?
-      view = @main_view || :open
-      self.render view, args
+  def show view, args
+    if Env.ajax?
+      view ||= args[:home_view] || :open
+      @inclusion_opts = args.delete(:items)
+      render view, args
     else
-      self.render_layout args
+      args.merge! :view=>view if view
+      @main_opts = args
+      self.render_layout
     end
   end
 
   view :layout, :perms=>:none do |args|
-    layout_content = get_layout_content args
+    layout_content = get_layout_content
     process_content layout_content
   end
 
@@ -98,6 +98,7 @@ format :html do
 
     @menu_vars = {
       :self         => card.name,
+      :linkname     => card.cardname.url_key,
       :type         => card.type_name,
       :structure    => card.structure && card.template.ok?(:update) && card.template.name,
       :discuss      => disc_card && disc_card.ok?( disc_card.new_card? ? :comment : :read ),
@@ -107,8 +108,8 @@ format :html do
     if card.real?
       @menu_vars.merge!({
         :edit      => card.ok?(:update),
-        :account   => card.account && card.update_account_ok?,
-        :watch     => Account.logged_in? && render_watch,
+        :account   => card.account && card.ok?(:update),
+        :watch     => Auth.signed_in? && render_watch,
         :creator   => card.creator.name,
         :updater   => card.updater.name,
         :delete    => card.ok?(:delete) && link_to( 'delete', path(:action=>:delete),
@@ -121,7 +122,6 @@ format :html do
     %{<span class="card-menu-link" data-menu-vars='#{json}'>#{_render_menu_link}</span>}
   end
 
-
   view :menu_link do |args|
     '<a class="ui-icon ui-icon-gear"></a>'
   end
@@ -142,7 +142,7 @@ format :html do
   ###---( TOP_LEVEL (used by menu) NEW / EDIT VIEWS )
 
   view :new, :perms=>:create, :tags=>:unknown_ok do |args|
-    frame_and_form :create, args, 'main-success'=>'REDIRECT' do |form|
+    frame_and_form :create, args, 'main-success'=>'REDIRECT' do
       [
         _optional_render( :name_fieldset,     args ),
         _optional_render( :type_fieldset,     args ),
@@ -203,7 +203,7 @@ format :html do
 
   
   view :edit, :perms=>:update, :tags=>:unknown_ok do |args|
-    frame_and_form :update, args do |form|
+    frame_and_form :update, args do
       [
         _optional_render( :content_fieldsets, args ),
         _optional_render( :button_fieldset,   args )
@@ -329,7 +329,7 @@ format :html do
   end
   
   view :content_fieldsets do |args|
-    %{
+    raw %{
       <div class="card-editor editor">
         #{ edit_slot args }
       </div>
@@ -344,7 +344,7 @@ format :html do
 
 
 
-  view :edit_in_form, :perms=>:update, :tags=>:unknown_ok do |args| #fixme.  why is this a view??
+  view :edit_in_form, :perms=>:update, :tags=>:unknown_ok do |args|
     eform = form_for_multi
     content = content_field eform, args.merge( :nested=>true )
     opts = { :editor=>'content', :help=>true, :attribs =>
@@ -355,16 +355,20 @@ format :html do
     else
       opts[:attribs].merge! :card_id=>card.id, :card_name=>(h card.name)
     end
+    
     fieldset fancy_title( args[:title] ), content, opts
   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 ).render_content
+    end
+        
+=begin        
         #{
           if card.accountable? && !card.account
             %{
@@ -375,8 +379,7 @@ format :html do
             }
           end
         }
-      }
-    end
+=end
   end
 
 
@@ -394,7 +397,7 @@ format :html do
       nest_args[:optional_comment_box] = :show if rparams[:name] == '+discussion' #fixme.  yuck!
 
       frame args do
-        process_inclusion rcard, nest_args
+        nest rcard, nest_args
       end
     end
   end
@@ -415,6 +418,12 @@ format :html do
     %{<div class="instruction">#{raw text}</div>} if text
   end
 
+  view :message, :perms=>:none, :tags=>:unknown_ok do |args|
+    frame args do
+      params[:message]
+    end
+  end
+
   view :conflict, :error_code=>409 do |args|
     load_revisions
     wrap args.merge( :slot_class=>'error-view' ) do
@@ -426,45 +435,52 @@ format :html do
   end
 
   view :change do |args|
+    args[:optional_title_link] = :show
     wrap args do
-      %{
-        #{ link_to_page card.name, nil, :class=>'change-card' }
-        #{ _optional_render :menu, args, :hide }
-        #{
-        if rev = card.current_revision and !rev.new_record?
-          # this check should be unnecessary once we fix search result bug
-          %{<span class="last-update"> #{
-
-            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} #{
-
-             time_ago_in_words card.updated_at } ago by #{ #ENGLISH
-             link_to_page card.updater.name, nil, :class=>'last-editor'}
-           </span>}
-        end
-        }
-      }
+      [
+        _optional_render( :title, args       ),
+        _optional_render( :menu, args, :hide ),
+        _optional_render( :last_action, args )
+      ]
     end
   end
-
+  
+  
+  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
+    %{
+      <span class="last-update">
+        #{ action }
+        #{ _render_updated_at }
+        ago by
+        #{ subformat(card.updater)._render_link }
+      </span> 
+    }
+  end
+          
   view :errors, :perms=>:none do |args|
     #Rails.logger.debug "errors #{args.inspect}, #{card.inspect}, #{caller[0..3]*", "}"
     if card.errors.any?
-      wrap args do
-        %{ <h2>Problems #{%{ with <em>#{card.name}</em>} unless card.name.blank?}</h2> } +
-        card.errors.map { |attrib, msg| "<div>#{attrib.to_s.upcase}: #{msg}</div>" } * ''
+      title = %{ Problems #{%{ with #{card.name} } unless card.name.blank?} }
+      frame args.merge( :title=>title ) do
+        card.errors.map do |attrib, msg|
+          msg = "#{attrib.to_s.upcase}: #{msg}" unless attrib == :abort
+          %{ <div class="card-error-msg">#{msg}</div> }
+        end
       end
     end
   end
 
   view :not_found do |args| #ug.  bad name.
-    sign_in_or_up_links = if !Account.logged_in?
+    sign_in_or_up_links = if !Auth.signed_in?
       %{<div>
-        #{link_to "Sign In", :controller=>'account', :action=>'signin'} or
-        #{link_to 'Sign Up', :controller=>'account', :action=>'signup'} to create it.
+        #{link_to "Sign in", wagn_path(':signin') } or
+        #{link_to 'Sign up', wagn_path('account/signup') } to create it.
        </div>}
     end
     frame args.merge(:title=>'Not Found', :optional_menu=>:never) do
@@ -489,13 +505,13 @@ format :html do
         message = case
         when task != :read && Wagn.config.read_only
           "We are currently in read-only mode.  Please try again later."
-        when Account.logged_in?
+        when Auth.signed_in?
           "You need permission #{to_task}"
         else
-          or_signup = if Card.new(:type_id=>Card::AccountRequestID).ok? :create
-            "or #{ link_to 'sign up', wagn_url('new/:account_request') }"
+          or_signup = if Card.new(:type_id=>Card::SignupID).ok? :create
+            "or #{ link_to 'sign up', wagn_url('account/signup') }"
           end
-          "You have to #{ link_to 'sign in', wagn_url('account/signin') } #{or_signup} #{to_task}"
+          "You have to #{ link_to 'sign in', wagn_url(':signin') } #{or_signup} #{to_task}"
         end
 
         %{<h1>Sorry!</h1>\n<div>#{ message }</div>}

data/mods/standard/sets/all/rss.rb

@@ -1,11 +1,10 @@
-# -*- encoding : utf-8 -*-
 
 format :rss do
 
-  def show args
-  #    render( args[:view] || :feed )
+  def show view, args
     @xml = Builder::XmlMarkup.new
-    render_feed args
+    view ||= :feed
+    render view, args
   end
 
   # FIXME: integrate this with common XML features when it is added
@@ -33,7 +32,7 @@ format :rss do
     end
     items.each do |item|
       @xml.item do
-        subformat(item).render_feed_item :view_changes=>(card.id==Card::RecentID)  #FIXME! yuck.
+        subformat(item).render_feed_item :view_changes=>(card.id==RecentID)  #FIXME! yuck.
       end
     end
   end

data/mods/standard/sets/all/text.rb

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 
 format :text do
 

data/mods/standard/sets/right/account.rb

@@ -1 +1,100 @@
-# -*- encoding : utf-8 -*-
+
+include All::Permissions::Accounts
+
+card_accessor :email
+card_accessor :password
+card_accessor :salt
+card_accessor :status
+card_accessor :token
+
+def active?   ; status=='active'  end
+def blocked?  ; status=='blocked' end
+def built_in? ; status=='system'  end
+def pending?  ; status=='pending' end
+
+format :html do
+
+  view :raw do |args|
+    %{
+      {{+#{Card[:email   ].name}|titled;title:email}}
+      {{+#{Card[:password].name}|titled;title:password}}
+    }
+  end
+
+  view :edit do |args|
+    args[:structure] = true
+    _final_edit args
+  end
+end
+
+
+event :validate_accountability, :on=>:create, :before=>:approve do
+  unless left and left.accountable?
+    errors.add :content, "not allowed on this card"
+  end
+end
+
+event :require_email, :on=>:create, :after=>:approve do
+  unless subcards["+#{Card[:email].name}"] 
+    errors.add :email, 'required'
+  end
+end
+
+
+event :set_default_salt, :on=>:create, :before=>:process_subcards do
+  salt = Digest::SHA1.hexdigest "--#{Time.now.to_s}--"
+  Env[:salt] = salt # HACK!!! need viable mechanism to get this to password
+  subcards["+#{Card[:salt].name}"] ||= {:content => salt }
+end
+
+event :set_default_status, :on=>:create, :before=>:process_subcards do
+  default_status = ( Auth.signed_in? || Auth.needs_setup? ? 'active' : 'pending' )
+  subcards["+#{Card[:status].name}"] = { :content => default_status }
+end
+
+event :generate_confirmation_token, :on=>:create, :before=>:process_subcards do
+  subcards["+#{Card[:token].name}"] = {:content => generate_token }
+end
+
+event :reset_password, :on=>:update, :before=>:approve, :when=>proc{ |c| c.has_reset_token? } do
+  result = Auth.authenticate_by_token @env_token
+  case result
+  when Integer
+    Auth.signin result
+    Env.params[:success] = { :id=>left.name, :view=>:related,
+      :related=>{:name=>"+#{Card[:account].name}", :view=>'edit'}
+    }
+    abort :success
+  when :token_expired
+    send_reset_password_token
+    Env.params[:success] = {
+      :id => '_self',
+      :view => 'message',
+      :message => "Sorry, this token has expired. Please check your email for a new password reset link."
+    }
+    abort :success
+  else
+    abort :failure, "error resetting password: #{result}" # bad token or account
+  end
+end
+
+def has_reset_token?
+  @env_token = Env.params[:reset_token]
+end
+
+event :send_new_account_confirmation_email, :on=>:create, :after=>:extend do
+  if self.email.present?
+    Mailer.confirmation_email( self ).deliver
+  end
+end
+
+event :send_reset_password_token do
+  Auth.as_bot do
+    token_card.update_attributes! :content => generate_token
+  end
+  Mailer.password_reset(self).deliver
+end
+
+def ok_to_read
+  is_own_account? ? true : super
+end