card 1.101.4 → 1.101.5

data/db/seed/test/fixtures/schema_migrations_deck_cards.yml

@@ -1,3 +1,5 @@
 ---
 schema_migrations_deck_cards_001:
   version: '20150116220621'
+schema_migrations_deck_cards_002:
+  version: '20210504195646'

data/db/test_seed.rb

@@ -12,10 +12,9 @@ class SharedData
     "Big Brother", "Optic fan", "Sunglasses fan", "Narcissist"
   ].freeze
 
-  CARDTYPE_COUNT = 43
+  CARDTYPE_COUNT = 44
 
   class << self
-
     def create_user name, args
       args[:subcards] = account_args args if args[:email]
 
@@ -46,9 +45,10 @@ class SharedData
       # CREATE A CARD OF EACH TYPE
 
       no_samples = %w[user sign_up set number mirror_list mirrored_list file image
-                      customized_bootswatch_skin]
+                      customized_bootswatch_skin alias]
       Card::Auth.createable_types.each do |type|
         next if no_samples.include? type.to_name.key
+
         create type: type, name: "Sample #{type}"
       end
 
@@ -57,7 +57,7 @@ class SharedData
       end
 
       create_layout_type "lay out", "Greatest {{_main|title: Callahan!; view: labeled}}"
-      create_pointer "stacks", ["horizontal", "vertical"]
+      create_pointer "stacks", %w[horizontal vertical]
       create_pointer "stacks+*self+*layout", "lay out"
       create "horizontal"
       create_pointer "vertical"
@@ -75,7 +75,7 @@ class SharedData
         ["Z", "I'm here to be referenced to"],
         ["A", "Alpha [[Z]]"],
         ["B", "Beta {{Z}}"],
-        ["T", "Theta"],
+        %w[T Theta],
         ["X", "[[A]] [[A+B]] [[T]]"],
         ["Y", "{{B}} {{A+B}} {{A}} {{T}}"],
         ["A+B", "AlphaBeta"],
@@ -114,7 +114,8 @@ class SharedData
       ## --------- Fruit: creatable by anyone but not readable ---
       Card.create! type: "Cardtype", name: "Fruit"
       Card.create! name: "Fruit+*type+*create", type: "Pointer", content: "[[Anyone]]"
-      Card.create! name: "Fruit+*type+*read", type: "Pointer", content: "[[Administrator]]"
+      Card.create! name: "Fruit+*type+*read", type: "Pointer",
+                   content: "[[Administrator]]"
 
       # codenames for card_accessor tests
       Card.create! name: "*write", codename: :write
@@ -158,7 +159,7 @@ class SharedData
 
     def user_and_role_cards
       # Card::Auth.instant_account_activation do
-        create_user "Joe Admin", content: "I'm number one", email: "joe@admin.com"
+      create_user "Joe Admin", content: "I'm number one", email: "joe@admin.com"
         create_user "Joe User", content: "I'm number two", email: "joe@user.com"
         create_user "Joe Camel", content: "Mr. Buttz", email: "joe@camel.com"
 
@@ -169,10 +170,10 @@ class SharedData
 
       # noinspection RubyResolve
       Card["Joe Admin"].fetch(:roles, new: { type_code: "pointer" })
-        .items = [Card::AdministratorID, Card::SharkID, Card::HelpDeskID]
+                       .items = [Card::AdministratorID, Card::SharkID, Card::HelpDeskID]
 
       Card["Joe User"].fetch(:roles, new: { type_code: "pointer" })
-              .items = [Card::SharkID]
+                      .items = [Card::SharkID]
 
       create_user "u1", email: "u1@user.com", password: "u1_pass"
       create_user "u2", email: "u2@user.com", password: "u2_pass"
@@ -188,19 +189,18 @@ class SharedData
       Card["u3"].fetch(:roles, new: {}).items = [r1, r4, Card::AdministratorID]
     end
 
-
     def cardtype_cards
       # for cql & permissions
-      %w[A+C A+D A+E C+A D+A F+A A+B+C].each {|name| create name}
+      %w[A+C A+D A+E C+A D+A F+A A+B+C].each { |name| create name }
       ("A".."F").each do |ch|
         create "Cardtype #{ch}", type_code: "cardtype",
