txgh 5.4.0 → 5.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb6e3463432f659922924f0e8772d52ff629d56e
-  data.tar.gz: b2ae04fce6e467c3e288f4719fa6b21428e21458
+  metadata.gz: a0183e2c5a596ebda16f7775a5cf078900068634
+  data.tar.gz: 0c2cc582d83d942c939c755bcf3e64d29d395dcc
 SHA512:
-  metadata.gz: ea6b213e8f7b13a610324114f192542f22ab018697373b12d5299d590f680c6cf25da29fe699a21ae8d4c391980c04ecbe89c6e97bfb615ecbaffa95a74fce4b
-  data.tar.gz: 00e05c87d887ce50b9fd26f252950bc7acde5511e73b29065f09197838e4d74468feebd9d2568e98771b4890df652b32543c17c49887cd6c283c3cbbd47616d7
+  metadata.gz: 05cb4253942683db1635da27f416ceb9b7ff7c9d48ebc0cb60164f845b091d6e2c78071581f15ccb5de1633fa382b41ac9f726c9be8d59ec00462746a9b927ef
+  data.tar.gz: 917ccf68a9992cb89782b8cf95ce71f6635a1945dcba1b232a1f2b90ded84c83a8a3f25df217523dec87c6c11b4c183ec2bf5d8ccdf21e485008782f1d0837ea

data/lib/txgh/resource_contents.rb

@@ -37,7 +37,7 @@ module Txgh
 
     def phrases
       @phrases ||= extractor.from_string(raw) do |extractor|
-        extractor.extract_each.map do |key, value|
+        extractor.extract_each(preserve_arrays: true).map do |key, value|
           { 'key' => key, 'string' => value }
         end
       end
@@ -56,7 +56,7 @@ module Txgh
       serializer.from_stream(stream, language) do |serializer|
         phrases.each do |phrase|
           serializer.write_key_value(
-            phrase['key'], (phrase['string'] || '').to_s
+            phrase['key'], str(phrase['string'] || '')
           )
         end
       end
@@ -95,6 +95,15 @@ module Txgh
 
     attr_reader :raw
 
+    def str(obj)
+      case obj
+        when Array
+          obj
+        else
+          obj.to_s
+      end
+    end
+
     def extractor
       id = EXTRACTOR_MAP.fetch(tx_resource.type) do
         raise TxghInternalError,

data/lib/txgh/version.rb

@@ -1,3 +1,3 @@
 module Txgh
-  VERSION = '5.4.0'
+  VERSION = '5.4.1'
 end

data/spec/diff_calculator_spec.rb

@@ -35,6 +35,29 @@ describe DiffCalculator do
       end
     end
 
+    context 'with an array added to HEAD' do
+      let(:head_phrases) do
+        diff_point_phrases + [
+          phrase('villains', %w(Khan Chang Valeris Shinzon))
+        ]
+      end
+
+      let(:diff_point_phrases) do
+        [
+          phrase('Bajor', 'Bajoran'),
+          phrase('Cardassia', 'Cardassian')
+        ]
+      end
+
+      it 'includes the new array' do
+        expect(diff[:added].size).to eq(1)
+        expect(diff[:modified].size).to eq(0)
+        phrase = diff[:added].first
+        expect(phrase['key']).to eq('villains')
+        expect(phrase['string']).to eq(%w(Khan Chang Valeris Shinzon))
+      end
+    end
+
     context 'with phrases removed from HEAD' do
       let(:head_phrases) do
         []
@@ -50,6 +73,21 @@ describe DiffCalculator do
       end
     end
 
+    context 'with an array removed from HEAD' do
+      let(:head_phrases) do
+        []
+      end
+
+      let(:diff_point_phrases) do
+        phrase('villains', %w(Khan Chang Valeris Shinzon))
+      end
+
+      it 'does not include the array' do
+        expect(diff[:added].size).to eq(0)
+        expect(diff[:modified].size).to eq(0)
+      end
+    end
+
     context 'with phrases modified in HEAD' do
       let(:head_phrases) do
         [phrase('TheNextGeneration', 'Jean Luc Picard (rocks)')]
@@ -68,6 +106,24 @@ describe DiffCalculator do
       end
     end
 
