flutter_polyglot_cli 1.0.2 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2677efcaed8b5c731998d960ad6b25f8ac26dfdc654b510d52bb44f57b31b97
-  data.tar.gz: b41e5447f2cd83df7ae743a1e95458fb745be38caa956be4e61263225be14400
+  metadata.gz: c5dfe5a15d8facf1e7be9af01f8d40f3f8655af091c3bbcb25482ba99e98ed75
+  data.tar.gz: 00d9f1c459aba1ca954b96171a4e554143ec4f765d90cb666fa22879ffcd47e6
 SHA512:
-  metadata.gz: d1804575384e29434dfe41b0fdaeef2693eeb804f35a293b9307c7186ce76999c638aafef11e2b8e84191c54b3652d9c45f534046aed6d19ae3137e2dd317c13
-  data.tar.gz: e084e1fbfa913eef571fd1234baea1acca3f0ab8e75bcad9926ce63e382291aee656dd701ee2b5938c3451fa4703b09d755ba2f64e8810fc3a2fe61d05040b33
+  metadata.gz: '073791e15366cc13996725f540078b383fbfcb4d09c4c4f6e4657f8d35583a8632e756389e1974f4c144a7a18cc9a9f5d896c698a4943af1883541533567a31e'
+  data.tar.gz: 43773c358c1719f751b93b61f03a44ce1c4e589fb8060decfbe5a5e18fd02d1f596d6e1d4c5eb83d7ef0aaa1dfeb55b2adcef5eafa4193ea231266343ebbf843

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    flutter_polyglot_cli (1.0.2)
+    flutter_polyglot_cli (1.1.4)
       activesupport
       commander
       json_api_client
@@ -28,7 +28,7 @@ GEM
     coderay (1.1.2)
     commander (4.4.7)
       highline (~> 2.0.0)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.6)
     equatable (0.6.1)
     faraday (0.17.0)
       multipart-post (>= 1.2, < 3)
@@ -45,7 +45,7 @@ GEM
       faraday_middleware (~> 0.9)
       rack (>= 0.2)
     method_source (0.9.2)
-    minitest (5.12.2)
+    minitest (5.14.1)
     multipart-post (2.1.1)
     necromancer (0.5.0)
     osx_keychain (1.0.2)
@@ -74,10 +74,10 @@ GEM
       tty-screen (~> 0.7)
       wisper (~> 2.0.0)
     tty-screen (0.7.0)
-    tzinfo (1.2.5)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
     wisper (2.0.1)
-    zeitwerk (2.2.0)
+    zeitwerk (2.3.1)
 
 PLATFORMS
   ruby

data/lib/flutter_polyglot_cli.rb

@@ -28,6 +28,7 @@ require 'flutter_polyglot_cli/serializers/localizations/loc_serializer'
 require 'flutter_polyglot_cli/serializers/localizations/localization_serializer'
 require 'flutter_polyglot_cli/serializers/localizations/localization_delegate_serializer'
 require 'flutter_polyglot_cli/serializers/localizations/localization_keys_serializer'
+require 'flutter_polyglot_cli/serializers/localizations/localization_strings_serializer'
 
 # Commands
 require 'flutter_polyglot_cli/commands/login'

data/lib/flutter_polyglot_cli/api/base.rb

@@ -3,7 +3,7 @@ module PolyglotFlutter
     class Base < JsonApiClient::Resource
       extend PolyglotFlutter::Helper::Depaginate
 
-      self.site = 'https://polyglot.infinum.co/api/v2/'
+      self.site = 'https://infinum.polyglothq.com/api/v2/'
 
       def self.token(token)
         self.connection_options = { headers: { 'X-Auth-Token' => token } }

data/lib/flutter_polyglot_cli/api/translation_key.rb

@@ -21,7 +21,7 @@ module PolyglotFlutter
 
       def convert_aruments(translation)
         new_translation = translation
-        translation.scan(/(%\w+)/).each_with_index do |match, index|
+        translation.scan(/(%\w)/).each_with_index do |match, index|
           new_translation = new_translation.sub(match[0], '{arg' + String(index) + '}')
         end
 

