card 1.101.5 → 1.101.6

data/tmpsets/set/{mod010-card-mod-permissions → mod009-card-mod-permissions}/all/update_read_rules.rb

@@ -2,14 +2,13 @@
 class Card; module Set; class All
 # Set: All cards (UpdateReadRules)
 #
+# FIXME: the following don't really belong here, but they have to come after
 module UpdateReadRules;
 extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-permissions/set/all/update_read_rules.rb"; end
-
-# FIXME: the following don't really belong here, but they have to come after
 # the reference stuff.  we need to organize a bit!
 
-event :update_rule_cache, :finalize, when: :is_rule? do
+event :update_rule_cache, :finalize, when: :rule? do
   Card::Rule.clear_rule_cache
 end
 

data/tmpsets/set/{mod010-card-mod-permissions → mod009-card-mod-permissions}/right/read.rb

@@ -9,7 +9,7 @@ include Abstract::Permission
 
 format :html do include Abstract::Permission::HtmlFormat end
 
-event :cascade_read_rule, :finalize, after: :update_rule_cache, when: :is_rule? do
+event :cascade_read_rule, :finalize, after: :update_rule_cache, when: :rule? do
   return unless name_is_changing? || trash_is_changing?
 
   update_read_ruled_cards
@@ -51,11 +51,9 @@ def update_cards_with_read_rule_id processed
   end
 end
 
-def each_member
+def each_member &block
   Auth.as_bot do
-    all_members.each_with_object(::Set.new) do |member, processed|
-      yield member, processed
-    end
+    all_members.each_with_object(::Set.new, &block)
   end
 end
 

data/tmpsets/set/{mod011-card-mod-account → mod010-card-mod-account}/abstract/account_field.rb

@@ -5,6 +5,11 @@ class Card; module Set; class Abstract
 module AccountField;
 extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-account/set/abstract/account_field.rb"; end
+delegate :accounted, to: :account_card
+
+def account_card
+  left
+end
 
 # allow account owner to update account field content
 def ok_to_update

data/tmpsets/set/{mod011-card-mod-account → mod010-card-mod-account}/abstract/accountable.rb

@@ -45,7 +45,11 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
        { path: { slot: { hide: %i[help_link bridge_link] } } }],
       ["Roles", :roles,
        { path:  { view: :content_with_edit_button } }],
-      ["Notifications", :follow]
+      ["Notifications", :follow],
+      ["API", :account,
+       { path: { view: :api_key,
+                 items: { view: :content },
+                 slot: { hide: %i[help_link bridge_link] } } }]
     ]
   end
 

data/tmpsets/set/{mod011-card-mod-account → mod010-card-mod-account}/all/account.rb

@@ -46,6 +46,7 @@ def fetch_read_rules
 
   ([AnyoneID] + parties).each_with_object([]) do |party_id, rule_ids|
     next unless (cache = Card::Rule.read_rule_cache[party_id])
+
     rule_ids.concat cache
   end
 end
@@ -55,10 +56,16 @@ def clear_roles
 end
 
 def with_clear_roles
-  a, b, c, d = @parties, @all_roles, @all_active_roles, @read_rules
+  a = @parties
+  b = @all_roles
+  c = @all_active_roles
+  d = @read_rules
   yield
 ensure
-  @parties, @all_roles, @all_active_roles, @read_rules = a, b, c, d
+  @parties = a
+  @all_roles = b
+  @all_active_roles = c
+  @read_rules = d
 end
 
 def all_enabled_roles
@@ -70,15 +77,17 @@ def all_roles
 end
 
 def enabled_role_ids
-  Auth.as_bot do
-    # workaround for broken migrations
-    return fetch_roles unless Card::Codename.exists? :enabled_roles
-
-    enabled = enabled_roles_card
+  with_enabled_roles do |enabled|
     enabled.virtual? ? enabled.item_ids : fetch_roles
   end
 end
 
+def with_enabled_roles
+  Auth.as_bot do
+    Card::Codename.exists?(:enabled_roles) ? yield(enabled_roles_card) : fetch_roles
+  end
+end
+
 def enabled_roles_card
   fetch :enabled_roles, eager_cache: true, new: { type_id: SessionID }
 end

data/tmpsets/set/{mod011-card-mod-account → mod010-card-mod-account}/right/account.rb

@@ -11,7 +11,6 @@ card_accessor :email
 card_accessor :password
 card_accessor :salt
 card_accessor :status
-card_accessor :api_key
 
 require_field :email
 
@@ -24,7 +23,7 @@ def accounted_id
 end
 
 def ok_to_read
-  own_account? ? true : super
+  own_account? || super
 end
 
 # allow account owner to update account field content
@@ -50,18 +49,14 @@ def send_account_email email_template
   ecard.deliver self, to: email
 end
 
-def validate_api_key! api_key
-  api_key_card.validate! api_key
-end
-
 def method_missing method, *args
-  super unless args.empty? && (matches = method.match(/^(?<status>.*)\?$/))
+  return super unless args.empty? && (matches = method.match(/^(?<status>.*)\?$/))
 
   status == matches[:status]
 end
 
 def respond_to_missing? method, _include_private=false
