card 1.101.5 → 1.103.0

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

@@ -316,4 +316,24 @@ schema_migrations_core_cards_157:
 schema_migrations_core_cards_158:
   version: '20191118145629'
 schema_migrations_core_cards_159:
+  version: '20200804112345'
+schema_migrations_core_cards_160:
+  version: '20200804112346'
+schema_migrations_core_cards_161:
+  version: '20200804112347'
+schema_migrations_core_cards_162:
+  version: '20200804112348'
+schema_migrations_core_cards_163:
+  version: '20200805112346'
+schema_migrations_core_cards_164:
+  version: '20200806112346'
+schema_migrations_core_cards_165:
+  version: '20200809112346'
+schema_migrations_core_cards_166:
   version: '20200821231558'
+schema_migrations_core_cards_167:
+  version: '20201115133753'
+schema_migrations_core_cards_168:
+  version: '20201129140917'
+schema_migrations_core_cards_169:
+  version: '20210509141814'

data/db/seeds.rb

@@ -1,4 +1,4 @@
-require "card/seed_consts"
+require "cardio/seed"
 require "active_record/fixtures"
-ActiveRecord::FixtureSet.create_fixtures CARD_SEED_PATH, CARD_SEED_TABLES
+ActiveRecord::FixtureSet.create_fixtures Cardio::Seed.path, Cardio::Seed::TABLES
 Cardio::Mod::Loader.load_mods

data/db/test_seed.rb

@@ -1,6 +1,7 @@
 # -*- encoding : utf-8 -*-
 
 require "timecop"
+require "active_support/core_ext/numeric/time"
 
 # noinspection RubyResolve
 class SharedData
@@ -12,7 +13,7 @@ class SharedData
     "Big Brother", "Optic fan", "Sunglasses fan", "Narcissist"
   ].freeze
 
-  CARDTYPE_COUNT = 44
+  CARDTYPE_COUNT = 54
 
   class << self
     def create_user name, args
@@ -210,6 +211,10 @@ class SharedData
       create "Cardtype E+*type+*default"
     end
 
+    def future_stamp
+      Time.zone.local 2020, 1, 1, 0, 0, 0
+    end
+
     def notification_cards
       Timecop.freeze(Cardio.future_stamp - 1.day) do
         # fwiw Timecop is apparently limited by ruby Time object,
@@ -304,12 +309,12 @@ class SharedData
           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

data/lib/card.rb

@@ -110,7 +110,7 @@ ActiveSupport.run_load_hooks(:before_card, self)
 # can be temporarily assumed using `Card::Auth#as`.
 #
 # {Card::Auth More on accounts}
-class Card < ApplicationRecord
+class Card < Cardio::Record
   extend Mark
   extend Dirty::MethodFactory
   extend Name::CardClass

data/lib/card/auth/current.rb

@@ -76,7 +76,7 @@ class Card
       end
 
       def session_user_key
-        "user_#{Cardio.database_name.underscore}".to_sym
+        "user_#{Cardio.database.underscore}".to_sym
       end
 
       private

data/lib/card/auth/setup.rb

@@ -47,7 +47,7 @@ class Card
 
       def user_account_count
         cql = user_account_cql
-        cql[:not] = { id: ["in"].concat(@hidden_accounts) } if @hidden_accounts
+        cql[:not] = { id: ["in"].concat(@hidden_accounts) } if @hidden_accounts.present?
         as_bot { Card.count_by_cql cql }
       end
     end

data/lib/card/cache.rb

@@ -107,7 +107,7 @@ class Card
       # (the non-standard caches)
       def reset_other
         Card::Codename.reset_cache
-        Cardio.delete_tmp_files!
+        Cardio::Utils.delete_tmp_files!
       end
 
       # generate a cache key from an object

data/lib/card/cache/persistent.rb

@@ -27,7 +27,7 @@ class Card
         @store = opts[:store]
         @klass = opts[:class]
         @class_key = @klass.to_s.to_name.key
-        @database = opts[:database] || Cardio.database_name
+        @database = opts[:database] || Cardio.database
       end
 
       # renew insures you're using the most current cache version by

