wagn 1.12.13 → 1.13.0.pre

data/mods/standard/lib/stylesheets/standard.scss

@@ -362,7 +362,7 @@ del.diffmod,
 }
 
 
-#credit, /* credit is deprecated */
+#credit, /* these are both deprecated */
 .flash-notice {  
   color: #333;
   font-size: 1.1em;
@@ -581,7 +581,7 @@ h2.set-label {
 /*-------------------------- */
 
 .ui-icon {
-  background-image: url([[/assets/images/ui-icons_454545_256x240.png]])
+  background-image: url([[/assets/smoothness/ui-icons_454545_256x240.png]])
 }
 
 .instruction {

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

@@ -5,23 +5,28 @@ module ClassMethods
 end
 
 def account
-  Account[ id ]
+  fetch :trait=>:account
 end
 
 def accountable?
-  Card.toggle( rule(:accountable) ) and
-  fetch( :trait=>:account, :new=>{} ).permitted?( :create) #don't use #ok? here because we don't want to check part permissions
+  Card.toggle( rule :accountable )
 end
 
 def parties
   @parties ||= (all_roles << self.id).flatten.reject(&:blank?)
 end
 
-def among? card_with_acct
-  card_with_acct.each do |auth|
-    return true if parties.member? auth
+def among? ok_ids
+  ok_ids.each do |ok_id|
+    return true if parties.member? ok_id
   end
-  card_with_acct.member? Card::AnyoneID
+  ok_ids.member? Card::AnyoneID
+end
+
+def is_own_account?
+  # card is +*account card of signed_in user.
+  cardname.part_names[0].key == Auth.as_card.key and
+  cardname.part_names[1].key == Card[:account].key
 end
 
 def read_rules
@@ -40,215 +45,23 @@ end
 
 def all_roles
   @all_roles ||= 
-    if id == Card::AnonID
+    if id == Card::AnonymousID
       []
     else
-      Account.as_bot do
+      Auth.as_bot do
         role_trait = fetch :trait=>:roles
-        [ Card::AuthID ] + ( role_trait ? role_trait.item_ids : [] )
+        [ Card::AnyoneSignedInID ] + ( role_trait ? role_trait.item_ids : [] )
       end
     end
 end
 
 
-format :html do
-  view :invitation_fields do |args|
-    email_params = params[:email] || {}
-    subject = email_params[:subject] || Card.setting('*invite+*subject') || ''
-    message = email_params[:message] || Card.setting('*invite+*message') || ''
-    
-    success = Card.setting "#{ Card[:invite].name }+#{ Card[:thanks].name }"
-    args[:buttons] = %{
-      #{ submit_tag 'Invite' }
-      #{ link_to 'Cancel', previous_location }      
-    }
-    
-    %{
-      #{ hidden_field_tag :success, "REDIRECT: #{success}" if success }
-      #{ fieldset :subject, text_field( :email, :subject, :value=>subject, :size=>60 ) }
-      #{ fieldset :message, text_area( :email, :message, :value=>message, :rows=>10, :cols => 60 ),
-          :help => "We'll create a password and attach it to the email." }
-      #{ _optional_render :button_fieldset, args }
-    }    
-  end
-  
-  
-  view :account, :perms=> lambda { |r| r.card.update_account_ok? } do |args|
-    frame_and_form :update, args, 'notify-success'=>'account details updated' do
-      %{
-        #{ render_account_detail }
-        #{ _optional_render :button_fieldset, args }
-      }
-    end
-  end
-  
-  def default_account_args args
-    default_new_account_args args
-    args[:buttons] = submit_tag 'Save Changes'
-  end
-
-
-  view :account_detail, :perms=>lambda { |r| r.card.update_account_ok? } do |args|
-    account = args[:account] || card.account
-    
-    %{
-      #{ fieldset :email,
-        text_field( 'card[account_args]', :email, :autocomplete => :off, :value=>account.email ),
-        :editor => 'content'
-      }
-      #{ fieldset :password,
-        password_field( 'card[account_args]', :password ),
-        :help   => (args[:setup] ? nil : 'no change if blank'),
-        :editor => 'content'
-      }
-      #{ fieldset 'confirm password',
-        password_field( 'card[account_args]', :password_confirmation ),
-        :editor => 'content'
-      }
-      #{ 
-        if !args[:setup] && Account.user.id != account.id 
-          fieldset :block, check_box_tag( 'card[account_args][blocked]', '1', account.blocked? ), :help=>'prevents sign-ins'
-        end
-      }
-    }
-    
-  end
-  
-
-  view :new_account, :perms=> lambda { |r| r.card.accountable? && !r.card.account } do |args|
-    frame_and_form :update, args do
-      %{
-        #{ _render_email_fieldset    }
-        #{ _render_invitation_field  }
-      }
-    end
-  end
-  
-  def default_new_account_args args
-    args[:hidden] = { :success => { :id=>'_self', :view=>'account' } }
-  end
-  
-  
-  view :email_fieldset do |args|
-    fieldset :email, text_field( 'card[account_args]', :email ), :editor=>'content'
-  end
-  
-  
-  view :signin_and_forgot_password, :perms=>:none do |args|
-    %{
-      <div id="sign-in">#{ _render_signin args }</div>
-      <div id="forgot-password">#{ _render_forgot_password args }</div>
-    }
-  end
-
-  view :signin, :perms=>:none do |args|
-    args.merge!( {
-      :title=>'Sign In',
-      :optional_help=>:show,
-      :optional_menu=>:never,
-      :hidden=>{ :success=>'REDIRECT:*previous' },
-      :buttons=> submit_tag( 'Sign in' ) 
-    })
-    if Card.new(:type_id=>Card::AccountRequestID).ok? :create
-      args[:buttons] += link_to( '...or sign up!', wagn_path("new/:account_request"))
-    end
-    
-    frame_and_form 'account/signin', args, :recaptcha=>:off do
-      [
-        fieldset( :email, text_field_tag( 'login', params[:login], :id=>'login_field' ) ),
-        fieldset( :password, password_field_tag( 'password' ) ),
-        _optional_render( :button_fieldset, args )
-      ]
-    end
-  end
-
-  view :forgot_password, :perms=>:none do |args|
-    args.merge!( {
-      :title=>'Forgot Password',
-      :optional_help=>:show, 
-      :optional_menu=>:never,
-      :hidden => { :success => { :view=>:forgot_password }},
-      :buttons => submit_tag( 'Reset my password' )
-    } )
-    
-    frame_and_form 'account/forgot_password', args, :recaptcha=>:off,
-      'notify-success'=>"Check your email for your new temporary password" do
-      [
-        fieldset( :email, text_field_tag( 'email', params[:email] ) ),
-        _optional_render( :button_fieldset, args )
-      ]
-    end
-  end
+event :generate_token do
+  Digest::SHA1.hexdigest "--#{Time.now.to_s}--#{rand 10}--" 
 end
 
