card 1.101.4 → 1.101.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6dd18af985f887f9ee6235c4da09625f700fbd33db1d62ca8ce2e50e4a745c7
-  data.tar.gz: 5e20663bf4a06a6c11b20b6311a8be0b7e09e3bac6197608d160c0415e22802a
+  metadata.gz: 471e6eb7596b5743e59b50b9158fa16953ba916f328bb10a2e63153fad797eff
+  data.tar.gz: 51cf98adab2d3b8bf4c6f9b6a374d31da99da82d14b96eb3fc50634b8948e3d9
 SHA512:
-  metadata.gz: 3e76c614cf17af63b8588d1ea249846f4b856924994a1c8ebd35b6515985c7642aff654746a5270fcd69c41c27214b7b65d211032597d7b50dfee9df131f87da
-  data.tar.gz: 413c7d66e9a44e8db643b4f61222b43bd882f6d9c69e2e2ab1c67c3a0ee143d7c430298bbe82e73b4f9b2aa99bfaa708dc546eb24a1d91f920fc22f47b76f461
+  metadata.gz: 6e86bce11c52e5fb214a5df5e09389f8328320c53316e0fba5a6747fe644d5e5468081dbd9d8e22c3a83b7db8b48a8d3cda25340dc0c3e1ec31901cc78c812fa
+  data.tar.gz: 68f7a39e5a47dd497c7ab4bc2160d4f125e4a9e617cd1bb3625472ac09b201917ba2f1688f3960cf90ab9064314a281265acea03f63f46bffc10c95ab37585c4

data/VERSION

@@ -1 +1 @@
-0.11.4
+0.11.5

data/config/i18n-tasks.yml

@@ -58,11 +58,6 @@ search:
   ## Root directories for relative keys resolution.
   relative_roots:
     - .
-  #   - app/controllers
-  #   - app/helpers
-  #   - app/mailers
-  #   - app/presenters
-  #   - app/views
 
   ## Files or `File.fnmatch` patterns to exclude from search. Some files are always excluded regardless of this setting:
   ##   %w(*.jpg *.png *.gif *.svg *.ico *.eot *.otf *.ttf *.woff *.woff2 *.pdf *.css *.sass *.scss *.less *.yml *.json)

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

@@ -7,8 +7,9 @@ module CoreExtensions
       end.join "\n"
     end
 
-    def to_name
+    def cardname
       Card::Name.compose self
     end
+    alias_method :to_name, :cardname
   end
 end

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

@@ -13,6 +13,7 @@ module CoreExtensions
 
         def initialize_nested classes, level=0
           return classes[level].new if level == classes.size - 1
+
           classes[level].new do |h, k|
             h[k] = initialize_nested classes, level + 1
           end

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

@@ -18,16 +18,20 @@ module CoreExtensions
       klone
     end
 
-    def send_unless method, *args, &_block
-      (block_given? ? yield : self) || send(method, *args)
+    # @return [Card::Name]
+    def cardname
+      Card::Name.new self
     end
+    alias_method :to_name, :cardname
 
-    def send_if     method, *args, &_block
-      (block_given? ? yield : self) && send(method, *args)
+    # @return [Card]
+    def card
+      Card[cardname]
     end
 
-    def to_name
-      Card::Name.new self
+    # @return [Integer] id of card with name
+    def card_id
+      cardname.card_id
     end
 
     def name?
@@ -36,7 +40,11 @@ module CoreExtensions
       # (at least in development mode) but the name cache is persistent.
       # Hence the name objects in the cache are objects of a different instance of the
       # Card::Name class and is_a?(Card::Name) will return false
-      self.is_a? Cardname
+      is_a? Cardname
+    end
+
+    def in? other
+      other.include? self
     end
 
     def deep_clone_instance_variables
@@ -44,9 +52,5 @@ module CoreExtensions
         instance_variable_set v, instance_variable_get(v).deep_clone
       end
     end
-
-    def in? other
-      other.include? self
-    end
   end
 end

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

@@ -69,7 +69,7 @@ module Patches
         end
       end
 
