card 1.17.4 → 1.18.0

data/lib/card/success.rb

@@ -11,16 +11,15 @@ class Card
       case success_params
       when Hash
         apply(success_params)
-      when nil  ;  self.name = '_self'
-      else      ;  self.target = success_params
+      when nil then  self.name = '_self'
+      else;  self.target = success_params
       end
     end
 
-
     def << value
       case value
-      when Hash ; apply value
-      else      ; self.target = value
+      when Hash then apply value
+      else; self.target = value
       end
     end
 
@@ -35,10 +34,10 @@ class Card
 
     def mark= value
       case value
-      when Integer   ; @id   = value
-      when String    ; @name = value
-      when Card      ; @card = value
-      else           ; self.target = value
+      when Integer then @id = value
+      when String then @name = value
+      when Card then @card = value
+      else; self.target = value
       end
     end
 
@@ -64,10 +63,10 @@ class Card
       when ''                     then ''
       when '*previous', :previous then :previous
       when /^(http|\/)/           then value
-      when /^TEXT:\s*(.+)/        then  $1
+      when /^TEXT:\s*(.+)/        then  Regexp.last_match(1)
       when /^REDIRECT:\s*(.+)/
         @redirect = true
-        process_target $1
+        process_target Regexp.last_match(1)
       else self.mark = value
       end
     end
@@ -89,7 +88,7 @@ class Card
     end
 
     def target name_context=@name_context
-      card(name_context) || ( @target == :previous ? Card::Env.previous_location : @target ) || Card.fetch(name_context)
+      card(name_context) || (@target == :previous ? Card::Env.previous_location : @target) || Card.fetch(name_context)
     end
 
     def []= key, value
@@ -98,7 +97,7 @@ class Card
       elsif key.to_sym == :soft_redirect
         @redirect = :soft
       else
-          @params.send "#{key}=", value
+        @params.send "#{key}=", value
       end
     end
 
@@ -128,9 +127,9 @@ class Card
     def method_missing method, *args
       case method
       when /^(\w+)=$/
-        self[$1.to_sym] = args[0]
+        self[Regexp.last_match(1).to_sym] = args[0]
       when /^(\w+)$/
-        self[$1.to_sym]
+        self[Regexp.last_match(1).to_sym]
       else
         super
       end
@@ -140,6 +139,4 @@ class Card
       Card::Env.session
     end
   end
-
-
-end
+end

data/lib/card/version.rb

@@ -2,9 +2,8 @@
 
 module Card::Version
   class << self
-
     def release
-      @@version ||= File.read( File.expand_path '../../../VERSION', __FILE__ ).strip
+      @@version ||= File.read(File.expand_path '../../../VERSION', __FILE__).strip
     end
   end
 end

data/lib/card/view_cache.rb

@@ -3,18 +3,18 @@ class Card
     class << self
       SIZE = 500
       LIMIT = 1000 # reduce cache size to SIZE if LIMIT is reached
-      CNT_KEY = 'view_cache_cnt'
-      FREQUENCY_KEY = 'view_cache_frequency'
+      CNT_KEY = 'view_cache_cnt'.freeze
+      FREQUENCY_KEY = 'view_cache_frequency'.freeze
 
       def cache
         Card::Cache[Card::ViewCache]
       end
 
       def fetch format, view, args, &block
-        return block.call if cacheable_view?(view, format)
+        return yield if cacheable_view?(view, format)
 
         key = cache_key view, format, args
-        if !cache.exist?(key)
+        unless cache.exist?(key)
           increment_cached_views_cnt
           reduce_cache if cached_views_cnt > LIMIT
         end

data/lib/card/view_name.rb

@@ -9,8 +9,8 @@ class Card
 
     class << self
       def new obj
-        return obj if self.class===obj
-        str = Array===obj ? obj*joint : obj.to_s
+        return obj if self.class === obj
+        str = Array === obj ? obj * joint : obj.to_s
         if known_name = @@name2viewnameobject[str]
           known_name
         else
