flutter_polyglot_cli 1.1.4 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5dfe5a15d8facf1e7be9af01f8d40f3f8655af091c3bbcb25482ba99e98ed75
-  data.tar.gz: 00d9f1c459aba1ca954b96171a4e554143ec4f765d90cb666fa22879ffcd47e6
+  metadata.gz: 651d0b0af0df1635b92bb6bae1ea81801d8f578bde0f72835e13c28ac2714f4c
+  data.tar.gz: 2dfdb9e39b20c6ffc481ffdfef6d28b9bf732ea340bc8de6fc11b9043610dac7
 SHA512:
-  metadata.gz: '073791e15366cc13996725f540078b383fbfcb4d09c4c4f6e4657f8d35583a8632e756389e1974f4c144a7a18cc9a9f5d896c698a4943af1883541533567a31e'
-  data.tar.gz: 43773c358c1719f751b93b61f03a44ce1c4e589fb8060decfbe5a5e18fd02d1f596d6e1d4c5eb83d7ef0aaa1dfeb55b2adcef5eafa4193ea231266343ebbf843
+  metadata.gz: 297a3d60d28e54f1fea3f92292e7f52825c1b2c2724a83eb5afd0cbcc46127f127c24426c25d2163cdc6263a8fe707b99568ceb2a536a7a8f98d22f3d5ee3b19
+  data.tar.gz: ca1eb64a9653625ea87673025bde895ab220733fd56aed8885a1cdb3e61bf28e3aae9cec17a27df716393611b69e9bbaff82b808b67cb85a369aa7a39f3bc349

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    flutter_polyglot_cli (1.1.4)
+    flutter_polyglot_cli (1.2.0)
       activesupport
       commander
       json_api_client
@@ -14,44 +14,42 @@ GEM
     RubyInline (3.12.5)
       ZenTest (~> 4.3)
     ZenTest (4.12.0)
-    activemodel (6.0.0)
-      activesupport (= 6.0.0)
-    activesupport (6.0.0)
+    activemodel (6.1.3)
+      activesupport (= 6.1.3)
+    activesupport (6.1.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.1, >= 2.1.8)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     byebug (11.0.1)
     coderay (1.1.2)
-    commander (4.4.7)
+    commander (4.5.2)
       highline (~> 2.0.0)
-    concurrent-ruby (1.1.6)
-    equatable (0.6.1)
-    faraday (0.17.0)
+    concurrent-ruby (1.1.8)
+    faraday (1.1.0)
       multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.13.1)
-      faraday (>= 0.7.4, < 1.0)
+      ruby2_keywords
+    faraday_middleware (1.0.0)
+      faraday (~> 1.0)
     highline (2.0.3)
-    i18n (1.7.0)
+    i18n (1.8.9)
       concurrent-ruby (~> 1.0)
-    json_api_client (1.16.1)
+    json_api_client (1.18.0)
       activemodel (>= 3.2.0)
       activesupport (>= 3.2.0)
       addressable (~> 2.2)
-      faraday (~> 0.15, >= 0.15.2)
-      faraday_middleware (~> 0.9)
+      faraday (>= 0.15.2, < 1.2.0)
+      faraday_middleware (>= 0.9.0, < 1.2.0)
       rack (>= 0.2)
     method_source (0.9.2)
     minitest (5.14.1)
     multipart-post (2.1.1)
-    necromancer (0.5.0)
     osx_keychain (1.0.2)
       RubyInline (~> 3)
-    pastel (0.7.3)
-      equatable (~> 0.6)
+    pastel (0.8.0)
       tty-color (~> 0.5)
     pry (0.12.2)
       coderay (~> 1.1.0)
@@ -59,25 +57,24 @@ GEM
     pry-byebug (3.7.0)
       byebug (~> 11.0)
       pry (~> 0.10)
-    public_suffix (4.0.1)
-    rack (2.0.7)
+    public_suffix (4.0.6)
+    rack (2.2.3)
     rake (10.5.0)
-    thread_safe (0.3.6)
-    tty-color (0.5.0)
-    tty-cursor (0.7.0)
-    tty-prompt (0.19.0)
-      necromancer (~> 0.5.0)
-      pastel (~> 0.7.0)
-      tty-reader (~> 0.6.0)
-    tty-reader (0.6.0)
+    ruby2_keywords (0.0.4)
+    tty-color (0.6.0)
+    tty-cursor (0.7.1)
+    tty-prompt (0.23.0)
+      pastel (~> 0.8)
+      tty-reader (~> 0.8)
+    tty-reader (0.9.0)
       tty-cursor (~> 0.7)
