aigu 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eac535ebe6faefec0c2da69698309d5f2a98f6f6
-  data.tar.gz: 2746a44b55270cbf60a67edf5f9370a008da918f
+  metadata.gz: cc22719006732fb891db0d44fa2d4ea812f3d123
+  data.tar.gz: 5ce1de8334206be7681ff5a55edcf522e495b488
 SHA512:
-  metadata.gz: bbf11e1e3214c658c24f897ddb223a2710b508331e3f5198ff17952262eb19141021a4b56aa31633344e9f3638858fa49115de7e924e479ce9197cbcaec85065
-  data.tar.gz: ba28a3484fd6e84abd5b3b92add340ea64baba68e9aabb4017b3117ecf4b67fca79a666fc145006d88dd63b1ec0025eb13c0d8072e111b88666f1da06a7bdfcb
+  metadata.gz: 020f7cd1063e9afb54266ea4c112d17e3d2b29c54fd27edec62e0fab257202d97b6ac74c981020f344e749e1730583b23c14ffaa8080a44803734d86d5dab6cd
+  data.tar.gz: b63fa05a19d32d4a753e2d5784317cf4c87317285b09d4192071ba3718f6a6e843181fb2a510a1de76cf83b03d2a8b4b8f16627fc2d72c0d9426e48b8e02ce64

data/.rubocop.yml

@@ -50,3 +50,6 @@ Metrics/AbcSize:
 
 ClassLength:
   Enabled: false
+
+Style/GuardClause:
+  Enabled: false

data/lib/aigu/android_exporter.rb

@@ -49,6 +49,7 @@ module Aigu
         end
       end
 
+      @output = remove_special_characters_escape(@output)
       @output
     end
 
@@ -161,5 +162,12 @@ module Aigu
       _, locale = get_resource_type(filepath)
       !(@locale == locale)
     end
+
+    def remove_special_characters_escape(content)
+      content.each_with_object({}) do |(key, value), memo|
+        # Remove single quotes escape "\'" -> "'"
+        memo[key] = value.gsub("\\'", "'")
+      end
+    end
   end
 end

data/lib/aigu/android_importer.rb

@@ -27,6 +27,7 @@ module Aigu
       json = File.read(@input_file)
       @object = JSON.parse(json)
       @object = expand_content_values(@object)
+      @object = escape_special_characters(@object)
     end
 
     def write_xml_files
@@ -95,6 +96,20 @@ module Aigu
       end
     end
 
+    def escape_special_characters(content)
+      content.each_with_object({}) do |(key, value), memo|
+        if value.is_a?(Array)
+          memo[key] = value.map { |s| escape_string_special_characters(s) }
+        else
+          memo[key] = escape_string_special_characters(value)
+        end
+      end
+    end
+
+    def escape_string_special_characters(string)
+      string.gsub("'", "\\\\'")
+    end
+
     def split_res_types(content)
       res_types = {}
 

data/lib/aigu/puller.rb

@@ -34,6 +34,11 @@ module Aigu
       response = http.request(request)
       puts 'Response code: ' + response.code
 
+      if response.code != '200'
+        puts 'Error pulling string revision from Accent'
+        exit 1
+      end
+
       puts "Generating #{@output_file}"
 
       File.open(@output_file, 'w+') do |file|

data/lib/aigu/pusher.rb

@@ -39,6 +39,11 @@ module Aigu
       response = http.request(request)
 
       puts 'Response: ' + response.code
+
+      if response.code != '201'
+        puts 'Error pushing string update to Accent'
+        exit 1
+      end
     end
   end
 end

data/lib/aigu/version.rb

@@ -1,3 +1,3 @@
 module Aigu
-  VERSION = '0.4.3'
+  VERSION = '0.4.4'
 end

data/spec/aigu/android_exporter_spec.rb

@@ -18,6 +18,7 @@ describe Aigu::AndroidExporter do
             <item>Living Room</item>
             <item>Kitchen</item>
             <item>Bedroom</item>
+            <item>array item with special characters character escaped: \'</item>
         </string-array>
       </resources>
       EOS
@@ -31,10 +32,34 @@ describe Aigu::AndroidExporter do
         'pairing_step_three_custom_nickname_array__ARRAY_ITEM__#0' => 'Custom',
         'pairing_step_three_custom_nickname_array__ARRAY_ITEM__#1' => 'Living Room',
         'pairing_step_three_custom_nickname_array__ARRAY_ITEM__#2' => 'Kitchen',
-        'pairing_step_three_custom_nickname_array__ARRAY_ITEM__#3' => 'Bedroom'
+        'pairing_step_three_custom_nickname_array__ARRAY_ITEM__#3' => 'Bedroom',
+        'pairing_step_three_custom_nickname_array__ARRAY_ITEM__#4' => "array item with special characters character escaped: '"
       }
     end
 
     it { expect(parse_xml).to eql expected_content }
   end
+
+  describe :remove_special_characters_escape do
+    let(:exporter) { Aigu::AndroidExporter.new }
+    let(:remove_special_characters_escape) { exporter.send(:remove_special_characters_escape, content) }
+
+    let(:content) do
+      {
+        'string1' => "I\\'m a pro",
+        'string2' => 'I am a pro',
+        'string3' => "J\\'aime l\\'avoir proche d\\'ici"
+      }
+    end
+
+    let(:expected_content) do
+      {
+        'string1' => "I'm a pro",
+        'string2' => 'I am a pro',
+        'string3' => "J'aime l'avoir proche d'ici"
+      }
+    end
+
+    it { expect(remove_special_characters_escape).to eql expected_content }
+  end
 end

data/spec/aigu/android_importer_spec.rb

@@ -13,7 +13,8 @@ describe Aigu::AndroidImporter do
         'pairing_step_three_custom_nickname_array__ARRAY_ITEM__#0' => 'Custom',
         'pairing_step_three_custom_nickname_array__ARRAY_ITEM__#1' => 'Living Room',
         'pairing_step_three_custom_nickname_array__ARRAY_ITEM__#2' => 'Kitchen',
-        'pairing_step_three_custom_nickname_array__ARRAY_ITEM__#3' => 'Bedroom'
+        'pairing_step_three_custom_nickname_array__ARRAY_ITEM__#3' => 'Bedroom',
+        'pairing_step_three_custom_nickname_array__ARRAY_ITEM__#4' => 'array item with special characters character escaped: \''
       }
     end
 
@@ -26,7 +27,8 @@ describe Aigu::AndroidImporter do
           'Custom',
           'Living Room',
           'Kitchen',
-          'Bedroom'
+          'Bedroom',
+          'array item with special characters character escaped: \''
         ]
       }
     end
@@ -128,4 +130,37 @@ describe Aigu::AndroidImporter do
 
     it { expect(res_xml).to eql expected_content }
   end
+
+  describe :escape_special_characters do
+    let(:importer) { Aigu::AndroidImporter.new }
+    let(:escape_special_characters) { importer.send(:escape_special_characters, content) }
+
+    let(:content) do
+      {
+        'string1' => "I'm a pro",
+        'string2' => 'I am a pro',
+        'string3' => "J'aime l'avoir proche d'ici",
+        'string_array' => [
+          'value_a',
+          'value_b',
+          'value_c with special characters: & < > \''
+        ]
+      }
+    end
+
+    let(:expected_content) do
+      {
+        'string1' => "I\\'m a pro",
+        'string2' => 'I am a pro',
+        'string3' => "J\\'aime l\\'avoir proche d\\'ici",
+        'string_array' => [
+          'value_a',
+          'value_b',
+          'value_c with special characters: & < > \\\''
+        ]
+      }
+    end
+
+    it { expect(escape_special_characters).to eql expected_content }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aigu
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Rémi Prévost
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-02 00:00:00.000000000 Z
+date: 2015-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -161,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Aigu converts a directory of Rails localization files into a single JSON