card 1.96.8 → 1.97.0

data/lib/card/migration/import/import_data/card_content.rb

@@ -28,4 +28,3 @@ class Card
     end
   end
 end
-

data/lib/card/mod.rb

@@ -59,19 +59,22 @@ class Card
   #
   # Other ways your mod can extend Decko functionality include:
   #   - **format** for creating new formats (think file extensions)
-  #   - **set_pattern** for additional {Card::Set::Pattern set patterns}, or types of sets.
+  #   - **set_pattern** for additional {Card::Set::Pattern set patterns},
+  #     or types of sets.
   #   - **chunk** provides tools for finding new patterns in card content
   #   - **file** for fixed initial card content
   module Mod
     class << self
       def load
         return if ENV["CARD_MODS"] == "none"
+
         if Card.take
           Loader.load_mods
         else
           Rails.logger.warn "empty database"
         end
       end
+
       # @return an array of Rails::Path objects
       def dirs
         @dirs ||= Dirs.new(Card.paths["mod"].existent)

data/lib/card/mod/dirs.rb

@@ -1,5 +1,4 @@
 class Card
-
   class << self
     def config
       Cardio.config
@@ -86,12 +85,16 @@ class Card
 
       def gem_mod mod_name, path=nil
         path ||= Cardio.gem_mod_paths[mod_name]
-        raise Error, "Unknown gem mod \"#{mod_name}\". Make sure it is in your Gemfile." unless path
+        unless path
+          raise Error, "Unknown gem mod \"#{mod_name}\". Make sure it is in your Gemfile."
+        end
+
         add_gem_mod mod_name, path
       end
 
       def add_gem_mod mod_name, mod_path
         return if @loaded_gem_mods.include?(mod_name)
+
         @loaded_gem_mods << mod_name
         add_path mod_name, mod_path
       end
@@ -111,6 +114,7 @@ class Card
         super() do |path|
           dirname = type ? File.join(path, type.to_s) : path
           next unless Dir.exist? dirname
+
           yield dirname
         end
       end
@@ -119,6 +123,7 @@ class Card
         @mods.each do |mod|
           path = tmp_dir mod, type
           next unless Dir.exist? path
+
           yield path
         end
       end
@@ -127,6 +132,7 @@ class Card
         @mods.each do |mod|
           dirname = type ? File.join(@paths[mod], type.to_s) : @paths[mod]
           next unless Dir.exist? dirname
+
           yield dirname, tmp_dir(mod, type)
         end
       end
@@ -135,6 +141,7 @@ class Card
         @mods.each do |mod|
           path = File.join(@paths[mod], "public", "assets")
           next unless Dir.exist? path
+
           yield mod, path
         end
       end
@@ -144,12 +151,14 @@ class Card
       def load_from_modfile
         modfile_path = File.join @current_path, "Modfile"
         return unless File.exist? modfile_path
+
         eval File.read(modfile_path), binding
       end
 
       def load_from_dir
         Dir.entries(@current_path).sort.each do |filename|
           next if filename =~ /^\./
+
           add_path filename
         end.compact
       end

data/lib/card/mod/load_strategy.rb

@@ -10,9 +10,9 @@ class Card
     class LoadStrategy
       def self.klass symbol
         case symbol
-          when :tmp_files     then TmpFiles
-          when :binding_magic then BindingMagic
-          else                     Eval
+        when :tmp_files     then TmpFiles
+        when :binding_magic then BindingMagic
+        else                     Eval
         end
       end
 
@@ -56,7 +56,7 @@ class Card
       def parts_from_path path
         # remove file extension and number prefixes
         parts = path.gsub(/\.rb/, "").gsub(%r{(?<=\A|/)\d+_}, "").split(File::SEPARATOR)
-        parts.map &:camelize
+        parts.map(&:camelize)
       end
     end
   end

data/lib/card/mod/load_strategy/set_binding_magic.rb

@@ -29,11 +29,14 @@ class Card
       # given module and all of its containing modules as described
       # by its fully qualified name in inner-to-outer order.
       def module_path_binding mod
-        raise ArgumentError.new(
-          "Can't determine path nesting for a module with a blank name"
-        ) if mod.name.to_s.empty?
-        m, b = nil, TOPLEVEL_BINDING
-        mod.name.split('::').each do |part|
+        if mod.name.to_s.empty?
+          raise ArgumentError,
+                "Can't determine path nesting for a module with a blank name"
+        end
+
+        m = nil
+        b = TOPLEVEL_BINDING
+        mod.name.split("::").each do |part|
           m, b =
             eval(
               "[ #{part} , #{part}.module_eval('binding') ]",
@@ -41,6 +44,7 @@ class Card
             )
         end
         raise "Module found at name path not same as specified module" unless m == mod
+
         b
       end
     end

data/lib/card/mod/load_strategy/set_tmp_files.rb

@@ -3,11 +3,11 @@ class Card
     class LoadStrategy
       # The {TmpFiles} load strategy version for set modules
       class SetTmpFiles < LoadStrategy::TmpFiles