-      tty-screen (~> 0.7)
-      wisper (~> 2.0.0)
-    tty-screen (0.7.0)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
+      tty-screen (~> 0.8)
+      wisper (~> 2.0)
+    tty-screen (0.8.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
     wisper (2.0.1)
-    zeitwerk (2.3.1)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby

data/bin/console

@@ -12,4 +12,3 @@ Pry.start
 
 require 'irb'
 IRB.start
-“

data/lib/flutter_polyglot_cli.rb

@@ -20,15 +20,13 @@ require 'flutter_polyglot_cli/api/translation_key'
 
 # File Accessors
 require 'flutter_polyglot_cli/io/token'
+require 'flutter_polyglot_cli/io/l10n'
 require 'flutter_polyglot_cli/io/config'
 
 # Serializers
 require 'flutter_polyglot_cli/serializers/translations/translations_serializer'
 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/commands/pull.rb

@@ -10,30 +10,34 @@ module PolyglotFlutter
 
       def call
         prompt.say('Fetching translations...')
-        generate_translations(project_configs, programming_language, mandatory_language)
+        generate_translations(project_configs)
         success('Translations successfully generated!')
       end
 
       private
 
-      def generate_translations(projects, _programming_language, mandatory_language)
+      def generate_translations(projects)
         projects.each do |project|
           project_id = project[:id]
+          flutter_instance = project[:flutterInstance]
+          mandatory_language = project[:mandatoryLanguage]
+          arb_path = project[:path]
+          l10n_path = project[:l10nFilePath]
+          directory_path = project[:sourceFilesPath]
+          output_localization_file = project[:outputLocalizationFile]
+          set_default_langauge = project[:setDefaultLangauge]
+
           languages = pull_languages(project_id)
           translation_keys = pull_translation_keys(project_id)
+          
+          write_translations(translation_keys, languages, arb_path)
+          write_l10n_yaml(l10n_path, arb_path, mandatory_language, output_localization_file)
 
-          directory_path = project[:sourceFilesPath]
-          write_translations(translation_keys, languages, project[:path])
-          write_localization(directory_path)
-          write_localization_delegate(languages, directory_path)
-          write_localization_keys(translation_keys, languages, directory_path, mandatory_language)
-
-          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 = "#{flutter_instance} packages get"
           `#{script}`
           
-          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)
+          write_localization(directory_path, languages, output_localization_file, set_default_langauge, mandatory_language)
+          
         end
       end
 
@@ -48,36 +52,19 @@ module PolyglotFlutter
         end
       end
 
-      def write_localization(translations_path)
-        return if translations_path.to_s.empty?
+      def write_l10n_yaml(l10n_path, arb_path, mandatory_language, output_localization_file)
+        return if l10n_path.to_s.empty?
 
-        PolyglotFlutter::Serializer::Localization::Localization
-          .new
-          .save(translations_path)
+        PolyglotFlutter::IO::L10n
+          .write(l10n_path, arb_path, mandatory_language, output_localization_file)
       end
 
-      def write_localization_delegate(languages, translations_path)
-        return if translations_path.to_s.empty?
+      def write_localization(directory_path, languages, output_localization_file, set_default_langauge, mandatory_language)
+        return if directory_path.to_s.empty?
 
-        PolyglotFlutter::Serializer::Localization::LocalizationDelegate
+        PolyglotFlutter::Serializer::Localization::Localization
           .new(languages: languages)
-          .save(translations_path)
-      end
-
-      def write_localization_keys(translation_keys, languages, translations_path, mandatory_language)
-        return if translations_path.to_s.empty?
-
-        PolyglotFlutter::Serializer::Localization::LocalizationKeys
-          .new(languages: languages, translation_keys: translation_keys, mandatory_language: mandatory_language)
-          .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)
+          .write(directory_path, output_localization_file, set_default_langauge, mandatory_language)
       end
 
       # Pulling data

data/lib/flutter_polyglot_cli/commands/setup.rb

@@ -17,19 +17,26 @@ module PolyglotFlutter
 
       def call
         project_id = project_id_prompt
-        language = 'dart'
+        flutter_instance = flutter_instance_prompt
+        l10n_path = './l10n.yaml'
+        output_localization_file = 'app_localizations'
+        set_default_langauge = false
         translations_path = translations_path_prompt
+        
         sources_path = sources_path_prompt
         mandatory_language = mandatory_language_prompt
         project = {
           id: project_id,
+          flutterInstance: flutter_instance,
+          mandatoryLanguage: mandatory_language,
           path: translations_path,
-          sourceFilesPath: sources_path
+          l10nFilePath: l10n_path,
+          sourceFilesPath: sources_path,
+          outputLocalizationFile: output_localization_file,
+          setDefaultLangauge: set_default_langauge,
         }
         config = {
-          language: language,
           projects: [project],
-          mandatory_language: mandatory_language
         }
         PolyglotFlutter::IO::Config.write(config)
         success
