RubyGems - card - Versions diffs - 1.108.1 → 1.109.0 - Mend

card 1.108.1 → 1.109.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (128) hide show

checksums.yaml +4 -4
data/VERSION +1 -1
data/config/environments/development.rb +1 -1
data/config/environments/production.rb +5 -2
data/config/initializers/01_core_extensions/array.rb +1 -0
data/config/initializers/01_core_extensions/hash.rb +4 -0
data/config/initializers/02_patches/active_record.rb +1 -1
data/config/initializers/core_extensions.rb +0 -1
data/config/initializers/deck_config.rb +3 -3
data/config/initializers/patches.rb +6 -6
data/lib/card/auth/current.rb +8 -6
data/lib/card/auth.rb +7 -6
data/lib/card/cache/class_methods.rb +2 -4
data/lib/card/cache/shared.rb +1 -1
data/lib/card/cache/temporary.rb +2 -2
data/lib/card/codename.rb +0 -1
data/lib/card/content/chunk/abstract.rb +1 -0
data/lib/card/content/chunk.rb +0 -1
data/lib/card/content/clean.rb +4 -2
data/lib/card/content/diff/l_c_s.rb +1 -2
data/lib/card/content/diff/result.rb +2 -1
data/lib/card/content/diff.rb +2 -1
data/lib/card/content/parser.rb +8 -7
data/lib/card/content.rb +1 -1
data/lib/card/director/subdirector_array.rb +1 -0
data/lib/card/director.rb +1 -1
data/lib/card/dirty/method_factory.rb +1 -0
data/lib/card/env/location.rb +3 -3
data/lib/card/env/location_history.rb +12 -11
data/lib/card/env/success/target.rb +4 -4
data/lib/card/env/support.rb +24 -2
data/lib/card/error.rb +1 -0
data/lib/card/fetch/store.rb +1 -1
data/lib/card/format/error.rb +1 -0
data/lib/card/format/method_delegation.rb +6 -4
data/lib/card/format/registration.rb +5 -3
data/lib/card/format/wrapper.rb +1 -0
data/lib/card/mailer.rb +1 -14
data/lib/card/name/all/parts.rb +1 -1
data/lib/card/name/all.rb +1 -0
data/lib/card/name/name_variants.rb +1 -0
data/lib/card/query/abstract_query/query_helper.rb +1 -2
data/lib/card/query/abstract_query/tie.rb +1 -1
data/lib/card/query/abstract_query.rb +3 -3
data/lib/card/query/card_class.rb +1 -0
data/lib/card/query/clause.rb +1 -0
data/lib/card/query/join.rb +3 -3
data/lib/card/reference/all.rb +6 -7
data/lib/card/rule/cache.rb +1 -0
data/lib/card/rule/preference_cache.rb +2 -0
data/lib/card/rule/read_rule_cache.rb +3 -0
data/lib/card/set/event/all.rb +6 -4
data/lib/card/set/event/callbacks.rb +1 -0
data/lib/card/set/event/options.rb +3 -2
data/lib/card/set/event/skip_and_trigger.rb +1 -1
data/lib/card/set/event.rb +2 -2
data/lib/card/set/format/abstract_format/view_definition.rb +1 -1
data/lib/card/set/format/haml_paths.rb +1 -1
data/lib/card/set/format.rb +4 -4
data/lib/card/set/helpers.rb +4 -4
data/lib/card/set/i18n_scanner.rb +23 -22
data/lib/card/set/i18n_scope.rb +4 -3
data/lib/card/set/pattern/all.rb +1 -1
data/lib/card/set/pattern/base.rb +6 -3
data/lib/card/set/pattern/class_methods.rb +1 -1
data/lib/card/set/pattern.rb +1 -1
data/lib/card/set/required_field.rb +3 -0
data/lib/card/set/trait.rb +6 -1
data/lib/card/subcards/all.rb +12 -4
data/lib/card/view/cache/cache_action.rb +1 -1
data/lib/card/view/cache.rb +1 -1
data/lib/card/view/classy.rb +5 -5
data/lib/card/view/options/key_lists.rb +1 -0
data/lib/card/view/options/voo_api.rb +1 -1
data/lib/cardio/command/application.rb +1 -1
data/lib/cardio/command/custom.rb +7 -6
data/lib/cardio/command/rake_command.rb +3 -2
data/lib/cardio/command/rspec_command.rb +1 -0
data/lib/cardio/generators/deck_generator_loader.rb +1 -1
data/lib/cardio/generators.rb +4 -3
data/lib/cardio/migration/port.rb +2 -0
data/lib/cardio/migration/stamp.rb +1 -0
data/lib/cardio/migration/transform.rb +1 -0
data/lib/cardio/migration.rb +2 -0
data/lib/cardio/mod/class_methods.rb +1 -2
data/lib/cardio/mod/dirs.rb +2 -4
data/lib/cardio/mod/eat/edibles.rb +8 -6
data/lib/cardio/mod/eat.rb +6 -5
data/lib/cardio/mod/load_strategy/set_binding_magic.rb +1 -1
data/lib/cardio/mod/load_strategy/tmp_files.rb +3 -2
data/lib/cardio/mod/load_strategy.rb +1 -0
data/lib/cardio/mod/loader/set_pattern_loader.rb +4 -0
data/lib/cardio/mod/loader/set_template.rb +14 -4
data/lib/cardio/mod/loader.rb +2 -2
data/lib/cardio/mod/sow/card_source.rb +1 -1
data/lib/cardio/mod/sow/remote_source.rb +32 -0
data/lib/cardio/mod/sow.rb +10 -10
data/lib/cardio/railtie.rb +1 -0
data/lib/cardio/script_loader.rb +1 -1
data/lib/cardio/seed.rb +1 -1
data/lib/cardio/utils.rb +1 -1
data/lib/cardio/version.rb +2 -1
data/lib/cardio.rb +3 -0
data/lib/generators/deck/templates/config.ru.erb +1 -1
data/mod/core/config/locales/en.yml +1 -0
data/mod/core/data/schema/20141001105348_move_revisions_to_actions.rb +2 -2
data/mod/core/data/schema/20241017160402_unique_codename.rb +8 -0
data/mod/core/data/transform/20150724123438_update_file_and_image_cards.rb +1 -1
data/mod/core/lib/tasks/card/export.rake +28 -0
data/mod/core/lib/tasks/card/migrate.rake +3 -3
data/mod/core/lib/tasks/card/seed.rake +2 -1
data/mod/core/lib/tasks/card.rake +47 -16
data/mod/core/set/all/admin.rb +1 -2
data/mod/core/set/all/assign_attributes.rb +3 -2
data/mod/core/set/all/codename.rb +7 -0
data/mod/core/set/all/debug.rb +3 -3
data/mod/core/set/all/initialize.rb +1 -0
data/mod/core/set/all/states.rb +7 -6
data/mod/core/set/all/type.rb +2 -0
data/mod/core/set/all/utils.rb +0 -1
data/mod/core/set/self/admin.rb +2 -1
data/mod/core/set/self/autoname.rb +1 -1
data/mod/core/set/self/mod.rb +4 -4
data/mod/core/set/self/trash.rb +1 -1
data/mod/core/set/type/mod.rb +18 -15
data/mod/core/set_pattern/09_self.rb +4 -0
data/mod/core/spec/set/all/trash_spec.rb +7 -7
metadata +42 -29