-
 event :set_stamper, :before=>:approve do
-  self.updater_id = Account.current_id
+  self.updater_id = Auth.current_id
   self.creator_id = self.updater_id if new_card?
 end
 
-event :create_account, :after=>:store, :on=>:save do
-  if @account_args && !account && Card.toggle( rule :accountable )
-    
-    # note - following must be done here because subcard handling happens later (after mods loaded)
-    # and account card must be created before user entry
-    # when all are cards, neither the as_bot nor the special treatment should be necessary.
-    account_card = Account.as_bot do
-      Card.create! :name=>"#{ name }+#{ Card[:account].name }"
-    end 
-    
-    @account_args[:status] = 'pending' unless accountable?
-    @account_args.reverse_merge! :card_id => self.id, :status => 'active', :account_id => account_card.id
-
-    user = User.new @account_args
-    handle_user_save user
-    @newly_activated_account = user if user.active?
-  end
-end
-
-event :update_account, :after=>:store, :on=>:update do
-  if @account_args && account && update_account_ok?
-    @account_args[:blocked] = account_args[:blocked] == '1'
-    if Account.as_id == id and account_args[:blocked]
-      raise Card::Oops, "can't block own account"
-    end
-    user = account
-    user.attributes = @account_args
-    handle_user_save user
-  end
-end
-
-def handle_user_save user
-  unless user.save
-    user.errors.each do |key,err|
-      errors.add key,err
-    end
-    raise ActiveRecord::Rollback
-  end
-end
-
-
-activation_ready = proc do |c|
-  Wagn::Env.params[:activate] and c.accountable? and c.account
-end
-
-event :activate_account, :after=>:store, :on=>:update, :when=>activation_ready do
-  account.update_attributes :status=>'active'
-  @newly_activated_account = account
-end
-
-
-event :notify_accounted, :after=>:extend do
-  if @newly_activated_account && @newly_activated_account.active?
-    email_args = Wagn::Env.params[:email] || {}
-    email_args[:message] ||= Card.setting('*signup+*message') || "Thanks for signing up to #{Card.setting('*title')}!"
-    email_args[:subject] ||= Card.setting('*signup+*subject') || "Account info for #{Card.setting('*title')}!"
-    @newly_activated_account.send_account_info email_args
-  end
-end
-
-event :block_deleted_user, :after=>:store, :on=>:delete do
-  if account = Account[ self.id ]
-    account.update_attributes :status=>'blocked'
-  end
-end

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

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
     
 format :css do
 
