card 1.96.8 → 1.97.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6715082009c2c58c4ed4d8a36b1f0c826552efae
-  data.tar.gz: 78c2b43dd24a1009608b1bf096eacc83556fbf39
+  metadata.gz: 3b59550d09bbcc807ad2b77447b9210447752630
+  data.tar.gz: 395dc3c7be36b523bc0253dc15a030b6cc72afdf
 SHA512:
-  metadata.gz: e7b2fc3c66eb5c4f52f039f379b1012fbd1f40bb73f31e94707b2c380a6ca7c51dfd620c8bc63e1338394198e8fbb72e422630eaed598abda8382eebae3dcea9
-  data.tar.gz: de15fad77c70810cfec22af1639d8dde030f4c1e89fe8720f636bd8a4d3c0f84c2bc651aa41721f0b493766c7226e75d559cf7b37e022d0b54c33de18aa7ea10
+  metadata.gz: '09f5e93e2ab0e97289fc9158672e278f9814efaf67fc1355b49e1002ae4e7f1cc848983ff388243490db23602c32ff095b309aec781757a2b0aa76aaec410115'
+  data.tar.gz: 272c9e9f7827f7b91d3ef2fde2d3aaa96f46cc5f05853e730ff51fdc6acb03adcff7a9238365a5c4b816d3cdb8a72a097895c710686948df70a8164755184a21

data/VERSION

@@ -1 +1 @@
-0.6.8
+0.7.0.pre

data/config/initializers/01_core_extensions/hash.rb

@@ -56,14 +56,14 @@ module CoreExtensions
       # opposite of #dig
       # eg. hash.bury(:a, :b, 7) will make sure hash[:a][:b] equals 7
       # @return [Hash] with arbitrary depth
-      def bury *array
-        key = array.shift
-        validate_bury_key! key
-        if array.size == 1
-          self[key] = array.first
+      def bury *val
+        k = val.shift
+        validate_bury_key! k
+        if val.size == 1
+          self[k] = val.first
         else
-          self[key] = {} unless self[key].is_a? Hash
-          self[key].bury(*array)
+          self[k] = {} unless self[k].is_a? ::Hash
+          self[k].bury(*val)
         end
         self
       end

data/config/initializers/01_core_extensions/object.rb

@@ -2,9 +2,7 @@ module CoreExtensions
   module Object
     def deep_clone
       case self
-      when Fixnum, Bignum, Float, NilClass, FalseClass, TrueClass, Symbol
-        # FIXME: Fixnum and Bignum are deprecated in Ruby 2.4 but need to be supported here
-        # so long as decko supports older ruby versions
+      when Integer, Float, NilClass, FalseClass, TrueClass, Symbol
         klone = self
       when Hash
         klone = clone
@@ -14,7 +12,13 @@ module CoreExtensions
         klone.clear
         each { |v| klone << v.deep_clone }
       else
-        klone = clone
+        klone =
+          if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.4") &&
+             (self.is_a?(Fixnum) || self.is_a?(Bignum))
+            self
+          else
+            clone
+          end
       end
       klone.deep_clone_instance_variables
       klone

data/config/initializers/02_patches/kaminari.rb

@@ -12,12 +12,6 @@ module Patches
           p = params_for(page)
           p.delete :controller
           p.delete :action
-          # TODO: make sure paging works with new related handling
-          if p["related"]
-            p["related"]["page"] = p["page"]
-            p["related"]["subslot"] = true
-            p = p["related"]
-          end
           mark = p.delete("mark") || p.delete("name")
           Card.fetch(mark).format.path p
         end

data/config/locales/de.yml

@@ -70,9 +70,10 @@ de:
         html_format:
           unknown_layout: "Unbekanntes Layout: %{name}"
           built_in: "Built-in Layouts: %{built_in_layouts}"
+          available_layouts: "Verfügbare Layouts: %{available_layouts}"
       set:
         all:
-          codename: 
+          codename:
             only_admins_codename: cur Administratoren können Codenamen festlegen
             error_code_in_use: codename %{codename} wird bereits benutzt
           event:
@@ -82,7 +83,7 @@ de:
           fetch:
             exception_fetch_arg_skipvirt: "%{func} called with new arguments and %{sv}"
           name_events:
-            error_name_exists: muss eindeutig sein; '%{name}' exisitiert bereits.
+            error_name_exists: muss eindeutig sein; '%{name}' existiert bereits.
             error_too_long: ist zu lang (%{length} Zeichen; erlaubt sind maximal 255)
             error_blank_name: darf nicht frei bleiben
             error_blank_key: darf nicht frei bleiben
@@ -189,7 +190,7 @@ de:
           json:
             invalid_json: invalid json
     :bootstrap:
-      set: 
+      set:
         type:
             customized_bootswatch_skin:
               not_valid_theme: kein gültiges Thema %{theme_name}
@@ -525,7 +526,9 @@ de:
             error_unknown_email: Unbekannte E-Mail-Adresse.
             error_not_active: Entschuldigung, der Account ist nicht aktiviert.
             error_wrong_password: Falsches Passwort
-            abort_bad_signin_args: ungültige Anmeldedaten
+            error_blank: fehlt
+            email_missing: E-Mail-Addresse fehlt
+            password_missing: Passwort fehlt
             error_not_active: nicht aktiviert
             error_not_recognized: unbekannt
         type:

data/config/locales/en.yml

@@ -80,9 +80,10 @@ en:
         html_format:
           unknown_layout: "Unknown layout: %{name}"
           built_in: "Built-in Layouts: %{built_in_layouts}"
+          available_layouts: "Available Layouts: %{available_layouts}"
       set:
         all:
-          codename: 
+          codename:
             only_admins_codename: only admins can set codename
             error_code_in_use: codename %{codename} already in use
           event:
@@ -199,7 +200,7 @@ en:
           json:
             invalid_json: invalid json
     :bootstrap:
-      set: 
+      set:
         type:
             customized_bootswatch_skin:
               not_valid_theme: not a valid theme %{theme_name}
@@ -367,42 +368,6 @@ en:
               account: account
             modal:
               close: Close
-            toolbar:
-              account: account
-              activity: activity
-              all: all
-              autosaved_draft: autosaved draft
-              by_group: by group
-              by_name: by name
-              cancel: cancel
-              card_delete_confirm: Are you sure you want to delete %{cardname}?
-              card_deleted: "%{cardname} deleted"
-              children: children
-              common: common
-              content: content
-              created: created
-              delete: delete
-              details: details
-              discuss: discuss
-              edit: edit
-              edited: edited
-              editors: editors
-              engage: engage
-              follow: follow
-              history: history
-              mates: mates
-              name: name
-              nests: nests
-              pin_pin: pin
-              pin_unpin: unpin
-              recent: recent
-              references_out: references out
-              references_in: references in
-              refresh: refresh
-              roles: roles
-              rules: rules
-              structure: structure
-              type: type
             wrapper:
               close: Close
         rstar:
@@ -561,8 +526,10 @@ en:
             check_email: Check your email for a link to reset your password
             error_unknown_email: Unrecognized email.
             error_not_active: Sorry, that account is not active.
+            error_blank: can't be blank
             error_wrong_password: Wrong password
-            abort_bad_signin_args: bad sign in arguments
+            email_missing: email can't be blank
+            password_missing: password can't be blank
             error_not_active: not active
             error_not_recognized: not recognized
     :carrierwave:
@@ -592,5 +559,45 @@ en:
             howto_turn_off: 'How to turn captcha off:'
             howto_go: Go to %{captcha_card}
             howto_update: Update all *captcha rules to "no".
