card 1.101.0 → 1.101.5

data/db/seed/test/fixtures/schema_migrations_deck_cards.yml

@@ -1,3 +1,5 @@
 ---
 schema_migrations_deck_cards_001:
   version: '20150116220621'
+schema_migrations_deck_cards_002:
+  version: '20210504195646'

data/db/test_seed.rb

@@ -12,10 +12,9 @@ class SharedData
     "Big Brother", "Optic fan", "Sunglasses fan", "Narcissist"
   ].freeze
 
-  CARDTYPE_COUNT = 43
+  CARDTYPE_COUNT = 44
 
   class << self
-
     def create_user name, args
       args[:subcards] = account_args args if args[:email]
 
@@ -46,9 +45,10 @@ class SharedData
       # CREATE A CARD OF EACH TYPE
 
       no_samples = %w[user sign_up set number mirror_list mirrored_list file image
-                      customized_bootswatch_skin]
+                      customized_bootswatch_skin alias]
       Card::Auth.createable_types.each do |type|
         next if no_samples.include? type.to_name.key
+
         create type: type, name: "Sample #{type}"
       end
 
@@ -57,7 +57,7 @@ class SharedData
       end
 
       create_layout_type "lay out", "Greatest {{_main|title: Callahan!; view: labeled}}"
-      create_pointer "stacks", ["horizontal", "vertical"]
+      create_pointer "stacks", %w[horizontal vertical]
       create_pointer "stacks+*self+*layout", "lay out"
       create "horizontal"
       create_pointer "vertical"
@@ -75,7 +75,7 @@ class SharedData
         ["Z", "I'm here to be referenced to"],
         ["A", "Alpha [[Z]]"],
         ["B", "Beta {{Z}}"],
-        ["T", "Theta"],
+        %w[T Theta],
         ["X", "[[A]] [[A+B]] [[T]]"],
         ["Y", "{{B}} {{A+B}} {{A}} {{T}}"],
         ["A+B", "AlphaBeta"],
@@ -114,7 +114,8 @@ class SharedData
       ## --------- Fruit: creatable by anyone but not readable ---
       Card.create! type: "Cardtype", name: "Fruit"
       Card.create! name: "Fruit+*type+*create", type: "Pointer", content: "[[Anyone]]"
-      Card.create! name: "Fruit+*type+*read", type: "Pointer", content: "[[Administrator]]"
+      Card.create! name: "Fruit+*type+*read", type: "Pointer",
+                   content: "[[Administrator]]"
 
       # codenames for card_accessor tests
       Card.create! name: "*write", codename: :write
@@ -158,7 +159,7 @@ class SharedData
 
     def user_and_role_cards
       # Card::Auth.instant_account_activation do
-        create_user "Joe Admin", content: "I'm number one", email: "joe@admin.com"
+      create_user "Joe Admin", content: "I'm number one", email: "joe@admin.com"
         create_user "Joe User", content: "I'm number two", email: "joe@user.com"
         create_user "Joe Camel", content: "Mr. Buttz", email: "joe@camel.com"
 
@@ -169,10 +170,10 @@ class SharedData
 
       # noinspection RubyResolve
       Card["Joe Admin"].fetch(:roles, new: { type_code: "pointer" })
-        .items = [Card::AdministratorID, Card::SharkID, Card::HelpDeskID]
+                       .items = [Card::AdministratorID, Card::SharkID, Card::HelpDeskID]
 
       Card["Joe User"].fetch(:roles, new: { type_code: "pointer" })
-              .items = [Card::SharkID]
+                      .items = [Card::SharkID]
 
       create_user "u1", email: "u1@user.com", password: "u1_pass"
       create_user "u2", email: "u2@user.com", password: "u2_pass"
@@ -188,19 +189,18 @@ class SharedData
       Card["u3"].fetch(:roles, new: {}).items = [r1, r4, Card::AdministratorID]
     end
 
-
     def cardtype_cards
       # for cql & permissions
-      %w[A+C A+D A+E C+A D+A F+A A+B+C].each {|name| create name}
+      %w[A+C A+D A+E C+A D+A F+A A+B+C].each { |name| create name }
       ("A".."F").each do |ch|
         create "Cardtype #{ch}", type_code: "cardtype",
