card 1.16.15 → 1.17.0

data/tmpsets/set/mod007-05_standard/all/rich_html/modal.rb

@@ -2,24 +2,17 @@
 class Card; module Set; module All; module RichHtml; module Modal; extend Card::Set
 # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/all/rich_html/modal.rb ~~~~~~~~~~~
 format :html do
-
-
-
-
   view :modal_link do |args|
     path_opts = args[:path_opts] || {}
     path_opts.merge!(layout: :modal)
     html_args = args[:html_args] || {}
-    #html_args.merge!('data-target'=>"#modal-#{card.cardname.safe_key}#{args[:modal_slot_id_postfix]}",
-    html_args.merge!('data-target'=>"#modal-main-slot",
-      'data-toggle'=>'modal')
+    html_args.merge!('data-target' => '#modal-main-slot',
+                     'data-toggle' => 'modal')
     link_to(args[:text] || _render_title(args), path(path_opts), html_args)
   end
 
   view :modal_slot do |args|
-    #wrap_with(:div, class: 'modal fade', role: 'dialog', id: "modal-#{card.cardname.safe_key}#{args[:modal_slot_id_postfix]}") do
-    id = "modal-"
-    id += (args[:modal_id] || 'main-slot')
+    id = "modal-#{args[:modal_id] || 'main-slot'}"
     wrap_with(:div, class: 'modal fade', role: 'dialog', id: id) do
       wrap_with(:div, class: 'modal-dialog') do
         content_tag :div, class: 'modal-content' do
@@ -29,16 +22,19 @@ format :html do
     end
   end
 
-
-  view :modal_menu, tags: :unknown_ok do |args|
+  view :modal_menu, tags: :unknown_ok do
     popout_params = {}
     popout_params[:view] = params[:view] if params[:view]
-    # we probably want to pass on a lot more params than just view, but not all of them
+    # we probably want to pass on a lot more params than just view,
+    # but not all of them
     # (eg we don't want layout, id, controller...)
     wrap_with :div, class: 'modal-menu' do
       [
-        link_to( glyphicon('remove'), '', class: 'close-modal pull-right close', 'data-dismiss'=>'modal'),
-        link_to( glyphicon('new-window'), popout_params, class: 'pop-out-modal pull-right close ' )
+        link_to(glyphicon('remove'), '',
+                class: 'close-modal pull-right close',
+                'data-dismiss' => 'modal'),
+        link_to(glyphicon('new-window'), popout_params,
+                class: 'pop-out-modal pull-right close ')
       ]
     end
   end
@@ -48,50 +44,11 @@ format :html do
   end
 
   def default_modal_footer_args args
-    args[:buttons] ||=  button_tag 'Close', class: 'btn-xs close-modal pull-right', 'data-dismiss'=>'modal'
-  end
-
-=begin
-  def default_modal_content_args args
-    args[:buttons] ||= button_tag 'Close', 'data-dismiss'=>'modal'
-  end
-
-  view :modal_link_and_dialog do |args|
-    _render_modal_link(args) + _render_modal(args)
-  end
-
-
-
-  # use modal_content for ajax calls to fill a modal_slot with content
-  view :modal_content do |args|
-    output [
-      wrap_with( :div, _render_modal_header(args), class: 'modal-header' ),
-      wrap_with( :div, _render_modal_body(args),   class: 'modal-body' ),
-      wrap_with( :div, _render_modal_footer(args), class: 'modal-footer' ),
-    ]
+    args[:buttons] ||=
+      button_tag 'Close',
+                 class: 'btn-xs close-modal pull-right',
+                 'data-dismiss' => 'modal'
   end
-
-  view :modal_header do |args|
-    _render_modal_title(args)
-  end
-
-  view :modal_body do |args|
-    _render_core(args)
-  end
-
-  view :modal_footer do |args|
-    args[:buttons] || ''
-  end
-
-  view :modal_title do |args|
-    "<h4>#{_render_title args.merge(title_class: 'modal-title')}</h4>"
-  end
-
-  view :modal do |args|
-    _render_modal_slot args.merge(optional_modal_content: :show)
-  end
-=end
-
 end
 
 

