card 1.96.8 → 1.97.0

data/lib/card/mailer.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 require "open-uri"
 
 class Card
@@ -30,7 +31,7 @@ class Card
               #{message}
             </body>
           </html>
-         HTML
+        HTML
       end
     end
   end

data/lib/card/mark.rb

@@ -2,8 +2,8 @@ class Card
   # Card::Mark provides class methods for Card to translate all different kind
   # of card identifiers to card objects.
   module Mark
-    ID_MARK_RE = /^~(?<id>\d+)$/
-    CODENAME_MARK_RE = /^:(?<codename>\w+)$/
+    ID_MARK_RE = /^~(?<id>\d+)$/.freeze
+    CODENAME_MARK_RE = /^:(?<codename>\w+)$/.freeze
 
     # translates marks (and other inputs) into a Card
     #

data/lib/card/migration.rb

@@ -1,147 +1,149 @@
 # -*- encoding : utf-8 -*-
 
-class Card::Migration < ActiveRecord::Migration[4.2]
-  include Card::Model::SaveHelper
-  @type = :deck_cards
-
-  class << self
-    # Rake tasks use class methods, migrations use instance methods.
-    # To avoid repetition a lot of instance methods here just call class
-    # methods.
-    # The subclass Card::CoreMigration needs a different @type so we can't use a
-    # class variable @@type. It has to be a class instance variable.
-    # Migrations are subclasses of Card::Migration or Card::CoreMigration
-    # but they don't inherit the @type. The method below solves this problem.
-    def type
-      @type || (ancestors[1] && ancestors[1].type)
-    end
+class Card
+  class Migration < ActiveRecord::Migration[4.2]
+    include Card::Model::SaveHelper
+    @type = :deck_cards
+
+    class << self
+      # Rake tasks use class methods, migrations use instance methods.
+      # To avoid repetition a lot of instance methods here just call class
+      # methods.
+      # The subclass Card::CoreMigration needs a different @type so we can't use a
+      # class variable @@type. It has to be a class instance variable.
+      # Migrations are subclasses of Card::Migration or Card::CoreMigration
+      # but they don't inherit the @type. The method below solves this problem.
+      def type
+        @type || (ancestors[1]&.type)
+      end
 
-    def find_unused_name base_name
-      test_name = base_name
-      add = 1
-      while Card.exists?(test_name)
-        test_name = "#{base_name}#{add}"
-        add += 1
+      def find_unused_name base_name
+        test_name = base_name
+        add = 1
+        while Card.exists?(test_name)
+          test_name = "#{base_name}#{add}"
+          add += 1
+        end
+        test_name
       end
-      test_name
-    end
 
-    def migration_paths mig_type=type
-      Cardio.migration_paths mig_type
-    end
+      def migration_paths mig_type=type
+        Cardio.migration_paths mig_type
+      end
 
-    def schema mig_type=type
-      Cardio.schema mig_type
-    end
+      def schema mig_type=type
+        Cardio.schema mig_type
+      end
 
-    def schema_suffix mig_type=type
-      Cardio.schema_suffix mig_type
-    end
+      def schema_suffix mig_type=type
+        Cardio.schema_suffix mig_type
+      end
 
-    def schema_mode mig_type=type
-      Cardio.with_suffix mig_type do
-        paths = Cardio.migration_paths(type)
-        yield(paths)
+      def schema_mode mig_type=type
+        Cardio.with_suffix mig_type do
+          paths = Cardio.migration_paths(type)
+          yield(paths)
+        end
       end
-    end
 
-    def assume_migrated_upto_version
-      schema_mode do
-        ActiveRecord::Schema.assume_migrated_upto_version schema,
-                                                          migration_paths
+      def assume_migrated_upto_version
+        schema_mode do
+          ActiveRecord::Schema.assume_migrated_upto_version schema,
+                                                            migration_paths
+        end
       end
-    end
 
-    def data_path filename=nil
-      path = migration_paths.first
-      File.join([path, "data", filename].compact)
+      def data_path filename=nil
+        path = migration_paths.first
+        File.join([path, "data", filename].compact)
+      end
     end
-  end
 
-  def contentedly
-    Card::Cache.reset_all
-    Cardio.schema_mode "" do
-      Card::Auth.as_bot do
-        begin
-          yield
-        ensure
-          ::Card::Cache.reset_all
+    def contentedly
+      Card::Cache.reset_all
+      Cardio.schema_mode "" do
+        Card::Auth.as_bot do
+          begin
+            yield
+          ensure
+            ::Card::Cache.reset_all
+          end
         end
       end
     end
-  end
 
