card 1.96.8 → 1.97.0

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

@@ -53,3 +53,7 @@ schema_migrations_026:
   version: '20170908114452'
 schema_migrations_027:
   version: '20180514152037'
+schema_migrations_028:
+  version: '20190116170824'
+schema_migrations_029:
+  version: '20190131223248'

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

@@ -182,8 +182,34 @@ schema_migrations_core_cards_090:
 schema_migrations_core_cards_091:
   version: '20180601133753'
 schema_migrations_core_cards_092:
-  version: '20181108181219'
+  version: '20180712042655'
 schema_migrations_core_cards_093:
-  version: '20181120200937'
+  version: '20180905061534'
 schema_migrations_core_cards_094:
+  version: '20180905061536'
+schema_migrations_core_cards_095:
+  version: '20181108181219'
+schema_migrations_core_cards_096:
+  version: '20181120200937'
+schema_migrations_core_cards_097:
   version: '20181129140917'
+schema_migrations_core_cards_098:
+  version: '20190125125150'
+schema_migrations_core_cards_099:
+  version: '20190204195038'
+schema_migrations_core_cards_100:
+  version: '20190204195039'
+schema_migrations_core_cards_101:
+  version: '20190228122633'
+schema_migrations_core_cards_102:
+  version: '20190228122634'
+schema_migrations_core_cards_103:
+  version: '20190228122635'
+schema_migrations_core_cards_104:
+  version: '20190228122636'
+schema_migrations_core_cards_105:
+  version: '20190228122638'
+schema_migrations_core_cards_106:
+  version: '20190306172622'
+schema_migrations_core_cards_107:
+  version: '20190306172623'

data/db/seed/test/seed.rb

@@ -15,7 +15,6 @@ class SharedData
 
   CARDTYPE_COUNT = 35
 
-
   class << self
 
     def create_user name, args
@@ -56,6 +55,17 @@ class SharedData
         create name
       end
 
+      create_layout "lay out", "Greatest {{_main|title: Callahan!; view: labeled}}"
+      create_pointer "stacks", ["horizontal", "vertical"]
+      create_pointer "stacks+*self+*layout", "lay out"
+
+      create_pointer "friends+*right+*default"
+      create_search_type "friends+*right+*options", '{"type":"User"}'
+
+      create_pointer "joes"
+      create "joes+*self+*input", "filtered list"
+      create "joes+*self+*options", ["Joe Admin", "Joe User", "Joe Camel"]
+
       # cards for rename_test
       # FIXME: could probably refactor these..
       [
@@ -134,6 +144,10 @@ class SharedData
 
       notification_cards
 
+      create "42", TEXT
+      create_pointer "items",
+                     content: ["Parry Hotter", "42", "Stam Broker", "First",
+                               "yeti skin+image", "*all+*script+*machine output"]
       # Card['*all+*style' ].ensure_machine_output
       # Card['*all+*script'].ensure_machine_output
       # (ie9 = Card[:script_html5shiv_printshiv]) && ie9.ensure_machine_output
@@ -280,4 +294,22 @@ class SharedData
 
     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.
+  TXT
 end

data/db/version.txt

@@ -1 +1 @@
-20180514152037
+20190131223248

data/db/version_core_cards.txt

@@ -1 +1 @@
-20181129140917
+20190306172623

data/lib/card.rb

@@ -114,6 +114,7 @@ class Card < ApplicationRecord
   require_dependency "card/view"
   require_dependency "card/act_manager"
   require_dependency "card/dirty"
+  require_dependency "card/layout"
 
   has_many :references_in,  class_name: :Reference, foreign_key: :referee_id
   has_many :references_out, class_name: :Reference, foreign_key: :referer_id

data/lib/card/act_manager.rb

@@ -1,6 +1,5 @@
 require_dependency "card/act_manager/stage_director"
 
-
 class Card
   # Manages the whole process of creating an {act Card::Act} ie. changing
   # a card and attached subcards.
@@ -82,6 +81,7 @@ class Card
     class << self
       def act_director
         return unless act_card
+
         act_card.director
       end
 
@@ -113,6 +113,7 @@ class Card
       # FIXME: use "parent" instead of opts (it's the only option)
       def fetch card, opts={}
         return directors[card] if directors[card]
+
         directors.each_key do |dir_card|
           return dir_card.director if dir_card.name == card.name && dir_card.director
         end
@@ -146,11 +147,13 @@ class Card
 
       def card_changed old_card
         return unless (director = @directors.delete old_card)
+
         add director
       end
 
       def delete director
         return unless @directors
+
         @directors.delete director.card
         director.delete
       end
@@ -193,6 +196,7 @@ class Card
         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
@@ -209,7 +213,7 @@ class Card
 
       def to_s
         act_director.to_s
-        #directors.values.map(&:to_s).join "\n"
+        # directors.values.map(&:to_s).join "\n"
       end
     end
   end

data/lib/card/act_manager/stage.rb

@@ -1,8 +1,8 @@
 class Card
   class ActManager
     module Stage
-      STAGES = [:initialize, :prepare_to_validate, :validate, :prepare_to_store,
-                :store, :finalize, :integrate, :after_integrate, :integrate_with_delay].freeze
+      STAGES = %i[initialize prepare_to_validate validate prepare_to_store
+                  store finalize integrate after_integrate integrate_with_delay].freeze
       stage_index = {}
       STAGES.each_with_index do |stage, i|
         stage_index[stage] = i
@@ -22,9 +22,9 @@ class Card
       def stage_index stage
         case stage
         when Symbol then
-          return STAGE_INDEX[stage]
+          STAGE_INDEX[stage]
         when Integer then
-          return stage
+          stage
         else
           raise Card::Error, "not a valid stage: #{stage}"
         end
@@ -36,7 +36,7 @@ class Card
           (opts[:before] && before?(opts[:before])) ||
           (opts[:after] && after?(opts[:after])) ||
           true # no phase restriction in opts
-        )
+      )
       end
 
       def before? allowed_phase