data/tmpsets/set/mod007-05_standard/all/rich_html/toolbar.rb

@@ -4,7 +4,7 @@ class Card; module Set; module All; module RichHtml; module Toolbar; extend Card
 
 format :html do
   def toolbar_pinned?
-    Card[:toolbar_pinned].content == 'true'
+    (tp = Card[:toolbar_pinned]) && tp.content == 'true'
   end
 
   view :toolbar do |args|
@@ -216,9 +216,9 @@ format :html do
       path_opts = tag_args.delete(:path_opts) || {}
       path_opts.merge! action: tag_args.delete(:action) if tag_args[:action]
       link_to link_text, path_opts, tag_args
+
     end
   end
-
   def autosaved_draft_link
     view_link('autosaved draft', :edit, path_opts: {edit_draft: true, slot: {show: :toolbar}}, class: 'navbar-link slotter pull-right')
   end

data/tmpsets/set/mod007-05_standard/right/account.rb

@@ -10,47 +10,50 @@ 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
+def active?;   status == 'active'  end
+def blocked?;  status == 'blocked' end
+def built_in?; status == 'system'  end
+def pending?;  status == 'pending' end
 
-
-def authenticate_by_token val
-  tcard = token_card                               or return :token_not_found
-  token == val                                     or return :incorrect_token
-  tcard.updated_at > Card.config.token_expiry.ago  or return :token_expired  # > means "after"
-  left and left.accountable?                       or return :illegal_account  #(overkill?)
-  Auth.as_bot { tcard.delete! }
-  left.id
+def validate_token! test_token
+  tcard = token_card
+  tcard.validate! test_token
+  copy_errors tcard
+  errors.empty?
 end
 
-
 format do
-  view :verify_url do |args|
-    card_url "update/#{card.cardname.left_name.url_key}?token=#{card.token}"
+  view :verify_url do
+    signup_name = card.cardname.left_name
+    card_url "update/#{signup_name.url_key}" \
+             "?token=#{card.token}" \
+             '&live_token=true'
   end
 
-  view :verify_days do |args|
-    ( Card.config.token_expiry / 1.day ).to_s
+  view :verify_days do
+    (Card.config.token_expiry / 1.day).to_s
   end
 
-  view :reset_password_url do |args|
-    card_url "update/#{card.cardname.url_key}?reset_token=#{card.token_card.refresh(true).content}"
+  view :reset_password_url do
+    card_url "update/#{card.cardname.url_key}" \
+             "?token=#{card.token_card.refresh(true).content}" \
+             '&live_token=true&event=reset_password'
   end
 
-  view :reset_password_days do |args|
-    ( Card.config.token_expiry / 1.day ).to_s
+  view :reset_password_days do
+    (Card.config.token_expiry / 1.day).to_s
   end
 end
 
-
 format :html do
-
   view :raw do |args|
     content = []
-    content << "{{+#{Card[:email   ].name}|titled;title:email}}"    unless args[:no_email]
-    content << "{{+#{Card[:password].name}|titled;title:password}}" unless args[:no_password]
+    unless args[:no_email]
+      content << "{{+#{Card[:email].name}|titled;title:email}}"
+    end
+    unless args[:no_password]
+      content << "{{+#{Card[:password].name}|titled;title:password}}"
+    end
     content * ' '
   end
 
@@ -60,56 +63,51 @@ format :html do
   end
 end
 
-
 event :validate_accountability, on: :create, before: :approve do
-  unless left and left.accountable?
-    errors.add :content, "not allowed on this card"
+  unless left && left.accountable?
+    errors.add :content, 'not allowed on this card'
   end
 end
 
 event :require_email, on: :create, after: :approve do
-  unless subfield(:email)
-    errors.add :email, 'required'
-  end
+  errors.add :email, 'required' unless subfield(:email)
 end
 
-
-event :set_default_salt, on: :create, before: :process_subcards do
-  salt = Digest::SHA1.hexdigest "--#{Time.now.to_s}--"
+event :set_default_salt, on: :create, before: :approve_subcards do
+  salt = Digest::SHA1.hexdigest "--#{Time.zone.now}--"
   Env[:salt] = salt # HACK!!! need viable mechanism to get this to password
   add_subfield :salt, content: salt
 end
 
-event :set_default_status, on: :create, before: :process_subcards do
-  default_status = ( Auth.needs_setup? ? 'active' : 'pending' )
+event :set_default_status, on: :create, before: :approve_subcards do
+  default_status = Auth.needs_setup? ? 'active' : 'pending'
   add_subfield :status, content: default_status
 end
 
 def confirm_ok?
-  Card.new( type_id: Card.default_accounted_type_id ).ok? :create
+  Card.new(type_id: Card.default_accounted_type_id).ok? :create
 end
 
-event :generate_confirmation_token, :on=>:create, :before=>:process_subcards, :when=>proc{ |c| c.confirm_ok? } do
+event :generate_confirmation_token,
+      on: :create, before: :process_subcards,
+      when: proc { |c| c.confirm_ok? } do
   add_subfield :token, content: generate_token
 end
 
-event :reset_password, on: :update, before: :approve, when: proc{ |c| c.has_reset_token? } do
-  case ( result = authenticate_by_token @env_token )
-  when Integer
-    Auth.signin result
+event :reset_password, on: :update, before: :approve, when:
+    proc { |c| c.reset_password? } do
+  if validate_token! @env_token
+    token_card.used!
+    Auth.signin left_id
     success << edit_password_success_args
-    abort :success
-  when :token_expired
-    send_reset_password_token
-    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
+    error_msg = errors.first.last
+    send_reset_password_token
+    msg = "Sorry, #{error_msg}. " \
+          'Please check your email for a new password reset link.'
+    success << { id: '_self', view: 'message', message: msg }
   end
+  abort :success
 end
 
 def edit_password_success_args
@@ -120,8 +118,9 @@ def edit_password_success_args
   }
 end
 
-def has_reset_token?
-  @env_token = Env.params[:reset_token]
+def reset_password?
+  @env_token = Env.params[:token]
+  @env_token && Env.params[:event] == 'reset_password'
 end
 
 event :reset_token do
@@ -130,51 +129,49 @@ event :reset_token do
   end
 end
 
-
 event :send_welcome_email do
-  if ((welcome = Card['welcome email']) && welcome.type_code == :email_template)
-    welcome.deliver(context: left, to: self.email)
+  welcome = Card['welcome email']
+  if welcome && welcome.type_code == :email_template
+    welcome.deliver context: left, to: email
   end
 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 )
+event :send_account_verification_email, on: :create, after: :extend, when:
+    proc { |c| c.token.present? } do
+  Card[:verification_email].deliver context: self, to: email
 end
 
 event :send_reset_password_token do
   Auth.as_bot do
     token_card.update_attributes! content: generate_token
   end
-  Card[:password_reset_email].deliver( context: self, to: self.email )
+  Card[:password_reset_email].deliver context: self, to: email
 end
 
 def ok_to_read
-  is_own_account? ? true : super
+  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
+  false
 end
 
 def send_change_notice act, followed_set, follow_option
-  if changes_visible?(act)
-    Auth.as(left.id) do
-      Card[:follower_notification_email].deliver(
-        context:       act.card,
-        to:            email,
-        follower:      left.name,
-        followed_set:  followed_set,
-        follow_option: follow_option
-      )
-    end
+  return unless changes_visible?(act)
+  Auth.as(left.id) do
+    Card[:follower_notification_email].deliver(
+      context:       act.card,
+      to:            email,
+      follower:      left.name,
+      followed_set:  followed_set,
+      follow_option: follow_option
+    )
   end
 end
 
-
 format :email do
   view :mail do |args|
     args[:to] ||= card.email
@@ -183,6 +180,5 @@ format :email do
 end
 
 
-
 # ~~~~~~~~~~~ below autogenerated; above pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/right/account.rb ~~~~~~~~~~~
 end;end;end;end;

data/tmpsets/set/mod007-05_standard/right/email.rb