-      def transform_integer_keys(hash, integer_keys)
+      def transform_integer_keys hash, integer_keys
         hash.transform_keys do |key|
           if integer_keys.include?(key)
             key.to_i

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

@@ -42,9 +42,7 @@ module Patches
 
         loop do
           relation = reorder(table[primary_key].asc).limit(batch_size)
-          if batch_start
-            relation = relation.where(table[primary_key].gt(batch_start))
-          end
+          relation = relation.where(table[primary_key].gt(batch_start)) if batch_start
           items = relation.pluck(*select_columns)
 
           break if items.empty?

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

@@ -21,9 +21,7 @@ module Patches
           def real_filename_and_line_offset filename
             File.open(filename) do |file|
               file.each_line.with_index do |line, i|
-                if line =~ /pulled from ([\S]+) ~~/
-                  return Regexp.last_match(1), i + 1
-                end
+                return Regexp.last_match(1), i + 1 if line.match?(/pulled from (\S+) ~~/)
               end
             end
             [filename, 0]

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

@@ -2,7 +2,7 @@ module Patches
   module Kaminari
     module Helpers
       module Tag
-        def self.included(klass)
+        def self.included klass
           klass.class_eval do
             remove_method :page_url_for
           end
@@ -33,7 +33,7 @@ module Patches
             #     to: {other: "params", user: {name: "yuki", page: nil}}
             #   (when @param_name == "user[page]")
             @param_name.to_s.scan(/\w+/)[0..-2]
-              .inject(page_params) { |h, k| h[k] }[$&] = nil
+                       .inject(page_params) { |h, k| h[k] }[Regexp.last_match(0)] = nil
           end
 
           page_params

data/config/initializers/deck_config.rb

@@ -1,3 +1,3 @@
-if File.exist? 'config/deck.yml'
+if File.exist? "config/deck.yml"
   Decko.application.config.x = OpenStruct.new(Decko.application.config_for(:deck))
 end

data/config/initializers/inflections.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 # Be sure to restart your server when you modify this file.
 
 # Add new inflection rules using the following format

data/config/initializers/internationalization.rb

@@ -4,28 +4,30 @@
 #
 # Necessary since 'card' is packaged as a gem which is not an Engine
 
-I18n.load_path += Dir.glob(Pathname(__FILE__).parent.parent.to_s +
-                           "/locales/*.{rb,yml}")
+I18n.load_path += Dir.glob("#{Pathname(__FILE__).parent.parent}/locales/*.{rb,yml}")
 
 # see http://svenfuchs.com/2009/7/19/experimental-ruby-i18n-extensions-pluralization-fallbacks-gettext-cache-and-chained-backend
-module I18n::Backend::Transformers
-
-  # this variable is a hook to allow dynamic activation/deactivation
-  @@demark_enable = true
-
-  def translate(*args)
-    transform_text(super) { |entry| "⟪#{entry}⟫" }
-  end
-
-  def localize(*args)
-    transform_text(super) { |entry| "⟦#{entry}⟧" }
-  end
-
-  def transform_text entry
-    if @@demark_enable && entry && (entry.is_a? String)
-      yield(entry)
-    else
-      entry
+module I18n
+  module Backend
+    module Transformers
+      # this variable is a hook to allow dynamic activation/deactivation
+      @@demark_enable = true
+
+      def translate *args
+        transform_text(super) { |entry| "⟪#{entry}⟫" }
+      end
+
+      def localize *args
+        transform_text(super) { |entry| "⟦#{entry}⟧" }
+      end
+
+      def transform_text entry
+        if @@demark_enable && entry && (entry.is_a? String)
+          yield(entry)
+        else
+          entry
+        end
+      end
     end
   end
 end
@@ -39,6 +41,6 @@ end
 # or ./config/environments/*.rb file.
 
 if ENV["DECKO_I18N_DEMARK"]
-  I18n::Backend::Simple.send(:include, I18n::Backend::Transformers)
+  I18n::Backend::Simple.include I18n::Backend::Transformers
   puts "DECKO_I18N_DEMARK is active"
 end

data/config/initializers/mime_types.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 # Be sure to restart your server when you modify this file.
 # Add new mime types for use in respond_to blocks:
 