data/lib/card/act_manager/stage_director.rb

@@ -1,10 +1,10 @@
-
 class Card
   def restore_changes_information
     # restores changes for integration phase
     # (rails cleared them in an after_create/after_update hook which is
     #  executed before the integration phase)
     return unless saved_changes.present?
+
     @mutations_from_database = mutations_before_last_save
   end
 
@@ -98,6 +98,7 @@ class Card
       def catch_up_to_stage next_stage
         if @transact_in_stage
           return if @transact_in_stage != next_stage
+
           next_stage = :integrate_with_delay
         end
         upto_stage(next_stage) do |stage|
@@ -143,6 +144,7 @@ class Card
         unless act_director
           raise Card::Error, "act requested without a main stage director"
         end
+
         @act = act_director.act ||= ActManager.need_act
       end
 
@@ -150,7 +152,7 @@ class Card
         if main?
           self
         else
-          ActManager.act_director || (@parent && @parent.main_director)
+          ActManager.act_director || (@parent&.main_director)
         end
       end
 
@@ -186,6 +188,7 @@ class Card
         new_stage = stage_index(stage)
         @stage ||= -1
         return if @stage >= new_stage
+
         if @stage < new_stage - 1
           raise Card::Error, "stage #{stage_symbol(new_stage - 1)} was " \
                              "skipped for card #{@card}"
@@ -195,10 +198,11 @@ class Card
 
       def run_single_stage stage, &block
         return true unless valid_next_stage? stage
+
         # puts "#{@card.name}: #{stage} stage".red
         prepare_stage_run stage
         execute_stage_run stage, &block
-      rescue => e
+      rescue StandardError => e
         @card.clean_after_stage_fail
         raise e
       end
@@ -256,9 +260,7 @@ class Card
       # and use the ActiveRecord :around_save callback to run the :store and
       # :finalize stages
       def store &save_block
-        if main? && !block_given?
-          raise Card::Error, "need block to store main card"
-        end
+        raise Card::Error, "need block to store main card" if main? && !block_given?
 
         # the block is the ActiveRecord block from the around save callback that
         # saves the card
@@ -284,6 +286,7 @@ class Card
       def store_pre_subcards
         @subdirectors.each do |subdir|
           next unless subdir.prior_store
+
           subdir.catch_up_to_stage :store
         end
       end
@@ -291,6 +294,7 @@ class Card
       def store_post_subcards
         @subdirectors.each do |subdir|
           next if subdir.prior_store
+
           subdir.catch_up_to_stage :store
         end
       end
@@ -311,7 +315,7 @@ class Card
       end
 
       def delete
