fastlane-plugin-google_sheet_localize 0.3.11 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b5d87c095c7e5ca644cad2b1843e389dc0772a30f10ee213fb21e8d5bb64e14
-  data.tar.gz: d85062c292448a24ca74fce441cb57369a588d30a3581f4929281bf605acbb3f
+  metadata.gz: ebe380844be5865d1b1522227cfa03271b371d4a7d2e2ab165b3d8e57507b7aa
+  data.tar.gz: b1d87a00e2f03b343032f43c394ec9baa0909232863ffeb0b21fd8790ebc8c1d
 SHA512:
-  metadata.gz: 129d2376d444e9b473a455085a7b1fd58ced4a95820f4a8dd339a3c8e0021e44f505bee4c6cbdfd522200a6033017653230cfd78dded79259a09375d4141221e
-  data.tar.gz: 1130f9c3f659b4b0ad46c7d09745fb002cce7d16b3de2fc78c32e14121d84f57d733e4b8ee2c62e999a5d077149bd57d73a9e2f8342d41378ff5500548e9ca0f
+  metadata.gz: 464c2ae7ee9ed2424a60b45889e8e94756a021d010f3d2f9dbbffb716a8c0751a822923e7e1a3eaa66bee44f1388d1ffa0108e49dc2d59d623d99d8f442f945c
+  data.tar.gz: 25ac9c540f9dce77d875fd0d8cd2893c8624ff03e17b6fae9e4b43900e56406c8fc198db8c833c6b94e784dce1e72fbb76b026b0c6bab8d82adb7230034586ff

data/lib/fastlane/plugin/google_sheet_localize/actions/google_sheet_localize_action.rb

@@ -302,11 +302,7 @@ module Fastlane
 
                   if !text.include?("one|")
 
-                  matches = text.scan(/%[0-9][sdf]/)
-
-                  matches.each { |match|
-                    text = text.gsub(match, "%#{match[1]}$#{match[2].gsub("s","@")}")
-                  }
+                  text = text.gsub("$s","$@").gsub("%s","%@")
 
                   line = "\"#{identifier}\" = \"#{text}\";"
                   if !comment.to_s.empty?
@@ -519,30 +515,40 @@ module Fastlane
         result = Array.new
         filtered = self.mapInvalidPlaceholder(text)
 
-        stringIndexes = filtered.scan(/%[0-9]?[s@]/)
-        intIndexes = filtered.scan(/%[0-9]?[d]/)
-        floatIndexes = filtered.scan(/%[0-9]?[f]/)
-        doubleIndexes = filtered.scan(/%[0-9]?ld/)
+        stringIndexes = self.scan_str(filtered, /%([0-9]+)?\$?[s@]/)
+        intIndexes = self.scan_str(filtered, /%([0-9]+)?\$?d/)
+        floatIndexes = self.scan_str(filtered, /%([0-9]+)?\$?([0-9]+)?.?([0-9]+)?f/)
+        doubleIndexes = self.scan_str(filtered, /%([0-9]+)?\$?([0-9]+)?.?([0-9]+)?ld/)
 
         if stringIndexes.count > 0
-          result = result.concat(stringIndexes.map { |e| { "index": e, "type": "String" }})
+          result = result + stringIndexes.map { |e| { "index": e[0], "offset": e[1], "type": "String" }}
         end
 
         if intIndexes.count > 0
-          result = result.concat(intIndexes.map { |e| { "index": e, "type": "Int" }})
+          result = result + intIndexes.map { |e| { "index": e[0], "offset": e[1], "type": "Int" }}
         end
 
         if floatIndexes.count > 0
-          result = result.concat(floatIndexes.map { |e| { "index": e, "type": "Float" }})
+          result = result + floatIndexes.map { |e| { "index": e[0], "offset": e[1], "type": "Float" }}
         end
 
         if doubleIndexes.count > 0
-          result = result.concat(doubleIndexes.map { |e| { "index": e, "type": "Double" }})
+          result = result + doubleIndexes.map { |e| { "index": e[0], "offset": e[1], "type": "Double" }}
         end
 
+        result = result.sort_by { |hsh| hsh[:offset] }
+
         return result
       end
 
+      def self.scan_str(str, pattern)
+        res = []
+        (0..str.length).each do |i|
+          res << [Regexp.last_match.to_s, i] if str[i..-1] =~ /^#{pattern}/
+        end
+        res
+      end
+
       def self.mapInvalidPlaceholder(text)
         filtered = text.gsub('%s', '%@').gsub('"', '\"')
         return filtered

data/lib/fastlane/plugin/google_sheet_localize/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module GoogleSheetLocalize
-    VERSION = "0.3.11"
+    VERSION = "0.4.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-google_sheet_localize
 version: !ruby/object:Gem::Version
-  version: 0.3.11
+  version: 0.4.1
 platform: ruby
 authors:
 - Mario Hahn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-24 00:00:00.000000000 Z
+date: 2021-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google_drive
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.6
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -181,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Creates .strings files for iOS and strings.xml files for Android