card 1.97.0.1 → 1.98.0

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

@@ -48,176 +48,218 @@ schema_migrations_core_cards_023:
 schema_migrations_core_cards_024:
   version: '20141230204340'
 schema_migrations_core_cards_025:
-  version: '20150202143810'
+  version: '20150116220620'
 schema_migrations_core_cards_026:
-  version: '20150220134731'
+  version: '20150202143810'
 schema_migrations_core_cards_027:
-  version: '20150317162412'
+  version: '20150220134731'
 schema_migrations_core_cards_028:
-  version: '20150326205655'
+  version: '20150317162412'
 schema_migrations_core_cards_029:
-  version: '20150331135745'
+  version: '20150326205655'
 schema_migrations_core_cards_030:
-  version: '20150429090551'
+  version: '20150331135745'
 schema_migrations_core_cards_031:
-  version: '20150501010515'
+  version: '20150429090551'
 schema_migrations_core_cards_032:
-  version: '20150508212032'
+  version: '20150501010515'
 schema_migrations_core_cards_033:
-  version: '20150510031118'
+  version: '20150508212032'
 schema_migrations_core_cards_034:
-  version: '20150528084659'
+  version: '20150510031118'
 schema_migrations_core_cards_035:
-  version: '20150601133433'
+  version: '20150528084659'
 schema_migrations_core_cards_036:
-  version: '20150605115802'
+  version: '20150601133433'
 schema_migrations_core_cards_037:
-  version: '20150610171702'
+  version: '20150605115802'
 schema_migrations_core_cards_038:
-  version: '20150610180019'
+  version: '20150610171702'
 schema_migrations_core_cards_039:
-  version: '20150627205133'
+  version: '20150610180019'
 schema_migrations_core_cards_040:
-  version: '20150702130543'
+  version: '20150627205133'
 schema_migrations_core_cards_041:
-  version: '20150708224756'
+  version: '20150702130543'
 schema_migrations_core_cards_042:
-  version: '20150724123438'
+  version: '20150708224756'
 schema_migrations_core_cards_043:
-  version: '20150807205221'
+  version: '20150724123438'
 schema_migrations_core_cards_044:
-  version: '20150824135418'
+  version: '20150807205221'
 schema_migrations_core_cards_045:
-  version: '20150903130006'
+  version: '20150824135418'
 schema_migrations_core_cards_046:
-  version: '20150910085603'
+  version: '20150903130006'
 schema_migrations_core_cards_047:
-  version: '20151120180631'
+  version: '20150910085603'
 schema_migrations_core_cards_048:
-  version: '20160801143221'
+  version: '20151120180631'
 schema_migrations_core_cards_049:
-  version: '20160801175002'
+  version: '20160801143221'
 schema_migrations_core_cards_050:
-  version: '20160804112340'
+  version: '20160801175002'
 schema_migrations_core_cards_051:
-  version: '20160804112510'
+  version: '20160804112340'
 schema_migrations_core_cards_052:
-  version: '20160804112538'
+  version: '20160804112510'
 schema_migrations_core_cards_053:
-  version: '20160804112547'
+  version: '20160804112538'
 schema_migrations_core_cards_054:
-  version: '20160804112548'
+  version: '20160804112547'
 schema_migrations_core_cards_055:
-  version: '20160804112560'
+  version: '20160804112548'
 schema_migrations_core_cards_056:
-  version: '20160806112710'
+  version: '20160804112560'
 schema_migrations_core_cards_057:
-  version: '20160811115836'
+  version: '20160805112548'
 schema_migrations_core_cards_058:
-  version: '20160812112513'
+  version: '20160806112710'
 schema_migrations_core_cards_059:
-  version: '20160908154210'
+  version: '20160811115836'
 schema_migrations_core_cards_060:
-  version: '20160914132636'
+  version: '20160812112513'
 schema_migrations_core_cards_061:
-  version: '20161102202156'
+  version: '20160908154210'
 schema_migrations_core_cards_062:
-  version: '20161103154836'
+  version: '20160914132636'
 schema_migrations_core_cards_063:
-  version: '20170209132834'
+  version: '20161102202156'
 schema_migrations_core_cards_064:
-  version: '20170314175313'
+  version: '20161103154836'
 schema_migrations_core_cards_065:
-  version: '20170515101262'
+  version: '20170209132834'
 schema_migrations_core_cards_066:
-  version: '20170608083819'
+  version: '20170314175313'
 schema_migrations_core_cards_067:
-  version: '20170608200649'
+  version: '20170515101262'
 schema_migrations_core_cards_068:
-  version: '20170719163733'
+  version: '20170608083819'
 schema_migrations_core_cards_069:
-  version: '20170720093738'
+  version: '20170608200649'
 schema_migrations_core_cards_070:
-  version: '20170726111053'
+  version: '20170719163733'
 schema_migrations_core_cards_071:
-  version: '20170726145012'
+  version: '20170720093738'
 schema_migrations_core_cards_072:
-  version: '20170830210517'
+  version: '20170726111053'
 schema_migrations_core_cards_073:
-  version: '20171110164934'
+  version: '20170726145012'
 schema_migrations_core_cards_074:
-  version: '20171113233151'
+  version: '20170830210517'
 schema_migrations_core_cards_075:
-  version: '20180215143733'
+  version: '20171110164934'
 schema_migrations_core_cards_076:
-  version: '20180216173344'
+  version: '20171113233151'
 schema_migrations_core_cards_077:
-  version: '20180404144130'
+  version: '20180215143733'
 schema_migrations_core_cards_078:
-  version: '20180423120222'
+  version: '20180216173344'
 schema_migrations_core_cards_079:
-  version: '20180423143146'
+  version: '20180404144130'
 schema_migrations_core_cards_080:
-  version: '20180423143147'
+  version: '20180423120222'
 schema_migrations_core_cards_081:
-  version: '20180423160231'
+  version: '20180423143146'
 schema_migrations_core_cards_082:
-  version: '20180423170283'
+  version: '20180423143147'
 schema_migrations_core_cards_083:
-  version: '20180425174432'
+  version: '20180423160231'
 schema_migrations_core_cards_084:
-  version: '20180425174433'
+  version: '20180423170283'
 schema_migrations_core_cards_085:
-  version: '20180508210903'
+  version: '20180425174432'
 schema_migrations_core_cards_086:
-  version: '20180509090433'
+  version: '20180425174433'
 schema_migrations_core_cards_087:
-  version: '20180509141814'
+  version: '20180508210903'
 schema_migrations_core_cards_088:
-  version: '20180509141815'
+  version: '20180509090433'
 schema_migrations_core_cards_089:
-  version: '20180515175726'
+  version: '20180509141814'
 schema_migrations_core_cards_090:
-  version: '20180516153037'
+  version: '20180509141815'
 schema_migrations_core_cards_091:
-  version: '20180601133753'
+  version: '20180515175726'
 schema_migrations_core_cards_092:
-  version: '20180712042655'
+  version: '20180516153037'
 schema_migrations_core_cards_093:
-  version: '20180905061534'
+  version: '20180601133753'
 schema_migrations_core_cards_094:
-  version: '20180905061536'
+  version: '20180712042655'
 schema_migrations_core_cards_095:
-  version: '20181108181219'
+  version: '20180905061534'
 schema_migrations_core_cards_096:
-  version: '20181120200937'
+  version: '20180905061536'
 schema_migrations_core_cards_097:
-  version: '20181129140917'
+  version: '20181108181219'
 schema_migrations_core_cards_098:
-  version: '20190125125150'
+  version: '20181120200937'
 schema_migrations_core_cards_099:
-  version: '20190204195038'
+  version: '20181129140917'
 schema_migrations_core_cards_100:
-  version: '20190204195039'
+  version: '20190125125150'
 schema_migrations_core_cards_101:
-  version: '20190228122633'
+  version: '20190204195038'
 schema_migrations_core_cards_102:
-  version: '20190228122634'
+  version: '20190204195039'
 schema_migrations_core_cards_103:
-  version: '20190228122635'
+  version: '20190228122633'
 schema_migrations_core_cards_104:
