rescodegen 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1cc0746cc5d75abad97618260d6ffde5db9d0d6
-  data.tar.gz: 67019eadc6cbeea942d08a196076bd66cc25988e
+  metadata.gz: c59f55dbbfbcb78c9f1d27bc7d15d0dea733865c
+  data.tar.gz: a0b55eef2c05a946010250bcc67bb696bb30fe9f
 SHA512:
-  metadata.gz: 8f697b4fdfed3a5ae98ab871538cdea35f349619146ce1a815d6c4e1e02601c1165d27ab04f826b216821c316c7dcf66eabe37e58b7aa8c9d0a9e72d5b734613
-  data.tar.gz: 0ce98a4477650c9f99924dbcee497847cde935fba36675b01d924709f443fcd684532d495f5283f834da695a8e9350e9df32b6f8551fe7f6107eeaec503e45a8
+  metadata.gz: 61fb365a48ad5132662a7c82512691d453e36f64160f0279a834a3b8654055f53064f875ec00692ab13e58a0acdb1003c8372c1880a4198ac4e58ffa38527b7a
+  data.tar.gz: 7082b4311ae00f35d82d223d37b3c02b27cd1ece9375c82500c556c01e63bb1a2b0fe26e7ebfd941408efeac1c6e00d1386e6df44494fa858bdd4d4583aff0d2

data/Gemfile.lock

@@ -1,15 +1,33 @@
 PATH
   remote: .
   specs:
-    rescodegen (0.1.2)
+    rescodegen (0.2.0)
+      plist (= 3.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    codeclimate-test-reporter (0.5.0)
+      simplecov (>= 0.7.1, < 1.0.0)
+    diff-lcs (1.2.5)
     docile (1.1.5)
     json (1.8.3)
     minitest (5.8.4)
+    plist (3.2.0)
     rake (10.5.0)
+    rspec (3.4.0)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+    rspec-core (3.4.3)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
     simplecov (0.11.2)
       docile (~> 1.1.0)
       json (~> 1.8)
@@ -21,9 +39,11 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.11)
+  codeclimate-test-reporter (~> 0.5)
   minitest (~> 5.0)
   rake (~> 10.0)
   rescodegen!
+  rspec (~> 3.4)
   simplecov (~> 0.11)
 
 BUNDLED WITH

data/README.md

@@ -1,39 +1,69 @@
+<a href="https://codeclimate.com/github/seanhenry/rescodegen/coverage"><img src="https://codeclimate.com/github/seanhenry/rescodegen/badges/coverage.svg" /></a>
+<a href="https://codeclimate.com/github/seanhenry/rescodegen"><img src="https://codeclimate.com/github/seanhenry/rescodegen/badges/gpa.svg" /></a>
 # rescodegen
-A command line tool for creating Swift and Objective-C code from localizable strings.
+A command line tool for creating Swift and Objective-C code from singular Localizable.strings and plural Localizable.stringsdict.
 ## Installation
 `$ sudo gem install rescodegen`
 
 ## Usage
 ### Generate Code
-`$ rescodegen -l swift -o output_folder Localizable.strings`
+`$ rescodegen -i Localizable.strings`
 ### Options
 
-|Option|Value|Description   |
-|---|---|---|
-|-l|swift\|objc|The language of the generated code.|
-|-o|relative/path/to/output/directory|Where to generate the files.|
-|-p|e.g. SH|An optional prefix to apply to Objective-C types.|
+|Option|Value|Required|Default|Description   |
+|---|---|---|---|---|
+|`-i`|relative/path/to/Localizable.strings|✔️||The input file(s). Must be `.strings` or `.stringsdict` format. You may specify more than 1 file.|
+|`-l`|swift or objc|❌|`swift`|The language of the generated code.|
+|`-o`|relative/path/to/output/directory|❌|`.`|Where to save generated files.|
+|`-p`|e.g. SH|❌||An optional prefix to apply to Objective-C types.|
 ## Example
 ### Localizable.strings  
 
 ```
-/* The Ok button label displayed when an error occurs on the home screen. */
-"HomeScreen.Alert.OkButtonLabel" = "Ok";
+...
+/* Error message to display when uploading an image fails. */
+"Uploader.ErrorAlert.Message" = "The upload failed.";
+...
+```
+### Localizable.stringsdict  
 
