card 1.16.9 → 1.16.10

data/tmpsets/set/mod007-05_standard/type/session.rb

@@ -1,5 +1,6 @@
 # -*- encoding : utf-8 -*-
-class Card; module Set; module Type; module Session; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/type/session.rb ~~~~~~~~~~~
+class Card; module Set; module Type; module Session; extend Card::Set
+# ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/type/session.rb ~~~~~~~~~~~
 include Pointer
 
 def history?

data/tmpsets/set/mod007-05_standard/type/set.rb

@@ -1,5 +1,6 @@
 # -*- encoding : utf-8 -*-
-class Card; module Set; module Type; module Set; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/type/set.rb ~~~~~~~~~~~
+class Card; module Set; module Type; module Set; extend Card::Set
+# ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/type/set.rb ~~~~~~~~~~~
 
 format :html do
 

data/tmpsets/set/mod007-05_standard/type/signup.rb

@@ -1,82 +1,115 @@
 # -*- encoding : utf-8 -*-
-class Card; module Set; module Type; module Signup; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/type/signup.rb ~~~~~~~~~~~
+class Card; module Set; module Type; module Signup; extend Card::Set
+# ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/type/signup.rb ~~~~~~~~~~~
 
 format :html do
-
   def default_new_args args
     super args
     args.merge!(
-      optional_help: :show, #, optional_menu: :never
-      buttons: button_tag( 'Submit', disable_with: 'Submitting', situation: 'primary' ),
-      account: card.fetch( trait: :account, new: {} ),
-      title:   'Sign up',
-      hidden:  {
+      optional_help: :show, # , optional_menu: :never
+      buttons: button_tag(' Submit',
+                          disable_with: 'Submitting', situation: 'primary'),
+      account: card.fetch(trait: :account, new: {}),
+      title: 'Sign up',
+      hidden: {
         success: (card.rule(:thanks) || '_self'),
         'card[type_id]' => card.type_id
       }
     )
+    return unless Auth.signed_in? && args[:account].confirm_ok?
+    invite_args args
+  end
 
-    if Auth.signed_in? and args[:account].confirm_ok?
-      args[:title] = 'Invite'
-      args[:buttons] = button_tag 'Send Invitation', situation: 'primary'
-      args[:hidden][:success] = '_self'
-    end
+  def invite_args args
+    args.merge!(
+      title: 'Invite',
+      buttons: button_tag('Send Invitation', situation: 'primary'),
+      hidden: { success: '_self' }
+    )
   end
 
   view :new do |args|
-    #FIXME - make more use of standard new view?
+    # FIXME: make more use of standard new view?
 
-    frame_and_form :create, args, 'main-success'=>"REDIRECT" do
+    frame_and_form :create, args, 'main-success' => 'REDIRECT' do
       [
-        _render_name_formgroup( help: 'usually first and last name' ),
-        _optional_render( :account_formgroups, args),
-        ( card.structure ? edit_slot : ''),
-        _optional_render( :button_formgroup, args )
+        _render_name_formgroup(help: 'usually first and last name'),
+        _optional_render(:account_formgroups, args),
+        (card.structure ? edit_slot : ''),
+        _optional_render(:button_formgroup, args)
       ]
     end
   end
 
-
   view :account_formgroups do |args|
     sub_args = { structure: true }
     sub_args[:no_password] = true if Auth.signed_in?
-    Auth.as_bot { subformat( args[:account] )._render :content_formgroup, sub_args }  #YUCK!!!!
+    Auth.as_bot do
+      subformat(args[:account])._render :content_formgroup, sub_args
+    end # 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.present?
-          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} verification email", card_path("update/~#{card.id}?approve_with_token=true"  ) )
-          links << link_to( "Approve without verification", card_path("update/~#{card.id}?approve_without_token=true") )
-        end
-        if card.ok? :delete
-          links << link_to( "Deny and delete", card_path("delete/~#{card.id}") )
-        end
-        headings << links * '' if links.any?
-      else
-        headings << "ERROR: signup card missing account"
-      end
+  view :core do |_args|
+    return if card.new_card? # necessary?
+    headings = []
+    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)
+      headings += verification_info account
+    else
+      headings << 'ERROR: signup card missing account'
     end