-  def import_json filename, merge_opts={}
-    Card::Mailer.perform_deliveries = false
-    output_file = File.join data_path, "unmerged_#{filename}"
-    merge_opts[:output_file] ||= output_file
-    Card.merge_list read_json(filename), merge_opts
-  end
+    def import_json filename, merge_opts={}
+      Card::Mailer.perform_deliveries = false
+      output_file = File.join data_path, "unmerged_#{filename}"
+      merge_opts[:output_file] ||= output_file
+      Card.merge_list read_json(filename), merge_opts
+    end
 
-  def import_cards filename, merge_opts={}
-    Card::Mailer.perform_deliveries = false
-    output_file = File.join data_path, "unmerged_#{filename}"
-    merge_opts[:output_file] ||= output_file
-    meta_data = JSON.parse(File.read(data_path(filename)))
-    full_data =
-      meta_data.map do |hash|
-        hash["content"] =
-          File.read data_path(File.join("cards", hash["name"].to_name.key))
-        hash
-      end
-    Card.merge_list full_data, merge_opts
-  end
+    def import_cards filename, merge_opts={}
+      Card::Mailer.perform_deliveries = false
+      output_file = File.join data_path, "unmerged_#{filename}"
+      merge_opts[:output_file] ||= output_file
+      meta_data = JSON.parse(File.read(data_path(filename)))
+      full_data =
+        meta_data.map do |hash|
+          hash["content"] =
+            File.read data_path(File.join("cards", hash["name"].to_name.key))
+          hash
+        end
+      Card.merge_list full_data, merge_opts
+    end
 
-  # uses the data in cards.yml and the card content in db/migrate_cards/data/cards
-  # to update or create the cards given by name or key in names_or_keys
-  def merge_cards names_or_keys
-    names_or_keys = Array(names_or_keys)
-    Card::Mailer.perform_deliveries = false
+    # uses the data in cards.yml and the card content in db/migrate_cards/data/cards
+    # to update or create the cards given by name or key in names_or_keys
+    def merge_cards names_or_keys
+      names_or_keys = Array(names_or_keys)
+      Card::Mailer.perform_deliveries = false
 
-    Card::Migration::Import.new(data_path).merge only: names_or_keys
-  end
+      Card::Migration::Import.new(data_path).merge only: names_or_keys
+    end
 
-  def read_json filename
-    raw_json = File.read data_path(filename)
-    json = JSON.parse raw_json
-    json.is_a?(Hash) ? json["card"]["value"] : json
-  end
+    def read_json filename
+      raw_json = File.read data_path(filename)
+      json = JSON.parse raw_json
+      json.is_a?(Hash) ? json["card"]["value"] : json
+    end
 
-  def data_path filename=nil
-    self.class.data_path filename
-  end
+    def data_path filename=nil
+      self.class.data_path filename
+    end
 
-  def schema_mode
-    Cardio.schema_mode self.class.type
-  end
+    def schema_mode
+      Cardio.schema_mode self.class.type
+    end
 
-  def migration_paths
-    Cardio.paths self.class.type
-  end
+    def migration_paths
+      Cardio.paths self.class.type
+    end
 
-  # Execute this migration in the named direction
-  # copied from ActiveRecord to wrap 'up' in 'contentendly'
-  def exec_migration conn, direction
-    @connection = conn
-    if respond_to?(:change)
-      if direction == :down
-        revert { change }
+    # Execute this migration in the named direction
+    # copied from ActiveRecord to wrap 'up' in 'contentendly'
+    def exec_migration conn, direction
+      @connection = conn
+      if respond_to?(:change)
+        if direction == :down
+          revert { change }
+        else
+          change
+        end
       else
-        change
+        contentedly { send(direction) }
       end
-    else
-      contentedly { send(direction) }
+    ensure
+      @connection = nil
     end
-  ensure
-    @connection = nil
-  end
 
-  def down
-    raise ActiveRecord::IrreversibleMigration
-  end
+    def down
+      raise ActiveRecord::IrreversibleMigration
+    end
 
-  def update_machine_output
-    Card.search(right: { codename: "machine_output" }).each(&:delete)
+    def update_machine_output
+      Card.search(right: { codename: "machine_output" }).each(&:delete)
+    end
   end
 end
 

data/lib/card/migration/core.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 require "card/migration"
 
 class Card

data/lib/card/migration/deck_structure.rb

@@ -1,4 +1,5 @@
 # -*- encoding : utf-8 -*-
+
 require "card/migration"
 
 class Card

data/lib/card/migration/import.rb