-
         private
 
         def generate_tmp_files
           return unless prepare_tmp_dir "tmp/set"
+
           @mod_dirs.each_with_tmp(:set) do |mod_dir, mod_tmp_dir|
             Dir.mkdir mod_tmp_dir
             Dir.glob("#{mod_dir}/**/*.rb").each do |abs_path|

data/lib/card/mod/load_strategy/tmp_files.rb

@@ -13,6 +13,7 @@ class Card
 
         def prepare_tmp_dir path
           return unless rewrite_tmp_files?
+
           p = Card.paths[path]
           FileUtils.rm_rf p.first, secure: true if p.existent.first
           Dir.mkdir p.first

data/lib/card/mod/loader.rb

@@ -9,15 +9,15 @@ class Card
   module Mod
     # Card::Mod::Loader is used to load all part of a mod,
     # i.e. initializers, patterns, formats, chunks, layouts and sets
+    # cards are not accessible at this point
 
     # A Loader object provides tools for generating and loading sets and set patterns,
     # each of which are typically written using a Decko DSL.
 
     # The mods are given by a Mod::Dirs object.
     # SetLoader can use three different strategies to load the set modules.
-
     class Loader
-      def initialize(load_strategy=:eval, mod_dirs=nil)
+      def initialize load_strategy=:eval, mod_dirs=nil
         mod_dirs ||= Mod.dirs
         klass = load_strategy_class load_strategy
         @load_strategy = klass.new mod_dirs, self
@@ -25,9 +25,9 @@ class Card
 
       def load_strategy_class load_strategy
         case load_strategy
-          when :tmp_files     then LoadStrategy::TmpFiles
-          when :binding_magic then LoadStrategy::BindingMagic
-          else                     LoadStrategy::Eval
+        when :tmp_files     then LoadStrategy::TmpFiles
+        when :binding_magic then LoadStrategy::BindingMagic
+        else                     LoadStrategy::Eval
         end
       end
 
@@ -35,7 +35,6 @@ class Card
         @load_strategy.load_modules
       end
 
-
       class << self
         attr_reader :module_type
 
@@ -54,12 +53,12 @@ class Card
           end
         end
 
-        def load_layouts
+        def load_layouts extension
           hash = {}
           Mod.dirs.each(:layout) do |dirname|
             Dir.foreach(dirname) do |filename|
