card 1.103.4 → 1.104.0

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

@@ -63,3 +63,5 @@ schema_migrations_031:
   version: '20200718051236'
 schema_migrations_032:
   version: '20200805200729'
+schema_migrations_033:
+  version: '20211128040849'

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

@@ -337,3 +337,11 @@ schema_migrations_core_cards_168:
   version: '20201129140917'
 schema_migrations_core_cards_169:
   version: '20210509141814'
+schema_migrations_core_cards_170:
+  version: '202108028112350'
+schema_migrations_core_cards_171:
+  version: '202108028112351'
+schema_migrations_core_cards_172:
+  version: '202108028112352'
+schema_migrations_core_cards_173:
+  version: '20211107155032'

data/db/test_seed.rb

@@ -13,7 +13,7 @@ class SharedData
     "Big Brother", "Optic fan", "Sunglasses fan", "Narcissist"
   ].freeze
 
-  CARDTYPE_COUNT = 54
+  CARDTYPE_COUNT = 44
 
   class << self
     def create_user name, args
@@ -153,9 +153,6 @@ class SharedData
       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
     end
 
     def user_and_role_cards

data/db/version.txt

@@ -1 +1 @@
-20200805200729
+20211128040849

data/db/version_core_cards.txt

@@ -1 +1 @@
-201905021300268
+202108028112352

data/lib/card/auth/current.rb

@@ -43,7 +43,7 @@ class Card
       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]
         else

data/lib/card/auth/permissions.rb

@@ -5,39 +5,14 @@ class Card
       # user has "root" permissions
       # @return [true/false]
       def always_ok?
-        usr_id = as_id
-        case usr_id
-        when Card::WagnBotID then true # cannot disable
-        when nil             then false
+        case as_id
+        when WagnBotID then true # cannot disable
+        when nil       then false
         else
-          always_ok_usr_id? usr_id
+          always_ok_cached?
         end
       end
 
-      # specified user has root permission
-      # @param usr_id [Integer]
-      # @return [true/false]
-      def always_ok_usr_id? usr_id, force_cache_update=false
-        always = always_cache
-        if always[usr_id].nil? || force_cache_update
-          update_always_cache usr_id, admin?(usr_id)
-        else
-          always[usr_id]
-        end
-      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
       # @return [Array of strings]
       def createable_types
@@ -56,16 +31,43 @@ class Card
       end
 
       # test whether user is an administrator
-      # @param user_id [Integer]
+      # @param user_mark [Cardish]
       # @return [true/false]
-      def admin? user_id
-        has_role? user_id, Card::AdministratorID
+      def admin? user_mark=nil
+        user_mark ||= as_id
+        has_role? Card::AdministratorID, user_mark
       end
 
-      def has_role? user_id, role_id
-        return false unless user_id && role_id
+      def has_role? role_mark, user_mark=nil
+        user_mark ||= as_id
+        return false unless (role_id = role_mark&.card_id)
 
-        Card[user_id].all_enabled_roles.include? role_id
+        Card[user_mark].all_enabled_roles.include? role_id
+      end
+
+      def update_always_cache value
+        always = always_cache
+        always = always.dup if always.frozen?
+        always[as_id] = value
+        Card.cache.write "ALWAYS", always
+        value
+      end
+
+      private
+
+      # specified user has root permission
+      # @return [true/false]
+      def always_ok_cached?
+        always = always_cache
+        if always[as_id].nil?
+          update_always_cache admin?
+        else
+          always[as_id]
+        end
+      end
+
+      def always_cache
+        Card.cache.read("ALWAYS") || {}
       end
     end
   end

data/lib/card/content/all.rb

@@ -5,10 +5,10 @@ class Card
       def content
         structured_content || standard_content
       end
-      alias_method :raw_content, :content # DEPRECATED!
+      # alias_method :raw_content, :content # DEPRECATED!
 
       def content= value
-        self.db_content = standardize_content(value)
+        self.db_content = standardize_content value
       end
 
       def content?
@@ -20,7 +20,7 @@ class Card
       end
 
       def standardize_content value
-        value.is_a?(Array) ? value.join("\n") : value
+        value.is_a?(Array) ? items_content(value) : value
       end
 
       def structured_content

data/lib/card/content/chunk.rb