-  method.match?(/\?/) ? true : super
+  method.match?(/\?$/) ? true : super
 end
 end;end;end;end;
 # ~~ generated from /Users/ethan/dev/decko/gem/card-mod-account/set/right/account.rb ~~

data/tmpsets/set/{mod011-card-mod-account → mod010-card-mod-account}/right/account/events.rb

@@ -51,7 +51,7 @@ def activatable
   yield
 end
 
-# note: this only works in the context of an action.
+# NOTE: this only works in the context of an action.
 # if run independently, it will not activate an account
 event :activate_account do
   add_subfield :status, content: "active"
@@ -102,7 +102,7 @@ end
 
 def reset_password_failure error_message
   Auth.as_bot { send_password_reset_email }
-  errors.add :content, tr(:sorry_email_reset, error_msg: error_message)
+  errors.add :content, t(:account_sorry_email_reset, error_msg: error_message)
 end
 end;end;end;end;end;
 # ~~ generated from /Users/ethan/dev/decko/gem/card-mod-account/set/right/account/events.rb ~~

data/tmpsets/set/{mod011-card-mod-account → mod010-card-mod-account}/right/email.rb

@@ -15,7 +15,7 @@ event :validate_email, :validate, on: :save do
   self.content = content.strip
   return if content.match?(/^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i)
 
-  errors.add :content, tr(:error_invalid_address)
+  errors.add :content, t(:account_error_invalid_address)
 end
 
 event :validate_unique_email, after: :validate_email, on: :save do
@@ -23,9 +23,9 @@ event :validate_unique_email, after: :validate_email, on: :save do
     Auth.as_bot do
       cql = { right_id: EmailID, eq: content, return: :id }
       cql[:not] = { id: id } if id
-      cql_comment = tr(:search_email_duplicate, content: content)
+      cql_comment = t(:account_search_email_duplicate, content: content)
       if Card.search(cql, cql_comment).first
-        errors.add :content, tr(:error_not_unique)
+        errors.add :content, t(:account_error_not_unique)
       end
     end
   end
@@ -33,6 +33,7 @@ end
 
 event :downcase_email, :prepare_to_validate, on: :save do
   return if !content || content == content.downcase
+
   self.content = content.downcase
 end
 
@@ -44,7 +45,7 @@ def ok_to_read
   if own_email? || Auth.always_ok?
     true
   else
-    deny_because tr(:deny_email_restricted)
+    deny_because t(:account_deny_email_restricted)
   end
 end
 

data/tmpsets/set/{mod011-card-mod-account → mod010-card-mod-account}/right/password.rb

@@ -12,7 +12,7 @@ def history?
 end
 
 def ok_to_read
-  own_account? ? true : super
+  own_account? || super
 end
 
 event :encrypt_password, :store,
@@ -30,7 +30,7 @@ end
 event :validate_password, :validate, on: :save do
   return if content.length > 3
 
-  errors.add :password, tr(:password_length)
+  errors.add :password, t(:account_password_length)
 end
 
 event :validate_password_present, :prepare_to_validate, on: :update do
@@ -38,7 +38,7 @@ event :validate_password_present, :prepare_to_validate, on: :update do
 end
 
 view :raw do
-  tr :encrypted
+  t :account_encrypted
 end
 
 module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFormat, self; extend Card::Set::AbstractFormat
@@ -53,6 +53,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
 
   def autocomplete?
     return "on" if @parent && @parent.card.name == "*signin+*account" # HACK
+
     "off"
   end
 end

data/tmpsets/set/{mod011-card-mod-account → mod010-card-mod-account}/right/roles.rb

@@ -16,8 +16,8 @@ end
 def forbidden_roles
   # restore old roles for permission check
   with_old_role_permissions do |new_roles|
-    new_roles.select do |card|
-      !Card.fetch(card, "*members").ok? :update
+    new_roles.reject do |card|
+      Card.fetch(card, "*members").ok? :update
     end
   end
 end

data/tmpsets/set/{mod011-card-mod-account → mod010-card-mod-account}/right/salt.rb

@@ -16,7 +16,7 @@ def history?
 end
 
 view :raw do
-  tr :private_data
+  t :account_private_data
 end
 end;end;end;end;
 # ~~ generated from /Users/ethan/dev/decko/gem/card-mod-account/set/right/salt.rb ~~

data/tmpsets/set/{mod011-card-mod-account → mod010-card-mod-account}/right/status.rb

@@ -18,7 +18,7 @@ end
 
 def ok_to_update
   if own_account? && !Auth.always_ok?
-    deny_because you_cant(tr(:deny_not_change_own_account))
+    deny_because you_cant(t(:account_deny_not_change_own_account))
   else
     super
   end

data/tmpsets/set/{mod011-card-mod-account → mod010-card-mod-account}/self/signin.rb

@@ -37,8 +37,13 @@ end
 # triggered by clicking "Reset my Password", this sends out the verification password
 # and aborts (does not sign in)
 event :send_reset_password_token, before: :signin, on: :update, trigger: :required do