-/* The error message displayed by an alert when content could not be loaded. */
-"HomeScreen.Alert.LoadErrorMessage" = "There was an error loading your content.";
+```
+...
+    <key>Uploader.ProgressLabel.Text</key>
+	<dict>
+		<key>NSStringLocalizedFormatKey</key>
+		<string>Uploading %#@images@.</string>
+		<key>images</key>
+		<dict>
+			<key>NSStringFormatSpecTypeKey</key>
+			<string>NSStringPluralRuleType</string>
+			<key>NSStringFormatValueTypeKey</key>
+            <string>d</string>
+            <key>one</key>
+            <string>one image</string>
+			<key>other</key>
+			<string>%d images</string>
+		</dict>
+	</dict>
+...
 ```
 ### Generate Code
 
 ```
-$ rescodegen -l swift -o . Localizable.strings
-$ rescodegen -l objc -o . Localizable.strings
+$ rescodegen -i Localizable.strings -i Localizable.stringsdict
+$ rescodegen -i Localizable.strings -i Localizable.stringsdict -l objc
 ```
 ### Xcode
 Drag the generated files into Xcode and add them to your target.
 ### Swift
-Access localised strings using the `localizedString` property.
-`Strings.Singular.homeScreen_alert_loadErrorMessage.localizedString`
+Access localized singular strings:  
+`Strings.Singular.uploader_errorAlert_message.localizedString` => "The upload failed."  
+Access localized plural strings:  
+`Strings.Plural.uploader_progressLabel_text.localizedString(1)` => "Uploading one image."  
 ### Objective-C
-Access localised strings using the `LocalizedSingularString` function.
-`LocalizedSingularString(SingularString_homeScreen_alert_loadErrorMessage);`
+Access localized singular strings:  
+`LocalizedSingularString(SingularString_uploader_errorAlert_message)` => "The upload failed."  
+Access localized plural strings:    
+`LocalizedPluralString(PluralString_uploader_progressLabel_text, 2)` => "Uploading 2 images." 
+## Encoding
+rescodegen currently only supports UTF-8 encoding. 

data/Rakefile

@@ -1,10 +1,19 @@
 require "bundler/gem_tasks"
 require "rake/testtask"
 
-Rake::TestTask.new(:test) do |t|
+task :test => [:unit, :acceptance] do 
+
+end
+
+Rake::TestTask.new(:unit) do |t|
     t.libs << "test"
     t.libs << "lib"
     t.test_files = FileList['test/**/*_tests.rb']
 end
 
+desc "Runs acceptance tests."
+task :acceptance do 
+    exec "rspec spec"
+end
+
 task :default => :test

data/bin/rescodegen

@@ -11,10 +11,13 @@ require 'optparse'
 require 'rescodegen/code_generator/swift_strings_generator'
 require 'rescodegen/code_generator/objc_header_strings_generator'
 require 'rescodegen/code_generator/objc_main_strings_generator'
-require 'rescodegen/key_generator/strings_key_generator'
+require 'rescodegen/key_generator/key_generator'
+require 'rescodegen/key_generator/code_safe_key_generator'
 require 'rescodegen/code_formatter/code_formatter'
+require 'rescodegen/key_reader/strings_key_reader'
+require 'rescodegen/key_reader/stringsdict_key_reader'
 
-options = { output: ".", language: "swift", prefix: "" }
+options = { output: ".", language: "swift", prefix: "", input: [] }
 
 parser = OptionParser.new do |opts|
     opts.banner = "Usage: rescodegen [options] input_file"
@@ -29,27 +32,58 @@ parser = OptionParser.new do |opts|
     opts.on("-p", "--prefix=PREFIX", "Optional prefix for Objective-C types.") do |p|
         options[:prefix] = p
     end
+    opts.on("-i", "--input=file1,file2", Array, "Accepts .strings or .stringsdict files.") do |i|
+        options[:input] += i
+    end
 end
 parser.parse!
 
 abort "Invalid -l argument. Expects swift or objc." if !options[:language].match("swift|objc")
