fastlane-plugin-google_sheet_localize 0.3.02 → 0.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c1d7dddbd2b0ddf15ad18d49aecfe648a946e3cc50b7e3b1c1eedc854de5936
-  data.tar.gz: f46ee1c5b94cc56c06bfb805519b3814261e45fb320a0930c68855938b7ef3fc
+  metadata.gz: 6ad1b088723de465606267fc7cd2da89753d60c51f3c36607591320b66cb8152
+  data.tar.gz: afbc9b0390d111892e3f2c408a5b7f3f5339b53ffff9c9bac2bb2d2e23aee83e
 SHA512:
-  metadata.gz: ca9db8509aacf9c551ce514a407dacdf5343e46425b45c2dc277fe6e722edeb514c398697b702074ff0452c8b42acf7c0f7fa78a02557fbea8ccfa9549fa730a
-  data.tar.gz: aed81a6006a9256690ef5330ea3dbf2fa43920aed95b35ca0b7b5d7291a0a3ae921232020e194a12e917e21256ef6313f69a37d05fb4fd5fc50f5a0f5cb70827
+  metadata.gz: 309965ccd5cbf39742863d369d6cdd50570714feec7f5fe678c21a12bd85b60e6dcfe4bc937bbb3caa29b65a806d917c3ff2072444bc561bcbe094148805569a
+  data.tar.gz: 2f1a279e8f808e85d26bf6134457340b9f6610a5dd121249e68adf508260095b7d43d9f09b03f6510fd7b7459e6fed142a7750f10e156cc586ec21f9885bbdf4

data/README.md

@@ -41,6 +41,11 @@ other|%d artists
 #### String Array: (Android)
 ["Monday", "Tuesday", "Wednesday"]
 
