card 1.101.0 → 1.101.5

data/lib/cardio/defaults.yml

@@ -0,0 +1,70 @@
+---
+# if you disable inline styles tinymce's formatting options stop working
+:allow_inline_styles: true
+:delaying:
+
+token_expiry: !ruby/object:ActiveSupport::Duration
+  value: 172800
+  parts:
+    :days: 2
+
+:recaptcha_public_key: # deprecated; use recaptcha_site_key instead
+:recaptcha_private_key: # deprecated; use recaptcha_secret_key instead
+
+:recaptcha_proxy:
+:recaptcha_site_key:
+:recaptcha_secret_key:
+:recaptcha_minimum_score: 0.5
+
+:google_analytics_key:
+
+:override_host:
+:override_protocol:
+
+:no_authentication: false
+:files_web_path: files
+
+:max_char_count: 200
+:max_depth: 20
+:email_defaults:
+
+:acts_per_page: 10
+:space_last_in_multispace: true
+:closed_search_limit: 10
+:paging_limit: 20
+
+:non_createable_types:
+  - - signup
+    - setting
+    - set
+    - session
+    - bootswatch_skin
+    - customized_bootswatch_skin
+
+:view_cache: false
+:rss_enabled: false
+:double_click: :signed_in
+
+:encoding: utf-8
+:request_logger: false
+:performance_logger: false
+:sql_comments: true
+
+:file_storage: :local
+:file_buckets: {}
+:file_default_bucket:
+:protocol_and_host:
+
+:rich_text_editor: :tinymce
+
+:persistent_cache: true
+:prepopulate_cache: false
+:machine_refresh: :cautious
+:compress_javascript: true
+
+:allow_irreversible_admin_tasks: false
+:raise_all_rendering_errors: false
+:rescue_all_in_controller: true
+:navbox_match_start_only: true
+
+:cache_set_module_list: false

data/lib/cardio/migration.rb

@@ -2,7 +2,7 @@
 
 module Cardio
   class Migration < ActiveRecord::Migration[4.2]
-    # include Card::Model::SaveHelper
+    include Card::Model::SaveHelper
     @type = :deck_cards
 
     class << self
@@ -14,7 +14,7 @@ module Cardio
       # Migrations are subclasses of Cardio::Migration or Card::CoreMigration
       # but they don't inherit the @type. The method below solves this problem.
       def type
-        @type || (ancestors[1]&.type)
+        @type || ancestors[1]&.type
       end
 
       def find_unused_name base_name

data/lib/cardio/migration/deck_structure.rb

@@ -9,10 +9,8 @@ module Cardio
     class DeckStructure < Migration
       @type = :deck
 
-      def contentedly
-        Cardio.schema_mode :deck do
-          yield
-        end
+      def contentedly &block
+        Cardio.schema_mode :deck, &block
       end
     end
   end

data/lib/cardio/migration/import.rb

@@ -99,7 +99,7 @@ module Cardio
       def fetch_remote_data name, view, url
         json_url = "#{url}/#{name}.json"
         json_url += "?view=#{view}" if view
-        json = ::File.open(json_url).read
+        json = open(json_url).read
         parse_and_symbolize json
       end
 
@@ -112,9 +112,9 @@ module Cardio
       def parse_and_symbolize json
         parsed = JSON.parse(json)
         case parsed
-        when Hash then
+        when Hash
           parsed.deep_symbolize_keys
-        when Array then
+        when Array
           parsed.map(&:deep_symbolize_keys)
         else
           parsed

data/lib/cardio/migration/import/import_data.rb

@@ -42,6 +42,7 @@ module Cardio
             unless attributes
               raise("no entry for #{key} (key: #{key.to_name.key}) in #{@path}")
             end
+
             prepare_for_import attributes
           end
         end

data/lib/cardio/mod.rb

@@ -78,6 +78,7 @@ module Cardio
 
       def dependencies name, nickname=true
         return unless (spec = gem_spec name, nickname)
+
         deps = spec&.dependencies || []
         dep_names = deps.map { |dep| dependencies dep.name, false }
         (dep_names << spec).flatten.compact.uniq

data/lib/cardio/mod/dirs.rb

@@ -65,7 +65,7 @@ module Cardio
       # Add a mod to mod load paths
       def add_path mod_name, path=nil
         if @mods.include? mod_name
-          raise Error,
+          raise Card::Error,
                 "name conflict: mod with name \"#{mod_name}\" already loaded"
         end
         @mods << mod_name
@@ -80,7 +80,7 @@ module Cardio
       end
 
       def unknown_gem_mod! name
-        raise Error, %(Unknown gem "#{name}". Make sure it is in your Gemfile.)
+        raise Card::Error, %(Unknown gem "#{name}". Make sure it is in your Gemfile.)
       end
 
       def add_gem_mod mod_name, mod_path

data/lib/cardio/mod/load_strategy.rb

@@ -56,10 +56,8 @@ module Cardio
         end
       end
 
-      def each_mod_dir module_type
-        @mod_dirs.each module_type do |base_dir|
-          yield base_dir
-        end
+      def each_mod_dir module_type, &block
+        @mod_dirs.each module_type, &block
       end
 
       def each_file_in_dir base_dir, subdir=nil

data/lib/cardio/mod/loader/set_loader.rb

@@ -53,7 +53,8 @@ module Cardio
 
           def add_explicit_format_modules
             @content.gsub!(/^ *format +:?(\w+)? *do *$/) do
-              format_name = $1.blank? ? nil : $1.to_sym
+              format_name = Regexp.last_match(1)
+              format_name = format_name.blank? ? nil : format_name.to_sym
               "module #{module_name format_name}; " \
               "module_parent.send :register_set_format, "\
               "#{format_class format_name}, self; "\

data/lib/cardio/mod/loader/set_pattern_loader.rb

@@ -40,7 +40,6 @@ module Cardio
           def preamble_bits
             [module_comment,
              module_chain,
-             "extend Card::Set::Pattern::Helper",
              "cattr_accessor :options",
              "class << self"]
           end

data/lib/cardio/mod/module_template.rb

@@ -63,6 +63,7 @@ module Cardio
 
       def module_comment
         return "" unless @strategy.clean_comments?
+
         @module_comment = nil if @module_comment.blank?
         [auto_comment, @module_comment].compact.join "\n"
       end

data/lib/cardio/modfiles.rb

@@ -20,11 +20,9 @@ module Cardio
       each_gem_mod_path(&block)
     end
 
-    def each_simple_mod_path
+    def each_simple_mod_path &block
       paths["mod"].each do |mods_path|
-        Dir.glob("#{mods_path}/*").each do |single_mod_path|
-          yield single_mod_path
-        end
+        Dir.glob("#{mods_path}/*").each(&block)
       end
     end
 

data/lib/cardio/schema.rb

@@ -37,14 +37,12 @@ module Cardio
       end
     end
 
-    def with_suffix type
+    def with_suffix type, &block
       return yield unless (new_suffix = Cardio.schema_suffix type) &&
                           new_suffix.present?
 
       original_name = ActiveRecord::Base.schema_migrations_table_name
-      with_migration_table "#{original_name}#{new_suffix}", original_name do
-        yield
-      end
+      with_migration_table "#{original_name}#{new_suffix}", original_name, &block
     end
 
     def with_migration_table new_table_name, old_table_name

data/lib/cardio/utils.rb

@@ -1,16 +1,25 @@
 module Cardio
   # Utilities that may need to be run even when mods are not loaded.
   module Utils
+    def t key, args={}
+      ::I18n.t key, args
+    end
+
     def seed_test_db
       system "env RAILS_ENV=test bundle exec rake db:fixtures:load"
     end
 
+    def database_name
+      @database_name ||= config.database_configuration.dig Rails.env, "database"
+    end
+
     # deletes tmp directory within files directory
     # It's here because it gets called as part of cache clearing, which sometimes gets
     # called in a context where card mods are not loaded.
     # Why does cache clearing need to do this??
     def delete_tmp_files! id=nil
       raise "no files directory" unless files_dir
+
       delete_tmp_files id
     rescue StandardError
       Rails.logger.info "failed to remove tmp files"

data/lib/generators/card/format/format_generator.rb

@@ -5,7 +5,7 @@ require "generators/card"
 class Card
   module Generators
     class FormatGenerator < NamedBase
-      source_root File.expand_path("../templates", __FILE__)
+      source_root File.expand_path("templates", __dir__)
 
       argument :module_name, required: true
       class_option "core", type: :boolean, aliases: "-c",

data/lib/generators/card/migration/migration_generator.rb

@@ -5,7 +5,7 @@ require "generators/card"
 class Card
   module Generators
     class MigrationGenerator < MigrationBase
-      source_root File.expand_path("../templates", __FILE__)
+      source_root File.expand_path("templates", __dir__)
 
       class_option "core", type: :boolean, aliases: "-c",
                            default: false, group: :runtime,
@@ -15,6 +15,7 @@ class Card
         migration_type = options["core"] ? :core_cards : :deck_cards
         mig_paths = Cardio.migration_paths(migration_type)
         raise "No migration directory for #{migration_type}" if mig_paths.blank?
+
         set_local_assigns!
         migration_template @migration_template,
                            File.join(mig_paths.first, "#{file_name}.rb")

data/lib/generators/card/mod/mod_generator.rb

@@ -11,15 +11,16 @@ class Card
                    desc: "create mod Card gem"
 
       def create_mod_tree
-        create_empty_tree mod_path => { lib:    [:javascript, :stylesheets],
+        create_empty_tree mod_path => { lib: %i[javascript stylesheets],
                                         public: [:assets],
-                                        set:    [] }
+                                        set: [] }
       end
 
       private
 
       def create_empty_tree structure
         return unless structure.present?
+
         if structure.is_a?(Hash)
           structure.each_pair do |k, v|
             empty_directory k.to_s

data/lib/generators/card/set/set_generator.rb

@@ -5,7 +5,7 @@ require "generators/card"
 class Card
   module Generators
     class SetGenerator < NamedBase
-      source_root File.expand_path("../templates", __FILE__)
+      source_root File.expand_path("templates", __dir__)
 
       argument :set_pattern, required: true
       argument :anchors, required: true, type: :array
@@ -14,8 +14,8 @@ class Card
                            desc: "create set files in Card gem"
 
       class_option "spec-only", type: :boolean,
-                                 default: false, group: :runtime,
-                                 desc: "create only spec file"
+                                default: false, group: :runtime,
+                                desc: "create only spec file"
 
       def create_files
         template "set_template.erb", set_path unless options["spec-only"]

data/lib/generators/card/template/template_generator.rb

@@ -7,7 +7,7 @@ class Card
     # A decko generator that creates a haml template for a view.
     # Run "decko generate card:template" to get usage information.
     class TemplateGenerator < NamedBase
-      source_root File.expand_path("../templates", __FILE__)
+      source_root File.expand_path("templates", __dir__)
 
       argument :set_pattern, required: true
       argument :anchors, required: true, type: :array

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

@@ -4,17 +4,18 @@ basket :tasks
 
 def run_task_from_task_basket task
   task = task.to_sym
-  task_data = tasks.find {|h| h[:name].to_sym == task.to_sym}
+  task_data = tasks.find { |h| h[:name].to_sym == task.to_sym }
   if !irreversibles_tasks_allowed? && task_data[:irreversible]
     not_allowed task_data[:stats][:link_text]
-  else
-    task_data[:execute_policy].call if task_data
+  elsif task_data
+    task_data[:execute_policy].call
   end
 end
 
 event :admin_tasks, :initialize, on: :update do
   return unless (task = Env.params[:task])
   raise Card::Error::PermissionDenied, self unless Auth.always_ok?
+
   case task.to_sym
   when :clear_cache          then Card::Cache.reset_all
   when :repair_references    then Card::Reference.repair_all
@@ -95,6 +96,7 @@ format :html do
         link_text: "clear cache", task: "clear_cache" }
     ]
     return stats unless oldmem
+
     stats << { title: "memory prev", count: oldmem, unit: "M" }
     stats << { title: "memory diff", count: newmem - oldmem, unit: "M" }
     stats
@@ -104,6 +106,7 @@ format :html do
     res = [(args[:title] || "")]
     res << "#{count(args[:count])}#{args[:unit]}"
     return res unless args[:task]
+
     res << link_to_card(:admin, (args[:link_text] || args[:task]),
                         path: { action: :update, task: args[:task] })
     res

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

@@ -25,24 +25,19 @@ format :html do
   end
 
   def warning_alert warnings
-    admin_warn = I18n.t(:admin_warn, scope: "mod.admin.set.self.admin_info")
     # 'ADMINISTRATOR WARNING'
     alert :warning, true do
-      "<h5>#{admin_warn}</h5>" + list_tag(warnings)
+      "<h5>#{t :admin_warn}</h5>" + list_tag(warnings)
     end
   end
 
   def no_email_delivery_message
     # "Email delivery is turned off."
     # "Change settings in config/application.rb to send sign up notifications."
-    I18n.t(:email_off,
-           scope: "mod.admin.set.self.admin_info",
-           path: "config/application.rb")
+    t :admin_email_off, path: "config/application.rb"
   end
 
   def warning_list_with_auto_scope warnings
-    # 'ADMINISTRATOR WARNING'
-    admin_warn = tr(:admin_warn)
-    "<h5>#{admin_warn}</h5>" + warnings.join("\n")
+    "<h5>#{t :admin_warn}</h5>" + warnings.join("\n")
   end
 end

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

@@ -24,6 +24,7 @@ format :html do
   def restored
     return unless (res_id = Env.params[:restore]) &&
                   (res_card = Card[res_id.to_i])
+
     alert :success, true do
       wrap_with(:h5, "restored") + subformat(res_card).render_bar
     end
@@ -35,7 +36,7 @@ format :html do
       button_link("empty trash",
                   btn_type: :default,
                   path: { mark: :admin, action: :update, task: :empty_trash,
-                          success: { id: "~#{card.id}" } },
+                          success: { mark: "~#{card.id}" } },
                   "data-confirm" => "Are you sure you want to delete "\
                                     "all cards in the trash?")
     )
@@ -58,6 +59,6 @@ format :html do
                                action: :update,
                                restore: trashed_card.id,
                                action_ids: [before_delete],
-                               success: { id: "~#{card.id}" } }
+                               success: { mark: "~#{card.id}" } }
   end
 end

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

@@ -8,8 +8,8 @@ describe Card::Set::Self::Admin do
     assert_view_select @core, "table"
   end
 
-  context "#update" do
-    let(:admin) {Card[:admin]}
+  describe "#update" do
+    let(:admin) { Card[:admin] }
 
     def run_admin_task task
       Card::Auth.as_bot do
@@ -29,14 +29,14 @@ describe Card::Set::Self::Admin do
     end
 
     context "irreversible tasks allowed" do
-      around(:example) do |example|
+      around do |example|
         Cardio.config.allow_irreversible_admin_tasks = true
         example.run
         Cardio.config.allow_irreversible_admin_tasks = false
       end
 
       it "triggers empty trash (with right params)" do
-        Card::Auth.as_bot {Card["A"].delete!}
+        Card::Auth.as_bot { Card["A"].delete! }
 
         expect(Card.where(trash: true)).not_to be_empty
         run_admin_task :empty_trash