card 1.98.0 → 1.99.1

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

@@ -57,3 +57,5 @@ schema_migrations_028:
   version: '20190116170824'
 schema_migrations_029:
   version: '20190131223248'
+schema_migrations_030:
+  version: '20190929202325'

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

@@ -188,78 +188,122 @@ schema_migrations_core_cards_093:
 schema_migrations_core_cards_094:
   version: '20180712042655'
 schema_migrations_core_cards_095:
-  version: '20180905061534'
+  version: '20180805112548'
 schema_migrations_core_cards_096:
-  version: '20180905061536'
+  version: '20180905061534'
 schema_migrations_core_cards_097:
-  version: '20181108181219'
+  version: '20180905061536'
 schema_migrations_core_cards_098:
-  version: '20181120200937'
+  version: '20180905061537'
 schema_migrations_core_cards_099:
-  version: '20181129140917'
+  version: '20181108181219'
 schema_migrations_core_cards_100:
-  version: '20190125125150'
+  version: '20181120200937'
 schema_migrations_core_cards_101:
-  version: '20190204195038'
+  version: '20181129140917'
 schema_migrations_core_cards_102:
-  version: '20190204195039'
+  version: '20190125125150'
 schema_migrations_core_cards_103:
-  version: '20190228122633'
+  version: '20190204195038'
 schema_migrations_core_cards_104:
-  version: '20190228122634'
+  version: '20190204195039'
 schema_migrations_core_cards_105:
-  version: '20190228122635'
+  version: '20190228122633'
 schema_migrations_core_cards_106:
-  version: '20190228122636'
+  version: '20190228122634'
 schema_migrations_core_cards_107:
-  version: '20190228122638'
+  version: '20190228122635'
 schema_migrations_core_cards_108:
-  version: '20190228122739'
+  version: '20190228122636'
 schema_migrations_core_cards_109:
-  version: '20190306172622'
+  version: '20190228122638'
 schema_migrations_core_cards_110:
-  version: '20190306172623'
+  version: '20190228122739'
 schema_migrations_core_cards_111:
-  version: '20190306172890'
+  version: '20190306172622'
 schema_migrations_core_cards_112:
-  version: '20190320091257'
+  version: '20190306172623'
 schema_migrations_core_cards_113:
-  version: '20190321085735'
+  version: '20190306172890'
 schema_migrations_core_cards_114:
-  version: '20190322095534'
+  version: '20190320091257'
 schema_migrations_core_cards_115:
-  version: '20190417142612'
+  version: '20190321085735'
 schema_migrations_core_cards_116:
-  version: '20190424100531'
+  version: '20190322095534'
 schema_migrations_core_cards_117:
-  version: '20190424101004'
+  version: '20190417142612'
 schema_migrations_core_cards_118:
-  version: '20190502130024'
+  version: '20190424100531'
 schema_migrations_core_cards_119:
-  version: '201905021300268'
+  version: '20190424101004'
 schema_migrations_core_cards_120:
-  version: '20190502130029'
+  version: '20190502130024'
 schema_migrations_core_cards_121:
-  version: '20190503122738'
+  version: '201905021300268'
 schema_migrations_core_cards_122:
-  version: '20190503122739'
+  version: '20190502130029'
 schema_migrations_core_cards_123:
-  version: '20190528131330'
+  version: '20190503122738'
 schema_migrations_core_cards_124:
-  version: '20190528141530'
+  version: '20190503122739'
 schema_migrations_core_cards_125:
-  version: '20190605133556'
+  version: '20190528131330'
 schema_migrations_core_cards_126:
-  version: '20190618110446'
+  version: '20190528141530'
 schema_migrations_core_cards_127:
-  version: '20190621143156'
+  version: '20190605133556'
 schema_migrations_core_cards_128:
-  version: '20190625153614'
+  version: '20190618110446'
 schema_migrations_core_cards_129:
-  version: '20190625153615'
+  version: '20190621143156'
 schema_migrations_core_cards_130:
-  version: '20190625153616'
+  version: '20190625153614'
 schema_migrations_core_cards_131:
-  version: '20190710090205'
+  version: '20190625153615'
 schema_migrations_core_cards_132:
+  version: '20190625153616'
+schema_migrations_core_cards_133:
+  version: '20190710090205'
+schema_migrations_core_cards_134:
   version: '20190710090207'
+schema_migrations_core_cards_135:
+  version: '20190710090208'
+schema_migrations_core_cards_136:
+  version: '20190710090209'
+schema_migrations_core_cards_137:
+  version: '20190718140125'
+schema_migrations_core_cards_138:
+  version: '20190718140126'
+schema_migrations_core_cards_139:
+  version: '20190820155833'
+schema_migrations_core_cards_140:
+  version: '20190822093633'
+schema_migrations_core_cards_141:
+  version: '20190823220017'
+schema_migrations_core_cards_142:
+  version: '20190823220018'
+schema_migrations_core_cards_143:
+  version: '20190826132738'
+schema_migrations_core_cards_144:
+  version: '20190829093961'
+schema_migrations_core_cards_145:
+  version: '20190829151731'
+schema_migrations_core_cards_146:
+  version: '20190829205148'
+schema_migrations_core_cards_147:
+  version: '20190830131820'
+schema_migrations_core_cards_148:
+  version: '20190902161223'
+schema_migrations_core_cards_149:
+  version: '20190902193208'
+schema_migrations_core_cards_150:
+  version: '20190904174403'
+schema_migrations_core_cards_151:
+  version: '20190909104250'
+schema_migrations_core_cards_152:
+  version: '20190918200115'
+schema_migrations_core_cards_153:
+  version: '20190927112151'
+schema_migrations_core_cards_154:
+  version: '20191008201046'

data/db/{seed/test/seed.rb → test_seed.rb}

@@ -4,11 +4,11 @@ require "timecop"
 
 # noinspection RubyResolve
 class SharedData
-  require_relative "../../../lib/card/model/save_helper"
+  require_relative "../lib/card/model/save_helper"
   extend Card::Model::SaveHelper
 
   USERS = [
-    "Joe User", "Joe Admin", "Joe Camel", "Sample User", "No count",
+    "Joe Admin", "Joe User", "Joe Camel", "Sample User", "No count",
     "u1", "u2", "u3",
     "Big Brother", "Optic fan", "Sunglasses fan", "Narcissist"
   ].freeze
@@ -19,7 +19,12 @@ class SharedData
 
     def create_user name, args
       args[:subcards] = account_args args if args[:email]
-      super name, args
+
+      if name == "Joe Admin"
+        super name, args
+      else
+        Card::Auth.with("joe_admin") { super name, args }
+      end
     end
 
     def account_args hash
@@ -40,9 +45,6 @@ class SharedData
 
       create "signup alert email+*to", "signups@wagn.org"
       # CREATE A CARD OF EACH TYPE
-      create_signup "Sample Signup" # , email: "invitation@request.com"
-      # above still necessary?  try commenting out above and 'Sign up' below
-      Card::Auth.current_id = Card::WagnBotID # need to reset after creating sign up, which changes current_id for extend phase
 
       no_samples = %w[user sign_up set number mirror_list mirrored_list file image
                       customized_bootswatch_skin]
@@ -62,11 +64,11 @@ class SharedData
       create_pointer "vertical"
 
       create_pointer "friends+*right+*default"
-      create_search_type "friends+*right+*options", '{"type":"User"}'
+      create_search_type "friends+*right+*content options", '{"type":"User"}'
 
       create_pointer "joes"
-      create "joes+*self+*input", "filtered list"
-      create "joes+*self+*options", ["Joe Admin", "Joe User", "Joe Camel"]
+      create "joes+*self+*input type", "filtered list"
+      create "joes+*self+*content options", ["Joe Admin", "Joe User", "Joe Camel"]
 
       # cards for rename_test
       # FIXME: could probably refactor these..
@@ -157,8 +159,8 @@ class SharedData
 
     def user_and_role_cards
       Card::Auth.instant_account_activation do