-  email = subfield(:email)&.content
-  send_reset_password_email_or_fail email
+  aborting do
+    blank_email? ? break : send_reset_password_email_or_fail
+  end
+end
+
+def email_from_subfield
+  @email_from_subfield ||= subfield(:email)&.content
 end
 
 def ok_to_read
@@ -49,10 +54,6 @@ def recaptcha_on?
   false
 end
 
-def i18n_signin key
-  I18n.t key, scope: "mod.card-mod-account.set.self.signin"
-end
-
 def authenticate_or_abort email, pword
   abort_unless email, :email_missing
   abort_unless pword, :password_missing
@@ -71,53 +72,31 @@ def failed_signin email
 end
 
 def abort_unless value, error_key
-  abort :failure, i18n_signin(error_key) unless value
+  abort :failure, t("account_#{error_key}") unless value
 end
 
 def signin_error_message account
-  case
-  when account.nil?     then i18n_signin(:error_unknown_email)
-  when !account.active? then i18n_signin(:error_not_active)
-  else                       i18n_signin(:error_wrong_password)
-  end
+  t "account_#{signin_error_key account}"
 end
 
 def error_on field, error_key
-  errors.add field, i18n_signin(error_key)
+  errors.add field, t("account_#{error_key}")
 end
 
 def account_for email
   Auth.find_account_by_email email
 end
 
-def send_reset_password_email_or_fail email
-  aborting do
-    break errors.add :email, i18n_signin(:error_blank) if email.blank?
-
-    if (account = Auth.find_account_by_email(email))&.active?
-      Auth.as_bot { account.send_password_reset_email }
-    elsif account
-      errors.add :account, i18n_signin(:error_not_active)
-    else
-      errors.add :email, i18n_signin(:error_not_recognized)
-    end
-  end
-end
-
-def send_reset_password_email_or_fail email
-  aborting do
-    break if blank_email? email
-
-    if (account = account_for email)&.active?
-      send_reset_password_email account
-    else
-      reset_password_fail account
-    end
+def send_reset_password_email_or_fail
+  if (account = account_for email_from_subfield)&.active?
+    send_reset_password_email account
+  else
+    reset_password_fail account
   end
 end
 
-def blank_email? email
-  return false if email.present?
+def blank_email?
+  return false if email_from_subfield.present?
 
   error_on :email, :error_blank
 end
@@ -134,6 +113,16 @@ def reset_password_fail account
   end
 end
 
+private
+
+def signin_error_key account
+  case
+  when account.nil?     then :error_unknown_email
+  when !account.active? then :error_not_active
+  else                       :error_wrong_password
+  end
+end
+
 module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFormat, self; extend Card::Set::AbstractFormat
   view :core, cache: :never do
     voo.edit_structure = [signin_field(:email), signin_field(:password)]
@@ -155,7 +144,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
 
   # FIXME: need a generic solution for this
   view :title do
-    voo.title ||= I18n.t(:sign_in_title, scope: "mod.card-mod-account.set.self.signin")
+    voo.title ||= t(:account_sign_in_title)
     super()
   end
 
@@ -170,7 +159,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
 
   view :reset_password_success do
     # 'Check your email for a link to reset your password'
-    frame { I18n.t(:check_email, scope: "mod.card-mod-account.set.self.signin") }
+    frame { t :account_check_email }
   end
 
   view :signin_buttons do
@@ -186,33 +175,31 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
   end
 
   def reset_password_voo
-    voo.title ||= card.i18n_signin(:forgot_password)
+    voo.title ||= t :account_forgot_password
     voo.edit_structure = [signin_field(:email)]
     voo.hide :help
   end
 
   view :edit_buttons do
-    text = I18n.t :reset_my_password, scope: "mod.card-mod-account.set.self.signin"
-    button_tag text, situation: "primary", class: "_close-modal-on-success"
+    button_tag t(:account_reset_my_password),
+               situation: "primary", class: "_close-modal-on-success"
   end
 
   def signin_success
-    "REDIRECT: #{Env.interrupted_action || '*previous'}"
+    { redirect: true, mark: (Env.interrupted_action || "*previous") }
   end
 
   def signin_button
-    text = I18n.t :sign_in, scope: "mod.card-mod-account.set.self.signin"
-    button_tag text, situation: "primary"
+    button_tag t(:account_sign_in), situation: "primary"
   end
 
   def signup_link
-    text = I18n.t :or_sign_up, scope: "mod.card-mod-account.set.self.signin"
-    subformat(Card[:account_links]).render! :sign_up, title: text
+    subformat(Card[:account_links]).render! :sign_up, title: t(:account_or_sign_up)
   end
 
   def reset_password_link
-    text = I18n.t :reset_password, scope: "mod.card-mod-account.set.self.signin"
-    link = link_to_view :edit, text, path: { slot: { hide: :bridge_link } }
+    link = link_to_view :edit, t(:account_reset_password),
+                        path: { slot: { hide: :bridge_link } }
     # FIXME: inline styling
     raw("<div style='float:right'>#{link}</div>")
   end