-input_file = ARGV.last
-abort "Missing input_file.\n\n#{parser.help}" if input_file.nil?
+abort "Missing -i argument. Must have at least 1 input file." if options[:input].size == 0
 output_file = options[:output] + "/" + options[:prefix] + "Strings"
 
-def generate_swift_file(code_safe_keys, keys, output_file)
-    File.write(output_file + ".swift", Rescodegen::SwiftStringsGenerator.new.generate(code_safe_keys, keys))
+def generate_swift_file(singular_code_safe_keys, singular_keys, plural_code_safe_keys, plural_keys, output_file)
+    File.write(output_file + ".swift", Rescodegen::SwiftStringsGenerator.new.generate(singular_code_safe_keys, singular_keys, plural_code_safe_keys, plural_keys))
+end
+
+def generate_objc_files(singular_code_safe_keys, singular_keys, plural_code_safe_keys, plural_keys, output_file, prefix)
+    File.write(output_file + ".h", Rescodegen::ObjcHeaderStringsGenerator.new(prefix).generate(singular_code_safe_keys, singular_keys, plural_code_safe_keys, plural_keys))
+    File.write(output_file + ".m", Rescodegen::ObjcMainStringsGenerator.new(prefix).generate(singular_code_safe_keys, singular_keys, plural_code_safe_keys, plural_keys))
+end
+
+def abort_bad_input_file
+    abort "Only currenly supports .strings and .stringsdict files."
 end
 
-def generate_objc_files(code_safe_keys, keys, output_file, prefix)
-    File.write(output_file + ".h", Rescodegen::ObjcHeaderStringsGenerator.new(prefix).generate(code_safe_keys, keys))
-    File.write(output_file + ".m", Rescodegen::ObjcMainStringsGenerator.new(prefix).generate(code_safe_keys, keys))
+def generator_for_file(file, key_reader)
+    code_safe_key_generator = Rescodegen::CodeSafeKeyGenerator.new
+    generator = Rescodegen::KeyGenerator.new(key_reader, code_safe_key_generator, file)
 end
 
-generator = Rescodegen::StringsKeyGenerator.create_from_file(input_file)
-keys = generator.keys
-code_safe_keys = generator.code_safe_keys
+abort_bad_input_file if options[:input].select { |file| file.end_with?(".strings") || file.end_with?(".stringsdict") }.empty?
+
+singular_keys = []
+singular_code_safe_keys = []
+options[:input].select { |file| file.end_with?(".strings") }
+               .map { |file|
+    generator = generator_for_file(file, Rescodegen::StringsKeyReader.new)
+    singular_keys += generator.keys
+    singular_code_safe_keys += generator.code_safe_keys
+}
+
+plural_keys = []
+plural_code_safe_keys = []
+options[:input].select { |file| file.end_with?(".stringsdict") }
+               .map { |file|
+    generator = generator_for_file(file, Rescodegen::StringsdictKeyReader.new)
+    plural_keys += generator.keys
+    plural_code_safe_keys += generator.code_safe_keys
+}
+
+abort "The input file(s) did not contain any keys." if singular_keys.size == 0 && plural_keys.size == 0
+
 formatter = Rescodegen::CodeFormatter.new
-code_safe_keys = code_safe_keys.map { |k| formatter.format_string(k) }
-generate_swift_file(code_safe_keys, keys, output_file) if options[:language] == "swift"
-generate_objc_files(code_safe_keys, keys, output_file, options[:prefix]) if options[:language] == "objc"
+singular_code_safe_keys = singular_code_safe_keys.map { |k| formatter.format_string(k) }
+plural_code_safe_keys = plural_code_safe_keys.map { |k| formatter.format_string(k) }
+generate_swift_file(singular_code_safe_keys, singular_keys, plural_code_safe_keys, plural_keys, output_file) if options[:language] == "swift"
+generate_objc_files(singular_code_safe_keys, singular_keys, plural_code_safe_keys, plural_keys, output_file, options[:prefix]) if options[:language] == "objc"

data/lib/rescodegen/code_generator/objc_header_strings_generator.rb

@@ -7,36 +7,49 @@ module Rescodegen
             @prefix = prefix
         end
 