-               codename: "cardtype_#{ch.downcase}"
+                                 codename: "cardtype_#{ch.downcase}"
       end
       Card::Codename.reset_cache
 
       ("a".."f").each do |ch|
         create "type-#{ch}-card", type_code: "cardtype_#{ch}",
-               content: "type_#{ch}_content"
+                                  content: "type_#{ch}_content"
       end
 
       create_pointer "Cardtype B+*type+*create", "[[r3]]"
@@ -210,7 +210,6 @@ class SharedData
       create "Cardtype E+*type+*default"
     end
 
-
     def notification_cards
       Timecop.freeze(Cardio.future_stamp - 1.day) do
         # fwiw Timecop is apparently limited by ruby Time object,
@@ -231,7 +230,7 @@ class SharedData
 
         followers.each do |name, _follow|
           create_user name, email: "#{name.parameterize}@user.com",
-                      password: "#{name.parameterize}_pass"
+                            password: "#{name.parameterize}_pass"
         end
 
         create "All Eyes On Me"
@@ -252,7 +251,8 @@ class SharedData
 
         Card::Auth.signin Card::WagnBotID
         create "Google glass+*self+*follow_fields", ""
-        create "Sunglasses+*self+*follow_fields", "[[#{:nests.cardname}]]\n[[_self+price]]\n[[_self+producer]]"
+        create "Sunglasses+*self+*follow_fields",
+               "[[#{:nests.cardname}]]\n[[_self+price]]\n[[_self+producer]]"
         create "Sunglasses+tint"
         create "Sunglasses+price"
 
@@ -277,7 +277,7 @@ class SharedData
           ["card with fields", "field 1", "field 2"],
           ["card with fields and admin fields", "field 1", "admin field 1"],
           ["admin card with fields and admin fields", "field 1", "admin field 1"],
-          ["admin card with admin fields", "admin field 1", "admin field 2"],
+          ["admin card with admin fields", "admin field 1", "admin field 2"]
         ].each do |name, f1, f2|
           create name,
                  content: "main content {{+#{f1}}}  {{+#{f2}}}",
@@ -297,25 +297,24 @@ class SharedData
         end
         create ["field 1", :right, :read], type: "Pointer", content: "[[Anyone]]"
       end
-
     end
   end
 
-  TEXT = <<-TXT.strip_heredoc.freeze
-      Far out in the uncharted backwaters of the unfashionable end of
-      the western spiral arm of the Galaxy lies a small unregarded
-      yellow sun.
-      
-      Orbiting this at a distance of roughly ninety-two million miles
-      is an utterly insignificant little blue green planet whose ape-
-      descended life forms are so amazingly primitive that they still
-      think digital watches are a pretty neat idea.
-      
-      This planet has - or rather had - a problem, which was this: most
-      of the people living on it were unhappy for pretty much of the time.
-      Many solutions were suggested for this problem, but most of these
-      were largely concerned with the movements of small green pieces
-      of paper, which is odd because on the whole it wasn't the small
-      green pieces of paper that were unhappy.
+  TEXT = <<~TXT.strip_heredoc.freeze
+          Far out in the uncharted backwaters of the unfashionable end of
+          the western spiral arm of the Galaxy lies a small unregarded
+          yellow sun.
+    #{'      '}
+          Orbiting this at a distance of roughly ninety-two million miles
+          is an utterly insignificant little blue green planet whose ape-
+          descended life forms are so amazingly primitive that they still
+          think digital watches are a pretty neat idea.
+    #{'      '}
+          This planet has - or rather had - a problem, which was this: most
+          of the people living on it were unhappy for pretty much of the time.
+          Many solutions were suggested for this problem, but most of these
+          were largely concerned with the movements of small green pieces
+          of paper, which is odd because on the whole it wasn't the small
+          green pieces of paper that were unhappy.
   TXT
 end

data/lib/card.rb

@@ -113,9 +113,24 @@ ActiveSupport.run_load_hooks(:before_card, self)
 class Card < ApplicationRecord
   extend Mark
   extend Dirty::MethodFactory
+  extend Name::CardClass
+  extend Cache::CardClass
+  extend Director::CardClass
+  extend Fetch::CardClass
+
   include Dirty
   include DirtyNames
   include Director::CardMethods
+  include Name::All
+  include Content::All
+  include Set::Event::All
+  include Set::Pattern::All
+  include Cache::All
+  include Director::All
+  include Reference::All
+  include Rule::All
+  include Fetch::All
+  include Subcards::All
 
   Card::Cache # trigger autoload
 