@@ -89,6 +89,7 @@ class Card
       register_list :nest_only, [:Nest]
       register_list :query, [:QueryReference]
       register_list :stub, [:ViewStub]
+      register_list :none, []
     end
   end
 end

data/lib/card/director/act_direction.rb

@@ -4,9 +4,7 @@ class Card
       attr_accessor :act, :act_card
 
       def act_director
-        return unless act_card
-
-        act_card.director
+        act_card&.director
       end
 
       def directors

data/lib/card/director/card_methods.rb

@@ -12,7 +12,6 @@ class Card
 
       def prepare_for_phases
         reset_patterns
-        identify_action
         include_set_modules
       end
 

data/lib/card/director/phases.rb

@@ -16,6 +16,7 @@ class Card
 
       def prepare_for_phases
         @card.prepare_for_phases unless running?
+        @card.identify_action
         @running = true
         @subdirectors.each(&:prepare_for_phases)
       end

data/lib/card/director.rb

@@ -180,6 +180,7 @@ class Card
       @subdirectors.clear
       @stage = nil
       @action = nil
+      @running = false
     end
 
     def appoint card

data/lib/card/fetch/all.rb

@@ -3,10 +3,10 @@ class Card
     # fetch-related Card instance methods
     module All
       # fetching from the context of a card
-      def fetch traits, opts={}
+      def fetch field_marks, opts={}
         opts[:new][:supercard] = self if opts[:new]
-        Array.wrap(traits).inject(self) do |card, trait|
-          Card.fetch card.name.trait(trait), opts
+        Array.wrap(field_marks).inject(self) do |card, mark|
+          Card.fetch card.name.field(mark.cardname), opts
         end
       end
 

data/lib/card/fetch/card_class.rb

@@ -26,7 +26,7 @@ class Card
       #      new: { opts for Card#new }  Return a new card when not found
       # @return [Card]
       def fetch *args
-        f = Card::Fetch.new(*args)
+        f = Fetch.new(*args)
         f.retrieve_or_new
       rescue ActiveModel::RangeError => _e
         Card.new name: "card id out of range: #{f.mark}"
@@ -65,19 +65,13 @@ class Card
       def id cardish
         case cardish
         when Integer then cardish
-        when Card then cardish.id
-        when Symbol then Card::Codename.id cardish
-        else fetch_id cardish
+        when Card    then cardish.id
+        when Symbol  then Codename.id cardish
+        when String  then Lexicon.id cardish
+        else quick_fetch(cardish)&.id
         end
       end
 
-      # @param mark_parts - see #fetch
-      # @return [Integer]
-      def fetch_id *mark_parts
-        mark = Card::Fetch.new(*mark_parts)&.mark
-        mark.is_a?(Integer) ? mark : quick_fetch(mark.to_s)&.id
-      end
-
       # @param mark - see #fetch
       # @return [Card::Name]
       def fetch_name *mark, &block

data/lib/card/fetch/results.rb

@@ -63,7 +63,7 @@ class Card
         return unless (sc = new_opts[:supercard])
 
         @card.supercard = sc
-        @card.update_superleft @card.name
+        @card.update_superleft
       end
 
       def quick_renew?
@@ -116,7 +116,7 @@ class Card
       def supercard_might_change_type?
         # ...via type_plus_right rule
         sc = new_opts[:supercard]
-        @force_type_lookup = sc&.new? && (sc.type_id != sc.default_type_id)
+        @force_type_lookup = sc&.new? && (sc.type_id != Card.default_type_id)
       end
 
       def new_opts

data/lib/card/model/save_helper.rb

@@ -13,7 +13,7 @@ class Card
       include SaveArguments
 
       def with_user user_name, &block
-        Card::Auth.with(current_id: Card.fetch_id(user_name), &block)
+        Card::Auth.with(current_id: user_name.card_id, &block)
       end
 
       def create_card name_or_args, content_or_args=nil
@@ -59,7 +59,7 @@ class Card
         return unless delete_code_card? name
 
         card = Card[name]
-        card.update! codename: nil
+        card.update! codename: ""
         card.delete!
       end
 

data/lib/card/name/all/descendants.rb