-  version: '20190228122636'
+  version: '20190228122634'
 schema_migrations_core_cards_105:
-  version: '20190228122638'
+  version: '20190228122635'
 schema_migrations_core_cards_106:
-  version: '20190306172622'
+  version: '20190228122636'
 schema_migrations_core_cards_107:
-  version: '20190306172623'
+  version: '20190228122638'
 schema_migrations_core_cards_108:
-  version: '20190306172890'
+  version: '20190228122739'
 schema_migrations_core_cards_109:
-  version: '20190320091257'
+  version: '20190306172622'
 schema_migrations_core_cards_110:
-  version: '20190321085735'
+  version: '20190306172623'
 schema_migrations_core_cards_111:
+  version: '20190306172890'
+schema_migrations_core_cards_112:
+  version: '20190320091257'
+schema_migrations_core_cards_113:
+  version: '20190321085735'
+schema_migrations_core_cards_114:
   version: '20190322095534'
+schema_migrations_core_cards_115:
+  version: '20190417142612'
+schema_migrations_core_cards_116:
+  version: '20190424100531'
+schema_migrations_core_cards_117:
+  version: '20190424101004'
+schema_migrations_core_cards_118:
+  version: '20190502130024'
+schema_migrations_core_cards_119:
+  version: '201905021300268'
+schema_migrations_core_cards_120:
+  version: '20190502130029'
+schema_migrations_core_cards_121:
+  version: '20190503122738'
+schema_migrations_core_cards_122:
+  version: '20190503122739'
+schema_migrations_core_cards_123:
+  version: '20190528131330'
+schema_migrations_core_cards_124:
+  version: '20190528141530'
+schema_migrations_core_cards_125:
+  version: '20190605133556'
+schema_migrations_core_cards_126:
+  version: '20190618110446'
+schema_migrations_core_cards_127:
+  version: '20190621143156'
+schema_migrations_core_cards_128:
+  version: '20190625153614'
+schema_migrations_core_cards_129:
+  version: '20190625153615'
+schema_migrations_core_cards_130:
+  version: '20190625153616'
+schema_migrations_core_cards_131:
+  version: '20190710090205'
+schema_migrations_core_cards_132:
+  version: '20190710090207'

data/db/seed/test/seed.rb

@@ -13,7 +13,7 @@ class SharedData
     "Big Brother", "Optic fan", "Sunglasses fan", "Narcissist"
   ].freeze
 
-  CARDTYPE_COUNT = 35
+  CARDTYPE_COUNT = 42
 
   class << self
 
@@ -44,7 +44,7 @@ class SharedData
       # 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 list listed_by file image
+      no_samples = %w[user sign_up set number mirror_list mirrored_list file image
                       customized_bootswatch_skin]
       Card::Auth.createable_types.each do |type|
         next if no_samples.include? type.to_name.key
@@ -55,9 +55,11 @@ class SharedData
         create name
       end
 
-      create_layout "lay out", "Greatest {{_main|title: Callahan!; view: labeled}}"
+      create_layout_type "lay out", "Greatest {{_main|title: Callahan!; view: labeled}}"
       create_pointer "stacks", ["horizontal", "vertical"]
       create_pointer "stacks+*self+*layout", "lay out"
+      create "horizontal"
+      create_pointer "vertical"
 
       create_pointer "friends+*right+*default"
       create_search_type "friends+*right+*options", '{"type":"User"}'
@@ -166,7 +168,10 @@ class SharedData
 
       # noinspection RubyResolve
       Card["Joe Admin"].fetch(trait: :roles, new: { type_code: "pointer" })
-        .items = [Card::AdministratorID]
+        .items = [Card::AdministratorID, Card::SharkID, Card::HelpDeskID]
+
+      Card["Joe User"].fetch(trait: :roles, new: { type_code: "pointer" })
+              .items = [Card::SharkID]
 
       create_user "u1", email: "u1@user.com", password: "u1_pass"
       create_user "u2", email: "u2@user.com", password: "u2_pass"
@@ -177,7 +182,7 @@ class SharedData
       r3 = create_role "r3"
       r4 = create_role "r4"
 
