card 1.99.4 → 1.99.5

data/tmpsets/set/{mod003-core → mod002-core}/all/permissions.rb

@@ -1,14 +1,15 @@
 # -*- encoding : utf-8 -*-
-class Card; module Set; class All
-# Set: All cards (Permissions)
-#
-module Permissions;
-extend Card::Set
-def self.source_location; "/Users/ethan/dev/decko/gem/card/mod/core/set/all/permissions.rb"; end
+class Card; module Set; class All; module Permissions; extend Card::Set
+# ~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/core/set/all/permissions.rb ~~
+
+Card.error_codes.merge! permission_denied: [:denial, 403],
+                        captcha: [:errors, 449]
+
 module ClassMethods
   def repair_all_permissions
-    Card.where("(read_rule_class is null or read_rule_id is null) and trash is false")
-        .each do |broken_card|
+    Card.where(
+      "(read_rule_class is null or read_rule_id is null) and trash is false"
+    ).each do |broken_card|
       broken_card.include_set_modules
       broken_card.repair_permissions!
     end
@@ -30,7 +31,6 @@ end
 # options.
 
 def ok? action
-  # binding.pry if action == :create
   @action_ok = true
   send "ok_to_#{action}"
   @action_ok
@@ -49,62 +49,45 @@ def ok! action, opts={}
 end
 
 def who_can action
+  # warn "who_can[#{name}] #{(prc=permission_rule_card(action)).inspect},
+  # #{prc.first.item_cards.map(&:id)}" if action == :update
   permission_rule_card(action).item_cards.map(&:id)
 end
 
-def anyone_can? action
-  who_can(action).include? Card::AnyoneID
-end
-
-def direct_rule_card action
+def permission_rule_id_and_class action
   direct_rule_id = rule_card_id action
   require_permission_rule! direct_rule_id, action
-  Card.fetch direct_rule_id, skip_modules: true
-end
-
-def permission_rule_id action
-  direct_rule = direct_rule_card action
-  applicable_permission_rule_id direct_rule, action
-end
-
-def permission_rule_id_and_class action
-  direct_rule = direct_rule_card action
-  [
-    applicable_permission_rule_id(direct_rule, action),
-    direct_rule.rule_class_name
-  ]
+  direct_rule = Card.fetch direct_rule_id, skip_modules: true
+  [applicable_permission_rule_id(direct_rule, action),
+   direct_rule.rule_class_name]
 end
 
 def applicable_permission_rule_id direct_rule, action
   if junction? && direct_rule.db_content =~ /^\[?\[?_left\]?\]?$/
-    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
+    lcard.permission_rule_id_and_class(action).first
   else
     direct_rule.id
   end
 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
-  lcard.permission_rule_id action
-end
-
 def permission_rule_card action
-  Card.fetch permission_rule_id(action)
+  Card.fetch permission_rule_id_and_class(action).first
 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, "No #{action} rule for #{name}"
   raise Card::Error::PermissionDenied, self
 end
 
 def rule_class_name
-  trunk.type_id == Card::SetID ? name.trunk_name.tag : nil
+  trunk.type_id == Card::SetID ? cardname.trunk_name.tag : nil
 end
 
 def you_cant what
@@ -142,7 +125,7 @@ def ok_to_create
   permit :create
   return if !@action_ok || !junction?
 
-  %i[left right].each do |side|
+  [:left, :right].each do |side|
     # left is supercard; create permissions will get checked there.
     next if side == :left && @superleft
     part_card = send side, new: {}
@@ -156,7 +139,7 @@ end
 
 def ok_to_read
   return if Auth.always_ok?
-  @read_rule_id ||= permission_rule_id(:read)
+  @read_rule_id ||= permission_rule_id_and_class(:read).first
   return if Auth.as_card.read_rules.member? @read_rule_id
   deny_because you_cant "read this"
 end
@@ -180,15 +163,12 @@ def ok_to_comment
   deny_because "No comments allowed on structured content" if structure
 end
 
-# don't know why we introduced this
-# but we have to preserve read rules to make
-# delete acts visible in recent changes -pk
-# event :clear_read_rule, :store, on: :delete do
-#   self.read_rule_id = self.read_rule_class = nil
-# end
+event :clear_read_rule, :store, on: :delete do
+  self.read_rule_id = self.read_rule_class = nil
+end
 
 event :set_read_rule, :store,
-      on: :save, changed: %i[type_id name] do
+      on: :save, changed: [:type_id, :name] do
   read_rule_id, read_rule_class = permission_rule_id_and_class(:read)
   self.read_rule_id = read_rule_id
   self.read_rule_class = read_rule_class
@@ -233,7 +213,8 @@ event :update_read_rule do
     self.read_rule_class = rclass
     Card.where(id: id).update_all read_rule_id: rcard_id,
                                   read_rule_class: rclass