+    :edit:
+      set:
+        all:
+          bridge:
+            tab_views:
+               account: account
+               activity: activity
+               all: all
+               autosaved_draft: autosaved draft
+               by_group: by group
+               by_name: by name
+               cancel: cancel
+               card_delete_confirm: Are you sure you want to delete %{cardname}?
+               card_deleted: "%{cardname} deleted"
+               children: children
+               common: common
+               content: content
+               created: created
+               delete: delete
+               details: details
+               discuss: discuss
+               edit: edit
+               edited: edited
+               editors: editors
+               engage: engage
+               follow: follow
+               history: history
+               mates: mates
+               name: name
+               nests: nests
+               pin_pin: pin
+               pin_unpin: unpin
+               recent: recent
+               references_out: references out
+               references_in: references in
+               refresh: refresh
+               roles: roles
+               rules: rules
+               structure: structure
+               type: type
 
 

data/db/migrate/20110511221913_require_earlier_migrations.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 require "card/version"
 
 class RequireEarlierMigrations < ActiveRecord::Migration[4.2]

data/db/migrate/20120105203350_require_1_8_migrations.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 class Require18Migrations < ActiveRecord::Migration[4.2]
   def self.up
     raise %(

data/db/migrate/20190116170824_add_left_key_to_card_virtuals.rb

@@ -0,0 +1,11 @@
+# -*- encoding : utf-8 -*-
+
+class AddLeftKeyToCardVirtuals < ActiveRecord::Migration[4.2]
+  def up
+    add_column :card_virtuals, :left_key, :string
+  end
+
+  def down
+    remove_column :card_virtuals, :left_key
+  end
+end

data/db/migrate/20190131223248_add_codename_index.rb

@@ -0,0 +1,9 @@
+class AddCodenameIndex < ActiveRecord::Migration[5.2]
+  def up
+    add_index :cards, [:codename], name: "cards_codename_index"
+  end
+
+  def down
+    remove_index :cards, name: "cards_codename_index"
+  end
+end

data/db/migrate_core_cards/20120611203506_rails_inflection_updates.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 class RailsInflectionUpdates < Card::Migration::Core
   def word ar
     [/(?<=\W|_|^)#{ar[0]}(?=\W|_|$)/i, /(?<=\W|_|^)#{ar[1]}(?=\W|_|$)/i, ar[2]]
@@ -18,7 +19,11 @@ class RailsInflectionUpdates < Card::Migration::Core
         twin.destroy
         yield
       elsif !card.trash
-        raise Card::Error::Oops.new("Your deck has two different cards with names '#{card.name}' and '#{twin.name}'. After this update it's no longer possible to differentiate between those two names. Please rename or delete one of the two cards and run the update again.")
+        raise Card::Error::Oops,
+              "Your deck has two different cards with names '#{card.name}' and "\
+              "'#{twin.name}'. After this update it's no longer possible to "\
+              "differentiate between those two names. Please rename or delete one of "\
+              "the two cards and run the update again."
       end
     else
       yield
@@ -36,7 +41,8 @@ class RailsInflectionUpdates < Card::Migration::Core
       word(keep_the_s("analysi")),
       word(keep_the_s("axi"))
     ]
-    %w(statu crisi alia bu octopu viru analysi basi diagnosi parenthesi prognosi synopsi thesi).each do |word|
+    %w[statu crisi alia bu octopu viru analysi basi diagnosi parenthesi
+       prognosi synopsi thesi].each do |word|
       corrections << word_end(keep_the_s(word))
     end
 

data/db/migrate_core_cards/20180712042655_head_rule.rb

@@ -0,0 +1,14 @@
+# -*- encoding : utf-8 -*-
+
+class HeadRule < Card::Migration::Core
+  def up
+    update_card :head, type_id: Card::SettingID
+    ensure_card [:all, :head],
+                type_id: Card::HTMLID,
+                content: "{{*head|core}}"
+    ensure_card [:head, :right, :help],
+                content: "head tag content"
+    ensure_card [:head, :right, :default], type_id: Card::HtmlID
+
+  end
+end

data/db/migrate_core_cards/20180905061536_migrate_layouts.rb

@@ -0,0 +1,64 @@
+# -*- encoding : utf-8 -*-
+
+class MigrateLayouts < Card::Migration::Core
+  def up
+    Card.search referred_to_by: { right: :layout } do |card|
+      create_head_rules card
+      update_layout_card card
+    end
+  end
+
+  # strip layout content down to body tag
+  def update_layout_card card
+    body = body_tag card
+    missing "body", card unless body.present?
+
+    puts "updating layout '#{card.name}'"
+    card.update! content: body.to_s
+  end
+
+  def body_tag card
+    card.content[/<body[^>]+>.*<\/body>/mi]
+  end
+
+  def create_head_rules layout_card
+    head = find_head_content layout_card
+    return missing "head", layout_card unless head
+
+    each_layout_set layout_card do |set_name|
+      puts "creating head rule for '#{set_name}'"
+      ensure_card [set_name, :head], content: head, type_id: Card::HtmlID
+    end
+  end
+
+  def find_head_content card
+    head_tag(card) || find_nested_head(card)
+  end
+
+  def head_tag card
+    if (match = card.content.match(/<head>(.*)<\/head>/mi))
+      match[1].strip
+    end
+  end
+
+  def missing obj, card
+    puts "warning: couldn't find #{obj} in layout '#{card.name}'"
+  end
+
+  def each_layout_set layout_card
+    Card.search(link_to: layout_card.name) do |rule|
+      yield rule.name.left
+    end
+  end
+
+  private
+
+  def find_nested_head card
+    # we go only one level deep
+    Card::Content.new(card.content, card, chunk_list: :nest_only).each_chunk do |chunk|
+      nested = chunk.referee_card
+      return head_tag(nested) if nested&.content&.match?(/<head>/i)
+    end
+    nil
+  end
+end

data/db/migrate_core_cards/20190125125150_add_script_rules_card.rb

@@ -0,0 +1,9 @@
+# -*- encoding : utf-8 -*-
+
+class AddScriptRulesCard < Card::Migration::Core
+  def up
+    ensure_card name: "script: rules",
+                type_id: Card::CoffeeScriptID,
+                codename: "script_rules"
+  end
+end

data/db/migrate_core_cards/20190204195039_add_rule_card.rb

@@ -0,0 +1,7 @@
+# -*- encoding : utf-8 -*-
+
+class AddRuleCard < Card::Migration::Core
+  def up
+    ensure_card "*rule", codename: "rule", type_id: Card::SetID
+  end
+end

data/db/migrate_core_cards/data/decko_logo.svg

@@ -0,0 +1,59 @@
+<svg style="min-width: 75px; min-height: 55px;" viewBox="0 0 242 220" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <!-- Generator: Sketch 46.2 (44496) - http://www.bohemiancoding.com/sketch -->
+  <title>b&amp;w_logo</title>
+  <desc>Created with Sketch.</desc>
+  <defs>
+    <rect id="path-1" x="35.3297422" y="10.484836" width="157.279595" height="190.607432" rx="12.491335"></rect>
+    <filter x="-12.1%" y="-10.5%" width="125.4%" height="121.0%" filterUnits="objectBoundingBox" id="filter-2">
+      <feMorphology radius="1" operator="dilate" in="SourceAlpha" result="shadowSpreadOuter1"></feMorphology>
+      <feOffset dx="1" dy="0" in="shadowSpreadOuter1" result="shadowOffsetOuter1"></feOffset>
+      <feGaussianBlur stdDeviation="5.5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
+      <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.1 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
+    </filter>
+    <rect id="path-3" x="51.9878879" y="19.404077" width="123.9533" height="171.161486" rx="9.6888466"></rect>
+    <filter x="-15.3%" y="-11.7%" width="132.3%" height="123.4%" filterUnits="objectBoundingBox" id="filter-4">
+      <feMorphology radius="1" operator="dilate" in="SourceAlpha" result="shadowSpreadOuter1"></feMorphology>
+      <feOffset dx="1" dy="0" in="shadowSpreadOuter1" result="shadowOffsetOuter1"></feOffset>
+      <feGaussianBlur stdDeviation="5.5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
+      <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.1 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
+    </filter>
+    <path d="M70.1050368,35.6666109 L159.089911,35.6666109 L159.089911,35.6666109 C163.678051,35.6666109 167.397473,39.386033 167.397473,43.9741728 L167.397473,87.717145 L167.397473,166.808436 L167.397473,166.808436 C167.397473,171.396576 163.678051,175.115998 159.089911,175.115998 L70.1050368,175.115998 L70.1050368,175.115998 C65.516897,175.115998 61.7974749,171.396576 61.7974749,166.808436 L61.7974749,43.9741728 L61.7974749,43.9741728 C61.7974749,39.386033 65.516897,35.6666109 70.1050368,35.6666109 Z" id="path-5"></path>
+    <filter x="-18.0%" y="-14.3%" width="137.9%" height="128.7%" filterUnits="objectBoundingBox" id="filter-6">
+      <feMorphology radius="1" operator="dilate" in="SourceAlpha" result="shadowSpreadOuter1"></feMorphology>
+      <feOffset dx="1" dy="0" in="shadowSpreadOuter1" result="shadowOffsetOuter1"></feOffset>
+      <feGaussianBlur stdDeviation="5.5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
+      <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.1 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
+    </filter>
+    <rect id="path-7" x="70.7637805" y="49.8525134" width="92.149175" height="107.18743" rx="7.8659801"></rect>
+    <filter x="-20.6%" y="-18.7%" width="143.4%" height="137.3%" filterUnits="objectBoundingBox" id="filter-8">
+      <feMorphology radius="1" operator="dilate" in="SourceAlpha" result="shadowSpreadOuter1"></feMorphology>
+      <feOffset dx="1" dy="0" in="shadowSpreadOuter1" result="shadowOffsetOuter1"></feOffset>
+      <feGaussianBlur stdDeviation="5.5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
+      <feColorMatrix values="0 0 0 0 0   0 0 0 0 0   0 0 0 0 0  0 0 0 0.102553216 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
+    </filter>
+  </defs>
+  <g id="Page-3" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="b&amp;w_logo" fill-rule="nonzero">
+      <g id="Decko-Logo-" transform="translate(7.000000, 4.000000)">
+        <g id="g5642">
+          <g id="svg-card-1" transform="translate(113.969540, 105.788552) scale(-1, 1) rotate(105.855860) translate(-113.969540, -105.788552) ">
+            <use fill="black" fill-opacity="1" filter="url(#filter-2)" xlink:href="#path-1"></use>
+            <use fill="#4D4D4D" fill-rule="evenodd" xlink:href="#path-1"></use>
+          </g>
+          <g id="svg-card-2" opacity="0.879999995" transform="translate(113.964538, 104.984820) scale(-1, 1) rotate(117.480003) translate(-113.964538, -104.984820) ">
+            <use fill="black" fill-opacity="1" filter="url(#filter-4)" xlink:href="#path-3"></use>
+            <use fill="#FFFFFF" fill-rule="evenodd" xlink:href="#path-3"></use>
+          </g>
+          <g id="svg-card-3" transform="translate(114.597474, 105.391304) scale(-1, 1) rotate(133.539993) translate(-114.597474, -105.391304) ">
+            <use fill="black" fill-opacity="1" filter="url(#filter-6)" xlink:href="#path-5"></use>
+            <use fill="#4C4C4C" fill-rule="evenodd" xlink:href="#path-5"></use>
+          </g>
+          <g id="svg-card-4" opacity="0.879999995" transform="translate(116.838368, 103.446228) scale(-1, 1) rotate(142.690002) translate(-116.838368, -103.446228) ">
+            <use fill="black" fill-opacity="1" filter="url(#filter-8)" xlink:href="#path-7"></use>
+            <use fill="#FFFFFF" fill-rule="evenodd" xlink:href="#path-7"></use>
+          </g>
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>