data/lib/card/cache/persistent_class.rb

@@ -12,7 +12,7 @@ class Card
       end
 
       def stamp_key
-        "#{Cardio.database_name}-stamp"
+        "#{Cardio.database}-stamp"
       end
 
       def renew

data/lib/card/codename.rb

@@ -138,7 +138,7 @@ class Card
 
       def unknown_codename! mark
         raise Card::Error::CodenameNotFound,
-              Cardio.t(:lib_exception_unknown_codename, codename: mark)
+              ::I18n.t(:lib_exception_unknown_codename, codename: mark)
       end
 
       def id_constant codename, id=nil

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

@@ -1,5 +1,3 @@
-# require "card/content/diff/processor"
-
 class Card
   class Content
     class Diff

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

@@ -1,3 +1,5 @@
+require "diff/lcs"
+
 class Card
   class Content
     class Diff

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

@@ -40,131 +40,6 @@ class Card
         def write_excluded_chunk text
           @complete << text
         end
-
-        # Summary object for Diff processing
-        class Summary
-          def initialize opts
-            opts ||= {}
-            @remaining_chars = opts[:length] || 50
-            @joint = opts[:joint] || "..."
-
-            @summary = nil
-            @chunks = []
-            @content_omitted = false
-          end
-
-          def rendered
-            @summary ||=
-              begin
-                truncate_overlap
-                @chunks.map do |chunk|
-                  @content_omitted ||= chunk[:action] == :ellipsis
-                  render_chunk chunk[:action], chunk[:text]
-                end.join
-              end
-          end
-
-          def add text
-            add_chunk text, :added
-          end
-
-          def delete text
-            add_chunk text, :deleted
-          end
-
-          def omit
-            if @chunks.empty? || @chunks.last[:action] != :ellipsis
-              add_chunk @joint, :ellipsis
-            end
-          end
-
-          def omits_content?
-            @content_omitted || @remaining_chars.negative?
-          end
-
-          private
-
-          def add_chunk text, action
-            return unless @remaining_chars.positive?
-
-            add_chunk_to_list text, action
-            @remaining_chars -= text.size
-          end
-
-          def add_chunk_to_list text, action
-            @chunks << { action: action, text: text }
-          end
-
-          def render_chunk action, text
-            case action
-            when "+", :added
-              Diff.render_added_chunk text
-            when "-", :deleted
-              Diff.render_deleted_chunk text
-            else text
-            end
-          end
-
-          def truncate_overlap
-            return unless @remaining_chars.negative?
-
-            process_ellipsis
-            index = @chunks.size - 1
-            while @remaining_chars < @joint.size && index >= 0
-              process_overlap(index) ? break : (index -= 1)
-            end
-          end
-
-          def chunk_text index
-            @chunks[index][:text]
-          end
-
-          def process_ellipsis
-            return unless @chunks.last[:action] == :ellipsis
-
-            @chunks.pop
-            @content_omitted = true
-            @remaining_chars += @joint.size
-          end
-
-          def process_overlap index
-            return true if overlap_finished index
-
-            @remaining_chars += chunk_text(index).size
-            @chunks.delete_at(index)
-            false
-          end
-
-          def overlap_finished index
-            overlap_size = @remaining_chars + chunk_text(index).size
-            if overlap_size == @joint.size
-              replace_with_joint index
-            elsif overlap_size > @joint.size
-              cut_with_joint index
-            else
-              return false
-            end
-            true
-          end
-
-          def cut_with_joint index
-            cut_range = 0..(@remaining_chars - @joint.size - 1)
-            @chunks[index][:text] = chunk_text(index)[cut_range]
-            @chunks[index][:text] += @joint
-          end
-
-          def replace_with_joint index
-            @chunks.pop
-            return unless index.positive?
-
-            case @chunks[index - 1][:action]
-            when :added
-              add_chunk_to_list @joint, :ellipsis
-            when :deleted
-              add_chunk_to_list @joint, :added
-            end
-          end
-        end
       end
     end
   end

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