@@ -43,6 +50,12 @@ module PolyglotFlutter
         prompt.select('Choose a project: ', filtered_projects)
       end
 
+      # Flutter instaince
+
+      def flutter_instance_prompt
+        prompt.ask('What is flutter instance that is ussed (flutter/fvm flutter/...)?', default: 'flutter')
+      end
+
       # Translations path
 
       def translations_path_prompt

data/lib/flutter_polyglot_cli/helpers/general.rb

@@ -25,18 +25,6 @@ module PolyglotFlutter
         @project_configs ||= config[:projects]
       end
 
-      def programming_language
-        @programming_language ||= config[:language]
-      end
-
-      def mandatory_language
-        @mandatory_language ||= config[:mandatory_language]
-      end
-
-      def use_old_naming
-        @useOldNaming ||= config[:useOldNaming]
-      end
-
       def indent(level = 0, initial = '')
         (1..level)
           .to_a.reduce('') { |result, _value| result + '    ' }

data/lib/flutter_polyglot_cli/io/l10n.rb

@@ -0,0 +1,19 @@
+module PolyglotFlutter
+  module IO
+    class L10n
+
+      class << self
+        def write(l10n_path, arb_path, mandatory_language, output_localization_file)
+          data = {
+              'arb-dir' => arb_path,
+              'template-arb-file' => "intl_#{mandatory_language.downcase}.arb",
+              'output-localization-file' => "#{output_localization_file}.dart",
+          }
+          File.open(l10n_path, 'w') { |file| YAML.dump(data, file) }
+        end
+
+      end
+    end
+  end
+end
+  

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

@@ -4,43 +4,62 @@ module PolyglotFlutter
   module Serializer
     module Localization
       class Localization < Base
-        def save(sources_path)
+        def write(sources_path, output_localization_file, set_default_langauge, mandatory_language)
+          @output_localization_file = output_localization_file
+          @set_default_langauge = set_default_langauge
+          @mandatory_language = mandatory_language
+
           FileUtils.mkdir_p sources_path unless File.exist? sources_path
-          output_path = File.join(sources_path, 'localization.dart')
+          output_path = File.join(sources_path, 'strings.dart')
           File.write(output_path, render)
         end
 