-        def generate(keys, values)
-            super(keys, values)
-            enum_name = prefix "SingularString"
+        def generate(singular_keys, singular_values, plural_keys, plural_values)
+            super(singular_keys, singular_values, plural_keys, plural_values)
             import_module("Foundation")
-            .start_enum(enum_name, "NSInteger")
-                .add_cases(enum_name, keys)
-            .finish_enum
-            .add_c_method("NSString*", prefix("LocalizedSingularString"), enum_name, "singularString")
-            .newline
+            .singular_enum(singular_keys, singular_values)
+            .plural_enum(plural_keys, plural_values)
+            add_c_method("NSString*", prefix("LocalizedSingularString"), "#{singular_enum_name} singularString") if singular_keys.size != 0
+            add_c_method("NSString*", prefix("LocalizedPluralString"), "#{plural_enum_name} pluralString, ...") if plural_keys.size != 0
+            newline
             @output
         end
 
     protected
 
+        def singular_enum(keys, values)
+            return self if keys.size == 0
+            newline
+            .start_enum(singular_enum_name, "NSInteger")
+                .add_cases(singular_enum_name, keys)
+            .finish_enum
+        end
+
+        def plural_enum(keys, values)
+            return self if keys.size == 0
+            newline
+            .start_enum(plural_enum_name, "NSInteger")
+                .add_cases(plural_enum_name, keys)
+            .finish_enum
+        end
+
         def import_module(name)
             @output += "@import #{name};"
-            newline.newline
-            self
+            newline
         end
 
         def start_enum(name, type)
             indent
             @output += "typedef NS_ENUM(#{type}, #{name})"
             open_brackets
-            self
         end
 
-        def add_c_method(return_type, name, parameter_type, parameter_name)
+        def add_c_method(return_type, name, parameter_list)
             newline
-            @output += "#{return_type} #{name}(#{parameter_type} #{parameter_name});"
+            @output += "#{return_type} #{name}(#{parameter_list});"
             self
         end
 
@@ -54,7 +67,14 @@ module Rescodegen
             indent
             @output += "};"
             newline
-            self
+        end
+
+        def singular_enum_name 
+            prefix "SingularString"
+        end
+
+        def plural_enum_name 
+            prefix "PluralString"
         end
     end
 end

data/lib/rescodegen/code_generator/objc_main_strings_generator.rb

@@ -7,87 +7,115 @@ module Rescodegen
             @prefix = prefix
         end
 
-        def generate(keys, values)
-            super(keys, values)
-            enum_name = prefix "SingularString"
+        def generate(singular_keys, singular_values, plural_keys, plural_values)
+            super(singular_keys, singular_values, plural_keys, plural_values)
             newline
             .import_header(prefix("Strings.h"))
             .newline
-            .start_c_method("NSString*", prefix("LocalizedSingularString"), enum_name, "singularString")
-                .start_switch("singularString")
-                    .add_cases(keys.map { |k| enum_name + "_" + k }, values)
-                .close_brackets
-            .close_brackets
-            .newline
+            .add_singular_methods(singular_keys, singular_values)
+            .add_plural_methods(plural_keys, plural_values)
             @output
         end
 
-        def import_header(name)
-            @output += "#import \"#{name}\""
-            self
-        end
+        protected
 
-        def start_c_method(return_type, name, parameter_type, parameter_name)
-            newline
-            @output += "#{return_type} #{name}(#{parameter_type} #{parameter_name})"
-            open_brackets
-            self
-        end
+            def add_singular_methods(keys, values)
+                return self if keys.size == 0
+                enum_name = prefix "SingularString"
+                start_c_method("NSString*", prefix("LocalizedSingularString"), "#{enum_name} singularString")
+                    .start_switch("singularString")
+                        .add_cases(keys.map { |k| enum_name + "_" + k }, values)
+                    .close_brackets
+                .close_brackets
+            end
 
