i18n-cocoa 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f66d36a153926975436d4239f13ccf052ca05164
-  data.tar.gz: 7550e2a670addbc6bb7b23588dd6b9ed2e36e045
+  metadata.gz: cf33f6d55b0323e9fc5c980f82f3e59515ac2a50
+  data.tar.gz: c00f49d7b1c616a240b2885827389361f238837c
 SHA512:
-  metadata.gz: 98aaec479882ec958d9609d8a2bc5c898bfe94c3c68523d860ec75f43982045ac074de0036a3554396df0c3f6725cfe018acd1ad70c07b41cd31f3ae1b37b88e
-  data.tar.gz: 1ef90d411f124ce5b0c72f615875ed3a847870b98f67e2acc561cb3d1768b130b3c7550763d68c04777314d00b95d0f671e3770c6f50f996c389ddbe1aa01d2e
+  metadata.gz: eb33bc5501a7feb7ba5c11d68cdb76fec4d95864bc5a67af5a0eb72d87c828bc524978a77874be78892f23e1f0d04122d01312788585c800ae32284ac6ab430d
+  data.tar.gz: 7c092cad942b9e6825af738ab9c745b3b991ead3e28ab53d6a8b93553035579733a2d7739d2ab33ae4159f6cbcfa7011ae89a296b656297ce9f1152bd5427a15

data/lib/i18n/cocoa/finder.rb

@@ -9,7 +9,7 @@ module I18n
       def initialize localized_macro_string='NSLocalizedString'
         @localized_macro_string = localized_macro_string
         @method_file_paths = []
-        @lozalized_file_paths = []
+        @localized_file_paths = []
 
         _search_file_paths File.absolute_path(".")
       end
@@ -33,43 +33,43 @@ module I18n
         [failure_issues.count == 0, failure_issues]
       end
 
-private
-    def _search_file_paths directory_path
-      Dir::foreach(directory_path) do |f|
-        current_file_path = "#{directory_path}/#{f}"
+      private
+      def _search_file_paths directory_path
+        Dir::foreach(directory_path) do |f|
+          current_file_path = "#{directory_path}/#{f}"
 
-        assort_with_extension current_file_path unless File.directory?current_file_path
+          assort_with_extension current_file_path unless File.directory?current_file_path
 
-        _search_file_paths current_file_path if _need_to_search_in_directory? current_file_path
+          _search_file_paths current_file_path if _need_to_search_in_directory? current_file_path
+        end
       end
-    end
 
-    def assort_with_extension file_path
-      return if File.directory?file_path
+      def assort_with_extension file_path
+        return if File.directory?file_path
 
-      extension = file_path.split('.').last
-      case extension
-      when 'm', 'mm', 'swift'
-        @method_file_paths << file_path
-      when 'strings'
-        @localized_file_paths << file_path
+        extension = file_path.split('.').last
+        case extension
+        when 'm', 'mm', 'swift'
+          @method_file_paths << file_path
+        when 'strings'
+          @localized_file_paths << file_path
+        end
       end
-    end
 
-    def _need_to_search_in_directory? file_path
-      return false unless File.directory? file_path
+      def _need_to_search_in_directory? file_path
+        return false unless File.directory? file_path
 
-      file_name = file_path.split('/').last
-      return false if file_name.start_with?"." # '.', '..', '.git'
+        file_name = file_path.split('/').last
+        return false if file_name.start_with?"." # '.', '..', '.git'
 
-      extension = file_name.split('.').last
-      xcode_extensions = ['xcodeproj', 'xcassets', 'xcworkspace']
-      return false if xcode_extensions.include?extension # directory for xcode
+        extension = file_name.split('.').last
+        xcode_extensions = ['xcodeproj', 'xcassets', 'xcworkspace']
+        return false if xcode_extensions.include?extension # directory for xcode
 
-      # TODO: support Pods, Carthage
+        # TODO: support Pods, Carthage
 
-      true
-    end
+        true
+      end
 
       def _find_lines_using_variable_key_in_method_files
         lines = []
@@ -118,15 +118,16 @@ private
       def _get_localized_keys_from_strings_files
         keys = []
 
-        @lozalized_file_paths.each do |file_path|
-          f = File.new(path, "r")
+        @localized_file_paths.each do |file_path|
+          f = File.new(file_path, "r")
           f.readlines.each do |l|
+            l = Utils.encode l
             next if l.start_with?("//")
 
-            match = /^"([^"]+)"[ ]*=[ ]*"([^"]+)";[\r\n]*$/.match(l)
-            next if match.nil?
+            m = /^"([^"]+)"[ ]*=[ ]*"([^"]+)";[\r\n]*$/.match(l)
+            next if m.nil?
 
-            keys << match[1] if match.size == 3
+            keys << m[1] if m.size == 3
           end
         end
 

data/lib/i18n/cocoa/utils.rb

@@ -5,8 +5,13 @@ module I18n
 
       def self.encode string
         # invalid byte sequence in US-ASCII (ArgumentError)
-        string.force_encoding('UTF-8')
-        string.encode("UTF-8", "UTF-8")
+        replace_invalid_byte string
+      end
+
+      def self.replace_invalid_byte string
+        replace_options = { invalid: :replace, undef: :replace, replace: '?' }
+        temporal_encoding = (string.encoding == Encoding::UTF_8 ? Encoding::UTF_16BE : Encoding::UTF_8)
+        string.encode(temporal_encoding, string.encoding, replace_options).encode(string.encoding)
       end
 
       def self.create_issue title, description

data/lib/i18n/cocoa/version.rb

@@ -2,6 +2,6 @@
 
 module I18n
   module Cocoa
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: i18n-cocoa
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Hirohisa Kawasaki