card 1.98.0 → 1.99.1

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

@@ -14,7 +14,8 @@ class Card
         {
           refer_to: %w[L I],
           link_to: "L",
-          include: "I"
+          include: "I",
+          nest: "I"
         }.each do |methodname, reftype|
           define_reference_method methodname, reftype, :referee, :referer_id
         end
@@ -22,7 +23,8 @@ class Card
         {
           referred_to_by: %w[L I],
           linked_to_by: "L",
-          included_by: "I"
+          included_by: "I",
+          nested_by: "I"
         }.each do |methodname, reftype|
           define_reference_method methodname, reftype, :referer, :referee_id
         end

data/lib/card/query/reference_query.rb

@@ -34,7 +34,7 @@ class Card
       end
 
       def non_outfield
-        add_condition "#{fld :present} = 0"
+        add_condition "#{fld :is_present} = 0"
       end
 
       def outfield_id outfield, id

data/lib/card/seed_consts.rb

@@ -15,5 +15,5 @@ unless defined? CARD_TEST_SEED_PATH
 end
 
 unless defined? CARD_TEST_SEED_SCRIPT_PATH
-  CARD_TEST_SEED_SCRIPT_PATH = File.join(Cardio.gem_root, "db", "seed", "test", "seed.rb")
+  CARD_TEST_SEED_SCRIPT_PATH = File.join(Cardio.gem_root, "db", "test_seed.rb")
 end

data/lib/card/set/event/delayed_event.rb

@@ -41,6 +41,8 @@ class Card
             ActManager.contextualize_delayed_event act_id, card, env, auth do
               card.send method_name
             end
+          ensure
+            ActManager.expire
           end
         end
       end

data/lib/card/set/format/abstract_format.rb

@@ -48,7 +48,7 @@ class Card
         #   You should certainly {Card::View::Cache learn more about caching} if you want
         #   to develop mods that are safe in a caching environment.
         #
-        # * __:closed__ [True/False]. Is view acceptable for rendering inside `closed`
+        # * __:compact__ [True/False]. Is view acceptable for rendering inside `compact`
         #   view?  Default is false.
         #
         # * __:denial__ [Symbol]. View to render if permission is denied. Value can be
@@ -70,10 +70,8 @@ class Card
         #       etc)
         #     * a *Symbol*: name of view to render
         #
-        # * __:wrap__ wrap view dynamically. Value is Symbol for wrapper. See {Wrapper}
-        #
-        # * DEPRECATED __:commentable__ [True/False].  Render this view for unknown cards
-        #   if comment box is showing and user has comment permission.
+        # * __:wrap__ wrap view dynamically. Value is Symbol for wrapper or Hash with
+        #   wrappers and wrapper options. See {Wrapper}
         #
         def view viewname, *args, &block
           def_opts = process_view_opts viewname, args

data/lib/card/set/format/abstract_format/view_opts.rb

@@ -14,7 +14,7 @@ class Card
 
           # view setting values can be accessed from Format objects (eg within format
           # blocks in set modules) using #view_setting(:setting_name, :view_name)
-          VIEW_SETTINGS = %i[cache commentable closed denial perms unknown wrap].freeze
+          VIEW_SETTINGS = %i[cache compact denial perms unknown wrap].freeze
 
           # view def opts are used in defining views but are not available
           # at any later point

data/lib/card/set/required_field.rb

@@ -32,7 +32,7 @@ class Card
       def create_field_delete_event
         field_set.class_exec(self) do |required|
           event required.field_event_name(:delete), :validate, on: :delete do
-            return if left&.singleton_class&.include?(required.parent_set)
+            return if left&.trash || left&.singleton_class&.include?(required.parent_set)
 
             errors.add required.field, "can't be deleted; required field of #{left.name}" # LOCALIZE
           end
@@ -43,6 +43,8 @@ class Card
         field_set.class_exec(self) do |required|
           event required.field_event_name(:update), :validate,
                 on: :update, changing: :name do
+            return if superleft&.attribute_is_changing? :name
+
             parent = Card.fetch(name_before_act.to_name.left)
             return if !parent || parent&.singleton_class&.include?(required.parent_set)
 
@@ -53,8 +55,11 @@ class Card
 
       def create_parent_event
         parent_set.class_exec(self) do |required|
-          event required.parent_event_name, :validate, on: :save do
-            return if field? required.field
+          event required.parent_event_name, :validate, on: :create do
+            return if field?(required.field) || left&.type_id == CardtypeID
+
+            # Without the Cardtype exemption, we can get errors on type plus right sets
+            # Need a better solution so we can require fields on cardtype+X cards, too.
 
             errors.add required.field, "required" # LOCALIZE
           end

data/lib/card/set_pattern.rb

@@ -2,6 +2,11 @@ class Card
   module Set
     class Pattern
       class << self
+        def reset
+          Card.set_patterns = []
+          @card_keys = @in_load_order = nil
+        end
+
         def find pattern_code
           Card.set_patterns.find { |sub| sub.pattern_code == pattern_code }
         end
@@ -67,6 +72,11 @@ class Card
 
             ([pattern_code] + anchor_codes).map { |code| code.to_s.camelize }.join "::"
           end
+
+          # label for set pattern if no anchor is given
+          def generic_label
+            label nil
+          end
         end
 
         # Instance methods

data/lib/card/tasks/card/file_card_creator.rb

@@ -1,6 +1,11 @@
+require_relative "./file_card_creator/script_card"
+require_relative "./file_card_creator/style_card"
+require_relative "./file_card_creator/haml_card"
+require_relative "./file_card_creator/abstract_file_card"
+
 class Card
   # A Factory class
-  # It choses the class to create the file card accoring to the given type.
+  # It chooses the class to create the file card according to the given type.
   class FileCardCreator
     CARD_CLASSES = [StyleCard, ScriptCard, HamlCard].freeze
 

data/lib/card/tasks/card/file_card_creator/abstract_file_card.rb

@@ -1,3 +1,8 @@
+require_relative "./output_helper"
+require_relative "./abstract_file_card/source_file"
+require_relative "./abstract_file_card/ruby_file"
+require_relative "./abstract_file_card/migration_file"
+
 class Card
   class FileCardCreator
     # A template class for generating cards that are linked to source files.

data/lib/card/tasks/card/file_card_creator/script_card.rb

@@ -1,3 +1,5 @@
+require_relative "./abstract_file_card"
+
 class Card
   class FileCardCreator
     # Move javascript or coffeescript from the card database to a file.

data/lib/card/view/cache/stub.rb

@@ -1,3 +1,5 @@
+require "msgpack"
+
 class Card
   class View
     module Cache
@@ -9,30 +11,11 @@ class Card
       #
       # A stub must contain all the information necessary to produce the view as intended.
       module Stub
-        class << self
-          def escape stub_json
-            stub_json.gsub "(", "_OParEN_"
-          end
-
-          def unescape stub_json
-            stub_json.gsub "_OParEN_", "("
-          end
-
-          # FIXME: escaping and unescaping stubs should not be necessary
-          # It's used to avoid problems with altered views, but altering views is
-          # unsafe and should be eliminated.  See {Card::View::Cache}.
-        end
-
         private
 
         # @return [String]
         def stub
-          "(stub)#{Stub.escape stub_json}(/stub)".html_safe
-        end
-
-        # @return [String] the stub_hash as JSON
-        def stub_json
-          JSON.generate stub_hash
+          "(StUb#{stub_hash.to_json}sTuB)".html_safe
         end
 
         # @return [Hash]

data/lib/card/view/options.rb

@@ -6,8 +6,8 @@ class Card
     #
     #      {{cardname|hide:menu}}
     #
-    # These options and others are available to monkeys when rendering views via
-    # #render or #nest.
+    # These options and others are available to monkeys when rendering views
+    # via #render or #nest.
     #
     #      nest "cardname", hide: :menu
     #      render :viewname, hide: :menu
@@ -51,9 +51,10 @@ class Card
           :title,          # overrides the name of the card
           :variant,        # override the canonical version of the name with a different
                            # variant
-          :editor,         # inline_nests makes a form within standard content (Symbol)
+          :input_type,     # inline_nests makes a form within standard content (Symbol)
           :type,           # set the default type of new cards
           :size,           # set an image size
+                           # (also used for character limit in one_line_content)
           :params,         # parameters for add button.  deprecated!
           :items,          # options for items (Hash)
           :cache,          # change view cache behaviour

data/lib/card/view/options/voo_api.rb

@@ -75,7 +75,7 @@ class Card
           try "normalize_#{option_key}", value
         end
 
-        def normalize_editor value
+        def normalize_input_type value
           value&.to_sym
         end
 

data/lib/cardio.rb

@@ -18,6 +18,12 @@ module Cardio
   mattr_reader :paths, :config
 
   class << self
+    def load_card?
+      ActiveRecord::Base.connection && !defined?(Card)
+    rescue
+      false
+    end
+
     def cache
       @cache ||= ::Rails.cache
     end
@@ -77,7 +83,7 @@ module Cardio
         allow_irreversible_admin_tasks: false,
         raise_all_rendering_errors:     false,
         rescue_all_in_controller:       true,
-        navbox_match_start_only:        :true,
+        navbox_match_start_only:        true,
         load_strategy:                  :eval
       }
     end

data/lib/cardio/schema.rb

@@ -2,9 +2,8 @@ module Cardio
   module Schema
     def assume_migrated_upto_version type
       Cardio.schema_mode(type) do
-        ActiveRecord::Schema.assume_migrated_upto_version(
-          Cardio.schema(type), Cardio.migration_paths(type)
-        )
+        ActiveRecord::Schema.assume_migrated_upto_version(Cardio.schema(type),
+                                                          Cardio.migration_paths(type))
       end
     end
 
@@ -33,25 +32,30 @@ module Cardio
 
     def migration_context type
       with_suffix type do
-        yield ActiveRecord::MigrationContext.new(Cardio.migration_paths(type))
+        yield ActiveRecord::MigrationContext.new(Cardio.migration_paths(type),
+                                                 ActiveRecord::SchemaMigration)
       end
     end
 
     def with_suffix type
       return yield unless (new_suffix = Cardio.schema_suffix type) &&
                           new_suffix.present?
+
       original_name = ActiveRecord::Base.schema_migrations_table_name
-      ActiveRecord::Base.schema_migrations_table_name =
-        "#{original_name}#{new_suffix}"
-      ActiveRecord::SchemaMigration.table_name = "#{original_name}#{new_suffix}"
-      # ActiveRecord::Base.table_name_suffix = new_suffix
-      # ActiveRecord::SchemaMigration.reset_table_name
-      # original_suffix = ActiveRecord::Base.table_name_suffix
+      with_migration_table "#{original_name}#{new_suffix}", original_name do
+        yield
+      end
+    end
+
+    def with_migration_table new_table_name, old_table_name
+      ActiveRecord::Base.schema_migrations_table_name = new_table_name
+      ActiveRecord::SchemaMigration.table_name = new_table_name
+      ActiveRecord::SchemaMigration.reset_column_information
       yield
-      ActiveRecord::Base.schema_migrations_table_name = original_name
-      ActiveRecord::SchemaMigration.table_name = original_name
-      # ActiveRecord::Base.table_name_suffix = original_suffix
-      # ActiveRecord::SchemaMigration.reset_table_name
+    ensure
+      ActiveRecord::Base.schema_migrations_table_name = old_table_name
+      ActiveRecord::SchemaMigration.table_name = old_table_name
+      ActiveRecord::SchemaMigration.reset_column_information
     end
 
     def schema type=nil

data/mod/Modfile

@@ -17,6 +17,7 @@ mod 'email'
 mod 'follow'
 mod 'developer'
 mod 'carrierwave'
+mod 'media'
 mod 'search'
 mod 'standard'
 mod 'rules'

data/mod/account/set/abstract/account_field.rb

@@ -0,0 +1,15 @@
+
+# allow account owner to update account field content
+def ok_to_update
+  return true if own_account? && !name_changed? && !type_id_changed?
+
+  super
+end
+
+# force inherit permission on create
+# (cannot be done with rule, because sets are not addressable)
+def applicable_permission_rule_id _direct_rule, action
+  return left_permission_rule_id action if action == :create
+
+  super
+end

data/mod/account/set/abstract/accounted.rb

@@ -0,0 +1,15 @@
+def account
+  fetch trait: :account, new: {}
+end
+
+def default_account_status
+  "active"
+end
+
+format :html do
+  def account_formgroups
+    Auth.as_bot do
+      subformat(card.account)._render :content_formgroups, structure: true
+    end
+  end
+end

data/mod/account/set/all/account.rb

@@ -8,10 +8,6 @@ def account
   fetch trait: :account
 end
 
-def accountable?
-  Card.toggle(rule(:accountable))
-end
-
 def parties
   @parties ||= (all_enabled_roles << id).flatten.reject(&:blank?)
 end
@@ -64,6 +60,9 @@ end
 
 def enabled_role_ids
   Auth.as_bot do
+    # workaround for broken migrations
+    return fetch_roles unless Card::Codename.exists? :enabled_roles
+
     role_trait = fetch(trait: :enabled_roles, new: { type_id: SessionID })
     role_trait.virtual? ? role_trait.item_ids : fetch_roles
   end

data/mod/account/set/right/account.rb

@@ -1,144 +1,32 @@
 # -*- encoding : utf-8 -*-
 
-include All::Permissions::Accounts
-
 card_accessor :email
 card_accessor :password
 card_accessor :salt
 card_accessor :status
-card_accessor :token
-
-#### ON CREATE
-
-# legal to add +*account card
-event :validate_accountability, :prepare_to_validate, on: :create do
-  errors.add :content, tr(:error_not_allowed) unless left&.accountable?
-end
-
-event :require_email, :prepare_to_validate,
-      after: :validate_accountability, on: :create do
-  errors.add :email, "required" unless subfield(:email)
-end
-
-event :set_default_salt, :prepare_to_validate, on: :create do
-  salt = Digest::SHA1.hexdigest "--#{Time.zone.now}--"
-  Env[:salt] = salt # HACK!!! need viable mechanism to get this to password
-  add_subfield :salt, content: salt
-end
-
-event :set_default_status, :prepare_to_validate, on: :create do
-  default_status = left&.try(:default_account_status) || "active"
-  add_subfield :status, content: default_status
-end
-
-event :generate_confirmation_token,
-      :prepare_to_store, on: :create, when: :can_approve? do
-  add_subfield :token, content: generate_token
-end
-
-event :send_account_verification_email, :integrate,
-      on: :create, when: proc { |c| c.token.present? } do
-  Card[:verification_email].deliver self, to: email
-end
-
-# ON UPDATE
-
-# reset password emails contain a link to update the +*account card
-# and trigger this event
-event :reset_password, :prepare_to_validate, on: :update, trigger: :required do
-  reset_password_with_token Env.params[:token]
-end
-
-# STANDALONE EVENTS
-# only triggered when called directly (as methods)
-
-event :reset_token do
-  token = generate_token
-  Auth.as_bot { token_card.update! content: token }
-  token
-end
-
-event :send_welcome_email do
-  welcome = Card[:welcome_email]
-  welcome.deliver self, to: email if welcome&.type_code == :email_template
-end
-
-event :send_reset_password_token do
-  Auth.as_bot do
-    token_card.update! content: generate_token
-  end
-  Card[:password_reset_email].deliver self, to: email
-end
+card_accessor :api_key
 
-def active?
-  status == "active"
-end
-
-def blocked?
-  status == "blocked"
-end
-
-def built_in?
-  status == "system"
-end
-
-def pending?
-  status == "pending"
-end
+require_field :email
 
-def validate_token! test_token
-  tcard = token_card
-  tcard.validate! test_token
-  copy_errors tcard
-  errors.empty?
-end
-
-def reset_password_with_token token
-  aborting do
-    if !token
-      errors.add :token, "is required"
-    elsif !validate_token!(token)
-      # FIXME: isn't this an error??
-      success << reset_password_try_again
-    else
-      success << reset_password_success
-    end
-  end
-end
-
-def refreshed_token
-  if token_card.id
-    token_card.refresh(true).db_content # TODO: explain why refresh is needed
-  else # eg when viewing email template
-    "[token]"
-  end
+def accounted
+  left
 end
 
-def can_approve?
-  Card.new(type_id: Card.default_accounted_type_id).ok? :create
+def accounted_id
+  left_id
 end
 
 def ok_to_read
   own_account? ? true : super
 end
 
-def reset_password_success
-  token_card.used!
-  Auth.signin left_id
-  { id: name,
-    view: :edit }
-end
+# allow account owner to update account field content
+def ok_to_update
+  return true if own_account? && !name_changed? && !type_id_changed?
 
-def reset_password_try_again
-  send_reset_password_token
-  { id: "_self",
-    view: "message",
-    message: tr(:sorry_email_reset, error_msg: errors.first.last) }
+  super
 end
 
-# FIXME: explain or remove.
-def edit_password_success_args; end
-
 def changes_visible? act
   act.actions_affecting(act.card).each do |action|
     return true if action.card.ok? :read
@@ -146,45 +34,25 @@ def changes_visible? act
   false
 end
 
-format do
-  view :verify_url, cache: :never do
-    card_url path(token_path_opts.merge(mark: card.name.left))
-  end
-
-  view :verify_days, cache: :never do
-    (Card.config.token_expiry / 1.day).to_s
-  end
-
-  view :reset_password_url do
-    card_url path(token_path_opts.merge(card: { trigger: :reset_password }))
+def send_account_email email_template
+  ecard = Card[email_template]
+  unless ecard&.type_id == EmailTemplateID
+    raise Card::Error, "invalid email template: #{email_template}"
   end
 
-  view :reset_password_days do
-    (Card.config.token_expiry / 1.day).to_s
-  end
+  ecard.deliver self, to: email
+end
 
-  def token_path_opts
-    { action: :update, live_token: true, token: card.refreshed_token }
-  end
+def validate_api_key! api_key
+  api_key_card.validate! api_key
 end
 
-format :html do
-  view :raw do
-    # FIXME: use field_nest instead of parsing content
-    # Problem: when you do that then the fields are missing in the sign up form:
-    # output( [field_nest(:email, view: :titled, title: "email"),
-    #          field_nest(:password, view: :titled, title: "password")])
-    %({{+#{:email.cardname}|labeled;title:email;edit:inline}}
-      {{+#{:password.cardname}|labeled;title:password;edit:inline}})
-  end
+def method_missing method, *args
+  super unless args.empty? && (matches = method.match(/^(?<status>.*)\?$/))
 
-  before :content_formgroup do
-    voo.edit_structure = [[:email, "email"], [:password, "password"]]
-  end
+  status == matches[:status]
 end
 
-format :email do
-  def mail context, fields
-    super context, fields.reverse_merge(to: card.email)
-  end
+def respond_to_missing? method, _include_private=false
+  method.match?(/\?/) ? true : super
 end