-        create_user "Joe User", content: "I'm number two", email: "joe@user.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"
 
         # data for testing users and account requests
@@ -251,7 +253,7 @@ class SharedData
 
         Card::Auth.current_id = Card::WagnBotID
         create "Google glass+*self+*follow_fields", ""
-        create "Sunglasses+*self+*follow_fields", "[[#{Card[:includes].name}]]\n[[_self+price]]\n[[_self+producer]]"
+        create "Sunglasses+*self+*follow_fields", "[[#{Card[:nests].name}]]\n[[_self+price]]\n[[_self+producer]]"
         create "Sunglasses+tint"
         create "Sunglasses+price"
 

data/db/version.txt

@@ -1 +1 @@
-20190131223248
+20190929202325

data/lib/card/act_manager.rb

@@ -76,9 +76,11 @@ class Card
   #    everything will rollback. If the integration phase fails the db changes
   #    of the other two phases will remain persistent.
   class ActManager
-    cattr_accessor :act, :act_card
+    extend EventDelay
 
     class << self
+      attr_accessor :act, :act_card
+
       def act_director
         return unless act_card
 
@@ -105,11 +107,22 @@ class Card
         self.act_card = nil
         self.act = nil
         directors.each_pair do |card, _dir|
+          card.expire
           card.director = nil
         end
+        expire
         @directors = nil
       end
 
+      def expire
+        expirees.each { |expiree| Card.expire expiree }
+        @expirees = []
+      end
+
+      def expirees
+        @expirees ||= []
+      end
+
       # FIXME: use "parent" instead of opts (it's the only option)
       def fetch card, opts={}
         return directors[card] if directors[card]
@@ -166,54 +179,11 @@ class Card
       end
 
       def running_act?
-        (dir = act_director) && dir.running?
-      end
-
-      # If active jobs (and hence the integrate_with_delay events) don't run
-      # in a background process then Card::Env.deserialize! decouples the
-      # controller's params hash and the Card::Env's params hash with the
-      # effect that params changes in the CardController get lost
-      # (a crucial example are success params that are processed in
-      # CardController#soft_redirect)
-      def contextualize_delayed_event act_id, card, env, auth
-        if delaying?
-          contextualize_for_delay(act_id, card, env, auth) { yield }
-        else
-          yield
-        end
-      end
-
-      def delaying?
-        const_defined?("Delayed") &&
-          Delayed::Worker.delay_jobs &&
-          Card.config.active_job.queue_adapter == :delayed_job
-      end
-
-      # The whole ActManager setup is gone once we reach a integrate with delay
-      # 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
-          end
-        end
-      end
-
-      def with_env_and_auth env, auth
-        Card::Auth.with auth do
-          Card::Env.with env do
-            yield
-          end
-        end
+        act_director&.running?
       end
 
       def to_s
         act_director.to_s
-        # directors.values.map(&:to_s).join "\n"
       end
     end
   end

data/lib/card/act_manager/event_delay.rb

@@ -0,0 +1,48 @@
+class Card
+  class ActManager
+    # methods for handling delayed events
+    module EventDelay
+      # If active jobs (and hence the integrate_with_delay events) don't run
+      # in a background process then Card::Env.deserialize! decouples the
+      # controller's params hash and the Card::Env's params hash with the
+      # effect that params changes in the CardController get lost
+      # (a crucial example are success params that are processed in
+      # CardController#soft_redirect)
+      def contextualize_delayed_event act_id, card, env, auth
+        if delaying?
+          contextualize_for_delay(act_id, card, env, auth) { yield }
+        else
+          yield
+        end
+      end
+
+      def delaying?
+        const_defined?("Delayed") &&
+          Delayed::Worker.delay_jobs &&
+          Card.config.active_job.queue_adapter == :delayed_job
+      end
+
+      # The whole ActManager setup is gone once we reach a integrate with delay
+      # 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
+          end
+        end
+      end
+
+      def with_env_and_auth env, auth
+        Card::Auth.with auth do
+          Card::Env.with env do
+            yield
+          end
+        end
+      end
+    end
+  end
+end