-        def start_switch(value)
-            indent
-            @output += "switch (#{value})"
-            open_brackets
-            self
-        end
+            def add_plural_methods(keys, values)
+                return self if keys.size == 0
+                enum_name = prefix "PluralString"
+                start_c_method("NSString*", "NSStringFromPluralString", "#{enum_name} pluralString")
+                    .start_switch("pluralString")
+                        .add_cases(keys.map { |k| enum_name + "_" + k }, values)
+                    .close_brackets
+                .close_brackets
+                .start_c_method("NSString*", prefix("LocalizedPluralString"), "#{enum_name} pluralString, ...")
+                    .return_localized_plural_string
+                .close_brackets
+            end
+
+            def import_header(name)
+                @output += "#import \"#{name}\""
+                self
+            end
+
+            def start_c_method(return_type, name, parameter_list)
+                newline
+                @output += "#{return_type} #{name}(#{parameter_list})"
+                open_brackets
+            end
+
+            def start_switch(value)
+                indent
+                @output += "switch (#{value})"
+                open_brackets
+            end
+
+            def add_cases(keys, values)
+                i = 0
+                until i == keys.size
+                    start_case(keys[i])
+                        .return_value(localized_string(values[i]))
+                    .finish_case
+                    i += 1
+                end
+                add_default_case
+            end
 
-        def add_cases(keys, values)
-            i = 0
-            until i == keys.size
-                start_case(keys[i])
-                    .return_value(localized_string(values[i]))
+            def add_default_case
+                start_default_case
+                    .return_value("@\"\"")
                 .finish_case
-                i += 1
             end
-            add_default_case
-            self
-        end
 
-        def add_default_case
-            start_default_case
-                .return_value("@\"\"")
-            .finish_case
-        end
+            def start_case(key)
+                indent
+                @output += "case #{key}:"
+                newline
+                increment_indent_level
+            end
 
-        def start_case(key)
-            indent
-            @output += "case #{key}:"
-            newline
-            increment_indent_level
-        end
+            def start_default_case
+                indent
+                @output += "default:"
+                newline
+                increment_indent_level
+            end
 
-        def start_default_case
-            indent
-            @output += "default:"
-            newline
-            increment_indent_level
-            self
-        end
+            def finish_case
+                decrement_indent_level
+            end
 
-        def finish_case
-            decrement_indent_level
-            self
-        end
+            def return_value(value)
+                indent
+                @output += "return #{value};"
+                newline
+            end
 
-        def return_value(value)
-            indent
-            @output += "return #{value};"
-            newline
-            self
-        end
+            def localized_string(value) 
+                return "NSLocalizedString(@\"#{value}\", @\"\")"
+            end
 
-        def localized_string(value) 
-            return "NSLocalizedString(@\"#{value}\", @\"\")"
-        end
+            def return_localized_plural_string
+                add_line("va_list args")
+                .add_line("va_start(args, pluralString)")
+                .add_line("NSString *string = [[NSString alloc] initWithFormat:NSStringFromPluralString(pluralString) locale:[NSLocale currentLocale] arguments:args]")
+                .add_line("va_end(args)")
+                .add_line("return string")
+            end
+
+            def add_line(line)
+                indent
+                @output += "#{line};"
+                newline
+            end
     end
 end

data/lib/rescodegen/code_generator/strings_generator.rb

@@ -2,8 +2,9 @@
 module Rescodegen
     class StringsGenerator
 
-        def generate(keys, values)
-            raise "Expects keys and values of equal sizes" if keys.size != values.size
+        def generate(singular_keys, singular_values, plural_keys, plural_values)
+            raise "Expects keys and values of equal sizes" if singular_keys.size != singular_values.size || plural_keys.size != plural_values.size
+            raise "Expects at least one key and one value" if singular_keys.size == 0 && plural_keys.size == 0
             @output = ""
             @tab_level = 0
         end
@@ -23,7 +24,6 @@ module Rescodegen
             @output += " {"
             newline
             increment_indent_level
-            self
         end
 
         def close_brackets
@@ -31,7 +31,6 @@ module Rescodegen
             indent
             @output += "}"
             newline
-            self
         end
 
         def increment_indent_level

data/lib/rescodegen/code_generator/swift_strings_generator.rb

@@ -3,22 +3,40 @@ require_relative 'strings_generator'
 module Rescodegen
     class SwiftStringsGenerator < StringsGenerator
 
-        def generate(keys, values)
-            super(keys, values)
+        def generate(singular_keys, singular_values, plural_keys, plural_values)
+            super(singular_keys, singular_values, plural_keys, plural_values)
             import_header("Foundation")
             start_struct("Strings")