-              next if filename =~ /^\./
-              layout_name = filename.gsub(/\.html$/, "")
+              next if filename =~ /^\./ || filename !~ /\.#{extension}$/
+              layout_name = filename.gsub(/\.#{extension}$/, "")
               hash[layout_name] = File.read File.join(dirname, filename)
             end
           end

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

@@ -24,7 +24,6 @@ class Card
           Card::Set.clean_empty_modules
         end
 
-
         class Template < ModuleTemplate
           def initialize modules, content_path
             super
@@ -33,6 +32,7 @@ class Card
 
           def to_const
             return Object if simple_load?
+
             pattern_klass = Card::Set.const_get_or_set(@pattern.camelize) { Class.new }
 
             @modules.inject(pattern_klass) do |const, name_part|
@@ -69,9 +69,9 @@ class Card
           end
 
           def preamble
-            <<-RUBY.strip_heredoc
-#{"extend Card::Set" unless helper_module?}
-            def self.source_location; "#{@content_path}"; end
+            <<~RUBY.strip_heredoc
+              #{'extend Card::Set' unless helper_module?}
+                          def self.source_location; "#{@content_path}"; end
             RUBY
           end
 

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

@@ -8,7 +8,7 @@ class Card
           case load_strategy
           when :tmp_files
             LoadStrategy::PatternTmpFiles
-          else :eval
+          else # :eval
             LoadStrategy::Eval
           end
         end
@@ -16,6 +16,7 @@ class Card
         class Template < ModuleTemplate
           def to_const
             return Object if simple_load?
+
             Card::Set.const_get_or_set(@pattern.camelize) do
               Class.new(Card::Set::Pattern::Abstract)
             end
@@ -51,7 +52,6 @@ class Card
             "end"
           end
         end
-
       end
     end
   end

data/lib/card/mod/module_template.rb

@@ -21,6 +21,7 @@ class Card
       # @return [String] the ruby code to build the modal
       def to_s
         return content_with_source_comment if simple_load?
+
         wrap_with_module_def
       end
 
@@ -43,25 +44,24 @@ class Card
       def wrap_with_module_def
         # for unknown reasons strip_heredoc doesn't work properly
         # and with trailing whitespace code like `=begin` fails
-        <<-RUBY.strip_heredoc
-# -*- encoding : utf-8 -*-
-#{module_chain}
-        #{preamble}
-        #{content_with_source_comment}
-        #{postamble}
-        #{end_chain}
+        <<~RUBY.strip_heredoc
+          # -*- encoding : utf-8 -*-
+          #{module_chain}
+                  #{preamble}
+                  #{content_with_source_comment}
+                  #{postamble}
+                  #{end_chain}
         RUBY
       end
 
       def content_with_source_comment
-        <<-RUBY.strip_heredoc
-# ~~ above autogenerated; below pulled from #{@content_path} ~~
-#{@content}
+        <<~RUBY.strip_heredoc
+          # ~~ above autogenerated; below pulled from #{@content_path} ~~
+          #{@content}
 
-# ~~ below autogenerated; above pulled from #{@content_path} ~~
+          # ~~ below autogenerated; above pulled from #{@content_path} ~~
         RUBY
       end
     end
   end
 end
-

data/lib/card/model/save_helper.rb

@@ -39,6 +39,7 @@ class Card
 
       def delete_card name
         return unless Card.exist?(name)
+
         Card[name].delete!
       end
 
@@ -47,6 +48,7 @@ class Card
           return unless Card::Codename.exist? name
         end
         return unless Card.exist?(name)
+
         card = Card[name]
         card.update! codename: nil
         card.delete!
@@ -120,7 +122,7 @@ class Card
       end
 
       def add_style name, opts={}
-        name.sub!(/^style\:?\s?/, '') # in case name is given with prefix
+        name.sub!(/^style\:?\s?/, "") # in case name is given with prefix
         # remove it so that we don't double it
 
         add_coderule_item name, "style",
@@ -129,7 +131,7 @@ class Card
       end
 
       def add_script name, opts={}
-        name.sub!(/^script\:?\s?/, '') # in case name is given with prefix
+        name.sub!(/^script\:?\s?/, "") # in case name is given with prefix
         # remove it so that we don't double it
 
         add_coderule_item name, "script",
@@ -142,7 +144,7 @@ class Card
         name = "#{prefix}: #{name}"
 
         ensure_card name, type_id: type_id,
-                    codename: codename
+                          codename: codename
         Card[to].add_item! name
       end
 
@@ -156,10 +158,10 @@ class Card
       alias_method :ensure!, :ensure_card!
       alias_method :delete, :delete_card
 
-
       def method_missing method, *args
         method_name, cardtype_card = extract_cardtype_from_method_name method
         return super unless method_name
+
         args = standardize_args(*args)
         send "#{method_name}_card", args.merge(type_id: cardtype_card.id)
       end
@@ -170,10 +172,12 @@ class Card
 
       def extract_cardtype_from_method_name method
         return unless method =~ /^(?<method_name>create|ensure)_(?<type>.+)(?:_card)?$/
+
         cardtype_card = Card[Regexp.last_match[:type]] ||
                         Card[Regexp.last_match[:type].to_sym]
         return unless cardtype_card&.type_id == Card::CardtypeID ||
                       cardtype_card.id == Card::SetID
+
         [Regexp.last_match[:method_name], cardtype_card]
       end
 
@@ -186,6 +190,7 @@ class Card
       def ensure_card_update name, args
         card = Card[name]
         return unless card
+
         ensure_attributes card, args
         card
       rescue Card::Error::CodenameNotFound => _e
@@ -201,6 +206,7 @@ class Card
 
       def normalize_trait_rule_args setting, value
         return value if value.is_a? Hash
+
         if Card.fetch_type_id([setting, :right, :default]) == PointerID
           value = Array(value).to_pointer_content
         end
@@ -238,6 +244,7 @@ class Card
 
       def standardize_update_args name_or_args, content_or_args
         return name_or_args if name_or_args.is_a?(Hash)
+
         hashify content_or_args, :content
       end
 
@@ -262,6 +269,7 @@ class Card
       def resolve_name_conflict args
         rename = args.delete :rename_if_conflict
         return unless args[:name] && rename
+
         args[:name] = Card.uniquify_name args[:name], rename
       end
 
@@ -270,6 +278,7 @@ class Card
         update_args = changing_args card, args
 
         return if update_args.empty? && subcards.empty?
+
         # FIXME: use ensure_attributes for subcards
         card.update! update_args.merge(subcards: subcards, skip: :validate_renaming)
       end

data/lib/card/name.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 require_dependency "card/env"
 
 require "cardname"
@@ -59,11 +60,11 @@ class Card
     end
 
     def star?
-      simple? && "*" == s[0, 1]
+      simple? && s[0, 1] == "*"
     end
 
     def rstar?
-      right && "*" == right[0, 1]
+      right && right[0, 1] == "*"
     end
 
     def code

data/lib/card/name/name_variants.rb

@@ -1,13 +1,13 @@
 class Card
   class Name
     module NameVariants
-      @@variant_methods = [:capitalize, :singularize, :pluralize, :titleize,
-                           :downcase, :upcase, :swapcase, :reverse, :succ]
+      @@variant_methods = %i[capitalize singularize pluralize titleize
+                             downcase upcase swapcase reverse succ]
       @@variant_aliases = { capitalized: :capitalize, singular: :singularize,
                             plural: :pluralize,       title: :titleize }
 
       def vary variants
-        variants.to_s.split(/[\s,]+/).inject(self.s) do |name, variant|
+        variants.to_s.split(/[\s,]+/).inject(s) do |name, variant|
           variant = @@variant_aliases[variant.to_sym] || variant.to_sym
           @@variant_methods.include?(variant) ? name.send(variant) : name
         end