wagn 1.13.0.pre2 → 1.13.0

data/mod/standard/set/right/style.rb

@@ -0,0 +1,9 @@
+require 'sass'
+include Machine
+
+store_machine_output :filetype => "css"
+
+def chunk_list  #turn off autodetection of uri's 
+                #TODO with the new format pattern this should be handled in the js format
+    :inclusion_only
+end

data/{mods/standard/sets → mod/standard/set}/self/account_links.rb

@@ -6,10 +6,10 @@ format :html do
     links = []
     if Auth.signed_in?
       links << link_to_page( Auth.current.name, nil, :id=>'my-card-link' )
+      if Card.new(:type_id=>Card.default_accounted_type_id).ok? :create
+        links << link_to( 'Invite', wagn_path('account/signup'), :id=>'invite-a-friend-link' )
+      end
       links << link_to( 'Sign out', wagn_path('delete/:signin'), :id=>'signout-link' )
-      #  if Card.new(:type_id=>Card.default_accounted_type_id).ok? :create
-      #    link_to 'Invite a Friend', "#{prefix}/invite", :id=>'invite-a-friend-link'
-      #  end
     else
       if Card.new(:type_id=>Card::SignupID).ok? :create
         links << link_to( 'Sign up', wagn_path('account/signup'), :id=>'signup-link' )

data/{mods/standard/sets → mod/standard/set}/self/head.rb

@@ -72,7 +72,7 @@ format :html do
       "window.wagn={rootPath:'#{ Wagn.config.relative_url_root }'}",
       "window.tinyMCEPreInit={base:\"#{wagn_path 'assets/tinymce'}\",query:'3.5.9',suffix:''}" # tinyMCE doesn't load on non-root wagns w/o preinit line
     ]
-    Env.recaptcha_on?                               and varvals << "wagn.recaptchaKey='#{Wagn.config.recaptcha_public_key}'"
+    card.have_recaptcha_keys?                        and varvals << "wagn.recaptchaKey='#{Wagn.config.recaptcha_public_key}'"
     c=Card[:double_click] and !Card.toggle c.content and varvals << 'wagn.noDoubleClick=true'
     @css_path                                        and varvals << "wagn.cssPath='#{@css_path}'"
     

data/{mods/standard/sets → mod/standard/set}/self/script_card_menu.rb

@@ -1,6 +1,6 @@
 
 view :raw do |args|
-  File.read "#{Wagn.gem_root}/mods/standard/lib/javascript/wagn_menu.js"
+  File.read "#{Wagn.gem_root}/mod/standard/lib/javascript/wagn_menu.js"
 end
 
 view :editor do |args|

data/{mods/standard/sets/self/style_functional.rb → mod/standard/set/self/script_html5shiv_printshiv.rb}

@@ -1,6 +1,5 @@
-
 view :raw do |args|
-  File.read "#{Wagn.gem_root}/mods/standard/lib/stylesheets/functional.scss"
+  File.read "#{Wagn.gem_root}/mod/standard/lib/javascript/html5shiv-printshiv.js"
 end
 
 view :editor do |args|

data/{mods/standard/sets → mod/standard/set}/self/script_jquery.rb

@@ -1,6 +1,6 @@
 
 view :raw do |args|
-  File.read "#{Wagn.gem_root}/mods/standard/lib/javascript/jquery.js"
+  File.read "#{Wagn.gem_root}/mod/standard/lib/javascript/jquery.js"
 end
 
 view :editor do |args|

data/{mods/standard/sets → mod/standard/set}/self/script_jquery_helper.rb

@@ -4,7 +4,7 @@ view :raw do |args|
   # jquery.ui.autocomplete must be after jquery.ui stuff 
   js_files = %w( jquerymobile.js jquery-ui.js jquery.ui.autocomplete.html.js jquery.autosize.js jquery.fileupload.js jquery.iframe-transport.js jquery_ujs.js )
   js_files.map do |filename|
-    File.read "#{Wagn.gem_root}/mods/standard/lib/javascript/#{filename}"
+    File.read "#{Wagn.gem_root}/mod/standard/lib/javascript/#{filename}"
   end.join("\n")
 end
 

data/{mods/standard/sets → mod/standard/set}/self/script_slot.rb

@@ -1,6 +1,6 @@
 view :raw do |args|
   [ "wagn_mod.js.coffee", "wagn.js.coffee" ].map do |name|