-                .start_enum("Singular", "String")
-                    .add_cases(keys, values)
-                    .start_computed_property("localizedString", "String")
-                        .return_localized_string
-                    .close_brackets
-                .close_brackets
+                .add_singular_enum(singular_keys, singular_values)
+                .add_plural_enum(plural_keys, plural_values)
             .close_brackets
             @output
         end
 
     protected
 
+        def add_singular_enum(keys, values)
+            return self if keys.size == 0
+            newline
+            .start_enum("Singular", "String")
+                .add_cases(keys, values)
+                .start_computed_property("localizedString", "String")
+                    .return_localized_string
+                .close_brackets
+            .close_brackets
+        end
+
+        def add_plural_enum(keys, values)
+            return self if keys.size == 0
+            newline
+            .start_enum("Plural", "String")
+                .add_cases(keys, values)
+                .start_function("localizedString", "args: CVarArgType...", "String")
+                    .return_localized_plural_string
+                .close_brackets
+            close_brackets
+        end
+
         def newline
             @output += "\n"
             self
@@ -26,22 +44,19 @@ module Rescodegen
 
         def import_header(name)
             @output += "import #{name}"
-            newline.newline
-            self
+            newline
         end
 
         def start_struct(name)
+            newline
             @output += "struct #{name}"
             open_brackets
-            newline
-            self
         end
 
         def start_enum(name, type)
             indent
             @output += "enum #{name}: #{type}"
             open_brackets
-            self
         end
 
         def add_cases(keys, values)
@@ -52,21 +67,35 @@ module Rescodegen
                 newline 
             end
             newline
-            self
         end
 
         def start_computed_property(name, type)
             indent
             @output += "var #{name}: #{type}"
             open_brackets
-            self
         end
 
         def return_localized_string
             indent
             @output += "return NSLocalizedString(rawValue, comment: \"\")"
             newline
-            self
+        end
+
+        def start_function(name, parameter_list, return_type)
+            indent
+            @output += "func #{name}(#{parameter_list}) -> #{return_type}"
+            open_brackets
+        end
+
+        def return_localized_plural_string
+            add_line "let localized = NSLocalizedString(rawValue, comment: \"\")"
+            add_line "return String(format: localized, locale: NSLocale.currentLocale(), arguments: args)"
+        end
+
+        def add_line(line)
+            indent
+            @output += "#{line}"
+            newline
         end
     end
 end

data/lib/rescodegen/key_generator/code_safe_key_generator.rb

@@ -0,0 +1,44 @@
+
+module Rescodegen
+                 
+    class CodeSafeKeyGenerator
+
+        def code_safe_keys_from_keys(keys)
+            keys.map { |key|
+                key.replace_string_format_specifiers
+                .replace_unsupported_characters
+                .replace_whitespace
+                .remove_duplicate_underscores
+                .trim_underscores
+                .protect_from_numbers
+            }
+        end
+    end
+end
+
+private
+    class String
+        def replace_string_format_specifiers
+            gsub(/%\.[0-9]f|%[a-zA-Z@]+/, "_")
+        end
+
+        def replace_unsupported_characters
+            gsub(/[^a-zA-Z0-9]/, "_")
+        end
+
+        def replace_whitespace
+            gsub(/\s+/, "_")
+        end
+
+        def remove_duplicate_underscores
+            gsub(/_+/, "_")
+        end
+
+        def trim_underscores
+            gsub(/^_|_$/, "")
+        end
+
+        def protect_from_numbers
+            sub(/(^[0-9])/, "_\\1")
+        end
+    end

data/lib/rescodegen/key_generator/key_generator.rb

@@ -0,0 +1,24 @@
+
+module Rescodegen
+
+    class KeyGenerator
+
+        attr_reader :key_reader
+        attr_reader :code_safe_key_generator
+        attr_reader :file_path
+
+        def initialize(key_reader, code_safe_key_generator, file_path)
+            @key_reader = key_reader
+            @code_safe_key_generator = code_safe_key_generator
+            @file_path = file_path
+        end
+
+        def keys
+            key_reader.read_keys_from_lines File.open(file_path).readlines
+        end
+
+        def code_safe_keys
+            code_safe_key_generator.code_safe_keys_from_keys keys
+        end
+    end
+end