-        def template
-          <<~TEMPLATE
-            import 'dart:async';
-            import 'package:flutter/material.dart';
-            import 'package:intl/intl.dart';
-            import 'initialize_i18n/messages_all.dart';
-
-            part 'localization_strings.dart';
-
-            // AUTO GENERATED FILE. DO NOT CHANGE.
-            class Localization {
-              Localization(this.localeName);
-
-              static Future<Localization> load(Locale locale) {
-                final String name =
-                    locale.countryCode.isEmpty ? locale.languageCode : locale.toString();
-                final String localeName = Intl.canonicalizedLocale(name);
+        def import_default_language() 
+          return '' unless @set_default_langauge 
+          %{import 'package:flutter_gen/gen_l10n/#{@output_localization_file}_#{@mandatory_language.downcase}.dart';}
+        end
 
-                return initializeMessages(localeName).then((bool _) {
-                  Intl.defaultLocale = localeName;
-                  return Localization(localeName);
-                });
-              }
+        def latest_localizations() 
+          return 'static AppLocalizations? _latestLocalizations;' unless @set_default_langauge 
+          %{static AppLocalizations? _latestLocalizations = AppLocalizations#{@mandatory_language.capitalize}(); }
+        end
 
-              static Localization of(BuildContext context) {
-                return Localizations.of<Localization>(context, Localization);
+        def template
+          <<~TEMPLATE
+          import 'package:flutter/material.dart';
+          import 'package:flutter_gen/gen_l10n/<%= @output_localization_file %>.dart';
+          <%= import_default_language %>
+          
+          class Strings {
+            Strings._();
+            <%= latest_localizations %>
+          
+            static AppLocalizations of(BuildContext context) => AppLocalizations.of(context) ?? latest;
+          
+            static AppLocalizations get latest {
+              final appLocalizations = _latestLocalizations;
+              if (appLocalizations == null) {
+                throw 'Unable to load App Localizations';
               }
-
-              final String localeName;
+              return appLocalizations;
+            }
+          }
+          
+          class StringsLocaleWidget extends StatelessWidget {
+            const StringsLocaleWidget({Key? key, required this.child}) : super(key: key);
+            final Widget child;
+          
+            @override
+            Widget build(BuildContext context) {
+              Strings._latestLocalizations = AppLocalizations.of(context);
+              return child;
             }
+          }
 
+          extension AppLocales on Locale {
+            <%= generate_static_locales(@languages) %>
+          }
+          
           TEMPLATE
         end
       end

data/lib/flutter_polyglot_cli/serializers/translations/translations_serializer.rb

@@ -3,12 +3,27 @@ module PolyglotFlutter
     class Translation
       class << self
         include Helper::General
+
+        def create_trainslation(key, value)
+          key = clean_variable_name(key)
+          value = value.gsub(/\n/, '\\n').gsub(/"/, '\\"')
+          args = value.scan(/{arg\d+}/).map { |arg| %{"#{arg[1..-2]}": {}} }
+          args_part = ''
+          unless args.empty? 
+            args_part = args.join ', '
+            args_part = %{, "placeholders": {#{args_part} }}
+          end
+          return %{
+      "#{key}": "#{value}",
+      "@#{key}": { "type": "text"#{args_part}}}
+          end
+
         def write(translation_keys, language, translations_path)
           translations = extract_translations(translation_keys, language)
 
           data = translations
                  .sort
-                 .map { |key, value| "\t\"#{clean_variable_name(key)}\": \"#{value.gsub(/\n/, '\\n').gsub(/"/, '\\"')}\",\n\t\"@#{clean_variable_name(key)}\": { \"type\": \"text\" }" }
+                 .map { |key, value| create_trainslation(key, value) }
                  .join(",\n")
                  .concat("\n")
           data = "{\n\t\"@@locale\": \"#{language['locale'].split('_').first}\",\n#{data}}"

data/lib/flutter_polyglot_cli/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flutter_polyglot_cli
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.2.0
 platform: ruby
 authors:
 - Maroje Marcelic
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-01 00:00:00.000000000 Z
+date: 2021-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -156,12 +156,10 @@ files:
 - lib/flutter_polyglot_cli/helpers/general.rb
 - lib/flutter_polyglot_cli/helpers/terminal.rb
 - lib/flutter_polyglot_cli/io/config.rb
+- lib/flutter_polyglot_cli/io/l10n.rb
 - lib/flutter_polyglot_cli/io/token.rb
 - lib/flutter_polyglot_cli/serializers/localizations/loc_serializer.rb
-- 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
@@ -184,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: A CLI for pulling polyglot translations and generating Flutter Source Files

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

@@ -1,43 +0,0 @@
-require_relative 'loc_serializer'
-
-module PolyglotFlutter
-  module Serializer
-    module Localization
-      class LocalizationDelegate < Base
-        def save(sources_path)
-          FileUtils.mkdir_p sources_path unless File.exist? sources_path
-          output_path = File.join(sources_path, 'localization_delegate.dart')
-          File.write(output_path, render)
-        end
-
-            def template()
-<<-TEMPLATE
-import 'dart:async';
-import 'dart:ui';
-import 'package:flutter/foundation.dart';
-import 'package:flutter/material.dart';
-import 'localization.dart';
-
-// AUTO GENERATED FILE. DO NOT CHANGE.
-class LocalizationDelegate extends LocalizationsDelegate<Localization> {
-  const LocalizationDelegate();
-
-  @override
-  bool isSupported(Locale locale) => <String><%= generate_locales(languages) %>.contains(locale.languageCode);
-
-  @override
-  Future<Localization> load(Locale locale) async => SynchronousFuture<Localization>(await Localization.load(locale));
-
-  @override
-  bool shouldReload(LocalizationDelegate old) => false;
-}
-
-extension AppLocales on Locale {
-  <%= generate_static_locales(languages) %>
-}
-TEMPLATE
-        end
-      end
-    end
-  end
-end

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

@@ -1,26 +0,0 @@
-require_relative 'loc_serializer'
-
-module PolyglotFlutter
-  module Serializer
-    module Localization
-      class LocalizationKeys < Base
-        def save(sources_path)
-          FileUtils.mkdir_p sources_path unless File.exist? sources_path
-          output_path = File.join(sources_path, 'localization_keys.dart')
-          File.write(output_path, render)
-        end
-
-        def template
-          <<~TEMPLATE
-            part of 'localization.dart';
-
-            // AUTO GENERATED FILE. DO NOT CHANGE.
-            extension LocalizationKeys on Localization {
-
-            <%= generate_localization_keys(languages, translation_keys, mandatory_language) %>}
-          TEMPLATE
-        end
-      end
-    end
-  end
-end

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

@@ -1,36 +0,0 @@
-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