@@ -23,12 +23,12 @@ class Card
       @s = str.to_s.strip
       @s = @s.encode('UTF-8') if RUBYENCODING
       @key = if @s.index(self.class.joint)
-          @parts = @s.split(/\s*#{JOINT_RE}\s*/)
-          @parts << '' if @s[-1,1] == self.class.joint
+               @parts = @s.split(/\s*#{JOINT_RE}\s*/)
+          @parts << '' if @s[-1, 1] == self.class.joint
           @simple = false
           @parts.map { |p| p.to_name.key } * self.class.joint
-        else
-          @parts = [str]
+             else
+               @parts = [str]
           @simple = true
           str.empty? ? '' : simple_key
         end
@@ -36,9 +36,11 @@ class Card
     end
 
     def simple_key
-      decoded.underscore.gsub(/[^#{OK4KEY_RE}]+/,'_').split(/_+/).reject(&:empty?)*'_'
+      decoded.underscore.gsub(/[^#{OK4KEY_RE}]+/, '_').split(/_+/).reject(&:empty?) * '_'
     end
 
-    def to_viewname() self end
+    def to_viewname
+      self
+    end
   end
 end

data/lib/cardio.rb

@@ -45,7 +45,7 @@ module Cardio
         space_last_in_multispace: true,
         closed_search_limit:    50,
 
-        non_createable_types:   [%w{ signup setting set }],
+        non_createable_types:   [%w( signup setting set )],
         view_cache:             false,
 
         encoding:               'utf-8',

data/lib/generators/card.rb

@@ -6,8 +6,7 @@ require 'rails/generators/active_record'
 class Card
   module Generators
     module ClassMethods
-
-      def source_root(path = nil)
+      def source_root path=nil
         if path
           @_card_source_root = path
         else
@@ -17,7 +16,7 @@ class Card
 
       # Override Rails default banner (wagn is the command name).
       def banner
-        "wagn generate #{namespace} #{self.arguments.map(&:usage)*' '} [options]".gsub(/\s+/, ' ')
+        "wagn generate #{namespace} #{arguments.map(&:usage) * ' '} [options]".gsub(/\s+/, ' ')
       end
     end
 
@@ -29,4 +28,3 @@ class Card
     end
   end
 end
-

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

@@ -9,13 +9,13 @@ class Card
 
       argument :module_name, required: true
       class_option 'core', type: :boolean, aliases: '-c', default: false, group: :runtime,
-       desc: 'create format files in Card gem'
+                           desc: 'create format files in Card gem'
 
       def create_files
         mod_path = if options.core?
-            File.join Cardio.gem_root, 'mod', file_name
-          else
-            File.join 'mod', file_name
+                     File.join Cardio.gem_root, 'mod', file_name
+                   else
+                     File.join 'mod', file_name
           end
         format_path = File.join(mod_path, 'format', "#{module_name}_format.rb")
         spec_path = File.join(mod_path, 'spec', 'format', "#{module_name}_format_spec.rb")

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

@@ -8,29 +8,29 @@ class Card
       source_root File.expand_path('../templates', __FILE__)
 
       class_option 'core', type: :boolean, aliases: '-c', default: false, group: :runtime,
-        desc: "Create card migration for card core"
+                           desc: 'Create card migration for card core'
 
       def create_migration_file
         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")
+        migration_template @migration_template, File.join(mig_paths.first, "#{file_name}.rb")
       end
 
-    protected
+      protected
 
       # sets the default migration template that is being used for the generation of the migration
       # depending on the arguments which would be sent out in the command line, the migration template
       # and the table name instance variables are setup.
 
       def set_local_assigns!
-        @migration_template = "card_migration.erb"
+        @migration_template = 'card_migration.erb'
         @migration_parent_class = options['core'] ? 'Card::CoreMigration' : 'Card::Migration'
         case file_name
         when /^(import)_(.*)(?:\.json)?/
-          @migration_action = $1
-          @json_filename    = "#{$2}.json"
+          @migration_action = Regexp.last_match(1)
+          @json_filename    = "#{Regexp.last_match(2)}.json"
         end
       end
     end

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

@@ -10,20 +10,19 @@ class Card
       argument :set_pattern, required: true
       argument :anchors, required: true, type: :array
       class_option 'core', type: :boolean, aliases: '-c', default: false, group: :runtime,
-       desc: 'create set files in Card gem'
+                           desc: 'create set files in Card gem'
 
       def create_files
         mod_path = if options.core?
-            File.join Cardio.gem_root, 'mod', file_name
-          else
-            File.join 'mod', file_name
+                     File.join Cardio.gem_root, 'mod', file_name
+                   else
+                     File.join 'mod', file_name
           end
         set_path  = File.join(mod_path, 'set', set_pattern, anchors[0..-2], "#{anchors.last}.rb")
-        spec_path = File.join(mod_path, 'spec', 'set', set_pattern, anchors[0..-2], "#{anchors.last}_spec.rb" )
+        spec_path = File.join(mod_path, 'spec', 'set', set_pattern, anchors[0..-2], "#{anchors.last}_spec.rb")
         template 'set_template.erb', set_path
         template 'set_spec_template.erb', spec_path
       end
     end
   end
 end
-

data/mod/01_core/chunk/include.rb

@@ -36,7 +36,8 @@ module Card::Chunk
         @process_chunk = name =~ /^\#\#/ ? '' : visible_comment(in_brackets)
       else
         @options = interpret_options
-        @options.merge! inc_name: name, inc_syntax: in_brackets
+        @options[:inc_name] = name
+        @options[:inc_syntax] = in_brackets
         @name = name
       end
     end

data/mod/01_core/chunk/link.rb

@@ -25,7 +25,7 @@ module Card::Chunk
         end
 
       @link_text = objectify @link_text
-      if target =~ %r(/|mailto:)
+      if target =~ %r{/|mailto:}
         @explicit_link = objectify target
       else
         @name = target
@@ -34,7 +34,7 @@ module Card::Chunk
 
     def divider_index string
       # there's probably a better way to do the following.
-      # point is to find the first pipe that's not inside an inclusion
+      # point is to find the first pipe that's not inside an nest
       return unless string.index '|'
       string_copy = "#{string}" # had to do this to create new string?!
       string.scan /\{\{[^\}]*\}\}/ do |incl|

data/mod/01_core/chunk/literal.rb

@@ -6,19 +6,16 @@
 # and within HTML tags.
 module Card::Chunk
   class EscapedLiteral < Abstract
-    FULL_RE = { '[' => /^\\\[\[[^\]]*\]\]/, '{' => /^\\\{\{[^\}]*\}\}/ }
-    Card::Chunk.register_class self, {
-      prefix_re: '\\\\(?:\\[\\[|\\{\\{)',
-      idx_char:  '\\'
-    }
+    FULL_RE = { '[' => /^\\\[\[[^\]]*\]\]/, '{' => /^\\\{\{[^\}]*\}\}/ }.freeze
+    Card::Chunk.register_class self,       prefix_re: '\\\\(?:\\[\\[|\\{\\{)',
+                                           idx_char:  '\\'
 
     def self.full_re prefix
-      re = FULL_RE[ prefix[1,1] ]
+      re = FULL_RE[prefix[1, 1]]
     end
 
-    def interpret match, content
-      @process_chunk = match[0].sub(/^\\(.)/, "<span>\\1</span>")
+    def interpret match, _content
+      @process_chunk = match[0].sub(/^\\(.)/, '<span>\\1</span>')
     end
   end
-
 end

data/mod/01_core/chunk/query_reference.rb

@@ -22,7 +22,7 @@ module Card::Chunk
         Card::Query::OPERATORS.keys +
         Card::Query::ATTRIBUTES.keys +
         Card::Query::CONJUNCTIONS.keys +
-        ['desc', 'asc', 'count']
+        %w(desc asc count)
       ).map(&:to_name)
     )
 