-        @parent.subdirectors.delete self if @parent
+        @parent&.subdirectors&.delete self
         super
       end
     end

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

@@ -25,18 +25,14 @@ class Card
 
         def integration_phase
           return if @abort
+
           @card.restore_changes_information
           run_single_stage :integrate
           run_single_stage :after_integrate
           run_single_stage :integrate_with_delay
-        rescue => e # don't rollback
-          Card::Error.current = e
-          unless e.class == Card::Error::Abort
-            warn "exception in integrate phase: #{e.message}"
-            warn e.backtrace.join "\n"
-            @card.notable_exception_raised
-          end
-          return false
+        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.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 require_dependency "card/auth/permissions"
 require_dependency "card/auth/proxy"
 require_dependency "card/auth/setup"

data/lib/card/auth/current.rb

@@ -113,7 +113,7 @@ class Card
       # set the current user based on token
       def set_current_from_token token, current=nil
         account = find_account_by_token token
-        if account && account.validate_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

data/lib/card/auth/permissions.rb

@@ -12,6 +12,7 @@ class Card
       def always_ok?
         usr_id = as_id
         return false unless usr_id
+
         always_ok_usr_id? usr_id
       end
 

data/lib/card/auth/proxy.rb

@@ -14,6 +14,7 @@ class Card
         @current_id = @as_id if @current_id.nil?
 
         return unless block_given?
+
         yield
       ensure
         if block_given?

data/lib/card/cache.rb

@@ -31,12 +31,14 @@ class Card
       # @return [{Card::Cache}]
       def [] klass
         raise "nil klass" if klass.nil?
+
         cache_type = persistent_cache || nil
         cache_by_class[klass] ||= new class: klass, store: cache_type
       end
 
       def persistent_cache
-        return @persistent_cache if !@persistent_cache.nil?
+        return @persistent_cache unless @persistent_cache.nil?
+
         @persistent_cache =
           case
           when ENV["NO_RAILS_CACHE"]          then false
@@ -51,7 +53,7 @@ class Card
         renew_persistent
         cache_by_class.each_value do |cache|
           cache.soft.reset
-          cache.hard.renew if cache.hard
+          cache.hard&.renew
         end
       end
 
@@ -79,7 +81,7 @@ class Card
       def reset_global
         cache_by_class.each_value do |cache|
           cache.soft.reset
-          cache.hard.annihilate if cache.hard
+          cache.hard&.annihilate
         end
         reset_other
       end
@@ -88,7 +90,7 @@ class Card
       def reset_hard
         Card::Cache::Persistent.reset if persistent_cache
         cache_by_class.each_value do |cache|
-          cache.hard.reset if cache.hard
+          cache.hard&.reset
         end
       end
 
@@ -144,7 +146,7 @@ class Card
     # @param key [String]
     # @param value
     def write key, value
-      @hard.write key, value if @hard
+      @hard&.write key, value
       @soft.write key, value
     end
 
@@ -159,21 +161,20 @@ class Card
     # delete specific cache entries by key
     # @param key [String]
     def delete key
-      @hard.delete key if @hard
+      @hard&.delete key
       @soft.delete key
     end
 
     # reset both caches (for a given Card::Cache instance)
     def reset
-      @hard.reset if @hard
+      @hard&.reset
       @soft.reset
     end
 
     # test for the existence of the key in either cache
     # @return [true/false]
     def exist? key
-      @soft.exist?(key) || (@hard && @hard.exist?(key))
+      @soft.exist?(key) || (@hard&.exist?(key))
     end
   end
 end
-

data/lib/card/cache/persistent.rb

@@ -115,6 +115,7 @@ class Card
       # @param attribute [String, Symbol]
       def write_attribute key, attribute, value
         return value unless @store
+
         if (object = deep_read key)
           object.instance_variable_set "@#{attribute}", value
           write key, object
@@ -124,7 +125,7 @@ class Card
 
       def deep_read key
         local_cache = @store.send :local_cache
-        local_cache.clear if local_cache
+        local_cache&.clear
         read key
       end
 

data/lib/card/cache/prepopulate.rb

@@ -15,6 +15,7 @@ class Card
 
       def prepopulate
         return unless prepopulate?
+
         prepopulate_rule_caches
         # prepopulate_card_cache
       end