aigu 0.4 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1891efbb20cc81f439f20f30fb4d74586e09c2c9
-  data.tar.gz: 2715fb01c3d8f203c791ffc55357469b077ad793
+  metadata.gz: 8ad319cbb6d09c6c0490394a5157c75c31068b0e
+  data.tar.gz: 7a3e850cb6f8e81296b1507402de29ca42352e6c
 SHA512:
-  metadata.gz: 83421bf2129630b61d54543cfa484963415151301c345fd624febb67d65de937a45634173c54fb3017c5a3c3a3f95f3ab92ce1f814b147c99a560336f675f390
-  data.tar.gz: 3a60ed45b7ee4764a8b809cb297e8a9b9a7bfa395ae683cd335009308b189a8bb56039e39e099abee88c5a637a3e1f9ac635b10bf575b5c40bdfc32b33b562ab
+  metadata.gz: f45211629474a502134398a2872e655bf44e77144b55971f24bd948d1657197de46e4de3be14788d34d7ebbc7321eb0bafae57db87ec20490d77aba3e54babe0
+  data.tar.gz: 888a73ce5a37e850a981f62bcd2c8d8d937a696d8948002ab5b6d157cce406899ad85192aabee2f6aae9d335ee4691442a6b450cc9c9cf79875a39a0896cdbc1

data/lib/aigu/ios_exporter.rb

@@ -40,25 +40,25 @@ module Aigu
       pattern = File.join(@input_directory, "#{@locale}.lproj", 'Localizable.strings')
       filepath = Dir[pattern].first
 
-      assign_output_from_file!(filepath)
+      assign_output_from_file!(filepath, false)
 
       pattern = File.join(@input_directory, "#{@locale}.lproj", 'Localizable.stringsdict')
       filepath = Dir[pattern].first
 
-      assign_output_from_file!(filepath)
+      assign_output_from_file!(filepath, true)
 
       @output
     end
 
-    def assign_output_from_file!(filepath)
+    def assign_output_from_file!(filepath, is_dict)
       if filepath
         puts "Processing #{filepath}"
 
         file_content = File.open(filepath, 'rt').read
 
-        @output.merge! parse_strings_file(file_content)
+        @output.merge! is_dict ? parse_stringsdict_file(file_content) : parse_strings_file(file_content)
       else
-        puts 'Strings file not found'
+        puts is_dict ? 'Stringsdict file not found' : 'Strings file not found'
       end
     end
 

data/lib/aigu/ios_importer.rb

@@ -72,9 +72,9 @@ module Aigu
 
     # This takes a string and replaces iOS interpolations to Android interpolations
     # so that it is reusable across platforms.
-    # Example: 'iOS interpolation %@ or %1$@' => 'Android interpolation %s or %1$s'.
+    # Example: 'iOS interpolation %s or %1$s' => 'Android interpolation %@ or %1$@'.
     def replace_string_interpolations(string)
-      string.gsub(/%([0-9]+\$)?@/, '%\\1s')
+      string.gsub(/%([0-9]+\$)?s/, '%\\1@')
     end
 
     def write_stringsdict_file(content)
@@ -82,6 +82,8 @@ module Aigu
 
       # read file
       file_path = File.join(@output_directory, "#{@locale}.lproj", 'Localizable.stringsdict')
+      return unless File.exist? file_path
+
       puts "Updating #{file_path}"
 
       file_content = File.open(file_path, 'rb:bom|utf-8').read

data/lib/aigu/version.rb

@@ -1,3 +1,3 @@
 module Aigu
-  VERSION = '0.4'
+  VERSION = '0.4.1'
 end

data/spec/aigu/ios_importer_spec.rb

@@ -9,11 +9,11 @@ describe Aigu::IosImporter do
       {
         'STRING_1' => 'Value of string #1',
         'STRING_2' => 'Value of string #2',
-        'STRING_3' => 'Value with special chars (%ld) %@\n " = " abc',
-        'STRING_4' => 'Value with an interpolation %@.',
-        'STRING_5' => 'Value with %@ interpolations %@.',
-        'STRING_6' => 'Value with an interpolation with an identifier %1$@.',
-        'STRING_7' => 'Value with %1$@ interpolations with an identifier %2$@.'
+        'STRING_3' => 'Value with special chars (%ld) %s\n " = " abc',
+        'STRING_4' => 'Value with an interpolation %s.',
+        'STRING_5' => 'Value with %s interpolations %s.',
+        'STRING_6' => 'Value with an interpolation with an identifier %1$s.',
+        'STRING_7' => 'Value with %1$s interpolations with an identifier %2$s.'
       }
     end
 
@@ -21,11 +21,11 @@ describe Aigu::IosImporter do
       <<-EOS.unindent
       "STRING_1" = "Value of string #1";
       "STRING_2" = "Value of string #2";
-      "STRING_3" = "Value with special chars (%ld) %s\\n " = " abc";
-      "STRING_4" = "Value with an interpolation %s.";
-      "STRING_5" = "Value with %s interpolations %s.";
-      "STRING_6" = "Value with an interpolation with an identifier %1$s.";
-      "STRING_7" = "Value with %1$s interpolations with an identifier %2$s.";
+      "STRING_3" = "Value with special chars (%ld) %@\\n " = " abc";
+      "STRING_4" = "Value with an interpolation %@.";
+      "STRING_5" = "Value with %@ interpolations %@.";
+      "STRING_6" = "Value with an interpolation with an identifier %1$@.";
+      "STRING_7" = "Value with %1$@ interpolations with an identifier %2$@.";
       EOS
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aigu
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: 0.4.1
 platform: ruby
 authors:
 - Rémi Prévost
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-20 00:00:00.000000000 Z
+date: 2014-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler