card 1.99.5 → 1.99.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0438dd31f0c6101dffdd517571880742e6ab883b1d571f83fed3659dbd6cd693'
-  data.tar.gz: de993267208ecc3c0fd5b10d8774c6f2b34bc2aa5c30816fcdd05f5fb6beb268
+  metadata.gz: c4f675190befef26d884a69d4e4e36901739bd130a68e20a68c430a3cf2ea56c
+  data.tar.gz: 54ae4a1da649e984b2c62a7ea430b4861c4b9d64a8f2004efff6f3000fc70349
 SHA512:
-  metadata.gz: a4b2ed7e91ff665d2972b557851bf1402d2e0b16e21d709dffbe4b572ed21dca55939e9db76752252f67fda23e213310edfbd1b575704b3a980bb15850189725
-  data.tar.gz: 48a01c10b26897dc7e4062a0940d18ed10bd9b37ff4cea488d0c54e774e48bb5694c5deac08ee25a4a047dc0b0137a2a1556e9f6059903160122aa61c0f6480b
+  metadata.gz: 93b245586c081b199f4a3b5a37a2b7b1265eb2b94bdac410a9cd388a0d66913ce5eced96220c79b4d504058fab1adb0d17cf736a0aa78320cc5af03ce7e4a909
+  data.tar.gz: 413929179c4ac6c258b79600dc9a5de24141dcb5b6d6cc7ccaed53d77e066150225dcbdbbf09d50c863b58578ec9613bbee8374db4ba0e6ebf32a4121b75bcfe

data/VERSION

@@ -1 +1 @@
-0.9.5
+0.9.6

data/db/migrate_core_cards/20140629222005_add_email_cards.rb

@@ -85,7 +85,7 @@ class AddEmailCards < Card::Migration::Core
     end
 
     wagn_bot = Card[:wagn_bot].account.email.present? ? Card[:wagn_bot].name : nil
-    token_emails_from = Card.global_setting("*invite+*from") || wagn_bot || "_user"
+    token_emails_from = Card::Rule.global_setting("*invite+*from") || wagn_bot || "_user"
     ["verification email", "password reset email"].each do |token_email_template_name|
       Card.create! name: "#{token_email_template_name}+#{Card[:from].name}", content: token_emails_from
     end

data/lib/card.rb

@@ -104,41 +104,31 @@ class Card < ApplicationRecord
   has_many :actions, -> { where(draft: [nil, false]).order :id }
   has_many :drafts, -> { where(draft: true).order :id }, class_name: :Action
 
-  cattr_accessor :set_patterns, :serializable_attributes, :set_specific_attributes
-  self.set_patterns = []
-
-  # attributes that ActiveJob can handle
-  def self.serializable_attr_accessor *args
-    self.serializable_attributes = args
-    attr_accessor(*args)
-  end
+  cattr_accessor :set_patterns, :action_specific_attributes, :set_specific_attributes
 
-  serializable_attr_accessor(
+  self.set_patterns = []
+  self.action_specific_attributes = [
     :action, :supercard, :superleft,
     :current_action,
-    :comment,                     # obviated soon
-    :update_referers,             # wrong mechanism for this
-    :update_all_users,            # if the above is wrong then this one too
-    :silent_change,               # and this probably too
-    # :remove_rule_stash,
+
     :last_action_id_before_edit,
     :only_storage_phase,          # used to save subcards
     :changed_attributes,
+
     :skip,                        # skip event(s) for all cards in act
     :skip_in_action,              # skip event for just this card
     :trigger,                     # trigger event(s) for all cards in act
-    :trigger_in_action            # trigger event for just this card
-  )
+    :trigger_in_action,           # trigger event for just this card
 
-  alias_method :skip_event, :skip
-  alias_method :skip_event_in_action, :skip_in_action
-  alias_method :trigger_event, :trigger
-  alias_method :trigger_event_in_action, :trigger_in_action
+    :comment,                     # obviated soon
 
-  def serializable_attributes
-    self.class.serializable_attributes + set_specific.keys
-  end
+    # TODO: refactor following to use skip/trigger
+    :update_referers,             # wrong mechanism for this
+    :update_all_users,            # if the above is wrong then this one too
+    :silent_change                # and this probably too
+  ]
 