@@ -6,24 +6,26 @@ class Card
         # NOTE: for all these helpers, method returns *all* fields/children/descendants.
         # (Not just those current user has permission to read.)
 
-        def fields
-          field_ids.map { |id| Card[id] }
+        def field_cards
+          field_ids.map(&:card)
         end
 
         def field_names
-          field_ids.map { |id| Card::Name[id] }
+          field_ids.map(&:cardname)
         end
 
         def field_ids
           child_ids :left
         end
 
-        def each_child &block
+        def each_child
           return unless id
 
-          Card.where(
-            "(left_id = #{id} or right_id = #{id}) and trash is false"
-          ).each(&block)
+          sql = "(left_id = #{id} or right_id = #{id}) and trash is false"
+          Card.where(sql).find_each do |card|
+            card.include_set_modules
+            yield card
+          end
         end
 
         # eg, A+B is a child of A and B

data/lib/card/name/all/parts.rb

@@ -58,7 +58,7 @@ class Card
         # after_store forces it to save the subcard first
         # and callback afterwards
         def with_id_after_store subcard
-          add_subcard subcard
+          subcard subcard
           subcard.director.after_store { |card| yield card.id }
         end
       end

data/lib/card/name/all.rb

@@ -7,7 +7,7 @@ class Card
 
       # TODO: use delegations and include more name functions
       delegate :simple?, :compound?, :junction?, to: :name
-
+      attr_reader :supercard
       def name
         @name ||= left_id ? Lexicon.lex_to_name([left_id, right_id]) : super.to_name
       end
@@ -47,8 +47,9 @@ class Card
         end
       end
 
-      def update_superleft cardname
-        @superleft = @supercard if cardname.field_of? @supercard.name
+      def update_superleft newname=nil
+        newname ||= name
+        @superleft = @supercard if newname.field_of? @supercard.name
       end
 
       def update_subcard_names new_name, name_to_replace=nil

data/lib/card/name/card_class.rb

@@ -7,6 +7,7 @@ class Card
       end
 
       def uniquify_name name, rename=:new
+        name = name.to_name
         return name unless Card.exists? name
 
         uniq_name = generate_alternative_name name

data/lib/card/name/fields_and_traits.rb

@@ -12,14 +12,9 @@ class Card
       end
 
       # @return [Card::Name]
-      def field_name tag_name
-        case tag_name
-        when Symbol
-          trait_name tag_name
-        else
-          tag_name = tag_name.to_s[1..-1] if tag_name.to_s[0] == "+"
-          [self, tag_name].to_name
-        end
+      def field_name tag
+        tag = tag.to_s[1..-1] if !tag.is_a?(Symbol) && tag.to_s[0] == "+"
+        [self, tag].to_name
       end
 
       # @return [True/False]
@@ -29,10 +24,12 @@ class Card
         if context.present?
           absolute_name(context).left_name.key == context.to_name.key
         else
-          s.match(/^\s*\+[^+]+$/).present?
+          s.match?(/^\s*\+[^+]+$/)
         end
       end
 
+      # name is relative name containing only the rightmost part
+      # @return [True/False]
       def field_only?
         relative? && stripped.to_name.parts.reject(&:blank?).first == parts.last
       end
@@ -40,27 +37,6 @@ class Card
       def relative_field_name tag_name
         field_name(tag_name).name_from self
       end
-
-      # @return [String]
-      def trait tag_code
-        name = trait_name tag_code
-        name.s
-      end
-
-      # @return [Card::Name]
-      def trait_name tag_code
-        Card::Name[self, tag_code.to_sym]
-      end
-
-      # @return [True/False]
-      def trait_name? *traitlist
-        return false unless compound?
-
-        right_key = right_name.key
-        traitlist.any? do |codename|
-          Card::Codename.name(codename)&.key == right_key
-        end
-      end
     end
   end
 end

data/lib/card/name/name_variants.rb

@@ -23,13 +23,17 @@ class Card
       end
 
       def card_id
-        Card.fetch_id self
+        Lexicon.id self
       end
 
       # @return [Symbol] codename of card with name
       def codename
         Codename[card_id]
       end
+
+      def codename_or_string
+        codename || s
+      end
     end
   end
 end

data/lib/card/name.rb

@@ -76,13 +76,5 @@ class Card
     def code
       Card::Codename[card_id]
     end
