card 1.101.4 → 1.101.5

data/lib/card/view/permission.rb

@@ -16,6 +16,7 @@ class Card
 
       def altered_view
         return if skip_check?
+
         alter_unknown || denial
       end
 

data/lib/cardio.rb

@@ -26,7 +26,7 @@ module Cardio
 
     def load_card?
       ActiveRecord::Base.connection && !card_defined?
-    rescue
+    rescue StandardError
       false
     end
 

data/lib/cardio/migration.rb

@@ -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

@@ -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/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/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

@@ -19,6 +19,7 @@ module Cardio
     # 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/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

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

data/mod/core/set/all/abort.rb

@@ -1,4 +1,3 @@
-
 # The Card#abort method is for cleanly exiting an action without continuing
 # to process any further events.
 #
@@ -33,9 +32,10 @@ end
 private
 
 def handle_abort_error e
-  if e.status == :triumph
+  case e.status
+  when :triumph
     @supercard ? raise(e) : true
-  elsif e.status == :success
+  when :success
     abort_success
   end
 end
@@ -51,12 +51,12 @@ end
 
 # this is an override of standard rails behavior that rescues abort
 # makes it so that :success abortions do not rollback
-def with_transaction_returning_status
+def with_transaction_returning_status &block
   status = nil
   self.class.transaction do
     add_to_transaction
     remember_transaction_record_state
-    status = abortable { yield }
+    status = abortable(&block)
     raise ActiveRecord::Rollback unless status
   end
   status

data/mod/core/set/all/assign_attributes.rb

@@ -5,8 +5,7 @@ def assign_attributes args={}
 
   assign_with_subcards args do
     assign_with_set_modules args do
-      params = prepare_assignment_params args
-      super params
+      super prepare_assignment_params(args)
     end
   end
 end
@@ -40,6 +39,7 @@ end
 
 def prepare_assignment_args args
   return {} unless args
+
   args = args.symbolize_keys
   normalize_type_attributes args
   stash_set_specific_attributes args
@@ -47,8 +47,7 @@ def prepare_assignment_args args
 end
 
 def assign_with_set_modules args
-  set_changed = args[:name] || args[:type_id]
-  return yield unless set_changed
+  return yield unless args[:name] || args[:type_id]
 
   refresh_set_modules { yield }
 end
@@ -56,9 +55,7 @@ end
 def assign_with_subcards args
   subcard_args = extract_subcard_args! args
   yield
-  # name= must come before process subcards
-  return unless subcard_args.present?
-  subcards.add subcard_args
+  subcards.add subcard_args if subcard_args.present?
 end
 
 def refresh_set_modules
@@ -96,7 +93,7 @@ def type_id_from_codename type_code
 end
 
 def type_id_from_cardname type_name
-  type_id_or_error(type_name) { Card.fetch_id type_name }
+  type_id_or_error(type_name) { type_name.card_id }
 end
 
 def type_id_or_error val

data/mod/core/set/all/codename.rb

@@ -25,5 +25,6 @@ end
 def validate_codename_uniqueness
   return (self.codename = nil) if codename.blank?
   return if errors.present? || !Card.find_by_codename(codename)
+
   errors.add :codename, t(:core_error_code_in_use, codename: codename)
 end

data/mod/core/set/all/collection.rb

@@ -1,10 +1,8 @@
 # shared methods for card collections (Pointers, Searches, Sets, etc.)
 module ClassMethods
-  def search spec, comment=nil
+  def search spec, comment=nil, &block
     results = ::Card::Query.run(spec, comment)
-    if block_given? && results.is_a?(Array)
-      results.each { |result| yield result }
-    end
+    results.each(&block) if block_given? && results.is_a?(Array)
     results
   end
 
@@ -14,11 +12,11 @@ module ClassMethods
     search spec.merge(return: "count")
   end
 
-  def find_each options={}
+  def find_each options={}, &block
     # this is a copy from rails (3.2.16) and is needed because this
     # is performed by a relation (ActiveRecord::Relation)
     find_in_batches(options) do |records|
-      records.each { |record| yield record }
+      records.each(&block)
     end
   end
 

data/mod/core/set/all/content.rb

@@ -67,7 +67,8 @@ end
 format do
   ONE_LINE_CHARACTER_LIMIT = 60
 
-  def chunk_list # override to customize by set
+  # override to customize by set
+  def chunk_list
     :default
   end
 
@@ -117,7 +118,7 @@ format do
     if text.size <= limit
       text
     else
-      text[0..(limit - 3)] + "..."
+      "#{text[0..(limit - 3)]}..."
     end
   end
 

data/mod/core/set/all/contextual_content.rb

@@ -15,10 +15,8 @@ format do
     card.context_card
   end
 
-  def with_context context_card
-    card.with_context context_card do
-      yield
-    end
+  def with_context context_card, &block
+    card.with_context context_card, &block
   end
 
   def contextual_content context_card, options={}