card 1.101.5 → 1.101.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 471e6eb7596b5743e59b50b9158fa16953ba916f328bb10a2e63153fad797eff
-  data.tar.gz: 51cf98adab2d3b8bf4c6f9b6a374d31da99da82d14b96eb3fc50634b8948e3d9
+  metadata.gz: eb3158879815350926305895501a13189dfab7e72a3be6f420b27664725b11c4
+  data.tar.gz: c042aafc55866bbcdaf214787ec93c003f3ff116e3a28567de3d15f872e90116
 SHA512:
-  metadata.gz: 6e86bce11c52e5fb214a5df5e09389f8328320c53316e0fba5a6747fe644d5e5468081dbd9d8e22c3a83b7db8b48a8d3cda25340dc0c3e1ec31901cc78c812fa
-  data.tar.gz: 68f7a39e5a47dd497c7ab4bc2160d4f125e4a9e617cd1bb3625472ac09b201917ba2f1688f3960cf90ab9064314a281265acea03f63f46bffc10c95ab37585c4
+  metadata.gz: 024fa39457a17479cf8c20da3821bbf456edfa9d488ddfd317971e9ea45cdf3cb85753314eaf3a06f1807df821c77a01077041c545db20477e6874ba15cd01da
+  data.tar.gz: 014d90189f0fb281fff7c78fd7c3a245f8b83c06524a78b7adc8cabeec2c4f054e8dce6914597cfdce9eec9d958bb6e8fab01e25afa1c23422e7417037ba4edd

data/README.md

@@ -19,7 +19,7 @@ Yes, if:
     Decko.org](http://decko.org)**.
 *   **You're looking at this page from a docs site** (ie, NOT GitHub) so you
     can use our links to navigate code. **Links look funny? [Try
-    rubydocs.info](http://docs.decko.org/gems/card).**
+    Decko's docs site](http://docs.decko.org/gems/card).**
 
 ### Decko: an *application* or a *development framework*?
 
@@ -109,12 +109,12 @@ really), because Set functionality is almost always developed using our Set
 DSL, which automatically handles the ruby module naming based on the file
 name.
 
-Cards, Formats, Sets, and other structures can all be developed via {Card::Mod
+Cards, Formats, Sets, and other structures can all be developed via {Cardio::Mod
 Mods}.
 
 ## Mods
 
-{Card::Mod Card Mods} (short for *modules* or *modifications*) are the primary
+{Cardio::Mod Card Mods} (short for *modules* or *modifications*) are the primary
 mechanism for developing and sharing Decko code. If you're just getting
-started as a Decko developer, learning about {Card::Mod Mods} is a great next
+started as a Decko developer, learning about {Cardio::Mod Mods} is a great next
 step.

data/VERSION

@@ -1 +1 @@
-0.11.5
+0.11.6

data/config/locales/en.yml

@@ -108,6 +108,7 @@ en:
   api_key_generating: "Generating API Key"
   api_key_taken: "API Key taken"
   api_key_get_jwt_token: "get a JWT token"
+  api_key_no_key: "No key."
 
   bootstrap_cannot_source_theme: can't find source for theme %{theme_name}
   bootstrap_not_valid_theme: not a valid theme %{theme_name}

data/db/migrate/20200805200729_add_unique_pair_indeces.rb

@@ -1,9 +1,43 @@
 class AddUniquePairIndeces < ActiveRecord::Migration[6.0]
   def change
-    # TODO: uncomment following
+    stash_duplicate_cards
+    delete_duplicate_virtuals
     add_index :cards, %i[left_id right_id], unique: true
     add_index :card_virtuals, %i[left_id right_id], unique: true
 
     drop_table :users
   end
+
+  private
+
+  def stash_duplicate_cards
+    fake_id = -9000
+    duplicates :cards do |id|
+      stash_card id, fake_id
+      fake_id = fake_id - 1
+    end
+  end
+
+  def delete_duplicate_virtuals
+    duplicates :card_virtuals do |id|
+      connection.execute "delete from card_virtuals where id = #{id}"
+    end
+  end
+
+  def stash_card id, fake_id
+    connection.execute(
+      "UPDATE cards set left_id = #{fake_id}, trash = true where id = #{id}"
+    )
+  end
+
+  def duplicates table
+    sql = "SELECT distinct a.id from #{table} a join #{table} b " \
+          "ON a.left_id = b.left_id AND a.right_id = b.right_id " \
+          "AND a.id < b.id"
+    connection.select_all(sql).each { |row| yield row["id"].to_i }
+  end
+
+  def connection
+    ActiveRecord::Base.connection
+  end
 end

data/db/migrate_core_cards/20190829093961_cardtype_grouping.rb

@@ -2,13 +2,13 @@
 
 class CardtypeGrouping < Cardio::Migration::Core
   CONTENT =
-    <<~EOT
-            {{+description|content}}
-      #{'      '}
-            {{_|add_button}} {{_|configure_button}}
-      #{'      '}
-            {{_|grouped_list}}
-    EOT
+    <<~STRUCTURE
+      {{+description|content}}
+
+      {{_|add_button}} {{_|configure_button}}
+      
+      {{_|grouped_list}}
+    STRUCTURE
 
   def up
     ensure_card %i[cardtype self structure], content: CONTENT

data/db/test_seed.rb

@@ -304,12 +304,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/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/mailer.rb

@@ -4,20 +4,14 @@ require "open-uri"
 
 class Card
   class Mailer < ActionMailer::Base
-    @@defaults = Card.config.email_defaults || {}
-    @@defaults.symbolize_keys!
-    @@defaults[:return_path] ||= @@defaults[:from] if @@defaults[:from]
-    @@defaults[:charset] ||= "utf-8"
-    default @@defaults
-
     class << self
       def new_mail *args, &block
-        mail = Mail.new(args, &block)
-        method = Card::Mailer.delivery_method
-        mail.delivery_method(method, Card::Mailer.send(:"#{method}_settings"))
-        mail.perform_deliveries    = Card::Mailer.perform_deliveries
-        mail.raise_delivery_errors = Card::Mailer.raise_delivery_errors
-        mail
+        Mail.new(args, &block).tap do |mail|
+          method = Card::Mailer.delivery_method
+          mail.delivery_method(method, send(:"#{method}_settings"))
+          mail.perform_deliveries    = perform_deliveries
+          mail.raise_delivery_errors = raise_delivery_errors
+        end
       end
 
       def layout message
@@ -33,6 +27,15 @@ class Card
           </html>
         HTML
       end
+
+      def defaults_from_config
+        (Card.config.email_defaults || {}).symbolize_keys.tap do |defaults|
+          defaults[:return_path] ||= defaults[:from] if defaults[:from]
+          defaults[:charset] ||= "utf-8"
+        end
+      end
     end
+
+    default defaults_from_config
   end
 end