data/mod/01_core/chunk/reference.rb

@@ -11,9 +11,9 @@ module Card::Chunk
         ref_card =
           case rendered_name # FIXME: this should be standard fetch option.
           when /^\~(\d+)$/ # get by id
-            Card.fetch $1.to_i
+            Card.fetch Regexp.last_match(1).to_i
           when /^\:(\w+)$/ # get by codename
-            Card.fetch $1.to_sym
+            Card.fetch Regexp.last_match(1).to_sym
           end
         ref_card ? ref_card.cardname : rendered_name.to_name
       end

data/mod/01_core/chunk/uri.rb

@@ -18,45 +18,42 @@ require 'uri'
 #   [iso3166]: http://geotags.com/iso3166/
 module Card::Chunk
   class URI < Abstract
+    SCHEMES = %w(irc http https ftp ssh git sftp file ldap ldaps mailto).freeze
 
-    SCHEMES = %w{irc http https ftp ssh git sftp file ldap ldaps mailto}
-
-    REJECTED_PREFIX_RE = %w{ ! ": " ' ]( }.map{|s|Regexp.escape s} * '|'
+    REJECTED_PREFIX_RE = %w{ ! ": " ' ]( }.map { |s| Regexp.escape s } * '|'
 
     attr_reader :uri, :link_text
     delegate :to, :scheme, :host, :port, :path, :query, :fragment, to: :uri
 
-    Card::Chunk.register_class self, {
-      prefix_re: "(?:(?!#{REJECTED_PREFIX_RE})(?:#{SCHEMES * '|'})\\:)",
-      full_re:    /^#{::URI.regexp( SCHEMES )}/,
-      idx_char:  ':'
-    }
+    Card::Chunk.register_class self,       prefix_re: "(?:(?!#{REJECTED_PREFIX_RE})(?:#{SCHEMES * '|'})\\:)",
+                                           full_re:    /^#{::URI.regexp(SCHEMES)}/,
+                                           idx_char:  ':'
 
     class << self
       def full_match content, prefix
-        prepend_str = if prefix[-1,1] != ':' && config[:prepend_str]
-          config[:prepend_str]
-        else
-          ''
+        prepend_str = if prefix[-1, 1] != ':' && config[:prepend_str]
+                        config[:prepend_str]
+                      else
+                        ''
         end
         content = prepend_str + content
         match = super content, prefix
-        [ match, prepend_str.length ]
+        [match, prepend_str.length]
       end
 
       def context_ok? content, chunk_start
-        preceding_string = content[chunk_start-2..chunk_start-1]
-        !( preceding_string =~ /(?:#{REJECTED_PREFIX_RE})$/ )
+        preceding_string = content[chunk_start - 2..chunk_start - 1]
+        !(preceding_string =~ /(?:#{REJECTED_PREFIX_RE})$/)
       end
     end
 
-    def interpret match, content
+    def interpret match, _content
       chunk = match[0]
-      last_char = chunk[-1,1]
+      last_char = chunk[-1, 1]
       chunk.gsub!(/(?:&nbsp;)+/, '')
 
       @trailing_punctuation = if %w{ , . ) ! ? : }.member?(last_char)
-        @text.chop!
+                                @text.chop!
         chunk.chop!
         last_char
       end
@@ -64,71 +61,63 @@ module Card::Chunk
 
       @link_text = chunk
 
-      #warn "uri parse[#{match.inspect}]"
-      @uri = ::URI.parse( chunk )
+      # warn "uri parse[#{match.inspect}]"
+      @uri = ::URI.parse(chunk)
       @process_chunk = "#{format.web_link(@link_text)}#{@trailing_punctuation}"
     rescue ::URI::Error => e
-      #warn "rescue parse #{chunk_class}: '#{m}' #{e.inspect} #{e.backtrace*"\n"}"
+      # warn "rescue parse #{chunk_class}: '#{m}' #{e.inspect} #{e.backtrace*"\n"}"
       Rails.logger.warn "rescue parse #{self.class}: #{e.inspect}"
     end
-
-
   end
 
   # FIXME: DRY, merge these two into one class
   class EmailURI < URI
+    PREPEND_STR = 'mailto:'.freeze
+    EMAIL = '[a-zA-Zd](?:[-a-zA-Zd]*[a-zA-Zd])?\\@'.freeze
 
-    PREPEND_STR = 'mailto:'
-    EMAIL = "[a-zA-Z\d](?:[-a-zA-Z\d]*[a-zA-Z\d])?\\@"
-
-    Card::Chunk.register_class self, {
-      prefix_re: "(?:(?!#{REJECTED_PREFIX_RE})#{EMAIL})\\b",
-      full_re:    /^#{::URI.regexp( SCHEMES )}/,
-      prepend_str: PREPEND_STR,
-      idx_char:  '@'
-    }
+    Card::Chunk.register_class self,       prefix_re: "(?:(?!#{REJECTED_PREFIX_RE})#{EMAIL})\\b",
+                                           full_re:    /^#{::URI.regexp(SCHEMES)}/,
+                                           prepend_str: PREPEND_STR,
+                                           idx_char:  '@'
 
     def interpret match, content
       super
-      @text = @text.sub(/^mailto:/,'')  # this removes the prepended string from the unchanged match text
+      @text = @text.sub(/^mailto:/, '')  # this removes the prepended string from the unchanged match text
       @process_chunk = "#{format.web_link(@link_text, text: @text)}#{@trailing_punctuation}"
     end
   end
 
   class HostURI < URI
-
-    GENERIC = 'aero|biz|com|coop|edu|gov|info|int|mil|museum|name|net|org'
-
-    COUNTRY = 'ad|ae|af|ag|ai|al|am|an|ao|aq|ar|as|at|au|aw|az|ba|bb|bd|be|' +
-      'bf|bg|bh|bi|bj|bm|bn|bo|br|bs|bt|bv|bw|by|bz|ca|cc|cf|cd|cg|ch|ci|ck|cl|' +
-      'cm|cn|co|cr|cs|cu|cv|cx|cy|cz|de|dj|dk|dm|do|dz|ec|ee|eg|eh|er|es|et|fi|' +
-      'fj|fk|fm|fo|fr|fx|ga|gb|gd|ge|gf|gh|gi|gl|gm|gn|gp|gq|gr|gs|gt|gu|gw|gy|' +
-      'hk|hm|hn|hr|ht|hu|id|ie|il|in|io|iq|ir|is|it|jm|jo|jp|ke|kg|kh|ki|km|kn|' +
-      'kp|kr|kw|ky|kz|la|lb|lc|li|lk|lr|ls|lt|lu|lv|ly|ma|mc|md|mg|mh|mk|ml|mm|' +
-      'mn|mo|mp|mq|mr|ms|mt|mu|mv|mw|mx|my|mz|na|nc|ne|nf|ng|ni|nl|no|np|nr|nt|' +
-      'nu|nz|om|pa|pe|pf|pg|ph|pk|pl|pm|pn|pr|pt|pw|py|qa|re|ro|ru|rw|sa|sb|sc|' +
-      'sd|se|sg|sh|si|sj|sk|sl|sm|sn|so|sr|st|su|sv|sy|sz|tc|td|tf|tg|th|tj|tk|' +
-      'tm|tn|to|tp|tr|tt|tv|tw|tz|ua|ug|uk|um|us|uy|uz|va|vc|ve|vg|vi|vn|vu|wf|' +
-      'ws|ye|yt|yu|za|zm|zr|zw|' +
-      'eu' # made this separate, since it's not technically a country -efm
-      # These are needed otherwise HOST will match almost anything
-
-    TLDS = "(?:#{GENERIC}|#{COUNTRY})"
-    #TLDS = "(?:#{GENERIC})"
-
-    PREPEND_STR = 'http://'
-    HOST = "(?:[a-zA-Z\d](?:[-a-zA-Z\d]*[a-zA-Z\d])?\\.)+#{TLDS}"
-
-    Card::Chunk.register_class self, {
-      prefix_re: "(?:(?!#{REJECTED_PREFIX_RE})#{HOST})\\b",
-      full_re:    /^#{::URI.regexp( SCHEMES )}/,
-      prepend_str: PREPEND_STR
-    }
+    GENERIC = 'aero|biz|com|coop|edu|gov|info|int|mil|museum|name|net|org'.freeze
+
+    COUNTRY = 'ad|ae|af|ag|ai|al|am|an|ao|aq|ar|as|at|au|aw|az|ba|bb|bd|be|' \
+              'bf|bg|bh|bi|bj|bm|bn|bo|br|bs|bt|bv|bw|by|bz|ca|cc|cf|cd|cg|ch|ci|ck|cl|' \
+              'cm|cn|co|cr|cs|cu|cv|cx|cy|cz|de|dj|dk|dm|do|dz|ec|ee|eg|eh|er|es|et|fi|' \
+              'fj|fk|fm|fo|fr|fx|ga|gb|gd|ge|gf|gh|gi|gl|gm|gn|gp|gq|gr|gs|gt|gu|gw|gy|' \
+              'hk|hm|hn|hr|ht|hu|id|ie|il|in|io|iq|ir|is|it|jm|jo|jp|ke|kg|kh|ki|km|kn|' \
+              'kp|kr|kw|ky|kz|la|lb|lc|li|lk|lr|ls|lt|lu|lv|ly|ma|mc|md|mg|mh|mk|ml|mm|' \
+              'mn|mo|mp|mq|mr|ms|mt|mu|mv|mw|mx|my|mz|na|nc|ne|nf|ng|ni|nl|no|np|nr|nt|' \
+              'nu|nz|om|pa|pe|pf|pg|ph|pk|pl|pm|pn|pr|pt|pw|py|qa|re|ro|ru|rw|sa|sb|sc|' \
+              'sd|se|sg|sh|si|sj|sk|sl|sm|sn|so|sr|st|su|sv|sy|sz|tc|td|tf|tg|th|tj|tk|' \
+              'tm|tn|to|tp|tr|tt|tv|tw|tz|ua|ug|uk|um|us|uy|uz|va|vc|ve|vg|vi|vn|vu|wf|' \
+              'ws|ye|yt|yu|za|zm|zr|zw|' \
+              'eu'.freeze # made this separate, since it's not technically a country -efm
+    # These are needed otherwise HOST will match almost anything
+
+    TLDS = "(?:#{GENERIC}|#{COUNTRY})".freeze
+    # TLDS = "(?:#{GENERIC})"
+
+    PREPEND_STR = 'http://'.freeze
+    HOST = "(?:[a-zA-Z\d](?:[-a-zA-Z\d]*[a-zA-Z\d])?\\.)+#{TLDS}".freeze
+
+    Card::Chunk.register_class self,       prefix_re: "(?:(?!#{REJECTED_PREFIX_RE})#{HOST})\\b",
+                                           full_re:    /^#{::URI.regexp(SCHEMES)}/,
+                                           prepend_str: PREPEND_STR
 
     def interpret match, content
       super
-      @text = @text.sub(/^http:\/\//,'')  # this removes the prepended string from the unchanged match text
-      #warn "huri t:#{@text}, #{match}, #{params.inspect}"
+      @text = @text.sub(/^http:\/\//, '')  # this removes the prepended string from the unchanged match text
+      # warn "huri t:#{@text}, #{match}, #{params.inspect}"
       @process_chunk = "#{format.web_link(@link_text, text: @text)}#{@trailing_punctuation}"
     end
   end