data/lib/card/act_manager/stage_director.rb

@@ -10,8 +10,8 @@ class Card
 
   def clean_after_stage_fail
     @action = nil
-    expire_pieces
-    subcards.each(&:expire_pieces)
+    # expire_pieces
+    # subcards.each(&:expire_pieces)
   end
 
   class ActManager

data/lib/card/act_manager/stage_director/phases.rb

@@ -6,7 +6,8 @@ class Card
           run_single_stage :initialize
           run_single_stage :prepare_to_validate
           run_single_stage :validate
-          @card.expire_pieces if @card.errors.any?
+        ensure
+          # @card.expire_pieces if @card.errors.any?
           @card.errors.empty?
         end
 
@@ -14,11 +15,7 @@ class Card
           catch_up_to_stage :prepare_to_store
           run_single_stage :store, &block
           run_single_stage :finalize
-          if @card.errors.any?
-            @card.expire_pieces
-            raise ActiveRecord::Rollback,
-                  "errors added in storage phase: #{@card.errors.full_messages * ','}"
-          end
+          raise ActiveRecord::RecordInvalid, @card if @card.errors.any?
         ensure
           @from_trash = nil
         end

data/lib/card/auth.rb

@@ -3,6 +3,7 @@
 require_dependency "card/auth/permissions"
 require_dependency "card/auth/proxy"
 require_dependency "card/auth/setup"
+require_dependency "card/auth/token"
 
 class Card
   # Singleton methods for account authentication and contextualization.

data/lib/card/auth/current.rb

@@ -54,6 +54,11 @@ class Card
                             current.fetch(trait: :roles)&.item_names].flatten.compact
       end
 
+      def no_special_roles?
+        Auth.current_roles.size == 1 # &&
+          # Auth.current_roles.first == Card.fetch_name(:anyone_signed_in)
+      end
+
       def clear_current_roles
         @current_roles = nil
       end
@@ -98,16 +103,32 @@ class Card
       end
 
       # set current from token or session
-      def set_current token, current
-        if token
-          unless set_current_from_token(token, current)
-            raise Card::Error::PermissionDenied, "token authentication failed"
-          end
+      def set_current opts={}
+        if opts[:token]
+          set_current_from_token opts[:token]
+        elsif opts[:api_key]
+          set_current_from_api_key opts[:api_key]
         else
           set_current_from_session
         end
       end
 
+      # set the current user based on token
+      def set_current_from_token token
+        payload = Token.validate! token
+        self.current_id = payload[:anonymous] ? Card::AnonymousID : payload[:user_id]
+      end
+
+      # set the current user based on api_key
+      def set_current_from_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
+
+        self.current = account.left_id
+      end
+
       # get :user id from session and set Auth.current_id
       def set_current_from_session
         self.current_id =
@@ -118,29 +139,11 @@ class Card
           end
       end
 
-      # set the current user based on token
-      def set_current_from_token token, current=nil
-        account = find_account_by_token token
-        if account&.validate_token!(token)
-          unless current && always_ok_usr_id?(account.left_id)
-            # can override current only if admin
-            current = account.left_id
-          end
-          self.current = current
-        elsif Env.params[:live_token]
-          true
-          # Used for activations and resets.
-          # Continue as anonymous and address problem later
-        else
-          false
-        end
-      end
-
-      # find +\*account card by +\*token card
+      # find +\*account card by +\*api card
       # @param token [String]
       # @return [+*account card, nil]
-      def find_account_by_token token
-        find_account_by "token", Card::TokenID, token.strip
+      def find_account_by_api_key api_key
+        find_account_by "api_key", Card::ApiKeyID, api_key.strip
       end
 
       # find +\*account card by +\*email card
@@ -160,7 +163,7 @@ class Card
           Card.search({ right_id: Card::AccountID,
                         right_plus: [{ id: field_id },
                                      { content: value }] },
-                      "find +*account for #{fieldname} (#{value})").first
+                      "find +:account for #{fieldname} (#{value})").first
         end
       end