-    %{<div class="invite-links">
-        #{ headings.map { |h| "<div>#{h}</div>"} * "\n" }
+    <<-HTML
+      <div class="invite-links">
+        #{ headings.map { |h| "<div>#{h}</div>" }.join "\n" }
       </div>
       #{ process_content render_raw }
-    }
+    HTML
+  end
+
+  def verification_info account
+    headings = []
+    token_action = 'Send'
+    if account.token.present?
+      headings << 'A verification email has been sent ' \
+                  "#{ "to #{account.email}" if account.email_card.ok? :read }"
+      token_action = 'Resend'
+    end
+    links = verification_links account, token_action
+    headings << links * '' if links.any?
+    headings
+  end
+
+  def verification_links account, token_action
+    links = []
+    if account.confirm_ok?
+      links << link_to(
+        "#{token_action} verification email",
+        card_path("update/~#{card.id}?approve_with_token=true")
+      )
+      links << link_to(
+        'Approve without verification',
+        card_path("update/~#{card.id}?approve_without_token=true")
+      )
+    end
+    if card.ok? :delete
+      links << link_to('Deny and delete', card_path("delete/~#{card.id}"))
+    end
+    links
   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}"
+event :activate_by_token, before: :approve, on: :update,
+                          when: proc { |c| c.has_token? } do
+  result = if account
+             account.authenticate_by_token(@env_token)
+           else
+             "no account associated with #{name}"
+           end
+
   case result
   when Integer
     abort :failure, 'no field manipulation mid-activation' if subcards.present?
@@ -98,18 +131,23 @@ def has_token?
 end
 
 event :activate_account do
-  subcards['+*account'] = {'+*status'=>'active'}
+  add_subfield :account
+  subfield(:account).add_subfield :status, content: 'active'
   self.type_id = Card.default_accounted_type_id
   account.send_welcome_email
 end
 
-event :approve_with_token, on: :update, before: :approve, when: proc {|c| Env.params[:approve_with_token] } do
+event :approve_with_token,
+      on: :update, before: :approve,
+      when: proc { Env.params[:approve_with_token] } do
   abort :failure, 'illegal approval' unless account.confirm_ok?
   account.reset_token
   account.send_account_verification_email
 end
 
-event :approve_without_token, on: :update, before: :approve, when: proc {|c| Env.params[:approve_without_token] } do
+event :approve_without_token,
+      on: :update, before: :approve,
+      when: proc { Env.params[:approve_without_token] } do
   abort :failure, 'illegal approval' unless account.confirm_ok?
   activate_account
 end