data/config/initializers/notification.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 ActiveSupport::Notifications.subscribe(/^card/) do |name, start, finish, _id, payload|
   Rails.logger.debug "#{(finish - start) * 1000}ms: #{name}: #{payload[:message]}"
 end

data/config/initializers/patches.rb

@@ -47,9 +47,11 @@ module ActiveRecord #:nodoc: all
   end
 end
 
-module ActiveJob::Arguments #:nodoc: all
-  class << self
-    prepend Patches::ActiveJob::Arguments
+module ActiveJob
+  module Arguments #:nodoc: all
+    class << self
+      prepend Patches::ActiveJob::Arguments
+    end
   end
 end
 
@@ -61,9 +63,8 @@ module ActiveSupport #:nodoc: all
   end
 end
 
-
 module Zeitwerk #:nodoc: all
   class Loader
     prepend Patches::Zeitwerk
   end
-end
+end

data/config/locales/en.yml

@@ -59,22 +59,11 @@ en:
   core_exception_almost_deleted: Narrowly averted deleting current file
   core_is_incomplete: is incomplete
   core_only_admins_codename: only admins can set codename
-
-  # core_label_set_all_cards: All cards
-  # core_label_set_plus_cards: All "+" cards
-  # core_label_set_right_cards: All "+%{name}" cards
-  # core_label_set_rstar_cards: All "+*" cards
-  # core_label_set_self_card: The card "%{name}"
-  # core_label_set_star_cards: All "*" cards
-  # core_label_set_type_cards: All "%{name}" cards
-  # core_label_set_typeplusright_cards: All "+%{right}" cards on "%{type}" cards
-  # core_label_setfollow_all_cards: everything
-  # core_label_setfollow_plus_cards: all "+" cards
-  # core_label_setfollow_right_cards: all "+%{name}s"
-  # core_label_setfollow_rstar_cards: all "+*" cards
-  # core_label_setfollow_star_cards: all "*" cards
-  # core_label_setfollow_type_cards: all "%{name}s"
-  # core_label_setfollow_typeplusright_cards: all "+%{right}" on "%{type}s"
+  core_rename_and_update: "Rename and Update"
+  core_renaming: "Renaming"
+  core_rename: "Rename"
+  core_rename_confirm: "Are you sure you want to rename"
+  core_rename_reference_confirm: "This name is referred to at least %{count} time(s). You may choose to <em>update</em> those references to use the new name."
 
   admin_warn: ADMINISTRATOR WARNING
   admin_email_off: Email delivery is turned off. Change settings in %{path} to send sign up notifications.
@@ -185,3 +174,8 @@ en:
   rules_templating: Templating
   rules_webpage: Webpage
   rules_editing: Editing
+
+  alias_target_must_be_simple: "must be aliased to a single, valid simple card"
+  alias_must_be_simple: "must be a simple (not a compound) card"
+  alias_cards_no_children: "Alias cards can't have children"
+  alias_redirect_former_name: "redirect former name to new one"

data/db/migrate/20110511221913_require_earlier_migrations.rb

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

data/db/migrate/20121111025347_require_1_10_migrations.rb

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

data/db/migrate/20121118114000_split_link_type.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 class SplitLinkType < ActiveRecord::Migration[4.2]
   def up
     add_column :card_references, :present, :integer

data/db/migrate/20121118115000_update_link_type.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 class UpdateLinkType < ActiveRecord::Migration[4.2]
   class TmpReference < ApplicationRecord
     self.table_name = "card_references"

data/db/migrate/20130106052640_table_cleanup.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 class TableCleanup < ActiveRecord::Migration[4.2]
   def up
     drop_table :cardtypes
@@ -20,6 +21,5 @@ class TableCleanup < ActiveRecord::Migration[4.2]
     remove_column :card_references, :updated_at
   end
 
-  def down
-  end
+  def down; end
 end

data/db/migrate/20130109015336_trunk_left.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 class TrunkLeft < ActiveRecord::Migration[4.2]
   def up
     rename_column :card_references, :link_type, :ref_type

