txgh 6.2.1 → 6.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 489ac4e3bc92e1b84207c831c966a268a948c76c
-  data.tar.gz: d131ab0a2d4280a5183719bec782e38220a7de20
+  metadata.gz: 1053ba18e7cb566323eac1abe07004895dc151c2
+  data.tar.gz: 50059beacd2a364ee3913309497d11d1fd028d29
 SHA512:
-  metadata.gz: c46275dd6f305e225dcacedeed5663dff4f0b045936af210e0b5c353a805bfb5cfd4d311df2b034958cc9b74ef9b9c8b523b3452607b91bfc44544b9a57ac37d
-  data.tar.gz: d105c4bcc2a8c5288ee5a229a7b0182b4790493466a6ebe21ce710db95c4a6538c373d783028c0f86c7eee90b71b1754fd033b93deddf171b1f88924babe4780
+  metadata.gz: a22619cc53d74193888d7d57f1727e1525dc868d863f38834f6ec6ca8684cd293aaa48033a09ffb05c7676d2093606c5990bbaa7647bc35441a18147c61717ef
+  data.tar.gz: ce6aed9c3b358dc67c912052ae7195e364aacb4c3afdde73eddc6d2bfedbc470f2a6859d8d27fb1608cc28592338f3881f63ca18edb216edb5d9f684c323bebc

data/lib/txgh/config/tx_config.rb

@@ -4,35 +4,39 @@ module Txgh
       class << self
         def load_file(path)
           config = Txgh::ParseConfig.load_file(path)
-          parse(config)
+          load_config(config)
         end
 
         def load(contents)
           config = Txgh::ParseConfig.load(contents)
-          parse(config)
+          load_config(config)
         end
 
         private
 
-        def parse(config)
-          resources = []
-          lang_map = {}
-
-          config.get_groups.each do |group|
-            if group == 'main'
-              main = config[group]
+        def load_config(config)
+          lang_map = load_lang_map(config)
+          resources = load_resources(config, lang_map)
+          new(resources, lang_map)
+        end
 
-              if main['lang_map']
-                lang_map = parse_lang_map(main['lang_map'])
-              end
-            else
-              resources.push(
-                parse_resource(group, config[group])
-              )
+        def load_lang_map(config)
+          lang_map = if main = config['main']
+            if map = main['lang_map']
+              parse_lang_map(map)
             end
           end
 
-          new(resources, lang_map)
+          lang_map || {}
+        end
+
+        def load_resources(config, lang_map)
+          [].tap do |resources|
+            config.groups.each do |group|
+              next if group == 'main'
+              resources << load_resource(group, config[group], lang_map)
+            end
+          end
         end
 
         def parse_lang_map(lang_map)
@@ -42,12 +46,12 @@ module Txgh
           end
         end
 
-        def parse_resource(name, resource)
+        def load_resource(name, resource, lang_map)
           id = name.split('.', 2)
           TxResource.new(
             id[0].strip, id[1].strip, resource['type'],
             resource['source_lang'], resource['source_file'],
-            resource['lang_map'], resource['file_filter']
+            lang_map, resource['file_filter']
           )
         end
       end

data/lib/txgh/resource_deleter.rb

@@ -43,7 +43,7 @@ module Txgh
         resource_hash['i18n_type'],
         resource_hash['source_language_code'],
         resource_hash['name'],
-        '', nil
+        {}, nil
       )
     end
   end

data/lib/txgh/tx_resource.rb

@@ -12,18 +12,7 @@ module Txgh
       @type = type
       @source_lang = source_lang
       @source_file = source_file
-      @lang_map = {}
-
-      if lang_map
-        result = {}
-        lang_map.split(',').each do |m|
-          key_value = m.split(':', 2)
-          result[key_value[0].strip] = key_value[1].strip
-        end
-
-        @lang_map = result
-      end
-
+      @lang_map = lang_map
       @translation_file = translation_file
     end
 

data/lib/txgh/version.rb

@@ -1,3 +1,3 @@
 module Txgh
-  VERSION = '6.2.1'
+  VERSION = '6.2.2'
 end

data/spec/merge_calculator_spec.rb

@@ -10,7 +10,7 @@ describe MergeCalculator do
   let(:resource) do
     TxResource.new(
       'project_name', 'resource_slug', 'YAML',
-      'en', 'en.yml', '', 'translation_file'
+      'en', 'en.yml', {}, 'translation_file'
     )
   end
 

data/spec/resource_contents_spec.rb

@@ -7,7 +7,7 @@ describe ResourceContents do
   let(:tx_resource) do
     TxResource.new(
       'project_slug', 'resource_slug', 'YAML',
-      'en', 'source_file', '', 'translation_file'
+      'en', 'source_file', {}, 'translation_file'
     )
   end
 

data/spec/resource_downloader_spec.rb

@@ -50,7 +50,7 @@ describe ResourceDownloader do
     before(:each) do
       tx_config.resources << Txgh::TxResource.new(
         project_name, "#{resource_slug}_second", 'YML',
-        'en', 'en.yml', '', 'translations/<lang>/sample2.yml'
+        'en', 'en.yml', {}, 'translations/<lang>/sample2.yml'
       )
 
       allow(Txgh::Config::TxManager).to(

data/spec/resource_updater_spec.rb

@@ -114,7 +114,7 @@ describe ResourceUpdater do
       TxBranchResource.new(
         TxResource.new(
           project_name, resource_slug, 'YAML',
-          'en', 'en.yml', '', 'translation_file'
+          'en', 'en.yml', {}, 'translation_file'
         ),
         ref
       )

data/spec/tx_branch_resource_spec.rb

@@ -19,7 +19,7 @@ describe TxBranchResource do
   let(:base_resource) do
     TxResource.new(
       project_slug, resource_slug, 'type', 'source_lang', 'source_file',
-      'ko-KR:ko', 'translation_file'
+      { 'ko-KR' => 'ko' }, 'translation_file'
     )
   end
 

data/spec/tx_resource_spec.rb

@@ -6,7 +6,7 @@ describe TxResource do
   let(:resource) do
     TxResource.new(
       'project_slug', 'resource_slug', 'type',
-      'source_lang', 'source_file', 'ko-KR:ko', 'translation_file/<lang>.foo'
+      'source_lang', 'source_file', { 'ko-KR' => 'ko' }, 'translation_file/<lang>.foo'
     )
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: txgh
 version: !ruby/object:Gem::Version
-  version: 6.2.1
+  version: 6.2.2
 platform: ruby
 authors:
 - Matthew Jackowski