card 1.99.1 → 1.99.2

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

@@ -0,0 +1,49 @@
+def account
+  fetch :account, new: {}
+end
+
+def default_account_status
+  "active"
+end
+
+def current_account?
+  id && Auth.current_id == id
+end
+
+format :html do
+  def default_bridge_tab
+    card.current_account? ? :account_tab : super
+  end
+
+  view :account_tab do
+    bridge_pill_sections "Account" do
+      [["Settings", account_details_items],
+       ["Content", account_content_items]]
+    end
+  end
+
+  def show_account_tab?
+    card.account.real?
+  end
+
+  def account_formgroups
+    Auth.as_bot do
+      subformat(card.account)._render :content_formgroups, structure: true
+    end
+  end
+
+  def account_details_items
+    [
+      ["Email and Password", :account,
+       { path: { slot: { hide: %i[help_link bridge_link] } } }],
+      ["Roles", :roles,
+       { path:  { view: :content_with_edit_button } }],
+      ["Notifications", :follow]
+    ]
+  end
+
+  def account_content_items
+    [["Created", :created],
+     ["Edited", :edited]]
+  end
+end

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

@@ -5,7 +5,7 @@ module ClassMethods
 end
 
 def account
-  fetch trait: :account
+  fetch :account
 end
 
 def parties
@@ -63,7 +63,7 @@ def enabled_role_ids
     # 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 = fetch(:enabled_roles, new: { type_id: Card::SessionID })
     role_trait.virtual? ? role_trait.item_ids : fetch_roles
   end
 end
@@ -74,7 +74,7 @@ end
 
 def role_ids_from_roles_trait
   Auth.as_bot do
-    role_trait = fetch trait: :roles
+    role_trait = fetch :roles
     role_trait ? role_trait.item_ids : []
   end
 end

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

@@ -36,7 +36,7 @@ end
 
 def send_account_email email_template
   ecard = Card[email_template]
-  unless ecard&.type_id == EmailTemplateID
+  unless ecard&.type_id == Card::EmailTemplateID
     raise Card::Error, "invalid email template: #{email_template}"
   end
 

data/mod/account/set/self/signin.rb

@@ -23,7 +23,7 @@ end
 
 event :signout, :validate, on: :delete do
   Env.reset_session
-  Auth.signin AnonymousID
+  Auth.signin Card::AnonymousID
   abort :success
 end
 
@@ -38,7 +38,7 @@ def ok_to_read
   true
 end
 
-def consider_recaptcha?
+def recaptcha_on?
   false
 end
 

data/mod/account/set/type/role.rb

@@ -1,5 +1,5 @@
 def disabled?
-  Auth.current&.fetch(trait: :disabled_roles)&.item_ids&.include? id
+  Auth.current&.fetch(:disabled_roles)&.item_ids&.include? id
 end
 
 format :html do

data/mod/account/set/type/signup.rb

@@ -1,4 +1,4 @@
-include_set Abstract::Accounted
+include_set Abstract::Accountable
 
 require_field :account
 
@@ -31,7 +31,7 @@ event :approve_without_verification, :validate, on: :update, trigger: :required
 end
 
 event :act_as_current_for_integrate_stage, :integrate, on: :create do
-  Auth.current_id = id
+  Auth.signin id
 end
 
 def account_subfield

data/mod/account/set/type/signup/views.rb

@@ -39,7 +39,7 @@ format :html do
   end
 
   def self_signup?
-    card.creator_id == AnonymousID
+    card.creator_id == Card::AnonymousID
   end
 
   def account_lines

data/mod/account/set/type/user.rb

@@ -1,5 +1,5 @@
 include Basic
-include_set Abstract::Accounted
+include_set Abstract::Accountable
 
 attr_accessor :email
 

data/mod/account/spec/set/abstract/accountable_spec.rb

@@ -0,0 +1,7 @@
+RSpec.describe Card::Set::Abstract::Accountable do
+  def card_subject
+    Card["Joe User"]
+  end
+
+  check_html_views_for_errors
+end

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

@@ -21,7 +21,7 @@ RSpec.describe Card::Set::All::Account do
       end
 
       it "updates when new roles are set" do
-        roles_card = @joe_user_card.fetch trait: :roles, new: {}
+        roles_card = @joe_user_card.fetch :roles, new: {}
         r1 = Card["r1"]
 
         Card::Auth.as_bot { roles_card.items = [r1.id] }
@@ -29,7 +29,7 @@ RSpec.describe Card::Set::All::Account do
         # simulate new request
         # clears local cache, where, eg, @parties would still be cached on card
 
-        Card::Auth.current_id = Card::Auth.current_id
+        Card::Auth.signin Card::Auth.current_id
         # simulate new request
         # current_id assignment clears several class variables
 
@@ -53,7 +53,7 @@ RSpec.describe Card::Set::All::Account do
   describe "+*email" do
     it "creates a card and account card" do
       jadmin = Card["joe admin"]
-      Card::Auth.current_id = jadmin.id
+      Card::Auth.signin jadmin.id
       # simulate login to get correct from address
 
       Card::Env[:params] = { email: { subject: "Hey Joe!",

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

@@ -151,7 +151,7 @@ RSpec.describe Card::Set::Right::Account do
     before do
       @email = "joe@user.com"
       @account = Card::Auth.find_account_by_email(@email)
-      Card::Auth.current_id = Card::AnonymousID
+      Card::Auth.signin Card::AnonymousID
     end
 
     let(:trigger_reset) { @account.update! trigger: :reset_password }

data/mod/account/spec/set/type/signup_spec.rb

@@ -2,7 +2,7 @@
 
 RSpec.describe Card::Set::Type::Signup do
   before do
-    Card::Auth.current_id = Card::AnonymousID
+    Card::Auth.signin Card::AnonymousID
   end
 
   let :big_bad_signup do
@@ -30,7 +30,7 @@ RSpec.describe Card::Set::Type::Signup do
       Card::Auth.as_bot do
         Card.create! name: "User+*type+*create", content: "[[Anyone]]"
       end
-      Card::Auth.current_id = Card::AnonymousID
+      Card::Auth.signin Card::AnonymousID
 
       @signup = big_bad_signup
       @account = @signup.account
@@ -89,7 +89,7 @@ RSpec.describe Card::Set::Type::Signup do
     before do
       # NOTE: by default Anonymous does not have permission
       # to create User cards and thus requires approval
-      Card::Auth.current_id = Card::AnonymousID
+      Card::Auth.signin Card::AnonymousID
       @signup = big_bad_signup
       @account = @signup.account
     end
@@ -172,7 +172,7 @@ RSpec.describe Card::Set::Type::Signup do
     before do
       # NOTE:
       # by default Anonymous does not have permission to create User cards.
-      Card::Auth.current_id = Card::WagnBotID
+      Card::Auth.signin Card::WagnBotID
       @signup = big_bad_signup
       @account = @signup.account
     end

data/mod/admin/set/self/admin.rb

@@ -119,7 +119,7 @@ format :html do
   end
 
   def machine_cache_count
-    Card::Virtual.where(right_id: MachineCacheID).count
+    Card::Virtual.where(right_id: Card::MachineCacheID).count
   end
 
   def delete_sessions_link months

data/mod/admin/set/self/admin_info.rb

@@ -6,8 +6,8 @@ format :html do
   view :core do
     warnings = []
     warnings << email_warning if Card.config.action_mailer.perform_deliveries == false
-    if Card.config.recaptcha_public_key ==
-       Card::Auth::Permissions::RECAPTCHA_DEFAULTS[:recaptcha_public_key] &&
+    if Card.config.recaptcha_site_key ==
+       Card::Auth::Permissions::RECAPTCHA_DEFAULTS[:recaptcha_site_key] &&
        card.rule(:captcha) == "1"
       warnings << recaptcha_warning
     end

data/mod/admin/set/self/version.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 
-require_dependency "card/version"
+# require "card/version"
 
 def ok_to_read
   true

data/mod/basic_types/set/type/json.rb

@@ -16,6 +16,10 @@ def item_names _args={}
   parse_content.keys
 end
 
+def item_values
+  parse_content.values
+end
+
 format :html do
   view :core do
     process_content ::CodeRay.scan(_render_raw, :json).div

data/mod/basic_types/spec/set/type/html_spec.rb

@@ -2,7 +2,7 @@
 
 RSpec.describe Card::Set::Type::Html do
   before do
-    Card::Auth.current_id = Card::WagnBotID
+    Card::Auth.signin Card::WagnBotID
   end
 
   it "has special editor" do

data/mod/bootstrap/db/migrate_core_cards/data/20181108181219_migrate_classic_skins_to_bootstrap.rb

@@ -16,12 +16,12 @@ class MigrateClassicSkinsToBootstrap < ActiveRecord::Migration[5.2]
 
   def change
     style_rule = Card[:all, :style]
-    if style_rule.item_names.first.key.in? UNSUPPORTED_SKINS
+    if style_rule.first_name.key.in? UNSUPPORTED_SKINS
       style_rule.update! content: DEFAULT_SKIN
     end
 
     layout_rule = Card[:all, :layout]
-    return unless layout_rule.item_names.first.key == UNSUPPORTED_LAYOUT
+    return unless layout_rule.first_name.key == UNSUPPORTED_LAYOUT
     layout_rule.update! content: DEFAULT_LAYOUT
   end
 end

data/mod/bootstrap/lib/bootstrap/component_loader.rb

@@ -2,7 +2,7 @@ class Bootstrap
   module ComponentLoader
     def load_components
       components.each do |component|
-        require "component/#{component}"
+        require_relative "component/#{component}"
         include_component component
       end
     end

data/mod/bootstrap/lib/stylesheets/style_bootstrap_cards.scss

@@ -473,6 +473,7 @@ body.mceContentBody {
     > .bar-bottom {
       padding: 1em 1em 1em 2em;
       border-top: 0;
+      overflow: hidden;
     }
   }
 

data/mod/bootstrap/set/abstract/bootswatch_theme.rb

@@ -68,7 +68,7 @@ end
 
 # reject cards that don't contribute directly to the content like skin or pointer cards
 def engine_input
-  extended_input_cards.select { |ca| ca.type_id.in? [ScssID, CssID] }
+  extended_input_cards.select { |ca| ca.type_id.in? [Card::ScssID, Card::CssID] }
 end
 
 # Don't create "+*machine output" file card

data/mod/bootstrap/set/all/bootstrap/tabs.rb

@@ -19,7 +19,7 @@ format :html do
         else
           [tab_content, {}]
         end
-      tab_buttons += tab_button("##{id}", tab_name, active_tab, button_attr)
+      tab_buttons += tab_button(id, tab_name, active_tab, button_attr)
       tab_panes += tab_pane(id, tab_name, tab_content, active_tab, args[:pane])
     end
     tab_panel tab_buttons, tab_panes, tab_type
@@ -57,7 +57,7 @@ format :html do
   def lazy_tab_button tab_name, id, url, active_tab
     return wrap_with(:li, tab_name, role: "presentation") unless url
     tab_button(
-      "##{id}", tab_name, active_tab,
+      id, tab_name, active_tab,
       "data-url" => url.html_safe,
       class: (active_tab ? nil : "load")
     )
@@ -109,8 +109,8 @@ format :html do
 
   def tab_button target, text, active=false, link_attr={}
     add_class link_attr, "active" if active
-    link = tab_button_link target, text, link_attr
-    li_args = { role: :presentation, class: "nav-item tab-li-#{text.to_name.key}" }
+    link = tab_button_link "##{target}", text, link_attr
+    li_args = { role: :presentation, class: "nav-item tab-li-#{target}" }
     wrap_with :li, link, li_args
   end
 

data/mod/bootstrap/set/type/customized_bootswatch_skin.rb

@@ -70,13 +70,13 @@ event :copy_theme, :prepare_to_store, on: :create do
 end
 
 def initialize_theme style_item_names=nil
-  add_subfield :colors, type_id: ScssID
+  add_subfield :colors, type_id: Card::ScssID
   add_variables_subfield
   add_stylesheets_subfield style_item_names
 end
 
 def add_stylesheets_subfield style_items=nil
-  opts = { type_id: SkinID }
+  opts = { type_id: Card::SkinID }
   if theme_name
     theme_style = add_bootswatch_subfield
     opts[:content] = "[[#{theme_style.name}]]"
@@ -92,12 +92,13 @@ def add_variables_subfield
   theme_content = content_from_theme(:variables)
   default_content = Type::CustomizedBootswatchSkin.read_bootstrap_variables
   add_subfield :variables,
-               type_id: ScssID,
+               type_id: Card::ScssID,
                content: "#{theme_content}\n\n\n#{default_content}"
 end
 
 def add_bootswatch_subfield
-  add_subfield :bootswatch, type_id: ScssID, content: content_from_theme(:bootswatch)
+  add_subfield :bootswatch, type_id: Card::ScssID,
+                            content: content_from_theme(:bootswatch)
 end
 
 def theme_card

data/mod/carrierwave/config/core_initializers/carrierwave.rb

@@ -1,6 +1,4 @@
-ActiveSupport.on_load :before_card do
-  require "carrierwave"
-end
+require "carrierwave"
 
 ActiveSupport.on_load :card do
   Card.extend CarrierWave::Mount

data/mod/carrierwave/lib/carrier_wave/{cardmount.rb → card_mount.rb}

@@ -1,6 +1,7 @@
 require "carrierwave"
 
 module CarrierWave
+  # adapt carrierwave mount to cards
   module CardMount
     include CarrierWave::Mount
 
@@ -74,7 +75,6 @@ module CarrierWave
           assign_file(url) { super }
         end
 
-
         def assign_file file
           db_column = _mounter(:#{column}).serialization_column
           send(:"\#{db_column}_will_change!") # unless attribute_is_changing? db_column
@@ -103,7 +103,7 @@ module CarrierWave
           @#{column}_changed = true
           @#{column}_is_changing = true
         end
-        
+
         def #{column}_is_changing?
           @#{column}_is_changing
         end

data/mod/carrierwave/lib/carrier_wave/file_card_uploader.rb

@@ -4,6 +4,20 @@ module CarrierWave
       @tmp_path ||= Card.paths["tmp"].existent.first
     end
   end
+
+  class SanitizedFile
+    def content_type
+      # the original content_type method doesn't seem to be very reliable
+      # It uses mime_magic_content_type  - which returns invalid/invalid for css files
+      # that start with a comment - as the second option.  (we switch the order and
+      # use it as the third option)
+      @content_type ||=
+        existing_content_type ||
+        mini_mime_content_type ||
+        mime_magic_content_type
+    end
+  end
+
   module Uploader
     # Implements a different name pattern for versions than CarrierWave's
     # default: we expect the version name at the end of the filename separated
@@ -52,7 +66,7 @@ module CarrierWave
   # ## Storage types
   # You can choose between four different storage options
   #  - coded: These files are in the codebase, like the default logo.
-  #      Every view is a wagn request.
+  #      Every view is a decko request.
   #  - local: Uploaded files which are stored in a local upload directory
   #      (upload path is configurable via config.paths["files"]).
   #      If read permissions are set such that "Anyone" can read, then there is
@@ -180,14 +194,6 @@ module CarrierWave
       end.downcase
     end
 
-    def content_type
-      # the original file's content_type method doesn't seem to be very reliable
-      # It uses mime_magic_content_type which returns invalid/invalid for css files
-      # that start with a comment
-      @content_type ||=
-        file.send(:existing_content_type) || file.send(:mini_mime_content_type)
-    end
-
     # generate identifier that gets stored in the card's db_content field
     # @param opts [Hash] generate an identifier using the given storage options
     #   instead of the storage options derived from the model and
@@ -281,9 +287,17 @@ module CarrierWave
       model.selected_content_action_id || action_id_stand_in
     end
 
-    # delegate carrierwave's fog config methods to cardio's config methods
+    # delegate carrierwave's fog config methods to bucket configuration
     ::CarrierWave::FileCardUploader::CONFIG_OPTIONS.each do |name|
-      define_method("fog_#{name}") { @model.bucket_config[name] }
+      define_method("fog_#{name}") { bucket_config name }
+    end
+
+    def bucket_config option
+      @model.bucket_config[option]
+    end
+
+    def asset_host
+      bucket_config(:asset_host) || super
     end
 
     private
@@ -298,7 +312,8 @@ module CarrierWave
       case @model.storage_type
       when :cloud
         ::CarrierWave::Storage::Fog.new(self)
-      else ::CarrierWave::Storage::File.new(self)
+      else
+        ::CarrierWave::Storage::File.new(self)
       end
     end
   end