@@ -93,7 +93,7 @@ class Card
       def fetch_remote_data name, view, url
         json_url = "#{url}/#{name}.json"
         json_url += "?view=#{view}" if view
-        json = open(json_url).read
+        json = ::File.open(json_url).read
         parse_and_symbolize json
       end
 

data/lib/card/migration/import/import_data.rb

@@ -39,7 +39,9 @@ class Card
         def select_cards names_or_keys
           names_or_keys.map do |key|
             attributes = find_card_attributes(key)
-            raise("no entry for #{key} (key: #{key.to_name.key}) in #{@path}") unless attributes
+            unless attributes
+              raise("no entry for #{key} (key: #{key.to_name.key}) in #{@path}")
+            end
             prepare_for_import attributes
           end
         end
@@ -47,6 +49,7 @@ class Card
         def changed_cards
           cards.map do |data|
             next unless changed?(data)
+
             prepare_for_import data
           end.compact
         end
@@ -78,7 +81,7 @@ class Card
 
         def split_attributes_and_content data
           card_data = {}
-          [:name, :type, :codename].each do |key|
+          %i[name type codename].each do |key|
             card_data[key] = data[key] if data[key]
           end
           card_data[:key] = data[:name].to_name.key
@@ -96,7 +99,7 @@ class Card
         def prepare_for_import data
           hash = card_attributes(data)
           hash[:content] = card_content(data)
-          [:file, :image].each do |attach|
+          %i[file image].each do |attach|
             hash[attach] &&= card_attachment(attach, data)
           end
           hash.with_indifferent_access

data/lib/card/migration/import/import_data/card_attributes.rb

@@ -2,60 +2,62 @@ class Card
   class Migration
     class Import
       class ImportData
-       # handles card attributes for import
-       module CardAttributes
-         def card_attributes data
-           card_attr = ::Set.new [:name, :type, :codename, :file, :image]
-           data.select { |k, v| v && card_attr.include?(k) }
-         end
-
-         def update_card_attributes card_data
-           card_entry = find_card_attributes card_data[:name]
-           # we only want strings and not the whole name objects
-           # for name and type
-           card_data[:name] = card_data[:name].to_s
-           card_data[:type] = card_data[:type].to_s
-           if card_entry
-             card_entry.replace card_data
-           else
-             cards << card_data
-           end
-         end
-
-         def update_attribute name, attr_key, attr_value
-           card = find_card_attributes name
-           return unless card
-           card[attr_key] = attr_value
-           card
-         end
-
-         def write_attributes
-           File.write @path, @data.to_yaml
-         rescue SystemCallError
-           false
-           # card.yml not written
-         end
-
-         def read_attributes
-           ensure_path
-           return { cards: [], remotes: {} } unless File.exist? @path
-           YAML.load_file(@path).deep_symbolize_keys
-         end
-
-         def find_card_attributes name
-           key = name.to_name.key
-           cards.find do |attr|
-             key == (attr[:key].present? ? attr[:key] : attr[:name].to_name.key)
-           end
-         end
-
-         private
-
-         def ensure_path
-           dir = File.dirname(@path)
-           FileUtils.mkpath dir unless Dir.exist? dir
-         end
-       end
+        # handles card attributes for import
+        module CardAttributes
+          def card_attributes data
+            card_attr = ::Set.new %i[name type codename file image]
+            data.select { |k, v| v && card_attr.include?(k) }
+          end
+
+          def update_card_attributes card_data
+            card_entry = find_card_attributes card_data[:name]
+            # we only want strings and not the whole name objects
+            # for name and type
+            card_data[:name] = card_data[:name].to_s
+            card_data[:type] = card_data[:type].to_s
+            if card_entry
+              card_entry.replace card_data
+            else
+              cards << card_data
+            end
+          end
+
+          def update_attribute name, attr_key, attr_value
+            card = find_card_attributes name
+            return unless card
+
+            card[attr_key] = attr_value
+            card
+          end
+
+          def write_attributes
+            File.write @path, @data.to_yaml
+          rescue SystemCallError
+            false
+            # card.yml not written
+          end
+
+          def read_attributes
+            ensure_path
+            return { cards: [], remotes: {} } unless File.exist? @path
+
+            YAML.load_file(@path).deep_symbolize_keys
+          end
+
+          def find_card_attributes name
+            key = name.to_name.key
+            cards.find do |attr|
+              key == (attr[:key].present? ? attr[:key] : attr[:name].to_name.key)
+            end
+          end
+
+          private
+
+          def ensure_path
+            dir = File.dirname(@path)
+            FileUtils.mkpath dir unless Dir.exist? dir
+          end
+        end
       end
     end
   end