-               codename: "cardtype_#{ch.downcase}"
+                                 codename: "cardtype_#{ch.downcase}"
       end
       Card::Codename.reset_cache
 
       ("a".."f").each do |ch|
         create "type-#{ch}-card", type_code: "cardtype_#{ch}",
-               content: "type_#{ch}_content"
+                                  content: "type_#{ch}_content"
       end
 
       create_pointer "Cardtype B+*type+*create", "[[r3]]"
@@ -210,7 +210,6 @@ class SharedData
       create "Cardtype E+*type+*default"
     end
 
-
     def notification_cards
       Timecop.freeze(Cardio.future_stamp - 1.day) do
         # fwiw Timecop is apparently limited by ruby Time object,
@@ -231,7 +230,7 @@ class SharedData
 
         followers.each do |name, _follow|
           create_user name, email: "#{name.parameterize}@user.com",
-                      password: "#{name.parameterize}_pass"
+                            password: "#{name.parameterize}_pass"
         end
 
         create "All Eyes On Me"
@@ -252,7 +251,8 @@ class SharedData
 
         Card::Auth.signin Card::WagnBotID
         create "Google glass+*self+*follow_fields", ""
-        create "Sunglasses+*self+*follow_fields", "[[#{:nests.cardname}]]\n[[_self+price]]\n[[_self+producer]]"
+        create "Sunglasses+*self+*follow_fields",
+               "[[#{:nests.cardname}]]\n[[_self+price]]\n[[_self+producer]]"
         create "Sunglasses+tint"
         create "Sunglasses+price"
 
@@ -277,7 +277,7 @@ class SharedData
           ["card with fields", "field 1", "field 2"],
           ["card with fields and admin fields", "field 1", "admin field 1"],
           ["admin card with fields and admin fields", "field 1", "admin field 1"],
-          ["admin card with admin fields", "admin field 1", "admin field 2"],
+          ["admin card with admin fields", "admin field 1", "admin field 2"]
         ].each do |name, f1, f2|
           create name,
                  content: "main content {{+#{f1}}}  {{+#{f2}}}",
@@ -297,25 +297,24 @@ class SharedData
         end
         create ["field 1", :right, :read], type: "Pointer", content: "[[Anyone]]"
       end
-
     end
   end
 
-  TEXT = <<-TXT.strip_heredoc.freeze
-      Far out in the uncharted backwaters of the unfashionable end of
-      the western spiral arm of the Galaxy lies a small unregarded
-      yellow sun.
-      
-      Orbiting this at a distance of roughly ninety-two million miles
-      is an utterly insignificant little blue green planet whose ape-
-      descended life forms are so amazingly primitive that they still
-      think digital watches are a pretty neat idea.
-      
-      This planet has - or rather had - a problem, which was this: most
-      of the people living on it were unhappy for pretty much of the time.
-      Many solutions were suggested for this problem, but most of these
-      were largely concerned with the movements of small green pieces
-      of paper, which is odd because on the whole it wasn't the small
-      green pieces of paper that were unhappy.
+  TEXT = <<~TXT.strip_heredoc.freeze
+          Far out in the uncharted backwaters of the unfashionable end of
+          the western spiral arm of the Galaxy lies a small unregarded
+          yellow sun.
+    #{'      '}
+          Orbiting this at a distance of roughly ninety-two million miles
+          is an utterly insignificant little blue green planet whose ape-
+          descended life forms are so amazingly primitive that they still
+          think digital watches are a pretty neat idea.
+    #{'      '}
+          This planet has - or rather had - a problem, which was this: most
+          of the people living on it were unhappy for pretty much of the time.
+          Many solutions were suggested for this problem, but most of these
+          were largely concerned with the movements of small green pieces
+          of paper, which is odd because on the whole it wasn't the small
+          green pieces of paper that were unhappy.
   TXT
 end

data/lib/card.rb

@@ -167,6 +167,7 @@ class Card < ApplicationRecord
   ]
 
   attr_accessor(*action_specific_attributes)
+
   self.action_specific_attributes +=
     %i[skip_hash full_skip_hash trigger_hash full_trigger_hash]
 

data/lib/card/auth/token.rb

@@ -25,8 +25,8 @@ class Card
         def decode token
           decoded = JWT.decode(token, SECRET_KEY)[0]
           HashWithIndifferentAccess.new decoded
-        rescue JWT::DecodeError => error
-          error.message
+        rescue JWT::DecodeError => e
+          e.message
         end
 
         def expiration

data/lib/card/cache.rb

@@ -53,6 +53,7 @@ class Card
       # on the persistent caches.
       def renew
         return if no_renewal
+
         renew_persistent
         cache_by_class.each_value do |cache|
           cache.soft.reset
@@ -175,7 +176,7 @@ class Card
     # test for the existence of the key in either cache
     # @return [true/false]
     def exist? key
-      @soft.exist?(key) || (@hard&.exist?(key))
+      @soft.exist?(key) || @hard&.exist?(key)
     end
   end
 end

data/lib/card/cache/all.rb

@@ -4,6 +4,7 @@ class Card
     module All
       def expire cache_type=nil
         return unless (cache_class = cache_class_from_type cache_type)
+
         expire_views
         expire_names cache_class
         expire_id cache_class
@@ -47,8 +48,10 @@ class Card
 
       def expire_name name_version, cache
         return unless name_version.present?
+
         key_version = name_version.to_name.key
         return unless key_version.present?
+
         cache.delete key_version
       end
 
@@ -57,6 +60,7 @@ class Card
           # puts "EXPIRE VIEW CACHE (#{name}): #{view_cache_keys}"
           view_keys = hard_read_view_cache_keys key
           next unless view_keys.present?
+
           expire_view_cache_keys view_keys
         end
         @view_cache_keys = []
@@ -64,6 +68,7 @@ class Card
 
       def expire_id cache
         return unless id.present?
+
         cache.delete "~#{id}"
       end
 

data/lib/card/cache/card_class.rb

@@ -4,6 +4,7 @@ class Card
     module CardClass
       def retrieve_from_cache cache_key, local_only=false
         return unless cache
+
         local_only ? cache.soft.read(cache_key) : cache.read(cache_key)
       end
 
@@ -28,12 +29,14 @@ class Card
 
       def write_to_soft_cache card
         return unless cache
+
         cache.soft.write card.key, card
       end
 
       def expire name
         key = name.to_name.key
         return unless (card = Card.cache.read key)
+
         card.expire
       end
     end

data/lib/card/codename.rb

@@ -143,7 +143,7 @@ class Card
 
       def id_constant codename, id=nil
         id ||= id! codename
-        Card.const_get_or_set(codename.to_s.camelize + "ID") { id }
+        Card.const_get_or_set("#{codename.to_s.camelize}ID") { id }
       end
     end
 

data/lib/card/content.rb

@@ -99,16 +99,12 @@ class Card
       "<#{__getobj__.class}:#{card}:#{self}>"
     end
 
-    def without_nests
-      without_chunks Chunk::Nest do |content|
-        yield content
-      end
+    def without_nests &block
+      without_chunks Chunk::Nest, &block
     end
 
-    def without_references
-      without_chunks Chunk::Nest, Chunk::Link do |content|
-        yield content
-      end
+    def without_references &block
+      without_chunks Chunk::Nest, Chunk::Link, &block
     end
 
     def without_chunks *chunk_classes

data/lib/card/content/chunk.rb

@@ -69,7 +69,7 @@ class Card
               chunk_class = const_get chunkname
               chunk_class.config[:prefix_re]
             end