@@ -1,13 +1,14 @@
 # -*- encoding : utf-8 -*-
 class Card; module Set; module Right; module Email; extend Card::Set
 # ~~~~~~~~~~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/right/email.rb ~~~~~~~~~~~
-#event :
 include All::Permissions::Accounts
 
-view :raw do |args|
+view :raw do
   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)
+  when card.real? then card.content
+  # following supports legacy behavior
+  # (should be moved to User+*email+*type plus right)
+  when card.left.account then card.left.account.email
   else ''
   end
 end
@@ -23,9 +24,10 @@ end
 event :validate_unique_email, after: :validate_email, on: :save do
   if content.present?
     Auth.as_bot do
-      wql = { right_id: Card::EmailID, eq: content }
+      wql = { right_id: Card::EmailID, eq: content, return: :id }
       wql[:not] = { id: id } if id
-      if Card.search( wql ).first
+      wql_comment = "email duplicate? (#{content})"
+      if Card.search(wql, wql_comment).first
         errors.add :content, 'must be unique'
       end
     end
@@ -33,9 +35,8 @@ event :validate_unique_email, after: :validate_email, on: :save do
 end
 
 event :downcase_email, before: :approve, on: :save do
-  if content and content != content.downcase
-    self.content = content.downcase
-  end
+  return if !content || content == content.downcase
+  self.content = content.downcase
 end
 
 def email_required?
@@ -43,16 +44,18 @@ def email_required?
 end
 
 def ok_to_read
-  if is_own_account? or Auth.always_ok?
+  if own_email? || Auth.always_ok?
     true
   else
-    deny_because "viewing email is restricted to administrators and account holders"
+    deny_because 'viewing email is restricted to administrators and ' \
+                 'account holders'
   end
 end
 
-def is_own_account?
-  cardname.parts[0].to_name.key == Auth.as_card.cardname.key
+def own_email?
+  cardname.part_names[0].key == Auth.as_card.key
 end
 
+
 # ~~~~~~~~~~~ below autogenerated; above pulled from /Users/ethan/dev/wagn/gem/card/mod/05_standard/set/right/email.rb ~~~~~~~~~~~
 end;end;end;end;

data/tmpsets/set/mod007-05_standard/right/password.rb

@@ -4,26 +4,34 @@ class Card; module Set; module Right; module Password; extend Card::Set
 
 include All::Permissions::Accounts
 
-view :editor do |args|
+view :editor do
   card.content = ''
-  autocomplete = (@parent && @parent.card.name=='*signin+*account') ? 'on' : 'off' #hack
+
+  # HACK
+  autocomplete = if @parent && @parent.card.name == '*signin+*account'
+                   'on'
+                 else
+                   'off'
+                 end
   password_field :content, class: 'card-content', autocomplete: autocomplete
 end
 
-view :raw do |args|
+view :raw do
   '<em>encrypted</em>'
 end
 
-event :encrypt_password, on: :save, after: :process_subcards, changed: :content,
-    when: proc{ |c| !Card::Env[:no_password_encryptions] } do
-      # no_password_encryptions = hack for import - fix with api for ignoring events
-
-  salt = (left && left.salt)
-  salt = Card::Env[:salt] unless salt.present? # hack - fix with better ORM handling
+event :encrypt_password, on: :save, after: :process_subcards,
+                         changed: :content,
+                         when: proc { !Card::Env[:no_password_encryptions] } do
+  # no_password_encryptions = hack for import - fix with api for ignoring events
+  salt = left && left.salt
+  # HACK: fix with better ORM handling
+  salt = Card::Env[:salt] unless salt.present?
   self.content = Auth.encrypt content, salt
 
-  #  errors.add :password, 'need a valid salt'
-  #  turns out we have a lot of existing account without a salt.  not sure when that broke??
+  # 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
 
 event :validate_password, on: :save, before: :approve do
@@ -37,7 +45,7 @@ event :validate_password_present, on: :update, before: :approve do
 end
 
 def ok_to_read
-  is_own_account? ? true : super
+  own_account? ? true : super
 end