data/db/migrate/20130411210957_update_codenames.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 class UpdateCodenames < ActiveRecord::Migration[4.2]
   def up
     { content: :structure, edit_help: :help }.each do |oldname, newname|

data/db/migrate/20140822073704_create_new_revision_tables.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 class CreateNewRevisionTables < ActiveRecord::Migration[4.2]
   def up
     add_column :cards, :db_content, :text

data/db/migrate/20141001105348_move_revisions_to_actions.rb

@@ -8,15 +8,19 @@ class MoveRevisionsToActions < ActiveRecord::Migration[4.2]
       TmpRevision.joins(left_join).where("cards.id IS NULL").delete_all
     end
   end
+
   class TmpAct < ApplicationRecord
     self.table_name = "card_acts"
   end
+
   class TmpAction < ApplicationRecord
     self.table_name = "card_actions"
   end
+
   class TmpChange < ApplicationRecord
     self.table_name = "card_changes"
   end
+
   class TmpCard < ApplicationRecord
     belongs_to :tmp_revision, foreign_key: :current_revision_id
     has_many :tmp_actions, foreign_key: :card_id
@@ -30,7 +34,10 @@ class MoveRevisionsToActions < ActiveRecord::Migration[4.2]
     created = ::Set.new
 
     TmpRevision.find_each do |rev|
-      TmpAct.create({ id: rev.id, card_id: rev.card_id, actor_id: rev.creator_id, acted_at: rev.created_at }, without_protection: true)
+      TmpAct.create(
+        { id: rev.id, card_id: rev.card_id, actor_id: rev.creator_id,
+          acted_at: rev.created_at }, without_protection: true
+      )
       if created.include? rev.card_id
         TmpAction.connection.execute "INSERT INTO card_actions (id, card_id, card_act_id, action_type) VALUES
                                                                ('#{rev.id}', '#{rev.card_id}', '#{rev.id}', 1)"
@@ -59,6 +66,5 @@ class MoveRevisionsToActions < ActiveRecord::Migration[4.2]
     # remove_column :cards, :current_revision
   end
 
-  def down
-  end
+  def down; end
 end

data/db/migrate/20141216053032_better_index_names.rb

@@ -6,11 +6,15 @@ class BetterIndexNames < ActiveRecord::Migration[4.2]
     rename_index :card_actions, "card_act_id_index", "card_actions_card_act_id_index"
     rename_index :card_actions, "card_id_index",     "card_actions_card_id_index"
 
-    rename_index :card_changes, "card_action_id_index", "card_changes_card_action_id_index"
+    rename_index :card_changes, "card_action_id_index",
+                 "card_changes_card_action_id_index"
 
-    rename_index :card_references, "wiki_references_referenced_card_id", "card_references_referee_id_index"
-    rename_index :card_references, "wiki_references_referenced_name",    "card_references_referee_key_index"
-    rename_index :card_references, "wiki_references_card_id",            "card_references_referer_id_index"
+    rename_index :card_references, "wiki_references_referenced_card_id",
+                 "card_references_referee_id_index"
+    rename_index :card_references, "wiki_references_referenced_name",
+                 "card_references_referee_key_index"
+    rename_index :card_references, "wiki_references_card_id",
+                 "card_references_referer_id_index"
 
     rename_index :cards, "cards_key_uniq",              "cards_key_index"
     rename_index :cards, "card_type_index",             "cards_type_id_index"
@@ -19,6 +23,5 @@ class BetterIndexNames < ActiveRecord::Migration[4.2]
     rename_index :cards, "index_cards_on_read_rule_id", "cards_read_rule_id_index"
   end
 
-  def down
-  end
+  def down; end
 end

data/db/migrate/20170908114442_create_delayed_jobs.rb

@@ -13,7 +13,7 @@ class CreateDelayedJobs < ActiveRecord::Migration[5.1]
       table.timestamps null: true
     end
 
-    add_index :delayed_jobs, [:priority, :run_at], name: "delayed_jobs_priority"
+    add_index :delayed_jobs, %i[priority run_at], name: "delayed_jobs_priority"
   end
 
   def self.down