copy_tuner_incompatible_search 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d8e36a8c2fe00fe286e5c1ddead546acc1f5b697798c8c62474f01905e95358
-  data.tar.gz: bbd8ecb9ca27bad1a3270653d2a2288c58235a00644262e57cce53faea3c799d
+  metadata.gz: 549e35e731fc1cc494c260d49c66e5dcdb5db7eb4cb4a82bd5dad34f32f2a685
+  data.tar.gz: 14e23c9d6841ccb3e18b49de84daa2a16c52a1c84f522d0bb121e3a31492945b
 SHA512:
-  metadata.gz: f065e961d42ecc2ada50b12700a0511ec81259b943e76a33891beead260f1daa2e54c5bc67f930c5af383c2a02b5334554c577b3114340b91301aa1ce5022693
-  data.tar.gz: e9fa13e7a77be62c0a9a04ec55cc0ecebfc6696f618e638659ab7386689e78adc687c266ecd86a7a7cba8c8faab153fb49b9413f36582f7f355f6b39bf1349ec
+  metadata.gz: 4967fec81fb7dc9cadb284f979cd85874fa5c1412f3ed9a1cdcd421d79534e8b1d860f1af348d89e8758a76c04d3c66469443b56cced0492f3965e134596236b
+  data.tar.gz: dba034921fafca23d9762a18ee0ef2df043f528307891e203976e10368b4c4b36ce954c08ec845cb5781f7a978f5a1fd68a6b0ffa4cc68af1c1242e7120f2307

data/CHANGELOG.md

@@ -1,4 +1,7 @@
-## [Unreleased]
+## [Unreleased]o
+## [2.0.3] - 2024-07-03
+- Bug fix
+
 ## [2.0.2] - 2024-05-04
 - Consider BOM in blurbs.csv
 ## [2.0.1] - 2024-05-04

data/Steepfile

@@ -29,7 +29,5 @@
 # end
 target :lib do
   check 'lib'
-  # すぐにrbsを導入するのは難しそうなのであとまわし
-  ignore 'lib/copy_tuner_incompatible_search/replace_command.rb'
   signature 'sig'
 end

data/exe/copy_tuner_incompatible_search

@@ -5,6 +5,6 @@ require_relative '../lib/copy_tuner_incompatible_search'
 project_name = File.basename(Dir.pwd)
 timestamp = Time.now.strftime('%Y%m%d%H%M%S')
 output_path = "tmp/usages-#{project_name}-#{timestamp}.xlsx"
-CopyTunerIncompatibleSearch::Command.run(output_path)
+CopyTunerIncompatibleSearch::SearchCommand.run(output_path)
 puts "open #{output_path}"
 `open #{output_path}`

data/lib/copy_tuner_incompatible_search/replace_command.rb

@@ -18,10 +18,10 @@ module CopyTunerIncompatibleSearch
 
     def run(output_path) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
       # usages.xlsxから生成したUsageオブジェクトの配列
-      usages = usage_sheet.each(type: 'Type', key: 'Key', ignored: 'Ignored', file: 'File', line: 'Line').filter_map.with_index do |hash, i|
+      usages = usage_sheet.each(type: 'Type', key: 'Key', file: 'File', line: 'Line').filter_map.with_index do |hash, i|
         next if i.zero? # skip header
 
-        Usage.new(**hash)
+        Usage.new(type: hash[:type], key: hash[:key], file: hash[:file], line: hash[:line])
       end
       # プロジェクト内で後方互換性のないキーの集合
       incompatible_keys = Set[*usages.select(&:static?).map(&:key)]
@@ -53,7 +53,7 @@ module CopyTunerIncompatibleSearch
           if i.zero?
             csv_out << row.headers
           end
-          key = row[0]
+          key = row['key']
           converted_key = "#{key}_html"
           if keys_to_convert.include?(key) && !dot_converted_keys.include?(key) && !underscore_converted_keys.include?(key)
             csv_out << [converted_key, *row[1..]]
@@ -82,14 +82,13 @@ module CopyTunerIncompatibleSearch
     attr_reader :usage_path, :blurbs_path
 
     class Usage
-      attr_reader :type, :key, :file, :line
+      attr_reader :type, :key, :file
 
-      def initialize(type:, key:, ignored:, file:, line:)
+      def initialize(type:, key:, file:, line:)
         @type = type
-        @key = key
-        @ignored = ignored
-        @file = file
-        @line = line.to_s.empty? ? nil : line.to_i
+        @key = key.to_s
+        @file = file.to_s
+        @line = line.to_s
       end
 
       def static?