-      Card["u1"].fetch(trait: :roles, new: {}).items = [r1, r2, r3]
+      Card["u1"].fetch(trait: :roles, new: { type_code: "pointer" }).items = [r1, r2, r3]
       Card["u2"].fetch(trait: :roles, new: {}).items = [r1, r2, r4]
       Card["u3"].fetch(trait: :roles, new: {}).items = [r1, r4, Card::AdministratorID]
     end

data/db/version_core_cards.txt

@@ -1 +1 @@
-20190322095534
+201905021300268

data/lib/card.rb

@@ -82,9 +82,9 @@ ActiveSupport.run_load_hooks(:before_card, self)
 #
 # Both views and events are defined in {Card::Mod mods}, short for modules or modifications.
 #
-# {Card::Format More on views}
+# {Card::Set::Format::AbstractFormat More on views}
 #
-# {Card::Set::Act More on events}
+# {Card::Set::Event More on events}
 #
 # ## Accounts and Permissions
 #

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

@@ -30,9 +30,6 @@ class Card
           run_single_stage :integrate
           run_single_stage :after_integrate
           run_single_stage :integrate_with_delay
-        rescue StandardError => e # don't rollback
-          Card::Error.report e, @card
-          false
         ensure
           @card.clear_changes_information unless @abort
           # ActManager.clear if main? && !@card.only_storage_phase

data/lib/card/auth/current.rb

@@ -32,7 +32,7 @@ class Card
 
       # set the id of the current user.
       def current_id= card_id
-        @current = @as_id = @as_card = nil
+        @current = @as_id = @as_card = @current_roles = nil
         card_id = card_id.to_i if card_id.present?
         @current_id = card_id
       end
@@ -49,13 +49,22 @@ class Card
           end
       end
 
+      def current_roles
+        @current_roles ||= [Card.fetch_name(:anyone_signed_in),
+                            current.fetch(trait: :roles)&.item_names].flatten.compact
+      end
+
+      def clear_current_roles
+        @current_roles = nil
+      end
+
       def serialize
         { as_id: as_id, current_id: current_id }
       end
 
       # @param auth_data [Integer|Hash] user id, user name, or a hash
-      # @opts auth_data [Integer] current_id
-      # @opts auth_data [Integer] as_id
+      # @option auth_data [Integer] current_id
+      # @option auth_data [Integer] as_id
       def with auth_data
         case auth_data
         when Integer
@@ -68,6 +77,7 @@ class Card
         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]
@@ -78,6 +88,7 @@ class Card
         @as_id = tmp_as_id
         @current = tmp_current
         @as_card = tmp_as_card
+        @current_roles = tmp_current_roles
       end
 
       # get session object from Env

data/lib/card/auth/permissions.rb

@@ -19,16 +19,27 @@ class Card
       # specified user has root permission
       # @param usr_id [Integer]
       # @return [true/false]
-      def always_ok_usr_id? usr_id
+      def always_ok_usr_id? usr_id, force_cache_update=false
         return true if usr_id == Card::WagnBotID # cannot disable
 
-        always = Card.cache.read("ALWAYS") || {}
-        if always[usr_id].nil?
-          always = always.dup if always.frozen?
-          always[usr_id] = admin? usr_id
-          Card.cache.write "ALWAYS", always
+        always = always_cache
+        if always[usr_id].nil? || force_cache_update
+          update_always_cache usr_id, admin?(usr_id)
+        else
+          always[usr_id]
         end
-        always[usr_id]
+      end
+
+      def update_always_cache usr_id, value
+        always = always_cache
+        always = always.dup if always.frozen?
+        always[usr_id] = value
+        Card.cache.write "ALWAYS", always
+        value
+      end
+
+      def always_cache
+        Card.cache.read("ALWAYS") || {}
       end
 
       # list of names of cardtype cards that current user has perms to create
@@ -56,7 +67,7 @@ class Card
       end
 
       def has_role? user_id, role_id
-        Card[user_id].all_roles.include? role_id
+        Card[user_id].all_enabled_roles.include? role_id
       end
     end
   end