-    File.read "#{Wagn.gem_root}/mods/standard/lib/javascript/#{name}"
+    File.read "#{Wagn.gem_root}/mod/standard/lib/javascript/#{name}"
   end.join("\n")
 end
 

data/{mods/standard/sets → mod/standard/set}/self/script_tinymce.rb

@@ -1,6 +1,6 @@
 
 view :raw do |args|
-  File.read "#{Wagn.gem_root}/mods/standard/lib/javascript/tinymce.js"
+  File.read "#{Wagn.gem_root}/mod/standard/lib/javascript/tinymce.js"
 end
 
 view :editor do |args|

data/{mods/standard/sets → mod/standard/set}/self/signin.rb

@@ -2,15 +2,23 @@
 format :html do
 
   view :open do |args|
-    args.merge! :title=>'Sign In', :optional_help=>:show
+    args.merge! :optional_help=>:show
     super args
   end
+  
+  def default_title_args args
+    args[:title] ||= 'Sign In'
+  end
 
   view :open_content do |args|
     # annoying step designed to avoid table of contents.  sigh
     _render_core( args )
   end
   
+  view :closed_content do |args|
+    ''
+  end
+  
   
   view :core do |args|
     args[:buttons] = button_tag 'Sign in'

data/mod/standard/set/self/style_functional.rb

@@ -0,0 +1,8 @@
+
+view :raw do |args|
+  File.read "#{Wagn.gem_root}/mod/standard/lib/stylesheets/functional.scss"
+end
+
+view :editor do |args|
+  "Content is stored in file and can't be edited."
+end

data/mod/standard/set/self/style_jquery_ui_smoothness.rb

@@ -0,0 +1,8 @@
+
+view :raw do |args|
+  File.read "#{Wagn.gem_root}/mod/standard/lib/stylesheets/jquery-ui-smoothness.css"
+end
+
+view :editor do |args|
+  "Content is stored in file and can't be edited."
+end

data/{mods/standard/sets → mod/standard/set}/self/style_standard.rb

@@ -1,6 +1,6 @@
 
 view :raw do |args|
-  File.read "#{Wagn.gem_root}/mods/standard/lib/stylesheets/standard.scss"
+  File.read "#{Wagn.gem_root}/mod/standard/lib/stylesheets/standard.scss"
 end
 
 view :editor do |args|

data/{mods/standard/sets → mod/standard/set}/type/image.rb

@@ -50,7 +50,7 @@ format :css do
     render_source
   end
   
-  view :content do |args|
+  view :content do |args|  #why is this necessary?
     render_core
   end
 end

data/{mods/standard/sets → mod/standard/set}/type/pointer.rb

@@ -138,6 +138,16 @@ format :css do
   
 end
 
+
+format :js do
+  view :core do |args|
+    card.item_cards.map do |item|
+      nest item, :view=>(params[:item] || :core)
+    end.join "\n\n"
+  end
+end
+
+
 format :data do
   view :core do |args|
     card.item_cards.map do |c|
@@ -172,7 +182,7 @@ end
 def item_names args={}
   context = args[:context] || self.cardname
   self.raw_content.to_s.split(/\n+/).map do |line|
-    item_name = line.gsub /\[\[|\]\]/, ''
+    item_name = line.gsub( /\[\[|\]\]/, '').strip
     if context == :raw
       item_name
     else

data/{mods/standard/sets → mod/standard/set}/type/search_type.rb

@@ -78,7 +78,7 @@ format do
       v = {}
       v[:spec] = card.spec search_params
       v[:item] = set_inclusion_opts args.merge( :spec_view=>v[:spec][:view] )
-      v[:results]  = card.item_cards search_params
+      v[:results]  = card.item_cards search_params  # this is really odd.  the search is called from within the vars???
       v
     rescue =>e
       { :error => e }
@@ -95,40 +95,6 @@ format do
   
 
 
-  def search_params
-    @search_params ||= begin
-      p = default_search_params.clone
-      
-      if focal? 
-        p[:offset] = params[:offset] if params[:offset]
-        p[:limit]  = params[:limit]  if params[:limit]
-        p.merge! params[:wql]        if params[:wql]
-      end
-      p
-    end
-  end
-
-  def default_search_params # wahh?
-    set_default_search_params
-  end
-  
-  def set_default_search_params overrides={}
-    @default_search_params ||= begin
-      p = { :default_limit=> 100 }.merge overrides
-      set_search_params_variables! p
-      p
-    end
-  end
-  
-  def set_search_params_variables! hash
-    hash[:vars] = params[:vars] || {}
-    params.each do |key,val|
-      case key.to_s
-      when '_wql'      ;  hash.merge! val
-      when /^\_(\w+)$/ ;  hash[:vars][$1.to_sym] = val
-      end
-    end
-  end
 
   def page_link text, page
     @paging_path_args[:offset] = page * @paging_limit

