swift_twine_formatter 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2272da7485deb67f7e7023bffbac8f87127c5555c21e692a5fe9e972b41eca6
-  data.tar.gz: bdc16f04960875eb0e4134b7bc315d0d14909de31506ca0efdd56cbfbd1651e3
+  metadata.gz: 5af7fc7a12fbf3bd74e7528d479d82f944c6e1739d9680fee8f20a41f9aefd59
+  data.tar.gz: ff42a10cd9f7b34d6b061a2ea24872b2a6d8d174aba80ab44f4cbfb1dbc544e3
 SHA512:
-  metadata.gz: 1b1e4aeb431366dcea212bda82197b3e194e6dde51678ab71a4a22a50325a212f8caa37375f0a19e6d58262d608a995e788a392026bd94cc0acd4bc3bc359bdc
-  data.tar.gz: 64f085976f745a6bde6eaaf9bb926c6417ddbb14bf0d4174106866fe1cdfe05f3fc7555932f40b9f7a2e62a5ddf6fd2e2023584d68043bdb39a60379a0020753
+  metadata.gz: a229f26a7c1f6f90c7d3ec18d051feaf646b0361b24b5cccfc7cc2818f6b76793103d77e570586ddec232aa5e26d58fcbaa751094e6067a3eed93d1eb09e01e7
+  data.tar.gz: 255b479da399d1d0219adcfd40d7e6f07729628e32c1183df0850e4f371f5b95d9e4254b891269856d5e1fcb3eea207664381f0c700776d5a08b55014ef6509e

data/lib/formatter.rb

@@ -6,6 +6,11 @@
 module Twine
   module Formatters
     class SwiftFormatter < Abstract
+
+        PLACEHOLDER_FLAGS_WIDTH_PRECISION_LENGTH = '([-+0#])?(\d+|\*)?(\.(\d+|\*))?(hh?|ll?|L|z|j|t|q)?'
+        PLACEHOLDER_PARAMETER_FLAGS_WIDTH_PRECISION_LENGTH = '(\d+\$)?' + PLACEHOLDER_FLAGS_WIDTH_PRECISION_LENGTH
+        PLACEHOLDER_TYPES = '[diufFeEgGxXoscpaA@]'
+
       def format_name
         'swift'
       end
@@ -89,6 +94,104 @@ module Twine
       end
 
       def format_value(value)
+          escape_quotes(value)
+      end
+    end
+
+    class SwiftEscapingFormatter < Abstract
+
+      PLACEHOLDER_FLAGS_WIDTH_PRECISION_LENGTH = '([-+0#])?(\d+|\*)?(\.(\d+|\*))?(hh?|ll?|L|z|j|t|q)?'
+      PLACEHOLDER_PARAMETER_FLAGS_WIDTH_PRECISION_LENGTH = '(\d+\$)?' + PLACEHOLDER_FLAGS_WIDTH_PRECISION_LENGTH
+      PLACEHOLDER_TYPES = '[diufFeEgGxXoscpaA@]'
+
+      def format_name
+        'swift-escaping'
+      end
+
+      def extension
+        '.strings'
+      end
+
+      def can_handle_directory?(path)
+        Dir.entries(path).any? { |item| /^.+\.lproj$/.match(item) }
+      end
+
+      def default_file_name
+        'Localizable.strings'
+      end
+
+      def determine_language_given_path(path)
+        path_arr = path.split(File::SEPARATOR)
+        path_arr.each do |segment|
+          match = /^(.+)\.lproj$/.match(segment)
+          if match
+            if match[1] == "Base"
+              return @options[:developer_language]
+            else
+              return match[1]
+            end
+          end
+        end
+
+        return super
+      end
+
+      def output_path_for_language(lang)
+        "#{lang}.lproj"
+      end
+
+      def read(io, lang)
+        last_comment = nil
+        while line = io.gets
+          # matches a `key = "value"` line, where key may be quoted or unquoted. The former may also contain escaped characters
+          match = /^\s*((?:"(?:[^"\\]|\\.)+")|(?:[^"\s=]+))\s*=\s*"((?:[^"\\]|\\.)*)"/.match(line)
+          if match
+            key = match[1]
+            key = key[1..-2] if key[0] == '"' and key[-1] == '"'
+            key.gsub!('\\"', '"')
+            value = match[2]
+            value.gsub!('\\"', '"')
+            set_translation_for_key(key, lang, value)
+            if last_comment
+              set_comment_for_key(key, last_comment)
+            end
+          end
+
+          match = /\/\* (.*) \*\//.match(line)
+          if match
+            last_comment = match[1]
+          else
+            last_comment = nil
+          end
+        end
+      end
+
+      def format_header(lang)
+        "//\n// Apple Strings File\n// Generated by Twine #{Twine::VERSION}\n//\n// Language: #{lang}\n//"
+      end
+
+      def format_section_header(section)
+        "// MARK: - #{section.name}\n"
+      end
+
+      def key_value_pattern
+        "\"%{key}\" = \"%{value}\";"
+      end
+
+      def format_comment(definition, lang)
+        "/* #{definition.comment.gsub('*/', '* /')} */\n" if definition.comment
+      end
+
+      def format_key(key)
+        escape_quotes(key)
+      end
+
+      def format_value(value)
+        # added escaping for % (% -> %%) to support SwiftGen
+        placeholder_syntax = PLACEHOLDER_PARAMETER_FLAGS_WIDTH_PRECISION_LENGTH + PLACEHOLDER_TYPES
+        single_percent_regex = /([^%])(%)(?!(%|#{placeholder_syntax}))/
+        value.gsub! single_percent_regex, '\1%%'
+
         escape_quotes(value)
       end
     end

data/lib/swift_twine_formatter.rb

@@ -4,3 +4,4 @@ require 'twine'
 require_relative 'formatter'
 
 Twine::Formatters.formatters << Twine::Formatters::SwiftFormatter.new
+Twine::Formatters.formatters << Twine::Formatters::SwiftEscapingFormatter.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swift_twine_formatter
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Sergei Romashenko
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-01 00:00:00.000000000 Z
+date: 2023-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: twine
@@ -24,7 +24,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.3
-description: Plugin to generate .strings files with classic comments and marks format.
+description: Plugin to generate .strings files with swift (SwiftGen compatible) comments
+  and marks format, and escaping percent symbol.
 email:
 - romashenko.sergey@gmail.com
 executables: []
@@ -33,11 +34,11 @@ extra_rdoc_files: []
 files:
 - lib/formatter.rb
 - lib/swift_twine_formatter.rb
-homepage:
+homepage: https://github.com/sergeirr/swift_twine_formatter
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -52,8 +53,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.17
-signing_key:
+rubygems_version: 3.4.13
+signing_key: 
 specification_version: 4
-summary: Plugin to generate .strings files with classic comments and marks format
+summary: Plugin to generate .strings files with swift (SwiftGen compatible) comments
+  and marks format, and escaping percent symbol
 test_files: []