+## iOS specifics
+
+In order to support Objective-C, the plugin provides the `support_objc` argument, which is default `false`.  
+Therefore, if you need Objective-C support pass `support_objc: true`.
+
 ## Example
 
 ```ruby

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

@@ -20,6 +20,7 @@ module Fastlane
         code_generation_path = params[:code_generation_path]
         identifier_name = params[:identifier_name]
         comment_example_language = params[:comment_example_language]
+        support_objc = params[:support_objc]
 
         if identifier_name.to_s.empty?
           if platform == "ios"
@@ -85,7 +86,7 @@ module Fastlane
             end
           end
       }
-      self.createFiles(result, platform, path, default_language, base_language, code_generation_path, comment_example_language)
+      self.createFiles(result, platform, path, default_language, base_language, code_generation_path, comment_example_language, support_objc)
       end
 
       def self.generateJSONObject(contentRows, index, identifierIndex)
@@ -131,7 +132,7 @@ module Fastlane
         }
       end
 
-      def self.createFiles(languages, platform, destinationPath, defaultLanguage, base_language, codeGenerationPath, comment_example_language)
+      def self.createFiles(languages, platform, destinationPath, defaultLanguage, base_language, codeGenerationPath, comment_example_language, support_objc)
           self.createFilesForLanguages(languages, platform, destinationPath, defaultLanguage, base_language)
 
           if platform == "web"
@@ -187,12 +188,12 @@ module Fastlane
             swiftFilepath = "#{swiftPath}/#{swiftFilename}"
 
             File.open(swiftFilepath, "w") do |f|
-              f.write("import Foundation\n\n// swiftlint:disable all\npublic struct Localization {\n")
+              f.write("import Foundation\n\n// swiftlint:disable all\n#{getiOSTypeDefinition(support_objc)} {\n")
               filteredItems.each { |item|
 
                 identifier = item['identifier']
 
-                values = identifier.dup.split(".")
+                values = identifier.dup.split(/\.|_/)
 
                 constantName = ""
 
@@ -220,10 +221,10 @@ module Fastlane
 
                 if arguments.count == 0
                   f.write(self.createComment(item['comment'], item['text']))
-                  f.write("public static let #{constantName} = localized(identifier: \"#{identifier}\")\n")
+                  f.write("#{getiOSAttributes(support_objc)}public static let #{constantName} = localized(identifier: \"#{identifier}\")\n")
                 else
                   f.write(self.createComment(item['comment'], item['text']))
-                  f.write(self.createiOSFunction(constantName, identifier, arguments))
+                  f.write(self.createiOSFunction(constantName, identifier, arguments, support_objc))
                 end
               }
               f.write("\n}")
@@ -238,24 +239,19 @@ module Fastlane
         if comment.to_s.empty?
           return %Q(
     /**
-    - Example:
-    ````
     #{example}
-    ````
     */
     )
         end
 
       return %Q(
     /**
+    #{example}
+    
     - Sheet comment:
     ````
     #{comment}
     ````
-    - Example:
-    ````
-    #{example}
-    ````
     */
     )
       end
@@ -293,7 +289,6 @@ module Fastlane
                 line = "\n\n#{identifier}\n"
               else
 
-                if !text.include?("one|")
 
                   if (text == "" || text == "TBD") && !defaultLanguage.to_s.empty?
                     default_language_object = languages.select { |languageItem| languageItem['language'] == defaultLanguage }.first["items"]
@@ -304,6 +299,8 @@ module Fastlane
                     text = self.mapInvalidPlaceholder(defaultLanguageText)
                   end
 
+                  if !text.include?("one|")
+
                   matches = text.scan(/%[0-9][sdf]/)
 
                   matches.each { |match|
@@ -334,7 +331,6 @@ module Fastlane
               text = self.mapInvalidPlaceholder(item['text'])
               identifier = item['identifier']
 
-              if !identifier.include?('//') && text.include?("one|")
                 if (text == "" || text == "TBD") && !defaultLanguage.to_s.empty?
                   default_language_object = languages.select { |languageItem| languageItem['language'] == defaultLanguage }.first["items"]
                   default_language_object = self.filterUnusedRows(default_language_object,'identifier', "false")
@@ -344,6 +340,8 @@ module Fastlane
                   text = self.mapInvalidPlaceholder(defaultLanguageText)
                 end
 
+                if !identifier.include?('//') && text.include?("one|")
+
                 text = text.gsub("\n", "|")
 
                 formatIdentifier = identifier.gsub(".", "")
@@ -436,6 +434,9 @@ module Fastlane
                 line = line + "    <string-array name=\"#{identifier}\">\n"
 
                 JSON.parse(text).each { |arrayItem|
+
+                  arrayItem = arrayItem.gsub("'", "\\\\'")
+
                   line = line + "        <item><![CDATA[#{arrayItem}]]></item>\n"
                 }
 
@@ -476,8 +477,8 @@ module Fastlane
         \n})
       end
 
-      def self.createiOSFunction(constantName, identifier, arguments)
-          functionTitle = "public static func #{constantName}("
+      def self.createiOSFunction(constantName, identifier, arguments, support_objc)
+          functionTitle = "#{getiOSAttributes(support_objc)}public static func #{constantName}("
 
           arguments.each_with_index do |item, index|
             functionTitle = functionTitle + "_ arg#{index}: #{item[:type]}"
@@ -500,6 +501,14 @@ module Fastlane
           return functionTitle
       end
 
+      def self.getiOSTypeDefinition(support_objc)
+        return support_objc ? "public class Localization: NSObject" : "public struct Localization"
+      end
+
+      def self.getiOSAttributes(support_objc)
+        return support_objc ? "@objc " : ""
+      end
+
       def self.findArgumentsInText(text)
 
         if text.include?("one|")
@@ -614,7 +623,12 @@ module Fastlane
                                   env_name: "CODEGENERATIONPATH",
                                description: "Code generation path for the Swift file",
                                   optional: true,
-                                      type: String)
+                                      type: String),
+          FastlaneCore::ConfigItem.new(key: :support_objc,
+                                  env_name: "OBJC_SUPPORT",
+                               description: "Whether the generated code should support Obj-C. Only relevant for the ios platform",
+                                      type: Boolean,
+                             default_value: false)
         ]
       end
 

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

@@ -1,5 +1,5 @@
 module Fastlane
   module GoogleSheetLocalize
-    VERSION = "0.3.02"
+    VERSION = "0.3.10"
   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.02
+  version: 0.3.10
 platform: ruby
 authors:
 - Mario Hahn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-09 00:00:00.000000000 Z
+date: 2020-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google_drive
@@ -181,8 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Creates .strings files for iOS and strings.xml files for Android