data/lib/card/mailer.rb CHANGED Viewed

@@ -3,6 +3,7 @@
 require "open-uri"
 class Card
+  # extends ActionMailer with card config
   class Mailer < ActionMailer::Base
     class << self
       def new_mail *args, &block
@@ -14,20 +15,6 @@ class Card
         end
       end
-      def layout message
-        <<-HTML
-          <!DOCTYPE html>
-          <html>
-            <head>
-              <meta http-equiv="Content-type" content="text/html;charset=UTF-8"/>
-            </head>
-            <body>
-              #{message}
-            </body>
-          </html>
-        HTML
-      end
       def defaults_from_config
         (Card.config.email_defaults || {}).symbolize_keys.tap do |defaults|
           defaults[:return_path] ||= defaults[:from] if defaults[:from]

data/lib/card/name/all/parts.rb CHANGED Viewed

@@ -5,7 +5,7 @@ class Card
       module Parts
         def left *args
           case
-          when simple?    then nil
+          when simple?   then nil
           when superleft then superleft
           when name_is_changing? && name.to_name.trunk_name == name_before_act.to_name
             nil # prevent recursion when, eg, renaming A+B to A+B+C

data/lib/card/name/all.rb CHANGED Viewed

@@ -8,6 +8,7 @@ class Card
       # TODO: use delegations and include more name functions
       delegate :simple?, :compound?, :junction?, to: :name
       attr_reader :supercard
       def name
         @name ||= left_id ? Lexicon.lex_to_name([left_id, right_id]) : super.to_name
       end

data/lib/card/name/name_variants.rb CHANGED Viewed

@@ -1,5 +1,6 @@
 class Card
   class Name
+    # variants of card names
     module NameVariants
       @@variant_methods = %i[capitalize singularize pluralize titleize
                              downcase upcase swapcase reverse succ]

data/lib/card/query/abstract_query/query_helper.rb CHANGED Viewed

@@ -19,13 +19,12 @@ class Card
         end
         def table_alias
-          @table_alias ||= begin
+          @table_alias ||=
             if fasten == :direct
               @superquery.table_alias
             else
               "#{table_prefix}#{root.table_seq}#{@table_suffix}"
             end
-          end
         end
         def table_seq

data/lib/card/query/abstract_query/tie.rb CHANGED Viewed

@@ -107,7 +107,7 @@ class Card
         end
         def list_of_ids? val
-          return unless val.is_a? Array
+          return false unless val.is_a? Array
           !val.find { |v| !id_from_val v }
         end

data/lib/card/query/abstract_query.rb CHANGED Viewed

@@ -71,10 +71,10 @@ class Card
       end
       def context
-        if !@context.nil?
-          @context
-        else
+        if @context.nil?
           @context = superquery ? superquery.context : ""
+        else
+          @context
         end
       end

data/lib/card/query/card_class.rb CHANGED Viewed

@@ -1,5 +1,6 @@
 class Card
   module Query
+    # query-related methods with which to extend Card class
     module CardClass
       def search spec, comment=nil, &block
         results = ::Card::Query.run(spec, comment)

data/lib/card/query/clause.rb CHANGED Viewed

@@ -1,5 +1,6 @@
 class Card
   module Query
+    # shared methods for query clauses
     module Clause
       #    attr_accessor :clause

data/lib/card/query/join.rb CHANGED Viewed

@@ -44,10 +44,10 @@ class Card
       end
       def side
-        if !@side.nil?
-          @side.to_s.upcase
-        else
+        if @side.nil?
           @side = inside_or? ? "LEFT" : nil
+        else
+          @side.to_s.upcase
         end
       end

data/lib/card/reference/all.rb CHANGED Viewed

@@ -1,13 +1,12 @@
 class Card
   class Reference < Cardio::Record
-    module All
-      # frozen_string_literal: true
-      # Cards can refer to other cards in their content, eg via links and nests.
-      # The card that refers is the "referer", the card that is referred to is
-      # the "referee". The reference itself has its own class (Card::Reference),
-      # which handles id-based reference tracking.
+    # frozen_string_literal: true
+    # Cards can refer to other cards in their content, eg via links and nests.
+    # The card that refers is the "referer", the card that is referred to is
+    # the "referee". The reference itself has its own class (Card::Reference),
+    # which handles id-based reference tracking.
+    module All
       PARTIAL_REF_CODE = "P".freeze
       # cards that refer to self

data/lib/card/rule/cache.rb CHANGED Viewed

@@ -1,5 +1,6 @@
 class Card
   module Rule
+    # a cache of all card rules in the deck
     class Cache
       class_attribute :sql, :cache_key

data/lib/card/rule/preference_cache.rb CHANGED Viewed

@@ -1,5 +1,7 @@
 class Card
   module Rule
+    # a preference is a user-specific rule.
+    # This caches all preferences in the deck
     class PreferenceCache < Cache
       self.sql = %(
         SELECT

data/lib/card/rule/read_rule_cache.rb CHANGED Viewed

@@ -1,5 +1,8 @@
 class Card
   module Rule
+    # the read rule cache, unlike the standard rule cache, is optimized for lookups
+    # based on the rules' values, because this is needed for high-performance
+    # permission-checking
     class ReadRuleCache < Cache
       self.sql = %(
         SELECT

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

@@ -14,7 +14,9 @@ class Card
         include SkipAndTrigger
         def event_applies? event
-          return unless set_condition_applies? event.set_module, event.opts[:changing]
+          unless set_condition_applies? event.set_module, event.opts[:changing]
+            return false
+          end
           CONDITIONS.all? { |c| send "#{c}_condition_applies?", event, event.opts[c] }
         end
@@ -91,10 +93,10 @@ class Card
         def wrong_stage opts
           return false if director.stage_ok? opts
-          if !stage
-            "phase method #{method} called outside of event phases"
-          else
+          if stage
             "#{opts.inspect} method #{method} called in stage #{stage}"
+          else
+            "phase method #{method} called outside of event phases"
           end
         end

data/lib/card/set/event/callbacks.rb CHANGED Viewed

@@ -1,6 +1,7 @@
 class Card
   module Set
     class Event
+      # handle card event callbacks
       module Callbacks
         def set_event_callbacks
           %i[before after around].each do |kind|

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

@@ -1,6 +1,7 @@
 class Card
   module Set
     class Event
+      # handle options available for event definition
       module Options
         def validate_conditions
           @opts.each do |key, val|
@@ -32,8 +33,8 @@ class Card
           return if invalid.empty?
           raise ArgumentError,
-                "invalid option#{'s' if invalid.size > 1} '#{invalid}' "\
-                  "for condition '#{condition}' in event '#{@event}'"
+                "invalid option#{'s' if invalid.size > 1} '#{invalid}' " \
+                "for condition '#{condition}' in event '#{@event}'"
         end
         def invalid_condition_values condition, val

data/lib/card/set/event/skip_and_trigger.rb CHANGED Viewed

@@ -7,7 +7,7 @@ class Card
           :skip,                        # [Array] skip event(s) for all cards in act
           :skip_in_action,              # [Array] skip event for just this card
           :trigger,                     # [Array] trigger event(s) for all cards in act
-          :trigger_in_action,           # [Array] trigger event for just this card
+          :trigger_in_action            # [Array] trigger event for just this card
         ]
         attr_reader(*settings)

data/lib/card/set/event.rb CHANGED Viewed

@@ -165,8 +165,8 @@ class Card
   end
   # one failed integration event should not harm others.
-  def rescuing_integration
-    Error.rescue_card(self) { yield }
+  def rescuing_integration &block
+    Error.rescue_card(self, &block)
   ensure
     true
   end

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

@@ -58,7 +58,7 @@ class Card
             views[mod][alias_to] || begin
               raise "cannot find #{alias_to} view in #{mod}; " \
-                      "failed to alias #{view} from #{self}"
+                    "failed to alias #{view} from #{self}"
             end
           end
         end

data/lib/card/set/format/haml_paths.rb CHANGED Viewed

@@ -46,7 +46,7 @@ class Card
           end
         end
-        TMPSET_REGEXP = %r{^.*/tmp(sets)?/set/[\w-]+/mod\d{3}-(?<modname>[^/]+)}
+        TMPSET_REGEXP = %r{^.*/tmp(?:sets)?/set/[\w-]+/mod\d{3}-(?<modname>[^/]+)}
         def deep_source source
           return source unless tmp_files?

data/lib/card/set/format.rb CHANGED Viewed

@@ -103,14 +103,14 @@ class Card
       # shortcut for {AbstractFormat#view} for when #view is called outside of a format
       # block
-      def view *args, &block
-        format { view(*args, &block) }
+      def view(...)
+        format { view(...) }
       end
       # shortcut for {AbstractFormat#before} for when #before is called outside of a
       # format block
-      def before view, &block
-        format { before view, &block }
+      def before(...)
+        format { before(...) }
       end
       private

data/lib/card/set/helpers.rb CHANGED Viewed

@@ -10,7 +10,7 @@ class Card
       # Card::Set::Type::User
       def shortname
         first = 2 # shortname eliminates Card::Set
-        last = first + num_set_parts(pattern_code)
+        last = pattern_code == :self ? -1 : (first + num_set_parts)
         set_name_parts[first..last].join "::"
       end
@@ -88,7 +88,7 @@ class Card
       end
       def test_set
-        # rubocop:disable Lint/Eval
+        # rubocop:disable Security/Eval
         ::Card::Set::Self.const_remove_if_defined :TestSet
         eval <<-RUBY, binding, __FILE__, __LINE__ + 1
           class ::Card::Set::Self
@@ -99,7 +99,7 @@ class Card
           end
         RUBY
         ::Card::Set::Self::TestSet
-        # rubocop:enable Lint/Eval
+        # rubocop:enable Security/Eval
       end
       def base_format_modules?
@@ -115,7 +115,7 @@ class Card
         Card::Set.modules[set_format_type_key][format_class][shortname] || []
       end
-      def num_set_parts pattern_code
+      def num_set_parts
         return 1 if pattern_code == :abstract
         Pattern.find(pattern_code).anchor_parts_count

data/lib/card/set/i18n_scanner.rb CHANGED Viewed

@@ -1,23 +1,24 @@
 # lib/my_custom_scanner.rb
-require "i18n/tasks/scanners/file_scanner"
-class Card
-  module Set
-    class I18nScanner < ::I18n::Tasks::Scanners::FileScanner
-      include ::I18n::Tasks::Scanners::RelativeKeys
-      include ::I18n::Tasks::Scanners::OccurrenceFromPosition
-      # @return [Array<[absolute key, Results::Occurrence]>]
-      def scan_file path
-        text = read_file(path)
-        text.scan(/[^\w._-]tr[( ]\s*["':](\w+)/).map do |_match|
-          occurrence = occurrence_from_position(
-            path, text, Regexp.last_match.offset(0).first
-          )
-          [absolute_key(".#{_match[0]}", path), occurrence]
-        end
-      end
-    end
-    ::I18n::Tasks.add_scanner "Card::Set::I18nScanner"
-  end
-end
+# require "i18n/tasks/scanners/file_scanner"
+# class Card
+#   module Set
+#     class I18nScanner < ::I18n::Tasks::Scanners::FileScanner
+#       include ::I18n::Tasks::Scanners::RelativeKeys
+#       include ::I18n::Tasks::Scanners::OccurrenceFromPosition
+#
+#       # @return [Array<[absolute key, Results::Occurrence]>]
+#       def scan_file path
+#         text = read_file(path)
+#
+#         # tr()
+#         text.scan(/[^\w._-]tr[( ]\s*["':](\w+)/).map do |_match|
+#           occurrence = occurrence_from_position(
+#             path, text, Regexp.last_match.offset(0).first
+#           )
+#           [absolute_key(".#{_match[0]}", path), occurrence]
+#         end
+#       end
+#     end
+#     ::I18n::Tasks.add_scanner "Card::Set::I18nScanner"
+#   end
+# end

data/lib/card/set/i18n_scope.rb CHANGED Viewed

@@ -1,5 +1,6 @@
 class Card
   module Set
+    # Adapt Internationalization(i18n) scope handling to infer mod prefixes.
     module I18nScope
       delegate :tmp_files?, to: Cardio::Mod::LoadStrategy
@@ -22,7 +23,7 @@ class Card
       def set_from_parts parts, index
         start_index = index + (tmp_files? ? 2 : 1)
-        parts[start_index..-1].join "."
+        parts[start_index..].join "."
       end
       def mod_from_parts parts, set_index
@@ -55,7 +56,7 @@ class Card
       #   this method returns ["core", "all", "event"]
       # def set_path_parts backtrace
       #   parts = path_parts backtrace
-      #   res = parts[path_mod_index(parts)..-1]
+      #   res = parts[path_mod_index(parts)..]
       #   res.delete_at 1
       # end
@@ -65,7 +66,7 @@ class Card
       #   this method returns ["core", "all", "event"]
       # def tmp_set_path_parts backtrace
       #   path_parts = find_tmp_set_path(backtrace).split(File::SEPARATOR)
-      #   res = path_parts[tmp_path_mod_index(path_parts)..-1]
+      #   res = path_parts[tmp_path_mod_index(path_parts)..]
       #   res[0] = mod_name_from_tmp_dir res.first
       #   res[-1] = res.last.split(".").first
       #   res

data/lib/card/set/pattern/all.rb CHANGED Viewed

@@ -25,7 +25,7 @@ class Card
         # new cards do not
         def patterns
-          @patterns ||= (new_card? ? concrete_patterns[1..-1] : concrete_patterns)
+          @patterns ||= (new_card? ? concrete_patterns[1..] : concrete_patterns)
         end
         def reset_patterns

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

@@ -4,8 +4,7 @@ class Card
       # class from which set patterns inherit
       class Base
         extend ClassMethods
-        delegate :pattern_code, :pattern, :anchorless?, :anchor_parts_count,
-                 :assigns_type, to: :class
+        delegate :pattern_code, :pattern, :anchorless?, :assigns_type, to: :class
         def initialize card
           return if anchorless?
@@ -43,6 +42,10 @@ class Card
           end
         end
+        def anchor_parts_count
+          @anchor_parts_count ||= self.class.anchor_parts_count @anchor_name
+        end
         def anchor_parts
           return [@anchor_name] unless anchor_parts_count > 1
@@ -51,7 +54,7 @@ class Card
             parts
           else
             # handles cases where anchor is a compound card, eg A+B+*self
-            [@anchor_name[0..-anchor_parts_count]] + parts[(-anchor_parts_count + 1)..-1]
+            [@anchor_name[0..-anchor_parts_count]] + parts[(-anchor_parts_count + 1)..]
           end
         end

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

@@ -38,7 +38,7 @@ class Card
           compound_only? ? card.name.compound? : true
         end
-        def anchor_parts_count
+        def anchor_parts_count _anchor_name=nil
           @anchor_parts_count ||= (anchorless? ? 0 : 1)
         end

data/lib/card/set/pattern.rb CHANGED Viewed

@@ -39,7 +39,7 @@ class Card
         # list of codenames of pattern cards
         # @return [Array <Symbol>]
         def codes
-          @codes ||= concrete.map(&:pattern_code).to_set
+          @codes ||= concrete.to_set(&:pattern_code)
         end
         # list of lists of codenames in pattern load order

data/lib/card/set/required_field.rb CHANGED Viewed

@@ -1,5 +1,8 @@
 class Card
   module Set
+    # supports requiring field cards
+    # for example, if A requires a B field, then you cannot create A without also
+    # creating A+B
     class RequiredField
       attr_reader :parent_set, :field, :options

data/lib/card/set/trait.rb CHANGED Viewed

@@ -53,6 +53,7 @@ class Card
       def assign_trait_type trait, type
         return unless type && (parts = trait_module_key_parts trait)
         assign_type type, normalize_const(parts)
       end
@@ -71,7 +72,11 @@ class Card
       end
       def define_trait_card trait, opts
-        define_method "#{trait}_card" do
+        define_method "#{trait}_card" do |sub=false|
+          if sub && (card = subfield trait)
+            return card
+          end
           # opts = opts.clone.merge supercard: card
           fetch trait.to_sym, new: opts.clone, eager_cache: true
         end

data/lib/card/subcards/all.rb CHANGED Viewed

@@ -30,7 +30,7 @@ class Card
       end
       def field field_name, args={}
-        if (sf = subcards.field field_name)
+        if (sf = subfield field_name)
           sf.assign_attributes args
           sf
         else
@@ -39,11 +39,19 @@ class Card
       end
       def field_content field_name
-        subcards.field(field_name)&.content
+        subfield(field_name)&.content
       end
-      def field? tag
-        fetch(tag) || subcards.field(tag).present?
+      def subfield field_name
+        subcards.field field_name
+      end
+      def subfield? field_name
+        subfield(field_name).present?
+      end
+      def field? field_name
+        fetch(field_name) || subfield?(field_name)
       end
       def drop_subcard name_or_card

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

@@ -89,7 +89,7 @@ class Card
           return true if caching == :deep || parent.present?
           # a parent voo means we're still in the same card
-          return unless (superformat_card = format.parent&.card)
+          return false unless (superformat_card = format.parent&.card)
           superformat_card.name == card.name.left_name
         end

data/lib/card/view/cache.rb CHANGED Viewed

@@ -261,7 +261,7 @@ class Card
       end
       def options_for_cache_key
-        hash_for_cache_key(live_options) + ";" + hash_for_cache_key(viz_hash)
+        "#{hash_for_cache_key(live_options)};#{hash_for_cache_key(viz_hash)}"
       end
       def hash_for_cache_key hash

data/lib/card/view/classy.rb CHANGED Viewed

@@ -120,18 +120,18 @@ class Card
         [classes, class_list(:single_use).delete(klass)]
       end
+      OK_TYPES = { ancestor_format: [:public],
+                   self_format: %i[public format_private],
+                   self: %i[public format_private private] }.freeze
       def ok_types space
-        case space
-        when :ancestor_format then [:public]
-        when :self_format     then %i[public format_private]
-        when :self            then %i[public format_private private]
-        end
+        OK_TYPES[space]
       end
       def class_list type=:private
         unless type.in? %i[private format_private public single_use]
           raise ArgumentError, "#{type} not a valid class list"
         end
         @class_list ||= {}
         @class_list[type] ||= {}
       end

data/lib/card/view/options/key_lists.rb CHANGED Viewed

@@ -1,6 +1,7 @@
 class Card
   class View
     module Options
+      # lists of view option keys
       module KeyLists
         # all standard option keys
         # @return [Array]

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

@@ -197,7 +197,7 @@ class Card
         # @param opts [Hash] options hash
         # @return [Hash] options Hash
         def foreign_options_in opts
-          foreign_opts = opts.reject { |k, _v| Options.all_keys.include? k }
+          foreign_opts = opts.except(*Options.all_keys)
           foreign_opts.empty? ? nil : foreign_opts
         end
       end

data/lib/cardio/command/application.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 require "rails/generators"
-require File.expand_path("../../../generators/deck/deck_generator", __FILE__)
+require File.expand_path("../../generators/deck/deck_generator", __dir__)
 require "cardio/command"
 Cardio::Command.run_non_deck_command ARGV.first, "cardio/commands"

data/lib/cardio/command/custom.rb CHANGED Viewed

@@ -8,14 +8,14 @@ module Cardio
       private
       def run_new
-        if !["-h", "--help"].intersection(args).empty?
-          ARGV.unshift "new"
-          require "cardio/command/application"
-        else
+        if ["-h", "--help"].intersection(args).empty?
           puts "Can't initialize a new deck within the directory of another, " \
                "please change to a non-deck directory first.\n"
           puts "Type '#{gem}' for help."
           exit 1
+        else
+          ARGV.unshift "new"
+          require "cardio/command/application"
         end
       end
@@ -46,9 +46,10 @@ module Cardio
       def run_help_for_group group
         puts
-        puts "For " + "#{group}s".yellow + ":"
+        puts "For #{"#{group}s".yellow}:"
         map.each do |command, conf|
           next unless conf[:group] == group
           puts command_help(command, conf)
         end
         puts
@@ -57,7 +58,7 @@ module Cardio
       # formats command string for help text
       def command_help command, conf
         alt = conf[:alias] ? "(or #{conf[:alias]})" : ""
-        "    " + command.to_s.ljust(12).light_cyan + alt.ljust(10) + conf[:desc]
+        "    #{command.to_s.ljust(12).light_cyan}#{alt.ljust(10)}#{conf[:desc]}"
       end
     end
   end