@@ -143,7 +158,6 @@ class Card < ApplicationRecord
     :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
-
     :comment,                     # obviated soon
 
     # TODO: refactor following to use skip/trigger
@@ -154,6 +168,9 @@ class Card < ApplicationRecord
 
   attr_accessor(*action_specific_attributes)
 
+  self.action_specific_attributes +=
+    %i[skip_hash full_skip_hash trigger_hash full_trigger_hash]
+
   define_callbacks :select_action, :show_page, :act
 
   ActiveSupport.run_load_hooks :card, self

data/lib/card/auth.rb

@@ -10,8 +10,7 @@ class Card
     extend Proxy
     extend Setup
     extend Current
-
-    @as_card = @as_id = @current_id = @current = nil
+    extend Token
 
     class << self
       # authenticate a user by their login name and unencrypted password.
@@ -40,6 +39,10 @@ class Card
       def encrypt password, salt
         Digest::SHA1.hexdigest "#{salt}--#{password}--"
       end
+
+      def serialize
+        { as_id: as_id, current_id: current_id }
+      end
     end
   end
 end

data/lib/card/auth/current.rb

@@ -2,114 +2,66 @@ class Card
   module Auth
     # methods for setting current account
     module Current
-      # set current user in process and session
-      def signin cardish
-        signin_id = Card.id(cardish) || Card::AnonymousID
-        self.current_id = signin_id
-        set_session_user signin_id
-      end
-
-      # current user is not anonymous
-      # @return [true/false]
-      def signed_in?
-        current_id != Card::AnonymousID
-      end
-
       # id of current user card.
       # @return [Integer]
       def current_id
         @current_id ||= Card::AnonymousID
       end
 
+      # set the id of the current user.
+      # @return [Integer]
+      def current_id= card_id
+        reset
+        card_id = card_id.to_i if card_id.present?
+        @current_id = card_id
+      end
+
       # current accounted card (must have +\*account)
       # @return [Card]
-      def current
-        if @current && @current.id == current_id
-          @current
-        else
-          @current = Card[current_id]
-        end
+      def current_card
+        return @current_card if @current_card&.id == current_id
+
+        @current_card = Card[current_id]
       end
+      alias_method :current, :current_card
 
       def current_roles
         @current_roles ||= [Card.fetch_name(:anyone_signed_in),
                             current.fetch(:roles)&.item_names].flatten.compact
       end
 
-      def serialize
-        { as_id: as_id, current_id: current_id }
-      end
-
-      # @param auth_data [Integer|Hash] user id, user name, or a hash
-      # @option auth_data [Integer] current_id
-      # @option auth_data [Integer] as_id
-      def with auth_data
-        if auth_data.is_a?(Integer) || auth_data.is_a?(String)
-          auth_data = { current_id: Card.id(auth_data) }
-        end
-
-        tmp_current_id = current_id
-        tmp_as_id = as_id
-        tmp_current = @current
-        tmp_as_card = @as_card
-        tmp_current_roles = @current_roles
-
-        # resets @as and @as_card
-        self.current_id = auth_data[:current_id]
-        @as_id = auth_data[:as_id] if auth_data[:as_id]
-        yield
-      ensure
-        @current_id = tmp_current_id
-        @as_id = tmp_as_id
-        @current = tmp_current
-        @as_card = tmp_as_card
-        @current_roles = tmp_current_roles
+      # set current user in process and session
+      def signin cardish
+        session[session_user_key] =
+          self.current_id = Card.id(cardish) || Card::AnonymousID
       end
 
-      # get session object from Env
-      # return [Session]
-      def session
-        Card::Env.session
+      # current user is not anonymous
+      # @return [true/false]
+      def signed_in?
+        current_id != Card::AnonymousID
       end
 
       # set current from token, api_key, or session
-      def signin_with opts={}
+      def signin_with _opts={}
         if opts[:token]
           signin_with_token opts[:token]
-        elsif opts[:api_key]
-          signin_with_api_key opts[:api_key]
         else
           signin_with_session
         end
       end
 
