card 1.101.4 → 1.101.5

data/lib/card/rule/all.rb

@@ -24,6 +24,7 @@ class Card
 
       def preference_card_id setting_code, user=nil
         return unless (user_id = preference_user_id user)
+
         rule_id_lookup Card::Rule.preference_cache,
                        "#{setting_code}+#{user_id}",
                        "#{setting_code}+#{AllID}"

data/lib/card/rule/cache.rb

@@ -39,12 +39,14 @@ class Card
         def lookup_hash
           rows.each_with_object({}) do |row, hash|
             next unless (key = lookup_key row)
+
             hash[key] = row["rule_id"].to_i
           end
         end
 
         def lookup_key row
           return false unless (setting_code = setting_code(row))
+
           anchor_id = row["anchor_id"]
           return false unless (pattern_code = pattern_code(anchor_id, row))
 

data/lib/card/set/advanced_api.rb

@@ -10,8 +10,8 @@ class Card
       def ensure_set &block
         set_module = yield
         set_module = card_set_module_const_get(set_module) unless set_module.is_a?(Module)
-      rescue NameError => error
-        define_set_from_error error
+      rescue NameError => e
+        define_set_from_error e
         # try again - there might be another submodule that doesn't exist
         ensure_set(&block)
       else
@@ -21,6 +21,7 @@ class Card
       def define_set_from_error error
         match = error.message.match(/uninitialized constant (?:Card::Set::)?(.+)$/)
         return unless match
+
         define_set match[1]
       end
 

data/lib/card/set/event.rb

@@ -156,8 +156,8 @@ class Card
     end
   end
 
-  def rescuing_if_integration is_integration
-    is_integration ? rescuing_integration { yield } : yield
+  def rescuing_if_integration is_integration, &block
+    is_integration ? rescuing_integration(&block) : yield
   end
 
   # one failed integration event should not harm others.

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

@@ -31,6 +31,7 @@ class Card
         # @param old_sets [True/False] whether to use the old_sets
         def set_condition_card old_sets
           return self if old_sets || no_current_action?
+
           @set_condition_card ||=
             updating_sets? ? set_condition_card_with_new_set_modules : self
         end
@@ -57,8 +58,10 @@ class Card
 
         def changed_condition_applies? _event, db_columns
           return true unless action == :update
+
           db_columns = Array(db_columns).compact
           return true if db_columns.empty?
+
           db_columns.any? { |col| single_changed_condition_applies? col }
         end
         alias_method :changing_condition_applies?, :changed_condition_applies?
@@ -73,11 +76,13 @@ class Card
 
         def single_changed_condition_applies? db_column
           return true unless db_column
+
           send "#{db_column}_is_changing?"
         end
 
         def wrong_stage opts
           return false if director.stage_ok? opts
+
           if !stage
             "phase method #{method} called outside of event phases"
           else
@@ -87,6 +92,7 @@ class Card
 
         def wrong_action actn
           return false if on_condition_applies?(nil, actn)
+
           "on: #{actn} method #{method} called on #{action}"
         end
       end

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

@@ -59,9 +59,9 @@ class Card
 
           def handle_perform
             yield
-          rescue StandardError => error
-            Card::Error.report error, @card
-            raise error
+          rescue StandardError => e
+            Card::Error.report e, @card
+            raise e
           ensure
             Director.expire
           end
@@ -121,7 +121,7 @@ class Card
   end
 
   def serialize_hash_value value
-    value.each_with_object({}) { |(k, v), h| h[k] = serialize_value(v) }
+    value.transform_values { |v| serialize_value(v) }
   end
 
   def deserialize_value val, type
@@ -138,8 +138,8 @@ class Card
   end
 
   def deserialize_hash_value value
-    value.each_with_object({}) do |(k, v), h|
-      h[k] = deserialize_value v[:value], v[:type]
+    value.transform_values do |v|
+      deserialize_value v[:value], v[:type]
     end
   end
 end

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

@@ -73,6 +73,7 @@ class Card
           stage = opts.delete :stage
           after_subcards = opts.delete :after_subcards
           return if opts[:after] || opts[:before] || opts[:around] || !(@stage = stage)
+
           # after, before, or around will override stage configuration
 
           opts[:after] = callback_name stage, after_subcards

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

@@ -55,6 +55,7 @@ class Card
             if block_given?
               raise Card::Error::ServerError, "no blocks allowed in aliased views"
             end
+
             views[mod][alias_to] || begin
               raise "cannot find #{alias_to} view in #{mod}; " \
                       "failed to alias #{view} from #{self}"

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

@@ -48,6 +48,7 @@ class Card
 
           def interpret_view_settings view, opts
             return unless opts.present?
+
             unknown_ok[view] = true if opts[:unknown] == true
 
             VIEW_SETTINGS.each do |setting_name|

data/lib/card/set/i18n_scope.rb

@@ -6,6 +6,7 @@ class Card
       # return scope for I18n
       def scope backtrace
         return "lib" unless (parts = path_parts backtrace)
+
         index = path_set_index parts
         mod = mod_from_parts parts, index
         mod || "lib"
@@ -33,15 +34,16 @@ class Card
       end
 
       def mod_without_version_suffix mod
-        mod.gsub(/-[\d\.]+$/, "")
+        mod.gsub(/-[\d.]+$/, "")
       end
 
       def mod_without_tmp_prefix mod
-        mod.gsub(/^[^-]*\-/, "")
+        mod.gsub(/^[^-]*-/, "")
       end
 
       def path_parts backtrace
         return unless (path = find_set_path backtrace)
+
         parts = path.split File::SEPARATOR
         parts[-1] = parts.last.split(".").first
         parts

data/lib/card/set/inheritance.rb

@@ -2,7 +2,6 @@ class Card
   module Set
     # API to inherit other sets and their formats
     module Inheritance
-
       # include a set module and all its format modules
       # @param [Module] set
       # @param [Hash] opts choose the formats you want to include. You can also

data/lib/card/set/loader.rb

@@ -33,8 +33,6 @@ class Card
       #  tmp files that add module names (Card::Set::PATTERN::ANCHOR) and
       #  extend the module with Card::Set.
 
-      #
-
       # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
       # Organization Phase
 

data/lib/card/set/pattern/base.rb

@@ -7,6 +7,7 @@ class Card
 
         def initialize card
           return if self.class.anchorless?
+
           @anchor_name = self.class.anchor_name(card).to_name
           @anchor_id = find_anchor_id card
         end
@@ -17,6 +18,7 @@ class Card
 
         def module_key
           return @module_key if defined? @module_key
+
           @module_key = self.class.module_key anchor_codenames
         end
 
@@ -35,8 +37,7 @@ class Card
 
         def anchor_codenames
           anchor_parts.map do |part|
-            part_id = Card.fetch_id part
-            Card::Codename[part_id] || break
+            part.cardname&.code || break
           end
         end
 

data/lib/card/set/pattern/class_methods.rb

@@ -35,7 +35,7 @@ class Card
         end
 
         def pattern_applies? card
-          junction_only? ? card.name.junction? : true
+          junction_only? ? card.name.compound? : true
         end
 
         def anchor_parts_count
@@ -63,7 +63,7 @@ class Card
         def quick_type name
           if name.present?
             card = Card.fetch name, skip_modules: true, new: {}
-            card.include_set_modules if card.new? && name.to_name.junction?
+            card.include_set_modules if card.new? && name.to_name.compound?
             card&.type_name
           else
             "RichText"

data/lib/card/set/required_field.rb

@@ -29,6 +29,7 @@ class Card
 
       def define_field_test
         return unless (test = event_test)
+
         method_name = field_test_name
         field_set.class_exec do
           define_method method_name do
@@ -39,13 +40,15 @@ class Card
 
       def field_test_name
         return unless event_test
+
         "_when_left_#{event_test}".to_sym
       end
 
       def event_test
         return @event_test unless @event_test.nil?
+
         test = options[:when]
-        @event_test = test&.is_a?(Symbol) ? test : false
+        @event_test = test.is_a?(Symbol) ? test : false
       end
 
       def field_set

data/lib/card/setting.rb

@@ -9,6 +9,7 @@ class Card
     #     O = Card['*create']         (object)
     # accessible in E
     attr_accessor :codename
+
     # accessible in E and M
     mattr_accessor :groups, :preferences
 
@@ -78,6 +79,7 @@ class Card
 
     def applies_to_prototype? prototype
       return true unless applies
+
       applies.call(prototype)
     end
 
@@ -114,6 +116,7 @@ class Card
 
     def permitted_type_ids types
       return unless types
+
       type_ids = Array.wrap(types).flatten.map do |cardtype|
         Card::Codename.id cardtype
       end

data/lib/card/subcards.rb

@@ -16,6 +16,7 @@ class Card
     include Relate
 
     attr_accessor :context_card, :keys
+
     def initialize context_card
       @context_card = context_card
       @keys = ::Set.new
@@ -73,10 +74,8 @@ class Card
       end.compact
     end
 
-    def each_card
-      cards.each do |card|
-        yield card
-      end
+    def each_card &block
+      cards.each(&block)
     end
 
     alias_method :each, :each_card

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

@@ -18,7 +18,7 @@ class Card
         end
 
         def ruby_file_name
-          @codename + ".rb"
+          "#{@codename}.rb"
         end
 
         def ruby_file_content

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

@@ -2,15 +2,13 @@ class Card
   class FileCardCreator
     # Helper methods to write to files and the console.
     module OutputHelper
-      def write_to_mod rel_dir, filename
+      def write_to_mod rel_dir, filename, &block
         dir = File.join "mod", @mod, rel_dir
         FileUtils.mkdir_p(dir) unless Dir.exist?(dir)
 
         path = File.join dir, filename
         log_file_action path do
-          File.open(path, "w") do |opened_file|
-            yield(opened_file)
-          end
+          File.open(path, "w", &block)
         end
       end
 

data/lib/card/tasks/card/migrate.rake

@@ -24,7 +24,7 @@ def reset_column_information mod=false
 end
 
 def load_mod_lib
-  Dir.glob(Cardio.root.join("mod/*/lib/*.rb")).each { |x| require x }
+  Dir.glob(Cardio.root.join("mod/*/lib/*.rb")).sort.each { |x| require x }
 end
 
 def without_dumping
@@ -100,7 +100,7 @@ namespace :card do
 
       Cardio.schema_mode args[:type] do
         version = ActiveRecord::Migrator.current_version
-        if version.to_i > 0 && (file = ::File.open(stamp_file, "w"))
+        if version.to_i.positive? && (file = ::File.open(stamp_file, "w"))
           puts ">>  writing version: #{version} to #{stamp_file}"
           file.puts version
         end

data/lib/card/view/cache.rb

@@ -194,8 +194,8 @@ class Card
       # those stubs.
       #
       # @return [String (usually)] rendered view
-      def cache_render
-        cached_view = cache_fetch { yield }
+      def cache_render &block
+        cached_view = cache_fetch(&block)
         cache_active? ? cached_view : format.stub_render(cached_view)
       end
 
@@ -212,18 +212,16 @@ class Card
 
       # If view is cached, retrieve it.  Otherwise render and store it.
       # Uses the primary cache API.
-      def cache_fetch
+      def cache_fetch &block
         caching do
           ensure_cache_key
-          self.class.cache.fetch cache_key do
-            yield
-          end
+          self.class.cache.fetch cache_key, &block
         end
       end
 
       # keep track of nested cache fetching
-      def caching
-        self.class.caching(self) { yield }
+      def caching &block
+        self.class.caching(self, &block)
       end
 
       # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

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

@@ -14,12 +14,11 @@ class Card
         end
 
         def log_cache_action
-          action = yield
+          yield
           # TODO: make configurable
           # ...or better yet, integrate into performance logger...
           # Rails.logger.warn "VIEW CACHE #{cache_active? ? '-->' : ''}[#{action}] "\
           #                   "(#{card.name}##{requested_view})"
-          action
         end
 
         # @return [Symbol] :off, :active, or :free

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

@@ -17,7 +17,7 @@ class Card
         end
 
         def bin_to_hex string
-          string.unpack("H*").first
+          string.unpack1("H*")
         end
 
         # @return [Hash]

data/lib/card/view/options.rb

@@ -51,11 +51,11 @@ class Card
           :structure,      # overrides the content of the card
           :title,          # overrides the name of the card
           :variant,        # override the canonical version of the name with a different
-                           # variant
+          # variant
           :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)
+          # (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
@@ -71,7 +71,7 @@ class Card
           :layout          #
         ]
       }
-      # Note: option values are strings unless otherwise noted
+      # NOTE: option values are strings unless otherwise noted
 
       class << self
         attr_reader :keymap