data/lib/flutter_polyglot_cli/commands/pull.rb

@@ -22,16 +22,18 @@ module PolyglotFlutter
           languages = pull_languages(project_id)
           translation_keys = pull_translation_keys(project_id)
 
+          directory_path = project[:sourceFilesPath]
           write_translations(translation_keys, languages, project[:path])
-          write_localization(project[:sourceFilesPath])
-          write_localization_delegate(languages, project[:sourceFilesPath])
-          write_localization_keys(translation_keys, languages, project[:sourceFilesPath], mandatory_language)
+          write_localization(directory_path)
+          write_localization_delegate(languages, directory_path)
+          write_localization_keys(translation_keys, languages, directory_path, mandatory_language)
 
-          FileUtils.mkdir_p "#{project[:sourceFilesPath]}initialize_i18n"
-          script = "flutter pub pub run intl_translation:generate_from_arb --output-dir=#{project[:sourceFilesPath]}initialize_i18n  --no-use-deferred-loading #{project[:sourceFilesPath]}localization_keys.dart #{project[:path]}intl_*.arb"
+          FileUtils.mkdir_p "#{directory_path}initialize_i18n"
+          script = "flutter pub pub run intl_translation:generate_from_arb --output-dir=#{directory_path}initialize_i18n  --no-use-deferred-loading #{project[:sourceFilesPath]}localization_keys.dart #{project[:path]}intl_*.arb"
           `#{script}`
-
-          # josonaj command
+          
+          File.delete("#{directory_path}localization_keys.dart") if File.exist?("#{directory_path}localization_keys.dart")
+          write_localization_strings(translation_keys, languages, directory_path, mandatory_language)
         end
       end
 
@@ -70,6 +72,14 @@ module PolyglotFlutter
           .save(translations_path)
       end
 
+      def write_localization_strings(translation_keys, languages, translations_path, mandatory_language)
+        return if translations_path.to_s.empty?
+
+        PolyglotFlutter::Serializer::Localization::LocalizationStrings
+          .new(languages: languages, translation_keys: translation_keys, mandatory_language: mandatory_language)
+          .save(translations_path)
+      end
+
       # Pulling data
 
       def pull_languages(project_id)

data/lib/flutter_polyglot_cli/helpers/general.rb

@@ -2,12 +2,12 @@ module PolyglotFlutter
   module Helper
     module General
       ESCAPE_KEYWORDS = %w[abstract as assert async await break case
-                           catch class const continue covariant default deferred do
-                           else enum export extends external factory false final
-                           finally for Function get hide if import in interface
-                           is library mixin new null on operator part rethrow return
-                           set static super switch sync this throw true try typedef var
-                           void while with yield _].freeze
+                          catch class const continue covariant default deferred do
+                          else enum export extends external factory false final
+                          finally for Function get hide if import in interface
+                          is library mixin new null on operator part rethrow return
+                          set static super switch sync this throw true try typedef var
+                          void while with yield _]
       def token
         @token ||= PolyglotFlutter::IO::Token.read
         if @token.to_s.empty?
@@ -74,7 +74,7 @@ module PolyglotFlutter
       def escape_keyword_if_needed(name)
         return name unless ESCAPE_KEYWORDS.include? name
 
-        "`#{name}`"
+        "#{name}_"
       end
 
       def generate_locales(languages)
@@ -84,12 +84,7 @@ module PolyglotFlutter
 
       def generate_localization_keys(languages, translation_keys, mandatory_language)
         result_string = ''
-        language = nil
-        languages.each do |lang|
-          if lang['locale'].split('_').first == mandatory_language
-            language = lang
-          end
-        end
+        language = find_app_language(languages, mandatory_language)
 
         dict = extract_translations(translation_keys, language)
         dict.each do |key, value|
@@ -128,6 +123,29 @@ module PolyglotFlutter
         locale_list = locale_names.each.map { |value| "AppLocales.#{value}" }.join(', ')
         result_string += "\n\tstatic List<Locale> get values => <Locale>[#{locale_list}];"
       end