@@ -6,8 +5,8 @@ format :css do
     { :view => :content }
   end
 
-  def show args
-    view = args[:view] || :content
+  def show view, args
+    view ||= :content
     render view, args
   end
   

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

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 require 'csv'
 
 format :csv  do

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

@@ -1,4 +1,3 @@
-# -*- encoding : utf-8 -*-
 
 def attach_array(rev_id=nil)
   c=if rev_id || self.new_card? || selected_revision_id==current_revision_id

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

@@ -1,8 +1,7 @@
-# -*- encoding : utf-8 -*-
 
 format do
-  def show args
-    view = args[:view] || :core
+  def show view, args
+    view ||= :core
     render view, args
   end
 end
@@ -22,6 +21,12 @@ view :link, :perms=>:none  do |args|
 end
 
 
+# DATE VIEWS
+
+view :created_at do |args| time_ago_in_words card.created_at end
+view :updated_at do |args| time_ago_in_words card.updated_at end
+
+
 # CONTENT VIEWS
 
 view :raw do |args|
@@ -45,6 +50,7 @@ view :closed_content do |args|
   Card::Content.truncatewords_with_closing_tags _render_core(args) #{ yield }
 end
 
+
 # note: content and open_content may look like they should be aliased to core, but it's important that they render
 # core explicitly so that core view overrides work.  the titled and labeled views below, however, are not intended
 # for frequent override, so this shortcut is fine.
@@ -97,10 +103,6 @@ view :bad_address, :perms=>:none, :error_code=>404 do |args|
   %{ 404: Bad Address }
 end
 
