ad_localize 3.0.0 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f445861f1e816fc7c19b5f5f609e5bda1d8451036d3f9be1bc5b55e203f8c5f
-  data.tar.gz: a3929195545e16d10d6140b11afe1a12d51006e20bf0ec93f0900b367bba82cd
+  metadata.gz: cbef79aa4f801f810011f962ea28926e6518fd2e09b5471b83fe9ecf71a72638
+  data.tar.gz: 75f97c8dbf7e7e751f47fde0e3ae9e92eac06bd64d231fd0052acf7d6c19f2ab
 SHA512:
-  metadata.gz: dacb1931f9870fd035584209161f3d7c014795ba189030eee0202bd9ccdce9a9d0a3661e090dbd0f43ab808330b60817fc1371562fa2ff197ceafbb1f8b9ad99
-  data.tar.gz: '088585ccd1b256228c3f4652c85cb9d351630a8595c72e9f723203ae1653031e0f5ee922778ce5b29167c3e86ccfc9c43f213f9732eea02d3427533804c66f33'
+  metadata.gz: 7f49d154c8b682f0e17415703d220f254ecd5e4839b0969b2d75175d1e0617a2ad8dd5b41deab3ad616481c73a77160edf4700ee5baf89c7837a1c47e7ed789d
+  data.tar.gz: d022f56a3cc71552836c4c51c5418e5057aa4ee06e1b19ac5b7974bf8e3ce98311a67f608c11a8bf9aa01e31196075a3a8a22448638c0614814909589ee8883a

data/ad_localize.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 2.0'
+  spec.add_development_dependency 'bundler', '>= 1.12.0', '< 3.0.0'
   spec.add_development_dependency 'rake', '~> 12.3'
   spec.add_development_dependency 'minitest', '~> 5.11'
   spec.add_development_dependency 'byebug', '~> 11.0'
@@ -48,4 +48,4 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'colorize', '~> 0.8'
 
   spec.required_ruby_version     = '~> 2.3'
-end
+end

data/lib/ad_localize/csv_parser.rb

@@ -24,10 +24,12 @@ module AdLocalize
           data.deep_merge!(row_data) unless row_data.nil?
         end
       end
+      remove_numeral_conflicts!(data)
       data
     end
 
     private
+
     # Returns 1 if row is ok, 0 if row there are missing information and -1 if row is not a csv row
     def check_row(row)
       valid_row = 1
@@ -123,5 +125,16 @@ module AdLocalize
         LOGGER.log(:warn, :red, "[#{locale.upcase}] Multiple arguments for #{key} but no order") unless is_all_ordered
       end
     end
+
+    def remove_numeral_conflicts!(data)
+      data.select do |_, wording|
+        wording.values.any? { |translation| (translation.keys & [:plural, :singular]).size == 2 }
+      end.keys.each do |key|
+        AdLocalize::LOGGER.log(:warn, :yellow, "Key \"#{key}\" is duplicated in singular and plural." \
+          "The singular wording will be ignored. You should keep one version of the key (singular or plural)"
+        )
+        data[key].values.each { |wording| wording.delete(:singular) }
+      end
+    end
   end
-end
+end

data/lib/ad_localize/platform/platform_formatter.rb

@@ -1,5 +1,3 @@
-require 'byebug'
-
 module AdLocalize::Platform
   class PlatformFormatter
     PLURAL_KEY_SYMBOL = :plural

data/lib/ad_localize/runner.rb

@@ -30,7 +30,7 @@ module AdLocalize
       parser = CsvParser.new
       data = parser.extract_data(file)
       if data.empty?
-        LOGGER.log(:error, :red, "No data were found in the file - cannot start the file generation process")
+        LOGGER.log(:error, :red, "No data were found in the file - check if there is a key column in the file")
       else
         export_platforms = options.dig(:only) || Constant::SUPPORTED_PLATFORMS
         export_platforms.each do |platform|
@@ -42,4 +42,4 @@ module AdLocalize
       end
     end
   end
-end
+end

data/lib/ad_localize/version.rb

@@ -1,3 +1,3 @@
 module AdLocalize
-  VERSION = "3.0.0"
+  VERSION = "3.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ad_localize
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.2
 platform: ruby
 authors:
 - Edouard Siegel
@@ -24,16 +24,22 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.12.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.12.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -161,7 +167,6 @@ files:
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile

data/Gemfile.lock

@@ -1,51 +0,0 @@
-PATH
-  remote: .
-  specs:
-    ad_localize (3.0.0)
-      activesupport (~> 4.2, >= 4.2.10)
-      colorize (~> 0.8)
-      nokogiri (~> 1.8, >= 1.8.2)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (4.2.11)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    ansi (1.5.0)
-    builder (3.2.3)
-    byebug (11.0.0)
-    colorize (0.8.1)
-    concurrent-ruby (1.1.4)
-    i18n (0.9.5)
-      concurrent-ruby (~> 1.0)
-    mini_portile2 (2.4.0)
-    minitest (5.11.3)
-    minitest-reporters (1.3.6)
-      ansi
-      builder
-      minitest (>= 5.0)
-      ruby-progressbar
-    nokogiri (1.10.1)
-      mini_portile2 (~> 2.4.0)
-    rake (12.3.2)
-    ruby-progressbar (1.10.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  ad_localize!
-  bundler (~> 2.0)
-  byebug (~> 11.0)
-  minitest (~> 5.11)
-  minitest-reporters (~> 1.3)
-  rake (~> 12.3)
-
-BUNDLED WITH
-   2.0.1