data/lib/rescodegen/key_reader/strings_key_reader.rb

@@ -0,0 +1,27 @@
+
+module Rescodegen
+
+    class StringsKeyReader
+
+        def read_keys_from_lines(lines)
+            lines.map(&method(:encode_line_with_utf8))
+            .select(&method(:line_contains_key))
+            .map(&method(:extract_key))
+        end
+
+        private
+            def encode_line_with_utf8(line)
+                line.encode("UTF-8", :invalid=>:replace, :replace=>"?").encode('UTF-8')
+            end
+
+            def line_contains_key(line)
+                return false if line.size == 0
+                line[0] == "\""
+            end
+
+            def extract_key(line) 
+                line.sub(/\n$/, "")
+                .sub(/(")(.*)(" = ".*)/, "\\2")
+            end
+    end
+end

data/lib/rescodegen/key_reader/stringsdict_key_reader.rb

@@ -0,0 +1,13 @@
+require 'plist'
+
+module Rescodegen
+
+    class StringsdictKeyReader
+
+        def read_keys_from_lines(lines)
+            plist = Plist::parse_xml lines.join("\n")
+            raise "Invalid plist file" if plist.nil?
+            plist.map { |k, _| k }
+        end
+    end
+end

data/lib/rescodegen/version.rb

@@ -1,3 +1,3 @@
 module Rescodegen
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/rescodegen.gemspec

@@ -18,8 +18,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_runtime_dependency "plist", "= 3.2.0"
+
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "simplecov", "~> 0.11"
+  spec.add_development_dependency "codeclimate-test-reporter", "~> 0.5"
+  spec.add_development_dependency "rspec", "~> 3.4"
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rescodegen
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Sean Henry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-03 00:00:00.000000000 Z
+date: 2016-03-08 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: plist
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +80,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.11'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
 description: 
 email:
 - hello@seanhenry.codes
@@ -87,7 +129,10 @@ files:
 - lib/rescodegen/code_generator/objc_main_strings_generator.rb
 - lib/rescodegen/code_generator/strings_generator.rb
 - lib/rescodegen/code_generator/swift_strings_generator.rb
-- lib/rescodegen/key_generator/strings_key_generator.rb
+- lib/rescodegen/key_generator/code_safe_key_generator.rb
+- lib/rescodegen/key_generator/key_generator.rb
+- lib/rescodegen/key_reader/strings_key_reader.rb
+- lib/rescodegen/key_reader/stringsdict_key_reader.rb
 - lib/rescodegen/version.rb
 - rescodegen.gemspec
 homepage: https://github.com/seanhenry/rescodegen

data/lib/rescodegen/key_generator/strings_key_generator.rb

@@ -1,34 +0,0 @@
-
-module Rescodegen
-    class StringsKeyGenerator
-
-        def self.create_from_file(input_file)
-            lines = File.open(input_file, "rb:UTF-16BE")
-            StringsKeyGenerator.new lines
-        end
-
-        def initialize(lines)
-            @keys = lines.map { |l| l.encode("UTF-8", :invalid=>:replace, :replace=>"?").encode('UTF-8') }
-            .reject { |l| l.strip == "" }
-            .select { |l| l[0] == "\"" }
-            .map do |line|
-                line.gsub(/\n$/, "")
-                .gsub(/(")(.*)(" = ".*)/, "\\2") # extracts key from "key" = "description"; format
-            end
-        end
-
-        def keys
-            @keys
-        end
-
-        def code_safe_keys
-            @keys.map do |key|
-                key.gsub(/%\.[0-9]f|%[a-zA-Z@]+/, "_") # replace %d, %ld, %.2f etc
-                .gsub(/[^a-zA-Z0-9]/, "_") # replace unsupported characters 
-                .gsub(/(\s|_)+/, "_") # replaces 1 or more occurance of whitespace and/or '_' with single '_'
-                .gsub(/^_|_$/, "") # remove _ from beginning and end 
-                .gsub(/(^[0-9])/, "_\\1") # add underscore at beginning if starts with number
-            end
-        end
-    end
-end