-          /(?:#{ prefix_res * '|' })/m
+          /(?:#{prefix_res * '|'})/m
         end
 
         def validate_chunk_list_key chunk_list_key

data/lib/card/content/clean.rb

@@ -46,7 +46,7 @@ class Card
         # $LAST_MATCH_INFO is nil if string is a SafeBuffer
         string.to_str.gsub(%r{<(/*)(\w+)([^>]*)>}) do |_raw|
           clean_tag $LAST_MATCH_INFO, ok_tags
-        end.gsub(/<\!--.*?-->/, "")
+        end.gsub(/<!--.*?-->/, "")
       end
 
       def clean_spaces string
@@ -56,6 +56,7 @@ class Card
       def clean_tag match, ok_tags
         tag = match[2].downcase
         return " " unless (ok_attrs = ok_tags[tag])
+
         "<#{match[1]}#{html_attribs tag, match[3], ok_attrs}>"
       end
 
@@ -70,7 +71,7 @@ class Card
         return ['"', nil] unless all_attributes =~ /\b#{attrib}\s*=\s*(?=(.))/i
 
         q = '"'
-        rest_value = $'
+        rest_value = Regexp.last_match.post_match
         if (idx = %w[' "].index Regexp.last_match(1))
           q = Regexp.last_match(1)
         end
@@ -79,7 +80,7 @@ class Card
         [q, rest_value]
       end
 
-      # NOTE allows classes beginning with "w-" (deprecated)
+      # NOTE: allows classes beginning with "w-" (deprecated)
       def process_attribute_match rest_value, reg_exp, attrib
         return rest_value unless (match = rest_value.match reg_exp)
 

data/lib/card/content/diff.rb

@@ -22,6 +22,7 @@ class Card
       end
 
       attr_reader :result
+
       delegate :summary, :complete, :summary_omits_content?, to: :result
 
       # diff options
@@ -41,11 +42,11 @@ class Card
       end
 
       def red?
-        @result.dels_cnt > 0
+        @result.dels_cnt.positive?
       end
 
       def green?
-        @result.adds_cnt > 0
+        @result.adds_cnt.positive?
       end
 
       private

data/lib/card/content/diff/l_c_s/processor.rb

@@ -42,7 +42,7 @@ class Card
             case action
             when "-" then del_old_excludees
             when "+" then add_new_excludees
-            when "!" then
+            when "!"
               del_old_excludees
               add_new_excludees
             else

data/lib/card/content/diff/result.rb

@@ -4,6 +4,7 @@ class Card
       # Result object for Diff processing
       class Result
         attr_accessor :complete, :summary, :dels_cnt, :adds_cnt
+
         def initialize summary_opts=nil
           @dels_cnt = 0
           @adds_cnt = 0

data/lib/card/content/parser.rb

@@ -62,7 +62,7 @@ class Card
           # prefix of matched chunk
           @chunk_start = prefix_match.begin(0) + @position
           # content index of beginning of chunk
-          if prefix_match.begin(0) > 0
+          if prefix_match.begin(0).positive?
             # if matched chunk is not beginning of test string
             @interval_string += @content[@position..@chunk_start - 1]
             # hold onto the non-chunk part of the string
@@ -87,7 +87,7 @@ class Card
           @chunks << @chunk_class.new(@match, @content_object)
           # add the chunk to the chunk list
           @last_position = @position
-          # note that the end of the chunk was the last place where a
+          # NOTE: that the end of the chunk was the last place where a
           # chunk was found (so far)
           true
         end

data/lib/card/content/truncate.rb

@@ -9,7 +9,7 @@ class Card
 
         truncated, wordstring = truncate input, words
         # nuke partial tags at end of snippet
-        wordstring.gsub!(/(<[^\>]+)$/, "")
+        wordstring.gsub!(/(<[^>]+)$/, "")
         wordstring = close_tags wordstring
         wordstring += ELLIPSES_HTML if truncated
         # wordstring += '...' if wordlist.length > l
@@ -34,9 +34,9 @@ class Card
       end
 
       def polish wordstring
-        wordstring.gsub! %r{<[/]?br[\s/]*>}, " "
+        wordstring.gsub! %r{</?br[\s/]*>}, " "
         # Also a hack -- get rid of <br>'s -- they make line view ugly.
-        wordstring.gsub! %r{<[/]?p[^>]*>}, " "
+        wordstring.gsub! %r{</?p[^>]*>}, " "
         ## Also a hack -- get rid of <br>'s -- they make line view ugly.
         wordstring
       end
@@ -45,17 +45,17 @@ class Card
         tags = []
 
         # match tags with or without self closing (ie. <foo />)
-        wordstring.scan(%r{\<([^\>\s/]+)[^\>]*?\>}).each do |t|
+        wordstring.scan(%r{<([^>\s/]+)[^>]*?>}).each do |t|
           tags.unshift(t[0])
         end
         # match tags with self closing and mark them as closed
-        wordstring.scan(%r{\<([^\>\s/]+)[^\>]*?/\>}).each do |t|
+        wordstring.scan(%r{<([^>\s/]+)[^>]*?/>}).each do |t|
           next unless (x = tags.index(t[0]))
 
           tags.slice!(x)
         end
         # match close tags
-        wordstring.scan(%r{\</([^\>\s/]+)[^\>]*?\>}).each do |t|
+        wordstring.scan(%r{</([^>\s/]+)[^>]*?>}).each do |t|
           next unless (x = tags.rindex(t[0]))
 
           tags.slice!(x)