card 1.101.1 → 1.101.6

data/tmpsets/set/{mod008-card-mod-format → mod007-card-mod-format}/type/number.rb

@@ -5,7 +5,6 @@ class Card; module Set; class Type
 module Number;
 extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-format/set/type/number.rb"; end
-
 module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFormat, self; extend Card::Set::AbstractFormat
   def input_type
     :text_field
@@ -13,7 +12,10 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
 end
 
 event :validate_number, :validate, on: :save do
-  errors.add :content, tr(:not_numeric, content: content) unless valid_number?(content)
+  unless valid_number?(content)
+    errors.add :content,
+               t(:format_not_numeric, content: content)
+  end
 end
 
 def valid_number? string

data/tmpsets/set/{mod008-card-mod-format → mod007-card-mod-format}/type/toggle.rb

@@ -11,8 +11,8 @@ end
 
 view :core do
   case card.content.to_i
-  when 1 then tr(:yes)
-  when 0 then tr(:no)
+  when 1 then t(:format_toggle_yes)
+  when 0 then t(:format_toggle_no)
   else
     "?"
   end

data/tmpsets/set/{mod009-card-mod-list → mod008-card-mod-list}/abstract/01_pointer/html_views.rb

@@ -68,8 +68,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
   end
 
   def autocomplete_input
-    items = items_for_input
-    haml :autocomplete_input, item: items.first, options_card: options_card_name
+    haml :autocomplete_input, item: items_for_input.first, options_card: options_card_name
   end
 
   def checkbox_input

data/tmpsets/set/{mod009-card-mod-list → mod008-card-mod-list}/abstract/01_pointer/html_views/filter.rb

@@ -58,6 +58,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
 
   def filter_card_from_params
     return unless params[:filter_card]
+
     Card.fetch params[:filter_card], new: {}
   end
 

data/tmpsets/set/{mod009-card-mod-list → mod008-card-mod-list}/abstract/01_pointer/other_views.rb

@@ -71,6 +71,7 @@ module JsonFormat; module_parent.send :register_set_format, Card::Format::JsonFo
 
   def essentials
     return {} if depth > max_depth
+
     card.item_cards.map do |item|
       nest item, view: :essentials
     end

data/tmpsets/set/{mod009-card-mod-list → mod008-card-mod-list}/abstract/id_pointer.rb

@@ -8,7 +8,7 @@ extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-list/set/abstract/id_pointer.rb"; end
 
 def standardize_item cardish
-  if (id = Card.fetch_id cardish)
+  if (id = Card.id cardish)
     "~#{id}"
   else
     Rails.logger.info "no id for '#{cardish}' added to id pointer"

data/tmpsets/set/{mod009-card-mod-list → mod008-card-mod-list}/self/input_options.rb

@@ -14,6 +14,7 @@ add_to_basket :options, "select"
 add_to_basket :options, "multiselect"
 add_to_basket :options, "list"
 add_to_basket :options, "filtered list"
+add_to_basket :options, "autocomplete"
 
 def content
   options.to_pointer_content

data/tmpsets/set/{mod009-card-mod-list → mod008-card-mod-list}/type/nest_list.rb

@@ -8,7 +8,7 @@ def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-list/set/type/nes
 include_set Abstract::Items
 
 def raw_item_strings content
-  reference_chunks(content).map(&:referee_name)
+  reference_chunks(content).map(&:referee_raw_name)
 end
 
 def item_options

data/tmpsets/set/{mod010-card-mod-permissions → mod009-card-mod-permissions}/abstract/permission.rb

@@ -5,7 +5,6 @@ class Card; module Set; class Abstract
 module Permission;
 extend Card::Set
 def self.source_location; "/Users/ethan/dev/decko/gem/card-mod-permissions/set/abstract/permission.rb"; end
-
 def standardize_items
   super unless content == "_left"
 end
@@ -91,6 +90,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
 
   def inheritance_checkbox
     return unless inheritable?
+
     <<-HTML
       <div class="perm-inheritance perm-section">
         #{check_box_tag 'inherit', 'inherit', inheriting?}
@@ -113,6 +113,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
 
   def in_context_of_self_set?
     return false unless @set_context
+
     @set_context.to_name.tag_name.key == Card[:self].key
   end
 
@@ -123,7 +124,7 @@ module HtmlFormat; module_parent.send :register_set_format, Card::Format::HtmlFo
       link_to_card card_id, nil, target: args[:target]
     end * ", "
     "Inherit ( #{links} )"
-  rescue
+  rescue StandardError
     "Inherit"
   end
 end

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

@@ -58,7 +58,7 @@ def direct_rule_card action
 end
 
 def permission_rule_id action
-  if junction? && rule(action).match?(/^\[?\[?_left\]?\]?$/)
+  if compound? && rule(action).match?(/^\[?\[?_left\]?\]?$/)
     left_permission_rule_id action
   else
     rule_card_id(action)
@@ -71,9 +71,7 @@ end
 
 def left_permission_rule_id action
   lcard = left_or_new(skip_virtual: true, skip_modules: true)
-  if action == :create && lcard.real? && lcard.action != :create
-    action = :update
-  end
+  action = :update if action == :create && lcard.real? && lcard.action != :create
   lcard.permission_rule_id action
 end
 
@@ -83,9 +81,11 @@ end
 
 def require_permission_rule! rule_id, action
   return if rule_id
+
   # RULE missing.  should not be possible.
   # generalize this to handling of all required rules
-  errors.add :permission_denied, tr(:error_no_action_rule, action: action, name: name)
+  errors.add :permission_denied,
+             t(:permission_error_no_action_rule, action: action, name: name)
   raise Card::Error::PermissionDenied, self
 end
 
@@ -117,6 +117,7 @@ def permit action, verb=nil
   end
 
   return true if permitted? action
+
   verb ||= action.to_s
   deny_because you_cant("#{verb} #{name.present? ? name : 'this'}")
 end
@@ -131,6 +132,7 @@ end
 def ok_to_create_side side
   # left is supercard; create permissions will get checked there.
   return true if side == :left && superleft
+
   part_card = send side, new: {}
   # if no card, there must be other errors
   return true unless part_card&.new_card? && !part_card.ok?(:create)
@@ -151,6 +153,7 @@ end
 def ok_to_update
   return false unless permit(:update)
   return true unless type_id_changed? && !permitted?(:create)
+
   deny_because you_cant("change to this type (need create permission)")
 end
 
@@ -177,17 +180,18 @@ end
 
 def update_field_read_rules
   return unless type_id_changed? || read_rule_id_changed?
+
   each_field_as_bot do |field|
     field.update_read_rule if field.rule(:read) == "_left"
   end
 end
 
-def each_field_as_bot
+def each_field_as_bot &block
   # find all cards with me as trunk and update their read_rule
   # (because of *type plus right)
   # skip if name is updated because will already be resaved
   Auth.as_bot do
-    fields.each { |field| yield field }
+    fields.each(&block)
   end
 end
 

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