@@ -0,0 +1,136 @@
+class Card
+  class Content
+    class Diff
+      # Summary object for Diff processing
+      class Summary
+        def initialize opts
+          opts ||= {}
+          @remaining_chars = opts[:length] || 50
+          @joint = opts[:joint] || "..."
+
+          @summary = nil
+          @chunks = []
+          @content_omitted = false
+        end
+
+        def rendered
+          @summary ||=
+            begin
+              truncate_overlap
+              @chunks.map do |chunk|
+                @content_omitted ||= chunk[:action] == :ellipsis
+                render_chunk chunk[:action], chunk[:text]
+              end.join
+            end
+        end
+
+        def add text
+          add_chunk text, :added
+        end
+
+        def delete text
+          add_chunk text, :deleted
+        end
+
+        def omit
+          return unless @chunks.empty? || @chunks.last[:action] != :ellipsis
+
+          add_chunk @joint, :ellipsis
+        end
+
+        def omits_content?
+          @content_omitted || @remaining_chars.negative?
+        end
+
+        private
+
+        def add_chunk text, action
+          return unless @remaining_chars.positive?
+
+          add_chunk_to_list text, action
+          @remaining_chars -= text.size
+        end
+
+        def add_chunk_to_list text, action
+          @chunks << { action: action, text: text }
+        end
+
+        def render_chunk action, text
+          case action
+          when "+", :added
+            Diff.render_added_chunk text
+          when "-", :deleted
+            Diff.render_deleted_chunk text
+          else text
+          end
+        end
+
+        def truncate_overlap
+          return unless @remaining_chars.negative?
+
+          process_ellipsis
+          index = @chunks.size - 1
+          process_remaining index
+        end
+
+        def process_remaining index
+          process_overlap(index) ? break : (index -= 1) while process_remaining? index
+        end
+
+        def process_remaining? index
+          @remaining_chars < @joint.size && index >= 0
+        end
+
+        def chunk_text index
+          @chunks[index][:text]
+        end
+
+        def process_ellipsis
+          return unless @chunks.last[:action] == :ellipsis
+
+          @chunks.pop
+          @content_omitted = true
+          @remaining_chars += @joint.size
+        end
+
+        def process_overlap index
+          return true if overlap_finished index
+
+          @remaining_chars += chunk_text(index).size
+          @chunks.delete_at(index)
+          false
+        end
+
+        def overlap_finished index
+          overlap_size = @remaining_chars + chunk_text(index).size
+          if overlap_size == @joint.size
+            replace_with_joint index
+          elsif overlap_size > @joint.size
+            cut_with_joint index
+          else
+            return false
+          end
+          true
+        end
+
+        def cut_with_joint index
+          cut_range = 0..(@remaining_chars - @joint.size - 1)
+          @chunks[index][:text] = chunk_text(index)[cut_range]
+          @chunks[index][:text] += @joint
+        end
+
+        def replace_with_joint index
+          @chunks.pop
+          return unless index.positive?
+
+          case @chunks[index - 1][:action]
+          when :added
+            add_chunk_to_list @joint, :ellipsis
+          when :deleted
+            add_chunk_to_list @joint, :added
+          end
+        end
+      end
+    end
+  end
+end

data/lib/card/content/parser.rb

@@ -36,12 +36,17 @@ class Card
         handle_remainder
       end
 
+      def current_match
+        @chunk_class = Chunk.find_class_by_prefix @prefix, @chunk_list
+
+        # get the chunk class from the prefix
+        content_slice = @content[@position..-1]
+        @chunk_class.full_match content_slice, @prefix
+      end
+
       def match_prefices prefix_regexp
         while match_prefix prefix_regexp
-          @chunk_class = Chunk.find_class_by_prefix @prefix, @chunk_list
-          # get the chunk class from the prefix
-          content_slice = @content[@position..-1]
-          @match, @offset = @chunk_class.full_match content_slice, @prefix
+          @match, @offset = current_match
           # see whether the full chunk actually matches
           # (as opposed to bogus prefix)
           if @match # we have a chunk match