+
+      def generate_strings(languages, translation_keys, mandatory_language)
+        result_string = ''
+        language = find_app_language(languages, mandatory_language)
+
+        dict = extract_translations(translation_keys, language)
+        dict.each do |key, value|
+          next if value.nil?
+
+          clean_var_name = clean_variable_name(key)
+          result_string += "\t#{clean_var_name},\n"
+        end
+
+        result_string
+      end
+
+      def find_app_language(languages, mandatory_language)
+        languages.each do |lang|
+          if lang['locale'].split('_').first == mandatory_language
+            return lang
+          end
+        end
+      end
     end
   end
 end

data/lib/flutter_polyglot_cli/serializers/localizations/localization_delegate_serializer.rb

@@ -26,10 +26,7 @@ class LocalizationDelegate extends LocalizationsDelegate<Localization> {
   bool isSupported(Locale locale) => <String><%= generate_locales(languages) %>.contains(locale.languageCode);
 
   @override
-  Future<Localization> load(Locale locale) {
-    Localization.load(locale);
-    return SynchronousFuture<Localization>(Localization(locale.languageCode));
-  }
+  Future<Localization> load(Locale locale) async => SynchronousFuture<Localization>(await Localization.load(locale));
 
   @override
   bool shouldReload(LocalizationDelegate old) => false;

data/lib/flutter_polyglot_cli/serializers/localizations/localization_serializer.rb

@@ -17,7 +17,7 @@ module PolyglotFlutter
             import 'package:intl/intl.dart';
             import 'initialize_i18n/messages_all.dart';
 
-            part 'localization_keys.dart';
+            part 'localization_strings.dart';
 
             // AUTO GENERATED FILE. DO NOT CHANGE.
             class Localization {

data/lib/flutter_polyglot_cli/serializers/localizations/localization_strings_serializer.rb

@@ -0,0 +1,36 @@
+require_relative 'loc_serializer'
+
+module PolyglotFlutter
+  module Serializer
+    module Localization
+      class LocalizationStrings < Base
+        def save(sources_path)
+          FileUtils.mkdir_p sources_path unless File.exist? sources_path
+          output_path = File.join(sources_path, 'localization_strings.dart')
+          File.write(output_path, render)
+        end
+
+        def template
+          <<~TEMPLATE
+          part of 'localization.dart';
+
+          // AUTO GENERATED FILE. DO NOT CHANGE.
+          enum Strings {
+          <%= generate_strings(languages, translation_keys, mandatory_language) %>}
+
+          extension StringsValue on Strings {
+            String value() => toString().split('.').last;
+
+            String localized({BuildContext context, List<Object> args}) {
+              if (context != null) {
+                Localizations.of<Localization>(context, Localization);
+              }
+              return Intl.message('', name: value(), args: args);
+            }
+          }
+          TEMPLATE
+        end
+      end
+    end
+  end
+end

data/lib/flutter_polyglot_cli/version.rb

@@ -1,3 +1,3 @@
 module PolyglotFlutter
-  VERSION = '1.0.2'
+  VERSION = '1.1.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flutter_polyglot_cli
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.4
 platform: ruby
 authors:
 - Maroje Marcelic
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-03-10 00:00:00.000000000 Z
+date: 2021-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -122,7 +122,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - maroje.marcelic@infinum.com
 executables:
@@ -161,6 +161,7 @@ files:
 - lib/flutter_polyglot_cli/serializers/localizations/localization_delegate_serializer.rb
 - lib/flutter_polyglot_cli/serializers/localizations/localization_keys_serializer.rb
 - lib/flutter_polyglot_cli/serializers/localizations/localization_serializer.rb
+- lib/flutter_polyglot_cli/serializers/localizations/localization_strings_serializer.rb
 - lib/flutter_polyglot_cli/serializers/translations/translations_serializer.rb
 - lib/flutter_polyglot_cli/version.rb
 homepage: https://github.com/infinum/flutter-polyglot-cli
@@ -168,7 +169,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -184,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: A CLI for pulling polyglot translations and generating Flutter Source Files
 test_files: []