-
-    def setting?
-      Set::Type::Setting.member_names[key]
-    end
-
-    def set?
-      Set::Pattern.card_keys[tag_name.key]
-    end
   end
 end

data/lib/card/query/abstract_query/tie.rb

@@ -93,9 +93,8 @@ class Card
 
         def id_from_val val
           case val
-          when Integer then val
-          when String  then Card.fetch_id(val) || -999
-          when Symbol  then Card::Codename.id(val) || -999
+          when Integer         then val
+          when String, Symbol  then val.card_id || -999
           end
         end
       end

data/lib/card/query/card_query/normalization.rb

@@ -28,7 +28,7 @@ class Card
 
         def normalize_value val
           case val
-          when Integer, Float, Hash, Symbol, NilClass then val
+          when Integer, Float, Hash, Symbol, NilClass, ActiveRecord::Relation then val
           when String                                 then normalize_string_value val
           when Array                                  then normalize_array_value val
           else raise Error::BadQuery, "Invalid value type: #{val.class} (#{val.inspect})"

data/lib/card/query/sql_statement/order.rb

@@ -18,12 +18,15 @@ class Card
       module Order
         def order
           full_syntax do
-            "ORDER BY #{order_directives.join ', '}"
+            dirs = order_directives
+            "ORDER BY #{dirs.join ', '}" if dirs.present?
           end
         end
 
         def order_directives
-          Array.wrap(order_config).map do |order_key|
+          return if @mods[:sort].blank?
+
+          Array.wrap(@mods[:sort]).map do |order_key|
             order_directive order_key
           end
         end
@@ -58,10 +61,6 @@ class Card
             safe_sql @mods[:dir]
           end
         end
-
-        def order_config
-          @mods[:sort].blank? ? "update" : @mods[:sort]
-        end
       end
     end
   end

data/lib/card/query/value.rb

@@ -32,9 +32,10 @@ class Card
 
       def parse_value value
         case value
-        when Array           then parse_array_value value.clone
-        when nil             then ["is", nil]
-        else                      ["=", parse_simple_value(value)]
+        when Array                  then parse_array_value value.clone
+        when ActiveRecord::Relation then ["in", value]
+        when nil                    then ["is", nil]
+        else                             ["=", parse_simple_value(value)]
         end
       end
 
@@ -48,7 +49,8 @@ class Card
         when String, Integer then value
         when Symbol          then value.to_s
         when nil             then nil
-        else raise Error::BadQuery, "Invalid property value: #{value.inspect}"
+        else
+          raise Error::BadQuery, "Invalid property value: #{value.inspect}"
         end
       end
 
@@ -66,9 +68,10 @@ class Card
 
       def sqlize v
         case v
-        when Query then v.to_sql
-        when Array then sqlize_array v
-        when nil   then "NULL"
+        when Query                  then v.to_sql
+        when ActiveRecord::Relation then "(#{v.to_sql})"
+        when Array                  then sqlize_array v
+        when nil                    then "NULL"
         else quote(v.to_s)
         end
       end

data/lib/card/reference/all.rb

@@ -21,7 +21,7 @@ class Card
       end
 
       def referer_cards_from_references references
-        references.map(&:referer_id).uniq.map(&Card.method(:fetch)).compact
+        references.map(&:referer_id).uniq.map(&:card).compact
       end
 
       # cards that self refers to
@@ -62,11 +62,13 @@ class Card
         Reference.mass_insert reference_values_array(ref_hash)
       end
 
-      # delete references from this card
-      def delete_references_out
-        return unless id.present?
-
-        Reference.where(referer_id: id).delete_all
+      # replace references in card content
+      def swap_names old_name, new_name
+        cont = content_object
+        cont.find_chunks(:Reference).each do |chunk|
+          chunk.swap_name old_name, new_name
+        end
+        cont.to_s
       end
 
       private
@@ -122,7 +124,7 @@ class Card
       end
 
       # Partial references are needed to track references to virtual cards.
-      # For example a link to virual card [[A+*self]] won't have a referee_id,
+      # For example a link to virtual card [[A+*self]] won't have a referee_id,
       # but when A's name is changed we have to find and update that link.
       def interpret_partial_references ref_hash, referee_name
         return if referee_name.simple?