-view :no_card, :perms=>:none, :error_code=>404 do |args|
-  %{ 404: No Card! }
-end
-
 view :too_deep, :perms=>:none do |args|
   %{ Man, you're too deep.  (Too many levels of inclusions at a time) }
 end

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

@@ -2,12 +2,12 @@ event :add_comment, :after=>:approve, :on=>:save, :when=> proc {|c| c.comment }
   self.content = %{
     #{ content }
     #{ '<hr>' unless content.blank? }
-    #{ comment.to_html }
+    #{ comment.split(/\n/).map {|line| "<p>#{line.strip.empty? ? '&nbsp;' : line}</p>"} * "\n" }
     <div class="w-comment-author">--#{
-      if Account.logged_in?
-        "[[#{Account.current.name}]]"
+      if Auth.signed_in?
+        "[[#{Auth.current.name}]]"
       else
-        Wagn::Env[:controller].session[:comment_author] = comment_author if Wagn::Env[:controller]
+        Env.session[:comment_author] = comment_author if Env.session
         "#{ comment_author } (Not signed in)"
       end
     }.....#{Time.now}</div>
@@ -26,7 +26,7 @@ view( :comment_box, :denial=>:blank, :tags=>:unknown_ok, :perms=>lambda { |r| r.
         #{ f.text_area :comment, :rows=>3 }
         <div class="comment-buttons">
           #{
-            unless Account.logged_in?
+            unless Auth.signed_in?
               card.comment_author= (session[:comment_author] || params[:comment_author] || "Anonymous") #ENGLISH
               %{<label>My Name is:</label> #{ f.text_field :comment_author }}
             end

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

@@ -1,5 +1,3 @@
-# -*- encoding : utf-8 -*-
-
 
 format :email do
   view :missing        do |args| '' end

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

@@ -0,0 +1,62 @@
+#~~~~~~~~~~~~~~~~
+# EXPERIMENTAL
+# the following methods are for visualing card events
+#  not ready for prime time!
+
+def events action
+  @action = action
+  root = _validate_callbacks + _save_callbacks
+  events = [ events_tree(:validation), events_tree(:save)]
+  @action = nil
+  puts_events events
+end
+
+private
+
+def puts_events events, prefix='', depth=0
+  r = ''
+  depth += 1
+  events.each do |e|
+    space = ' ' * (depth * 2)
+
+    #FIXME - this is not right.  before and around callbacks are processed in declaration order regardless of kind.
+    # not all befores then all arounds
+    
+    if e[:before]
+      r += puts_events( e[:before], space+'v  ', depth)
+    end
+    if e[:around]
+      r += puts_events( e[:around], space+'vv ', depth )
+    end
+    
+    
+    output = "#{prefix}#{e[:name]}"
+    #warn output
+    r+= "#{output}\n"
+    
+    if e[:after]
+      r += puts_events( e[:after ].reverse, space+'^  ', depth )
+    end
+  end
+  r
+end
+
+def events_tree filt
+  hash = {:name => filt }
+  if respond_to? "_#{filt}_callbacks"
+    send( "_#{filt}_callbacks" ).each do |callback|
+      next unless callback.applies? self
+      hash[callback.kind] ||= []    
+      hash[callback.kind] << events_tree( callback.filter )
+    end
+  end
+  hash
+end
+#FIXME - this doesn't belong here!!
+
+class ::ActiveSupport::Callbacks::Callback
+  def applies? object
+    object.send :eval, "value=nil;halted=false;!!(#{@compiled_options})"
+  end
+end
+

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

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

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

@@ -1,6 +1,6 @@
 format :html do
   
-  watch_perms = lambda { |r| Account.logged_in? && !r.card.new_card? }
+  watch_perms = lambda { |r| Auth.signed_in? && !r.card.new_card? }
   view :watch, :tags=>[:unknown_ok, :no_wrap_comments], :denial=>:blank, :perms=>watch_perms do |args|
     
     wrap args do
@@ -38,7 +38,7 @@ end
 
 event :notify_followers, :after=>:extend do
   begin
-    return false if Card.record_timestamps==false or Wagn.config.send_emails==false
+    return false if Card.record_timestamps==false
     # userstamps and timestamps are turned off in cases like updating read_rules that are automated and
     # generally not of enough interest to warrant notification
   
@@ -47,8 +47,12 @@ event :notify_followers, :after=>:extend do
     @trunk_watcher_watched_pairs ||= trunk_watcher_watched_pairs
     @watcher_watched_pairs ||= watcher_watched_pairs
     
-    @watcher_watched_pairs.reject {|p| @trunk_watcher_watched_pairs.map(&:first).include? p.first }.each do |watcher, watched|
-      watcher and mail = Mailer.change_notice( watcher, self, action, watched.to_s, nested_notifications ) and mail.deliver
+    @watcher_watched_pairs.reject do |p|
+      @trunk_watcher_watched_pairs.map(&:first).include? p.first
+    end.each do |watcher, watched|
+      watcher and
+      mail = Mailer.change_notice( watcher, self, action, watched.to_s, nested_notifications ) and
+      mail.deliver
     end
   
     if @supercard
@@ -72,18 +76,16 @@ attr_accessor :nested_notifications
 def trunk_watcher_watched_pairs
   # do the watchers lookup before the includer test since it's faster.
   if cardname.junction?
-    #warn "trunk_watcher_pairs #{cardname}, #{cardname.trunk_name.inspect}, #{includers.inspect}"
     tcard = Card[tname=cardname.trunk_name]
     tcard and pairs = tcard.watcher_watched_pairs
-      #warn "trunk_watcher_pairs TC:#{tcard.inspect}, #{tname}, P:#{pairs.inspect}, k:#{tname.key} member: pr:#{!pairs.nil?}, and I:#{includers.map(&:key).member?(tname.key)}"
+    #fixme - includers not working on structured cards, so this is commented for now
     return pairs if !pairs.nil? and includers.map(&:key).member?(tname.key)
-    #warn "twatch empty ..."
   end
   []
 end
 
-def watching_type?; watcher_pairs(false, :type).member? Account.current_id end
-def watching?;      watcher_pairs(false).       member? Account.current_id end
+def watching_type?; watcher_pairs(false, :type).member? Auth.current_id end
+def watching?;      watcher_pairs(false).       member? Auth.current_id end
 
 def watchers
   watcher_watched_pairs false
@@ -95,7 +97,7 @@ def watcher_watched_pairs pairs=true
 end
 
 def watcher_pairs pairs=true, kind=:name, hash={}
-  #warn "wp #{inspect} P:#{pairs}, k:#{kind}, uid:#{Account.current_id} #{hash.inspect}, OI:#{hash.object_id}"
+  #warn "wp #{inspect} P:#{pairs}, k:#{kind}, uid:#{Auth.current_id} #{hash.inspect}, OI:#{hash.object_id}"
 
   wname, rc = (kind == :type) ?
        [ self.type_name, self.type_card.fetch(:trait=>:watchers) ] :
@@ -106,7 +108,7 @@ def watcher_pairs pairs=true, kind=:name, hash={}
   if hash.any?
     #warn "wp #{pairs}, #{kind}, #{hash.inspect}"
     if pairs
-      hash.each.reject {|i,wname| i == Account.current_id }.map {|i,wname| [ i, wname ] }
+      hash.each.reject {|i,wname| i == Auth.current_id }.map {|i,wname| [ i, wname ] }
     else
       hash.keys
     end