-    expire :hard
+    expire_hard
+
     update_field_read_rules
   end
 end
@@ -243,23 +224,54 @@ def add_to_read_rule_update_queue updates
 end
 
 event :check_permissions, :validate do
+  task =
+    if @action != :delete && comment # will be obviated by new comment handling
+      :comment
+    else
+      @action
+    end
   track_permission_errors do
-    ok? action_for_permission_check
+    ok? task
   end
 end
 
-def action_for_permission_check
-  commenting? ? :comment : @action
-end
-
 def track_permission_errors
   @permission_errors = []
   result = yield
-  @permission_errors.each { |msg| errors.add :permission_denied, msg }
+
+  @permission_errors.each do |message|
+    errors.add :permission_denied, message
+  end
   @permission_errors = nil
+
   result
 end
 
+def recaptcha_on?
+  have_recaptcha_keys? &&
+    Env[:controller]   &&
+    !Auth.signed_in?   &&
+    !Auth.needs_setup? &&
+    !Auth.always_ok?   &&
+    Card.toggle(rule(:captcha))
+end
+
+def have_recaptcha_keys?
+  @@have_recaptcha_keys =
+    if defined?(@@have_recaptcha_keys)
+      @@have_recaptcha_keys
+    else
+      !!(Card.config.recaptcha_public_key && Card.config.recaptcha_private_key)
+    end
+end
+
+event :recaptcha, :validate do
+  if !@supercard && !Env[:recaptcha_used] && recaptcha_on?
+    Env[:recaptcha_used] = true
+    Env[:controller].verify_recaptcha model: self, attribute: :captcha
+  end
+end
+
 module Accounts
   # This is a short-term hack that is used in account-related cards to allow a
   # permissions pattern where permissions are restricted to the owner of the
@@ -268,14 +280,40 @@ module Accounts
   # (without creating separate rules for each account holder) but is not yet.
 
   def permit action, verb=nil
-    case action
-    when :comment then @action_ok = false
-    when :create  then @superleft ? true : super(action, verb)
-    # restricts account creation to subcard handling on permitted card
-    # (unless explicitly permitted)
-    else own_account? ? true : super(action, verb)
+    if action == :comment then @action_ok = false
+    elsif action == :create  then @superleft ? true : super(action, verb)
+      # restricts account creation to subcard handling on permitted card
+      # (unless explicitly permitted)
+    elsif own_account? then true
+    else
+      super action, verb
+    end
+  end
+end
+
+module Follow
+  def ok_to_update
+    permit :update
+  end
+
+  def ok_to_create
+    permit :create
+  end
+
+  def ok_to_delete
+    permit :delete
+  end
+
+  def permit action, verb=nil
+    if [:create, :delete, :update].include?(action) && Auth.signed_in? &&
+       (user = rule_user) && Auth.current_id == user.id
+      return true
+    else
+      super action, verb
     end
   end
 end
+
+
+# ~~ below autogenerated; above pulled from /Users/ethan/dev/wagn/gem/card/mod/core/set/all/permissions.rb ~~
 end;end;end;end;
-# ~~ generated from /Users/ethan/dev/decko/gem/card/mod/core/set/all/permissions.rb ~~

data/tmpsets/set/mod002-core/all/phases.rb

@@ -0,0 +1,23 @@
+# -*- encoding : utf-8 -*-
+class Card; module Set; class All; module Phases; extend Card::Set
+# ~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/core/set/all/phases.rb ~~
+def prepare_for_phases
+  reset_patterns
+  include_set_modules
+end
+
+def only_storage_phase?
+  only_storage_phase || !director.main?
+end
+
+delegate :validation_phase, to: :director
+delegate :storage_phase, to: :director
+delegate :integration_phase, to: :director
+
+def clean_up
+  Card::DirectorRegister.clear
+end
+
+
+# ~~ below autogenerated; above pulled from /Users/ethan/dev/wagn/gem/card/mod/core/set/all/phases.rb ~~
+end;end;end;end;

data/tmpsets/set/{mod003-core → mod002-core}/all/references.rb

@@ -1,13 +1,9 @@
 # -*- encoding : utf-8 -*-
-class Card; module Set; class All
-# Set: All cards (References)
-#
+class Card; module Set; class All; module References; extend Card::Set
+# ~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/core/set/all/references.rb ~~
 # frozen_string_literal: true
 
 # Cards can refer to other cards in their content, eg via links and nests.
-module References;
-extend Card::Set
-def self.source_location; "/Users/ethan/dev/decko/gem/card/mod/core/set/all/references.rb"; end
 # The card that refers is the "referer", the card that is referred to is
 # the "referee". The reference itself has its own class (Card::Reference),
 # which handles id-based reference tracking.
@@ -16,30 +12,24 @@ PARTIAL_REF_CODE = "P".freeze
 
 # cards that refer to self
 def referers
-  referer_cards_from_references references_in
+  references_in.map(&:referer_id).map(&Card.method(:fetch)).compact
 end
 
 # cards that include self
-def nesters
-  referer_cards_from_references references_in.where(ref_type: "I")
-end
-
-def referer_cards_from_references references
-  references.map(&:referer_id).uniq.map(&Card.method(:fetch)).compact
+def includers
+  refs = references_in.where(ref_type: "I")
+  refs.map(&:referer_id).map(&Card.method(:fetch)).compact
 end
 
 # cards that self refers to
 def referees
-  referees_from_references references_out
+  references_out.map { |ref| Card.fetch ref.referee_key, new: {} }
 end
 
 # cards that self includes
-def nestees
-  referees_from_references references_out.where(ref_type: "I")
-end
-
-def referees_from_references references
-  references.map(&:referee_key).uniq.map { |key| Card.fetch key, new: {} }
+def includees
+  refs = references_out.where(ref_type: "I")
+  refs.map { |ref| Card.fetch ref.referee_key, new: {} }
 end
 
 # cards that refer to self by name
@@ -51,15 +41,15 @@ end
 # cards that refer to self or any descendant
 def family_referers
   @family_referers ||= ([self] + descendants).map(&:referers).flatten.uniq
-  # TODO: make this more efficient using partial references!
+  # FIXME: could be much more efficient!
 end
 
 # replace references in card content
 def replace_reference_syntax old_name, new_name
-  obj_content = Card::Content.new content, self
+  obj_content = Card::Content.new raw_content, self
   obj_content.find_chunks(Card::Content::Chunk::Reference).select do |chunk|
     next unless (old_ref_name = chunk.referee_name)
-    next unless (new_ref_name = old_ref_name.swap old_name, new_name)
+    next unless (new_ref_name = old_ref_name.replace_part old_name, new_name)
     chunk.referee_name = chunk.replace_reference old_name, new_name
     refs = Card::Reference.where referee_key: old_ref_name.key
     refs.update_all referee_key: new_ref_name.key
@@ -88,7 +78,7 @@ end
 # delete references from this card
 def delete_references_out
   raise "id required to delete references" if id.nil?
-  Card::Reference.where(referer_id: id).delete_all
+  Card::Reference.delete_all referer_id: id
 end
 
 # interpretation phase helps to prevent duplicate references
@@ -98,8 +88,7 @@ end
 # }
 def interpret_reference ref_hash, referee_name, ref_type
   return unless referee_name # eg commented nest has no referee_name
-  referee_name = referee_name.to_name
-  referee_key = referee_name.key
+  referee_key = (referee_name = referee_name.to_name).key
   return if referee_key == key # don't create self reference
 
   referee_id = Card.fetch_id(referee_name)
@@ -134,10 +123,10 @@ def reference_values_array ref_hash
   values
 end
 
-# invokes the given block for each reference in content with
+# invokes the given block for each reference in raw_content with
 # the reference name and reference type
 def each_reference_out
-  content_obj = Card::Content.new content, self
+  content_obj = Card::Content.new raw_content, self
   content_obj.find_chunks(Card::Content::Chunk::Reference).each do |chunk|
     yield(chunk.referee_name, chunk.reference_code)
   end
@@ -152,7 +141,7 @@ event :prepare_referer_update, :validate, on: :update, changed: :name do
 end
 
 # when name changes, update references to card
-event :refresh_references_in, :finalize, on: :save, after: :name_change_finalized do
+event :refresh_references_in, :finalize, on: :save, changed: :name do
   Card::Reference.unmap_referees id if @action == :update && !update_referers
   Card::Reference.map_referees key, id
 end
@@ -170,12 +159,16 @@ end
 
 # on rename, update names in cards that refer to self by name (as directed)
 event :update_referer_content, :finalize,
-      on: :update, after: :name_change_finalized, when: :update_referers do
-  referers.each do |card|
-    next if card.structure
-    card.skip = %i[validate_renaming check_permissions!]
-    attach_subcard card.name,
-                   content: card.replace_reference_syntax(name_before_last_save, name)
+      on: :update, changed: :name,
+      when: proc { |card| card.update_referers } do
+  # FIXME: break into correct stages
+  Auth.as_bot do
+    family_referers.each do |card|
+      next if card == self || card.structure
+      card = card.refresh
+      card.db_content = card.replace_reference_syntax name_was, name
+      card.save!
+    end
   end
 end
 
@@ -184,13 +177,11 @@ end
 # eg.  A links to X+Y.  if X+Y is renamed and we're not updating the link in A,
 # then we need to be sure that A has a partial reference
 event :update_referer_references_out, :finalize,
-      on: :update, after: :name_change_finalized,
-      when: :not_update_referers do
-  referers.map(&:update_references_out)
+      on: :update, changed: :name,
+      when: proc { |c| !c.update_referers } do
+  family_referers.map(&:update_references_out)
 end
 
-def not_update_referers
-  !update_referers
-end
+
+# ~~ below autogenerated; above pulled from /Users/ethan/dev/wagn/gem/card/mod/core/set/all/references.rb ~~
 end;end;end;end;
-# ~~ generated from /Users/ethan/dev/decko/gem/card/mod/core/set/all/references.rb ~~

data/tmpsets/set/{mod003-core → mod002-core}/all/rules.rb

@@ -1,11 +1,7 @@
 # -*- encoding : utf-8 -*-
-class Card; module Set; class All
-# Set: All cards (Rules)
-#
+class Card; module Set; class All; module Rules; extend Card::Set
+# ~~ above autogenerated; below pulled from /Users/ethan/dev/wagn/gem/card/mod/core/set/all/rules.rb ~~
 # frozen_string_literal: true
-module Rules;
-extend Card::Set
-def self.source_location; "/Users/ethan/dev/decko/gem/card/mod/core/set/all/rules.rb"; end
 
 RULE_SQL = %(
   SELECT
@@ -74,15 +70,14 @@ def is_standard_rule?
     l.type_id == Card::SetID
 end
 
-# TODO: abstract so account doesn't have to have User type.
 def is_preference?
-  name.parts.length > 2 &&
+  cardname.parts.length > 2 &&
     (r = right(skip_modules: true)) &&
     r.type_id == Card::SettingID &&
     (set = self[0..-3, skip_modules: true]) &&
     set.type_id == Card::SetID &&
     (user = self[-2, skip_modules: true]) &&
-    (user.type_id == Card::UserID || user.codename == :all)
+    (user.type_id == Card::UserID || user.codename == "all")
 end
 
 def rule setting_code, options={}
@@ -111,7 +106,9 @@ def rule_card_id setting_code, options={}
 end
 
 def preference_card_id_lookups setting_code, options={}
-  user_id = options[:user_id] || options[:user]&.id || Auth.current_id
+  user_id = options[:user_id] ||
+            (options[:user] && options[:user].id) ||
+            Auth.current_id
   return unless user_id
   ["#{setting_code}+#{AllID}", "#{setting_code}+#{user_id}"]
 end
@@ -127,7 +124,7 @@ def related_sets with_self=false
     sets << ["#{name}+*type", Card::Set::Type.label(name)]
   end
   sets << ["#{name}+*self", Card::Set::Self.label(name)] if with_self
-  if known? && name.simple?
+  if known? && cardname.simple?
     sets << ["#{name}+*right", Card::Set::Right.label(name)]
   end
   sets
@@ -152,16 +149,22 @@ module ClassMethods
     end
   end
 
+  def path_setting name # shouldn't this be in location helper?
+    name ||= "/"
+    return name if name =~ /^(http|mailto)/
+    "#{Card.config.relative_url_root}#{name}"
+  end
+
   def toggle val
     val.to_s.strip == "1"
   end
 
   def rule_cache_key row
-    return false unless (setting_code = Card::Codename[row["setting_id"].to_i])
+    return false unless (setting_code = Codename[row["setting_id"].to_i])
 
     anchor_id = row["anchor_id"]
     set_class_id = anchor_id.nil? ? row["set_id"] : row["set_tag_id"]
-    return false unless (set_class_code = Card::Codename[set_class_id.to_i])
+    return false unless (set_class_code = Codename[set_class_id.to_i])
 
     [anchor_id, set_class_code, setting_code].compact.map(&:to_s) * "+"
   end
@@ -195,10 +198,10 @@ module ClassMethods
   def all_user_ids_with_rule_for set_card, setting_code
     key =
       if (l = set_card.left) && (r = set_card.right)
-        set_class_code = Card::Codename[r.id]
+        set_class_code = Codename[r.id]
         "#{l.id}+#{set_class_code}+#{setting_code}"
       else
-        set_class_code = Card::Codename[set_card.id]
+        set_class_code = Codename[set_card.id]
         "#{set_class_code}+#{setting_code}"
       end
     user_ids = user_ids_cache[key] || []
@@ -215,7 +218,8 @@ module ClassMethods
         left: {
           left: { type_id: SetID }, right: user_name
         },
-        return: :name }, "preference cards for user: #{user_name}"
+        return: :name
+      }, "preference cards for user: #{user_name}"
     )
   end
 
@@ -301,5 +305,7 @@ module ClassMethods
     Card.cache.write "READRULES", nil
   end
 end
+
+
+# ~~ below autogenerated; above pulled from /Users/ethan/dev/wagn/gem/card/mod/core/set/all/rules.rb ~~
 end;end;end;end;
-# ~~ generated from /Users/ethan/dev/decko/gem/card/mod/core/set/all/rules.rb ~~