+  attr_accessor(*action_specific_attributes)
   attr_accessor :follower_stash
 
   STAGE_CALLBACKS = [

data/lib/card/act_manager.rb

@@ -107,6 +107,7 @@ class Card
         directors.each_pair do |card, _dir|
           card.expire
           card.director = nil
+          card.clear_action_specific_attributes
         end
         expire
         @directors = nil

data/lib/card/act_manager/event_delay.rb

@@ -26,16 +26,21 @@ class Card
       # event processed by ActiveJob.
       # This is the improvised resetup to get subcards working.
       def contextualize_for_delay act_id, card, env, auth, &block
-        self.act = Act.find act_id if act_id
         with_env_and_auth env, auth do
-          return yield unless act
-
-          run_act(act.card || card) do
-            act_card.director.run_delayed_event act, &block
+          if act_id && (self.act = Act.find act_id)
+            run_job_with_act act, card, &block
+          else
+            yield
           end
         end
       end
 
+      def run_job_with_act act, card, &block
+        run_act(act.card || card) do
+          act_card.director.run_delayed_event act, &block
+        end
+      end
+
       def with_env_and_auth env, auth
         Card::Auth.with auth do
           Card::Env.with env do

data/lib/card/act_manager/subdirector_array.rb

@@ -19,6 +19,8 @@ class Card
         card = card.card if card.is_a? StageDirector
         each { |dir| return dir if dir.card == card }
         dir = ActManager.fetch card, parent: @parent
+        return dir if dir.main
+
         dir.replace_card card if dir.card != card
         dir.main = false
         dir.parent = @parent

data/lib/card/auth/current.rb

@@ -147,8 +147,6 @@ class Card
         Rails.configuration.database_configuration.dig Rails.env, "database"
       end
 
-      private
-
       # set the id of the current user.
       def current_id= card_id
         @current = @as_id = @as_card = @current_roles = nil

data/lib/card/cache/prepopulate.rb

@@ -27,10 +27,10 @@ class Card
       end
 
       def prepopulate_rule_caches
-        prepopulate_cache("RULES") { Card.rule_cache }
-        prepopulate_cache("READRULES") { Card.read_rule_cache }
-        prepopulate_cache("USER_IDS") { Card.user_ids_cache }
-        prepopulate_cache("RULES") { Card.rule_keys_cache }
+        prepopulate_cache("RULES") { Card::Rule.rule_cache }
+        prepopulate_cache("READRULES") { Card::Rule.read_rule_cache }
+        prepopulate_cache("USER_IDS") { Card::Rule.user_ids_cache }
+        prepopulate_cache("RULE_KEYS") { Card::Rule.rule_keys_cache }
       end
 
       # def prepopulate_card_cache

data/lib/card/env.rb

@@ -5,10 +5,9 @@ class Card
   # Env can differ for each request; Card.config should not.
   module Env
     extend LocationHistory
-
-    SERIALIZABLE_ATTRIBUTES = ::Set.new %i[
-      main_name params ip ajax html host protocol salt
-    ]
+    extend RequestAssignments
+    extend SlotOptions
+    extend Serialization
 
     class << self
       def reset args={}
@@ -38,13 +37,11 @@ class Card
         self[:params] ||= {}
       end
 
-      def slot_opts
-        # FIXME:  upgrade to safe parameters
-        self[:slot_opts] ||= begin
-          opts = params[:slot]&.clone || {}
-          opts = opts.to_unsafe_h if opts.is_a? ActionController::Parameters
-          opts.merge! shortcut_slot_opts
-          opts.deep_symbolize_keys.slice(*Card::View::Options.slot_keys)
+      def hash hashish
+        case hashish
+        when Hash then hashish.clone
+        when ActionController::Parameters then hashish.to_unsafe_h
+        else {}
         end
       end
 
@@ -65,7 +62,7 @@ class Card
       end
 
       def localhost?
-        self[:host] && self[:host] =~ /^localhost/
+        self[:host]&.match?(/^localhost/)
       end
 
       def ajax?
@@ -76,38 +73,8 @@ class Card
         !self[:controller] || self[:html]
       end
 
-      def serialize
-        @env.select { |k, _v| SERIALIZABLE_ATTRIBUTES.include?(k) }
-      end
-
-      # @param serialized_env [Hash]
-      def with serialized_env
-        tmp_env = serialize if @env
-        @env ||= {}
-        @env.update serialized_env
-        yield
-      ensure
-        @env.update tmp_env if tmp_env
-      end
-
       private
 
-      def assign_ajax c
-        c.request.xhr? || c.request.params[:simulate_xhr]
-      end
-
-      def assign_html c
-        [nil, "html"].member?(c.params[:format])
-      end
-
-      def assign_host c
-        Card.config.override_host || c.request.env["HTTP_HOST"]
-      end
-
-      def assign_protocol c
-        Card.config.override_protocol || c.request.protocol
-      end
-
       def method_missing method_id, *args
         case args.length
         when 0 then self[method_id]
@@ -115,17 +82,6 @@ class Card
         else super
         end
       end
-
-      def shortcut_slot_opts
-        opts = {}
-        opts[:size] = params[:size].to_sym if params[:size]
-        opts[:items] = { view: params[:item].to_sym } if slot_items_shortcut?
-        opts
-      end
-
-      def slot_items_shortcut?
-        params[:item].present? && !params.dig(:slot, :items, :view).present?
-      end
     end
   end
 end

data/lib/card/env/location.rb

@@ -21,10 +21,23 @@ class Card
       end
 
       def protocol_and_host
-        Card.config.protocol_and_host || "#{Card::Env[:protocol]}#{Card::Env[:host]}"
+        Card.config.protocol_and_host || "#{Env[:protocol]}#{Env[:host]}"
       end
 
-      extend Location # ??
+      def cardname_from_url url
+        m = url.match cardname_from_url_regexp
+        m ? Card::Name[m[:mark]] : nil
+      end
+
+      private
+
+      def cardname_from_url_regexp
+        return unless Env[:host]
+
+        %r{#{Regexp.escape Env[:host]}/(?<mark>[^\?]+)}
+      end
+
+      extend Location # allows calls on Location constant, eg Location.card_url
     end
   end
 end

data/lib/card/env/request_assignments.rb

@@ -0,0 +1,24 @@
+class Card
+  module Env
+    # environmental variables assigned based on request
+    module RequestAssignments
+      private
+
+      def assign_ajax c
+        c.request.xhr? || c.request.params[:simulate_xhr]
+      end
+
+      def assign_html c
+        [nil, "html"].member?(c.params[:format])
+      end
+
+      def assign_host c
+        Card.config.override_host || c.request.env["HTTP_HOST"]
+      end
+
+      def assign_protocol c
+        Card.config.override_protocol || c.request.protocol
+      end
+    end
+  end
+end

data/lib/card/env/serialization.rb

@@ -0,0 +1,24 @@
+class Card
+  module Env
+    # serializing environment (eg for delayed jobs)
+    module Serialization
+      SERIALIZABLE_ATTRIBUTES = ::Set.new %i[
+        main_name params ip ajax html host protocol salt
+      ]
+
+      # @param serialized_env [Hash]
+      def with serialized_env
+        tmp_env = serialize if @env
+        @env ||= {}
+        @env.update serialized_env
+        yield
+      ensure
+        @env.update tmp_env if tmp_env
+      end
+
+      def serialize
+        @env.select { |k, _v| SERIALIZABLE_ATTRIBUTES.include?(k) }
+      end
+    end
+  end
+end

data/lib/card/env/slot_options.rb

@@ -0,0 +1,30 @@
+class Card
+  module Env
+    # slot-related environmental variable handling
+    module SlotOptions
+      def slot_opts
+        # FIXME:  upgrade to safe parameters
+        self[:slot_opts] ||= interpret_slot_options
+      end
+
+      private
+
+      def interpret_slot_options
+        opts = hash params[:slot]
+        opts.merge! shortcut_slot_opts
+        opts.deep_symbolize_keys.slice(*Card::View::Options.slot_keys)
+      end
+
+      def shortcut_slot_opts
+        opts = {}
+        opts[:size] = params[:size].to_sym if params[:size]
+        opts[:items] = { view: params[:item].to_sym } if slot_items_shortcut?
+        opts
+      end
+
+      def slot_items_shortcut?
+        params[:item].present? && !params.dig(:slot, :items, :view).present?
+      end
+    end
+  end
+end

data/lib/card/format/error.rb

@@ -53,15 +53,20 @@ class Card
       end
 
       def loud_error e, view
+        log_error e if focal? && voo.root?
         card.errors.add "#{view} view", rendering_error(e, view) if card.errors.empty?
         raise e
       end
 
       def quiet_error e, view
         # TODO: unify with Card::Error#report
+        log_error e
+        rendering_error e, view
+      end
+
+      def log_error e
         Rails.logger.info e.message
         Rails.logger.debug e.backtrace.join("\n")
-        rendering_error e, view
       end
 
       def rendering_error exception, view

data/lib/card/mod/loader/set_pattern_loader.rb

@@ -38,7 +38,11 @@ class Card
           end
 
           def preamble_bits
-            [module_comment, module_chain, "cattr_accessor :options", "class << self"]
+            [module_comment,
+             module_chain,
+             "extend Card::Set::Pattern::Helper",
+             "cattr_accessor :options",
+             "class << self"]
           end
 
           def postamble

data/lib/card/model/save_helper.rb

@@ -70,10 +70,14 @@ class Card
       # The derived codename is all lower case with underscores; "*" and ":" are removed
       def ensure_code_card name_or_args, content_or_args=nil
         name, args = standardize_ensure_args name_or_args, content_or_args
-        args[:codename] = name.downcase.tr(" ", "_").tr(":*", "") unless args[:codename]
+        args[:codename] = codename_from_name(name) unless args[:codename]
         ensure_card_simplified name, args
       end
 
+      def codename_from_name name
+        name.downcase.tr(" ", "_").tr(":*", "")
+      end
+
       # create if card doesn't exist
       # updates existing card only if given attributes are different including
       # the name

data/lib/card/set/event/delayed_event.rb

@@ -1,14 +1,27 @@
 require "application_job"
 
 class Card
+  # attributes that ActiveJob can handle
+  def serializable_attributes
+    self.class.action_specific_attributes + set_specific.keys
+  end
+
   module Set
     class Event
       module DelayedEvent
         DELAY_STAGES = ::Set.new(%i[integrate_with_delay_stage
                                     integrate_with_delay_final_stage]).freeze
 
+        def priority
+          @priority || 10
+        end
+
         private
 
+        def process_delayed_job_opts opts
+          @priority = opts.delete :priority
+        end
+
         def with_delay? opts
           DELAY_STAGES.include?(opts[:after]) || DELAY_STAGES.include?(opts[:before])
         end
@@ -27,25 +40,37 @@ class Card
         def define_event_delaying_method
           @set_module.class_exec(self) do |event|
             define_method(event.delaying_method_name, proc do
-              IntegrateWithDelayJob.set(queue: event.name).perform_later(
-                Card::ActManager.act&.id, self, serialize_for_active_job,
-                Card::Env.serialize, Card::Auth.serialize,
-                event.simple_method_name
-              )
+              IntegrateWithDelayJob
+                .set(set_delayed_job_args(event))
+                .perform_later(*perform_delayed_job_args(event))
             end)
           end
         end
 
         class IntegrateWithDelayJob < ApplicationJob
           def perform act_id, card, card_attribs, env, auth, method_name
-            Card::Cache.renew
-            card.deserialize_for_active_job! card_attribs
-            ActManager.contextualize_delayed_event act_id, card, env, auth do
-              card.send method_name
+            handle_perform do
+              load_card card, card_attribs
+              ActManager.contextualize_delayed_event act_id, card, env, auth do
+                card.send method_name
+              end
             end
+          end
+
+          def handle_perform
+            yield
+          rescue StandardError => error
+            Card::Error.report error, @card
+            raise error
           ensure
             ActManager.expire
           end
+
+          def load_card card, card_attribs
+            @card = card
+            Card::Cache.renew
+            card.deserialize_for_active_job! card_attribs
+          end
         end
       end
     end
@@ -58,6 +83,21 @@ class Card
     include_set_modules
   end
 
+  private
+
+  def set_delayed_job_args event
+    { queue: event.name, priority: event.priority }
+  end
+
+  def perform_delayed_job_args event
+    [Card::ActManager.act&.id,
+     self,
+     serialize_for_active_job,
+     Card::Env.serialize,
+     Card::Auth.serialize,
+     event.simple_method_name]
+  end
+
   def serialize_for_active_job
     serializable_attributes.each_with_object({}) do |name, hash|
       hash[name] = instance_variable_get("@#{name}")