-      # set the current user based on token
-      def signin_with_token token
-        payload = Token.validate! token
-        signin payload[:anonymous] ? Card::AnonymousID : payload[:user_id]
-      end
-
-      # set the current user based on api_key
-      def signin_with_api_key api_key
-        account = find_account_by_api_key api_key
-        unless account&.validate_api_key! api_key
-          raise Card::Error::PermissionDenied, "API key authentication failed"
-        end
-
-        signin account.left_id
-      end
-
       # get :user id from session and set Auth.current_id
       def signin_with_session
-        card_id = session_user
-        signin(card_id && Card.exists?(card_id) ? card_id : nil)
+        card_id = session[session_user_key]
+        card_id = nil unless Card.exists? card_id
+        signin card_id
       end
 
-      # find +\*account card by +\*api card
-      # @param api_key [String]
-      # @return [+*account card, nil]
-      def find_account_by_api_key api_key
-        find_account_by :api_key, api_key.strip
+      # get session object from Env
+      # return [Session]
+      def session
+        Card::Env.session
       end
 
       # find +\*account card by +\*email card
@@ -119,6 +71,16 @@ class Card
         find_account_by :email, email.strip.downcase
       end
 
+      def reset
+        @as_id = @as_card = @current_id = @current_card = @current_roles = nil
+      end
+
+      def session_user_key
+        "user_#{Cardio.database_name.underscore}".to_sym
+      end
+
+      private
+
       # general pattern for finding +\*account card based on field cards
       # @param fieldcode [Symbol] code of account field
       # @param value [String] content of field
@@ -130,29 +92,6 @@ class Card
                       "find +:account with +#{fieldcode} (#{value})").first
         end
       end
-
-      def session_user
-        session[session_user_key]
-      end
-
-      def set_session_user card_id
-        session[session_user_key] = card_id
-      end
-
-      def session_user_key
-        "user_#{database.underscore}".to_sym
-      end
-
-      def database
-        Rails.configuration.database_configuration.dig Rails.env, "database"
-      end
-
-      # set the id of the current user.
-      def current_id= card_id
-        @current = @as_id = @as_card = @current_roles = nil
-        card_id = card_id.to_i if card_id.present?
-        @current_id = card_id
-      end
     end
   end
 end

data/lib/card/auth/proxy.rb

@@ -4,10 +4,10 @@ class Card
     module Proxy
       # operate with the permissions of another "proxy" user
       def as given_user
-        tmp_id   = @as_id
+        tmp_id = @as_id
         tmp_card = @as_card
 
-        @as_id   = get_user_id(given_user)
+        @as_id = Card.id given_user
         @as_card = nil
         # we could go ahead and set as_card if given a card...
 
@@ -18,7 +18,7 @@ class Card
         yield
       ensure
         if block_given?
-          @as_id   = tmp_id
+          @as_id = tmp_id
           @as_card = tmp_card
         end
       end
@@ -37,22 +37,42 @@ class Card
       # proxy user card
       # @return [Card]
       def as_card
-        if @as_card && @as_card.id == as_id
-          @as_card
-        else
-          @as_card = Card[as_id]
-        end
+        return @as_card if @as_card&.id == as_id
+
+        @as_card = Card[as_id]
       end
 
-      # get card id from args of unknown type
-      # @todo replace with general mechanism, eg #quick_fetch
-      def get_user_id user
-        case user
-        when NilClass then nil
-        when Card     then user.id
-        when Integer   then user
-        else Card.fetch_id(user)
+      # @param auth_data [Integer|Hash] user id, user name, or a hash
+      # @option auth_data [Integer] current_id
+      # @option auth_data [Integer] as_id
+      def with auth_data
+        if auth_data.is_a?(Integer) || auth_data.is_a?(String)
+          auth_data = { current_id: Card.id(auth_data) }
         end
+
+        temporarily do
+          # resets @as and @as_card
+          self.current_id = auth_data[:current_id]
+          @as_id = auth_data[:as_id] if auth_data[:as_id]
+          yield
+        end
+      end
+
+      private
+
+      def temporarily
+        tmp_current_id = current_id
+        tmp_as_id = as_id
+        tmp_current_card = @current_card
+        tmp_as_card = @as_card
+        tmp_current_roles = @current_roles
+        yield
+      ensure
+        @current_id = tmp_current_id
+        @as_id = tmp_as_id
+        @current = tmp_current_card
+        @as_card = tmp_as_card
+        @current_roles = tmp_current_roles
       end
     end
   end