data/mod/standard/set/type/signup.rb

@@ -0,0 +1,146 @@
+
+format :html do
+  
+  def default_new_args args
+    super args
+    args.merge!(
+      :optional_help => :show, #, :optional_menu=>:never
+      :buttons => button_tag( 'Submit' ),
+      :account => card.fetch( :trait=>:account, :new=>{} ),
+      :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[:hidden][:success] = '_self'
+    end
+  end
+  
+  view :new do |args|
+    #FIXME - make more use of standard new view?
+    
+    frame_and_form :create, args, 'main-success'=>"REDIRECT" do
+      [
+        _render_name_fieldset( :help=>'usually first and last name' ),
+        _optional_render( :account_fieldsets, args),
+        ( card.structure ? edit_slot : ''),
+        _optional_render( :button_fieldset, args )
+      ]
+    end
+  end
+
+
+  view :account_fieldsets do |args|
+    sub_args = { :structure => true }
+    sub_args[:no_password] = true if Auth.signed_in?
+    Auth.as_bot { subformat( args[:account] )._render :content_fieldset, sub_args }  #YUCK!!!!
+  end
+
+
+  view :core do |args|
+    headings, links = [], []
+    if !card.new_card? #necessary?
+      by_anon = card.creator_id == AnonymousID
+      headings << %(<strong>#{ card.name }</strong> #{ 'was' if !by_anon } signed up on #{ format_date card.created_at })
+      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 }"
+          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") )
+        end
+        if card.ok? :delete
+          links << link_to( "Deny and delete", wagn_path("/delete/~#{card.id}") )
+        end
+        headings << links * '' if links.any?
+      else
+        headings << "ERROR: signup card missing account"
+      end
+    end
+    %{<div class="invite-links">
+        #{ headings.map { |h| "<div>#{h}</div>"} * "\n" }
+      </div>
+      #{ process_content render_raw }    
+    }
+  end
+end
+
+event :activate_by_token, :before=>:approve, :on=>:update, :when=>proc{ |c| c.has_token? } do
+  result = account ? account.authenticate_by_token( @env_token ) : "no account associated with #{name}"
+  case result
+  when Integer
+    abort :failure, 'no field manipulation mid-activation' if subcards.present? 
+    # necessary because the rest of the action is performed as Wagn Bot
+    activate_account
+    Auth.signin id
+    Auth.as_bot
+    Env.params[:success] = ''
+  when :token_expired
+    resend_activation_token
+    abort :success
+  else
+    abort :failure, "signup activation error: #{authentication_result}" # bad token or account
+  end
+end
+
+def has_token?
+  @env_token = Env.params[:token]
+end
+
+event :activate_account do
+  subcards['+*account'] = {'+*status'=>'active'}
+  self.type_id = Card.default_accounted_type_id
+end
+
+event :approve_token, :on=>:update, :before=>:approve, :when=>proc {|c| Env.params[:approve_token] } do
+  abort :failure, 'illegal approval' unless account.confirm_ok?
+  account.reset_token
+  account.send_account_confirmation_email
+end
+
+event :approve_without_token, :on=>:update, :before=>:approve, :when=>proc {|c| Env.params[:approve_without_token] } do
+  abort :failure, 'illegal approval' unless account.confirm_ok?
+  activate_account
+end
+
+event :resend_activation_token do
+  account.reset_token
+  account.send_account_confirmation_email
+  Env.params[:success] = {
+    :id => '_self',
+    :view => 'message',
+    :message => "Sorry, this token has expired. Please check your email for a new password reset link."
+  }
+end
+
+def signed_in_as_me_without_password?
+  Auth.signed_in? && Auth.current_id==id && account.password.blank?
+end
+
+event :redirect_to_edit_password, :on=>:update, :after=>:store, :when=>proc {|c| c.signed_in_as_me_without_password? } do
+  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')
+  subcards['+*account'] ||={}
+  subcards['+*account']['+*email']   = email if email
+  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
+end
+