@@ -120,31 +158,25 @@ event :resend_activation_token do
   Env.params[:success] = {
     id: '_self',
     view: 'message',
-    message: "Sorry, this token has expired. Please check your email for a new password reset link."
+    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?
+  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
+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
-
 event :act_as_current_for_extend_phase, before: :extend, on: :create do
-  Auth.current_id = self.id
+  Auth.current_id = id
 end
 
 
-
 # ~~~~~~~~~~~ below autogenerated; above pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/type/signup.rb ~~~~~~~~~~~
 end;end;end;end;

data/tmpsets/set/mod007-05_standard/type/toggle.rb

@@ -1,5 +1,6 @@
 # -*- encoding : utf-8 -*-
-class Card; module Set; module Type; module Toggle; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/type/toggle.rb ~~~~~~~~~~~
+class Card; module Set; module Type; module Toggle; extend Card::Set
+# ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/type/toggle.rb ~~~~~~~~~~~
 
 view :core do |args|
   case card.raw_content.to_i

data/tmpsets/set/mod007-05_standard/type/uri.rb

@@ -1,5 +1,6 @@
 # -*- encoding : utf-8 -*-
-class Card; module Set; module Type; module Uri; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/type/uri.rb ~~~~~~~~~~~
+class Card; module Set; module Type; module Uri; extend Card::Set
+# ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/type/uri.rb ~~~~~~~~~~~
 format do
   include Phrase::Format
 

data/tmpsets/set/mod007-05_standard/type/user.rb

@@ -1,46 +1,59 @@
 # -*- encoding : utf-8 -*-
-class Card; module Set; module Type; module User; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/type/user.rb ~~~~~~~~~~~
+class Card; module Set; module Type; module User; extend Card::Set
+# ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/type/user.rb ~~~~~~~~~~~
 
 include Basic
 
 attr_accessor :email
 
 format :html do
-
-  view :setup, tags: :unknown_ok, perms: lambda { |r| Auth.needs_setup? } do |args|
-    help_text = '<h3>To get started, set up an account.</h3>'
-    if Card.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.'
+  view :setup, tags: :unknown_ok,
+               perms: lambda { |_r| Auth.needs_setup? } do |args|
+    account = card.fetch trait: :account, new: {}
+    Auth.as_bot do
+      frame_and_form :create, args do
+        [
+          _render_name_formgroup(help: 'usually first and last name'),
+          subformat(account)._render(:content_formgroup, structure: true),
+          _render_button_formgroup(args)
+        ]
+      end
     end
-    args.merge!( {
+  end
+
+  def default_setup_args args
+    args.merge!(
       title: 'Welcome, Wagneer!',
       optional_help: :show,
       optional_menu: :never,
       help_text: help_text,
-      buttons: button_tag( 'Set up', disable_with: 'Setting up', situation: 'primary' ),
+      buttons: setup_button,
       hidden: {
         success: "REDIRECT: #{ Card.path_setting '/' }",
         'card[type_id]' => Card.default_accounted_type_id,
-        'setup'=>true
+        'setup' => true
       }
-    } )
-
-    account = card.fetch trait: :account, new: {}
+    )
+  end
 
-    Auth.as_bot do
-      frame_and_form :create, args do
-        [
-          _render_name_formgroup( help: 'usually first and last name' ),
-          subformat(account)._render( :content_formgroup, structure: true ),
-          _render_button_formgroup( args )
-        ]
-      end
+  def help_text
+    text = '<h3>To get started, set up an account.</h3>'
+    if Card.config.action_mailer.perform_deliveries == false
+      text += <<-HTML
+        <br>WARNING: Email delivery is turned off.
+        Change settings in config/application.rb to send sign up notifications.'
+      HTML
     end
+    text
   end
-end
 
+  def setup_button
+    button_tag 'Set up', disable_with: 'Setting up', situation: 'primary'
+  end
+end
 
-event :setup_as_bot, before: :check_permissions, on: :create, when: proc{ |c| Card::Env.params[:setup] } do
+event :setup_as_bot, before: :check_permissions, on: :create,
+                     when: proc { Card::Env.params[:setup] } do
   abort :failure unless Auth.needs_setup?
   Auth.as_bot
   # we need bot authority to set the initial administrator roles
@@ -48,31 +61,28 @@ event :setup_as_bot, before: :check_permissions, on: :create, when: proc{ |c| Ca
   # 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['signup alert email+*to'] = name
-  subcards['+*roles'] = { content: Card[:administrator].name }
-
-  email, password = subcards.delete('+*account+*email'), subcards.delete('+*account+*password')
-  subcards['+*account'] = { '+*email'=>email, '+*password'=>password }
+event :setup_first_user, before: :process_subcards, on: :create,
+                         when: proc { Card::Env.params[:setup] } do
+  add_subcard 'signup alert email+*to', content: name
+  add_subfield :roles, content: Card[:administrator].name
 end
 
-event :signin_after_setup, before: :extend, on: :create, when: proc{ |c| Card::Env.params[:setup] } do
-  Card.cache.delete Auth::NEED_SETUP_KEY
+event :signin_after_setup, before: :extend, on: :create,
+                           when: proc { Card::Env.params[:setup] } do
   Auth.signin id
 end
 
-def follow follow_name, option = '*always'
-  if (card = Card.fetch(follow_name)) && (set_card = card.default_follow_set_card)
-    if (follow_rule = Card.fetch(set_card.follow_rule_name(name), new: {}))
-      follow_rule.drop_item "*never"
-      follow_rule.add_item option
-      follow_rule.save!
-    end
-  end
+def follow follow_name, option='*always'
+  return unless
+    (card = Card.fetch follow_name) &&
+    (set_card = card.default_follow_set_card) &&
+    (follow_rule_name = set_card.follow_rule_name(name)) &&
+    (follow_rule = Card.fetch follow_rule_name, new: {})
+  follow_rule.drop_item '*never'
+  follow_rule.add_item option
+  follow_rule.save!
 end
 
 
-
-
 # ~~~~~~~~~~~ below autogenerated; above pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/type/user.rb ~~~~~~~~~~~
 end;end;end;end;

data/tmpsets/set/mod008-06_bootstrap/all/bootstrap/form.rb

@@ -1,5 +1,6 @@
 # -*- encoding : utf-8 -*-
-class Card; module Set; module All; module Bootstrap; module Form; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/06_bootstrap/set/all/bootstrap/form.rb ~~~~~~~~~~~
+class Card; module Set; module All; module Bootstrap; module Form; extend Card::Set
+# ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/06_bootstrap/set/all/bootstrap/form.rb ~~~~~~~~~~~
 format :html do
   def button_tag content_or_options = nil, options = {}, &block
     bootstrapify_button( block_given? ? content_or_options : options )

data/tmpsets/set/mod008-06_bootstrap/all/bootstrap/helper.rb

@@ -1,5 +1,6 @@
 # -*- encoding : utf-8 -*-
-class Card; module Set; module All; module Bootstrap; module Helper; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/06_bootstrap/set/all/bootstrap/helper.rb ~~~~~~~~~~~
+class Card; module Set; module All; module Bootstrap; module Helper; extend Card::Set
+# ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/06_bootstrap/set/all/bootstrap/helper.rb ~~~~~~~~~~~
 format :html do
   def glyphicon icon_type, extra_class=''
     content_tag(:span, '', class: "glyphicon glyphicon-#{icon_type} #{extra_class}", 'aria-hidden'=>true)

data/tmpsets/set/mod008-06_bootstrap/all/bootstrap/wrapper.rb

@@ -1,5 +1,6 @@
 # -*- encoding : utf-8 -*-
-class Card; module Set; module All; module Bootstrap; module Wrapper; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/06_bootstrap/set/all/bootstrap/wrapper.rb ~~~~~~~~~~~
+class Card; module Set; module All; module Bootstrap; module Wrapper; extend Card::Set
+# ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/06_bootstrap/set/all/bootstrap/wrapper.rb ~~~~~~~~~~~
 format :html do
 
   def frame args={}, &block

data/tmpsets/set/mod008-06_bootstrap/all/rich_bootstrap.rb

@@ -1,5 +1,6 @@
 # -*- encoding : utf-8 -*-
-class Card; module Set; module All; module RichBootstrap; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/06_bootstrap/set/all/rich_bootstrap.rb ~~~~~~~~~~~
+class Card; module Set; module All; module RichBootstrap; extend Card::Set
+# ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/06_bootstrap/set/all/rich_bootstrap.rb ~~~~~~~~~~~
 format :html do
 
   view :closed do |args|

data/tmpsets/set/mod008-06_bootstrap/self/bootstrap_cards.rb

@@ -1,5 +1,6 @@
 # -*- encoding : utf-8 -*-
-class Card; module Set; module Self; module BootstrapCards; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/06_bootstrap/set/self/bootstrap_cards.rb ~~~~~~~~~~~
+class Card; module Set; module Self; module BootstrapCards; extend Card::Set
+# ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/06_bootstrap/set/self/bootstrap_cards.rb ~~~~~~~~~~~
 view :raw do |args|
   File.read "#{Cardio.gem_root}/mod/06_bootstrap/lib/stylesheets/#{card.codename}.scss"
 end

data/tmpsets/set/mod008-06_bootstrap/self/bootstrap_js.rb

@@ -1,5 +1,6 @@
 # -*- encoding : utf-8 -*-
-class Card; module Set; module Self; module BootstrapJs; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/06_bootstrap/set/self/bootstrap_js.rb ~~~~~~~~~~~
+class Card; module Set; module Self; module BootstrapJs; extend Card::Set
+# ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/06_bootstrap/set/self/bootstrap_js.rb ~~~~~~~~~~~
 view :raw do |args|
   [ "bootstrap.js", "bootstrap_modal_wagn.js" ].map do |name|
     File.read "#{Cardio.gem_root}/mod/06_bootstrap/lib/javascript/#{name}"

data/tmpsets/set/mod008-06_bootstrap/self/bootswatch_shared.rb

@@ -1,5 +1,6 @@
 # -*- encoding : utf-8 -*-
-class Card; module Set; module Self; module BootswatchShared; extend Card::Set # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/06_bootstrap/set/self/bootswatch_shared.rb ~~~~~~~~~~~
+class Card; module Set; module Self; module BootswatchShared; extend Card::Set
+# ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/06_bootstrap/set/self/bootswatch_shared.rb ~~~~~~~~~~~
 view :raw do |args|
   bootstrap_path = "#{Cardio.gem_root}/mod/06_bootstrap/lib/stylesheets/bootstrap"