@@ -114,6 +113,12 @@ module CopyTunerIncompatibleSearch
         last_key = key.split('.').last
         ".#{last_key}"
       end
+
+      def line
+        raise 'line is not set' if @line.empty?
+
+        @line.to_i
+      end
     end
 
     class Result
@@ -154,7 +159,8 @@ module CopyTunerIncompatibleSearch
       CSV.parse(blurbs_csv_text, headers: true, quote_char: '"').each do |row|
         key = row['key']
         all_blurb_keys << key
-        translation = row[1]
+        tr_range = detect_translation_range(row)
+        translation = row[tr_range].join(' ')
         if translation.match?(/&#\d+;|&\w+;/) && !key.match?(/[_.]html$/)
           keys_with_special_chars << key
         end
@@ -162,6 +168,12 @@ module CopyTunerIncompatibleSearch
       [Set[*all_blurb_keys], keys_with_special_chars]
     end
 
+    def detect_translation_range(row)
+      start = 1
+      finish = row.to_h.keys.index('created_at') - 1
+      start..finish
+    end
+
     def replace_code_for_lazy_usages(lazy_usages_by_key, keys_for_code_replace, underscore_converted_keys, dot_converted_keys)
       lazy_usages_by_key.each do |key, usages|
         next unless keys_for_code_replace.include?(key)
@@ -186,7 +198,7 @@ module CopyTunerIncompatibleSearch
       lines = file_readlines(usage.file)
       if usage.lazy?
         lazy_key = usage.lazy_key
-        regex = /(?<=['"])#{Regexp.escape(lazy_key)}(?=['"])/
+        regex = /(?<=['"])#{Regexp.escape(lazy_key.to_s)}(?=['"])/
       else
         regex = /(?<=['"])#{Regexp.escape(usage.key)}(?=['"])/
       end

data/lib/copy_tuner_incompatible_search/{command.rb → search_command.rb}

@@ -4,7 +4,7 @@ require 'axlsx'
 require 'set'
 
 module CopyTunerIncompatibleSearch
-  class Command
+  class SearchCommand
     def self.run(output_path)
       self.new.run(output_path)
     end

data/lib/copy_tuner_incompatible_search/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CopyTunerIncompatibleSearch
-  VERSION = '2.0.2'
+  VERSION = '2.0.3'
 end

data/lib/copy_tuner_incompatible_search.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'copy_tuner_incompatible_search/version'
-require_relative 'copy_tuner_incompatible_search/command'
+require_relative 'copy_tuner_incompatible_search/search_command'
 require_relative 'copy_tuner_incompatible_search/xlsx_writer'
 require_relative 'copy_tuner_incompatible_search/replace_command'
 

data/sig/lib/copy_tuner_incompatible_search/replace_command.rbs

@@ -0,0 +1,100 @@
+module CopyTunerIncompatibleSearch
+  class ReplaceCommand
+    def self.run: (String usage_path, String blurbs_path, String output_path) -> void
+
+    def initialize: (String usage_path, String blurbs_path) -> void
+
+    def run: (String output_path) -> Result
+
+    private
+
+    attr_reader usage_path: String
+
+    attr_reader blurbs_path: String
+
+    class Usage
+      @line: String
+
+      type usage_type = 'dynamic' | 'static' | 'lazy'
+
+      attr_reader type: usage_type
+
+      attr_reader key: String
+
+      attr_reader file: String
+
+      def initialize: (type: usage_type, key: String?, file: String?, line: String?) -> void
+
+      def static?: () -> bool
+
+      def lazy?: () -> bool
+
+      def dynamic?: () -> bool
+
+      def used?: () -> bool
+
+      def lazy_key: () -> (nil | String)
+
+      def line: () -> Integer
+    end
+
+    class Result
+      attr_reader newly_replaced_keys: Array[String]
+
+      attr_reader existing_keys: Array[String]
+
+      attr_reader not_used_incompatible_keys: Array[String]
+
+      attr_reader keys_to_ignore: Array[String]
+
+      attr_reader already_ignored_keys: Array[String]
+
+      attr_reader keys_with_special_chars: Array[String]
+
+      attr_reader dynamic_count: Integer
+
+      def initialize: (Array[String] newly_replaced_keys, Array[String] existing_keys, Array[String] not_used_incompatible_keys, Array[String] keys_to_ignore, Array[String] already_ignored_keys, Array[String] keys_with_special_chars, Integer dynamic_count) -> void
+    end
+
+    def usage_sheet: () -> untyped
+
+    def blurbs_csv_text: () -> String
+
+    def search_ignored_keys: () -> Array[String]
+
+    def ignored_keys_text: () -> String
+
+    def parse_blurbs_csv: () -> [Set[String], Array[String]]
+
+    def replace_code_for_lazy_usages: (Hash[String, Array[Usage]] lazy_usages_by_key, Array[String] keys_for_code_replace, Set[String] underscore_converted_keys, Set[String] dot_converted_keys) -> void
+
+    def replace_code_for_static_usages: (Hash[String, Array[Usage]] static_usages_by_key, Array[String] keys_for_code_replace, Set[String] underscore_converted_keys, Set[String] dot_converted_keys) -> void
+
+    def replace_code: (Usage usage, Set[String] underscore_converted_keys, Set[String] dot_converted_keys) -> void
+
+    def file_readlines: (String path) -> Array[String]
+
+    def file_write: (String path, String text) -> void
+
+    def generate_html_key: (Usage usage, Set[String] underscore_converted_keys, Set[String] dot_converted_keys) -> String
+  end
+end
+
+module Roo
+  class Spreadsheet
+    def self.open: (String path) -> untyped
+  end
+end
+
+# 公式のrbsファイルだとなぜかエラーが出てsteep checkがパスしないので、自前で定義している
+class CSV
+  def self.parse: (String str, ?::Hash[Symbol, untyped] options) -> Array[CSV::Row]
+  def self.open: (String path, String mode) { (CSV csv) -> void } -> void
+  def <<: (Array[untyped] row) -> void
+  class Row
+    def []: (String key) -> String
+          | (Integer index) -> String
+          | (range[Integer] range) -> Array[String]
+    def headers: () -> Array[String]
+  end
+end

data/sig/lib/copy_tuner_incompatible_search/{command.rbs → search_command.rbs}

@@ -1,5 +1,5 @@
 module CopyTunerIncompatibleSearch
-  class Command
+  class SearchCommand
     def self.run: (String output_path) -> void
 
     def run: (String output_path) -> void

data/sig/lib/copy_tuner_incompatible_search/xlsx_writer.rbs

@@ -1,12 +1,12 @@
 module CopyTunerIncompatibleSearch
   class XlsxWriter
-    def initialize: (Array[Command::Result] results, Set[String] incompatible_keys, Set[String] ignored_keys) -> void
+    def initialize: (Array[SearchCommand::Result] results, Set[String] incompatible_keys, Set[String] ignored_keys) -> void
 
     def save_to: (String output_path) -> void
 
     private
 
-    attr_reader results: Array[Command::Result]
+    attr_reader results: Array[SearchCommand::Result]
 
     attr_reader incompatible_keys: Set[String]
 
@@ -14,9 +14,9 @@ module CopyTunerIncompatibleSearch
 
     def freeze_pane: (untyped sheet) -> void
 
-    def add_result_rows: (untyped sheet, Command::Result result, untyped style) -> void
+    def add_result_rows: (untyped sheet, SearchCommand::Result result, untyped style) -> void
 
-    def should_output?: (Command::Usage usage, Command::Result result, String full_key) -> bool
+    def should_output?: (SearchCommand::Usage usage, SearchCommand::Result result, String full_key) -> bool
 
     def ignored_flag: (String key) -> ("Y" | "N")
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: copy_tuner_incompatible_search
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Junichi Ito
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-05-03 00:00:00.000000000 Z
+date: 2024-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx
@@ -44,12 +44,13 @@ files:
 - exe/copy_tuner_incompatible_replace
 - exe/copy_tuner_incompatible_search
 - lib/copy_tuner_incompatible_search.rb
-- lib/copy_tuner_incompatible_search/command.rb
 - lib/copy_tuner_incompatible_search/replace_command.rb
+- lib/copy_tuner_incompatible_search/search_command.rb
 - lib/copy_tuner_incompatible_search/version.rb
 - lib/copy_tuner_incompatible_search/xlsx_writer.rb
 - sig/copy_tuner_incompatible_search.rbs
-- sig/lib/copy_tuner_incompatible_search/command.rbs
+- sig/lib/copy_tuner_incompatible_search/replace_command.rbs
+- sig/lib/copy_tuner_incompatible_search/search_command.rbs
 - sig/lib/copy_tuner_incompatible_search/xlsx_writer.rbs
 homepage: https://github.com/JunichiIto/copy_tuner_incompatible_search
 licenses:
@@ -74,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Search usage of incompatible keys in CopyTuner.