+    context 'with an array modified in HEAD' do
+      let(:head_phrases) do
+        [phrase('villains', %w(Khan Chang Valeris Shinzon))]
+      end
+
+      let(:diff_point_phrases) do
+        [phrase('villains', %w(Khan Chang Valeris))]
+      end
+
+      it 'includes the entire array' do
+        expect(diff[:added].size).to eq(0)
+        expect(diff[:modified].size).to eq(1)
+        phrase = diff[:modified].first
+        expect(phrase['key']).to eq('villains')
+        expect(phrase['string']).to eq(%w(Khan Chang Valeris Shinzon))
+      end
+    end
+
     context 'with no phrases modified, added, or removed' do
       let(:head_phrases) do
         [

data/spec/merge_calculator_spec.rb

@@ -46,6 +46,22 @@ describe MergeCalculator do
     end
   end
 
+  context 'with an array added in HEAD' do
+    let(:diff_point_phrases) do
+      [phrase('planet.earth', 'Human')]
+    end
+
+    let(:head_phrases) do
+      diff_point_phrases + [
+        phrase('villains', %w(Kahn Chang Valeris Shinzon))
+      ]
+    end
+
+    it 'includes the added array' do
+      expect(merge_result.phrases).to eq(head_phrases)
+    end
+  end
+
   context 'with phrases removed from HEAD' do
     let(:diff_point_phrases) do
       head_phrases + [
@@ -62,6 +78,22 @@ describe MergeCalculator do
     end
   end
 
+  context 'with an array removed from HEAD' do
+    let(:diff_point_phrases) do
+      head_phrases + [
+        phrase('villains', %w(Kahn Chang Valeris Shinzon))
+      ]
+    end
+
+    let(:head_phrases) do
+      [phrase('planet.earth', 'Human')]
+    end
+
+    it 'does not include the removed array' do
+      expect(merge_result.phrases).to eq(head_phrases)
+    end
+  end
+
   context 'with phrases modified in HEAD' do
     let(:diff_point_phrases) do
       [phrase('planet.bajor', 'Cardassian')]
@@ -76,6 +108,20 @@ describe MergeCalculator do
     end
   end
 
+  context 'with an array modified in HEAD' do
+    let(:diff_point_phrases) do
+      [phrase('villains', %w(Kahn Chang Valeris))]
+    end
+
+    let(:head_phrases) do
+      [phrase('villains', %w(Kahn Chang Valeris Shinzon))]
+    end
+
+    it 'includes the modified phrase' do
+      expect(merge_result.phrases).to eq(head_phrases)
+    end
+  end
+
   context 'with no phrases modified, added, or removed' do
     let(:diff_point_phrases) do
       [phrase('planet.bajor', 'Bajoran')]

data/spec/resource_contents_spec.rb

@@ -11,18 +11,29 @@ describe ResourceContents do
     )
   end
 
-  let(:raw_contents) do
+  let(:default_contents) do
     outdent(%Q(
       en:
         welcome:
-          message: Hello!
+          message: "Hello!"
         goodbye:
-          message: Goodbye!
+          message: "Goodbye!"
+    ))
+  end
+
+  let(:array_contents) do
+    outdent(%Q(
+      en:
+        captains:
+        - "Janeway"
+        - "Picard"
+        - "Sisko"
+        - "Kirk"
     ))
   end
 
   let(:contents) do
-    ResourceContents.from_string(tx_resource, raw_contents)
+    ResourceContents.from_string(tx_resource, default_contents)
   end
 
   describe '#phrases' do
@@ -32,6 +43,13 @@ describe ResourceContents do
         { 'key' => 'goodbye.message', 'string' => 'Goodbye!' }
       ])
     end
+
+    it 'preserves arrays' do
+      rsrc_contents = ResourceContents.from_string(tx_resource, array_contents)
+      expect(rsrc_contents.phrases).to eq([
+        { 'key' => 'captains', 'string' => %w(Janeway Picard Sisko Kirk) }
+      ])
+    end
   end
 
   describe '#add' do
@@ -47,13 +65,14 @@ describe ResourceContents do
     it 'serializes the phrases to the given stream' do
       stream = StringIO.new
       contents.write_to(stream)
-      expect(stream.string).to eq(outdent(%Q(
-        en:
-          welcome:
-            message: "Hello!"
-          goodbye:
-            message: "Goodbye!"
-      )))
+      expect(stream.string).to eq(default_contents)
+    end
+
+    it 'serializes arrays correctly' do
+      stream = StringIO.new
+      rsrc_contents = ResourceContents.from_string(tx_resource, array_contents)
+      rsrc_contents.write_to(stream)
+      expect(stream.string).to eq(array_contents)
     end
 
     it 'includes phrases that were added after the fact' do

data/txgh.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
   s.has_rdoc = true
 
-  s.add_dependency 'abroad', '~> 4.0'
+  s.add_dependency 'abroad', '~> 4.1'
   s.add_dependency 'faraday', '~> 0.9'
   s.add_dependency 'faraday_middleware', '~> 0.10'
   s.add_dependency 'json', '~> 1.8'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: txgh
 version: !ruby/object:Gem::Version
-  version: 5.4.0
+  version: 5.4.1
 platform: ruby
 authors:
 - Matthew Jackowski
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-03 00:00:00.000000000 Z
+date: 2016-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: abroad
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement