rescodegen 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 136d0b761e58c2f09bb8bb731158e274489a7934
-  data.tar.gz: 32fa0490730335d87ab6c81112a896cca7e6e0b5
+  metadata.gz: a1cc0746cc5d75abad97618260d6ffde5db9d0d6
+  data.tar.gz: 67019eadc6cbeea942d08a196076bd66cc25988e
 SHA512:
-  metadata.gz: 461b685f603733ddd318bb16cff004a1ea6dbea1deffe5a233bb17d39370884868e4845882b66219692cd5f949d4835e4a5ccd1e214523653c72e45e7a2469a4
-  data.tar.gz: 68ee217657dfc31488661db3a3c6d8169a9bedafee8fca043a79ec0ea8a3c5e7d67aa11c89c55b99c4e1e956f163a0f217a67be027c03e0cc126b953210726be
+  metadata.gz: 8f697b4fdfed3a5ae98ab871538cdea35f349619146ce1a815d6c4e1e02601c1165d27ab04f826b216821c316c7dcf66eabe37e58b7aa8c9d0a9e72d5b734613
+  data.tar.gz: 0ce98a4477650c9f99924dbcee497847cde935fba36675b01d924709f443fcd684532d495f5283f834da695a8e9350e9df32b6f8551fe7f6107eeaec503e45a8

data/Gemfile.lock

@@ -1,13 +1,20 @@
 PATH
   remote: .
   specs:
-    rescodegen (0.1.0)
+    rescodegen (0.1.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    minitest (5.4.3)
-    rake (10.4.2)
+    docile (1.1.5)
+    json (1.8.3)
+    minitest (5.8.4)
+    rake (10.5.0)
+    simplecov (0.11.2)
+      docile (~> 1.1.0)
+      json (~> 1.8)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
 
 PLATFORMS
   ruby
@@ -17,6 +24,7 @@ DEPENDENCIES
   minitest (~> 5.0)
   rake (~> 10.0)
   rescodegen!
+  simplecov (~> 0.11)
 
 BUNDLED WITH
    1.11.2

data/README.md

@@ -10,8 +10,9 @@ A command line tool for creating Swift and Objective-C code from localizable str
 
 |Option|Value|Description   |
 |---|---|---|
-|-l|swift\|objc|The language of the generated code|
-|-o|directory|Where to generate the files|
+|-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.|
 ## Example
 ### Localizable.strings  
 
@@ -35,4 +36,4 @@ Access localised strings using the `localizedString` property.
 `Strings.Singular.homeScreen_alert_loadErrorMessage.localizedString`
 ### Objective-C
 Access localised strings using the `LocalizedSingularString` function.
-`LocalizedSingularString(SingularStringHomeScreen_alert_loadErrorMessage);`
+`LocalizedSingularString(SingularString_homeScreen_alert_loadErrorMessage);`

data/bin/rescodegen

@@ -12,10 +12,9 @@ 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/code_formatter/swift_code_formatter'
-require 'rescodegen/code_formatter/objc_code_formatter'
+require 'rescodegen/code_formatter/code_formatter'
 
-options = { output: ".", language: "swift" }
+options = { output: ".", language: "swift", prefix: "" }
 
 parser = OptionParser.new do |opts|
     opts.banner = "Usage: rescodegen [options] input_file"
@@ -27,29 +26,30 @@ parser = OptionParser.new do |opts|
     opts.on("-o", "--output=directory", "Directory to create file.") do |o|
         options[:output] = o
     end
+    opts.on("-p", "--prefix=PREFIX", "Optional prefix for Objective-C types.") do |p|
+        options[:prefix] = p
+    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?
-output_file = options[:output] + "/Strings"
+output_file = options[:output] + "/" + options[:prefix] + "Strings"
 
 def generate_swift_file(code_safe_keys, keys, output_file)
-    formatter = Rescodegen::SwiftCodeFormatter.new
-    code_safe_keys = code_safe_keys.map { |k| formatter.format_string(k) }
     File.write(output_file + ".swift", Rescodegen::SwiftStringsGenerator.new.generate(code_safe_keys, keys))
 end
 
-def generate_objc_files(code_safe_keys, keys, output_file)
-    formatter = Rescodegen::ObjcCodeFormatter.new
-    code_safe_keys = code_safe_keys.map { |k| formatter.format_string(k) }
-    File.write(output_file + ".h", Rescodegen::ObjcHeaderStringsGenerator.new.generate(code_safe_keys, keys))
-    File.write(output_file + ".m", Rescodegen::ObjcMainStringsGenerator.new.generate(code_safe_keys, keys))
+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))
 end
 
 generator = Rescodegen::StringsKeyGenerator.create_from_file(input_file)
 keys = generator.keys
 code_safe_keys = generator.code_safe_keys
+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) if options[:language] == "objc"
+generate_objc_files(code_safe_keys, keys, output_file, options[:prefix]) if options[:language] == "objc"

data/lib/rescodegen/code_formatter/code_formatter.rb

@@ -2,7 +2,12 @@
 module Rescodegen
     class CodeFormatter
 
-    protected
+    def format_string(string)
+            string.sub(/^[A-Z]+/) { |s| downcase_string_unless_acronym(s) }
+            .gsub(/_[A-Z]+/) { |s| downcase_string_unless_acronym(s) }
+    end
+
+    private
         def downcase_string_unless_acronym(string)
             string.downcase! unless string.tr("_", "").size > 1
             string

data/lib/rescodegen/code_generator/objc_header_strings_generator.rb

@@ -3,13 +3,18 @@ require_relative 'strings_generator'
 module Rescodegen
     class ObjcHeaderStringsGenerator < StringsGenerator
 
+        def initialize(prefix)
+            @prefix = prefix
+        end
+
         def generate(keys, values)
             super(keys, values)
+            enum_name = prefix "SingularString"
             import_module("Foundation")
-            .start_enum("SingularString", "NSInteger")
-                .add_cases("SingularString", keys)
+            .start_enum(enum_name, "NSInteger")
+                .add_cases(enum_name, keys)
             .finish_enum
-            .add_c_method("NSString*", "LocalizedSingularString", "SingularString", "singularString")
+            .add_c_method("NSString*", prefix("LocalizedSingularString"), enum_name, "singularString")
             .newline
             @output
         end
@@ -38,7 +43,7 @@ module Rescodegen
         def add_cases(enum_name, keys)
             keys.each do |key|
                 indent
-                @output += "#{enum_name}#{key},"
+                @output += "#{enum_name}_#{key},"
                 newline
             end
             self

data/lib/rescodegen/code_generator/objc_main_strings_generator.rb

@@ -3,14 +3,19 @@ require_relative 'strings_generator'
 module Rescodegen
     class ObjcMainStringsGenerator < StringsGenerator
 
+        def initialize(prefix)
+            @prefix = prefix
+        end
+
         def generate(keys, values)
             super(keys, values)
+            enum_name = prefix "SingularString"
             newline
-            .import_header("Strings.h")
+            .import_header(prefix("Strings.h"))
             .newline
-            .start_c_method("NSString*", "LocalizedSingularString", "SingularString", "singularString")
+            .start_c_method("NSString*", prefix("LocalizedSingularString"), enum_name, "singularString")
                 .start_switch("singularString")
-                    .add_cases(keys.map { |k| "SingularString" + k }, values)
+                    .add_cases(keys.map { |k| enum_name + "_" + k }, values)
                 .close_brackets
             .close_brackets
             .newline
@@ -39,7 +44,7 @@ module Rescodegen
         def add_cases(keys, values)
             i = 0
             until i == keys.size
-                start_case(keys[i], values[i])
+                start_case(keys[i])
                     .return_value(localized_string(values[i]))
                 .finish_case
                 i += 1
@@ -54,7 +59,7 @@ module Rescodegen
             .finish_case
         end
 
-        def start_case(key, value)
+        def start_case(key)
             indent
             @output += "case #{key}:"
             newline

data/lib/rescodegen/code_generator/strings_generator.rb

@@ -10,6 +10,10 @@ module Rescodegen
 
     protected
 
+        def prefix(string)
+            @prefix + string
+        end
+
         def newline
             @output += "\n"
             self

data/lib/rescodegen/version.rb

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

data/rescodegen.gemspec

@@ -21,4 +21,5 @@ Gem::Specification.new do |spec|
   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"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rescodegen
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Sean Henry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-01 00:00:00.000000000 Z
+date: 2016-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.11'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.11'
 description: 
 email:
 - hello@seanhenry.codes
@@ -69,8 +83,6 @@ files:
 - bin/rescodegen
 - lib/rescodegen.rb
 - lib/rescodegen/code_formatter/code_formatter.rb
-- lib/rescodegen/code_formatter/objc_code_formatter.rb
-- lib/rescodegen/code_formatter/swift_code_formatter.rb
 - lib/rescodegen/code_generator/objc_header_strings_generator.rb
 - lib/rescodegen/code_generator/objc_main_strings_generator.rb
 - lib/rescodegen/code_generator/strings_generator.rb

data/lib/rescodegen/code_formatter/objc_code_formatter.rb

@@ -1,11 +0,0 @@
-require_relative 'code_formatter'
-
-module Rescodegen
-    class ObjcCodeFormatter < CodeFormatter
-
-        def format_string(string)
-            string.sub(/^[a-z]/, &:upcase)
-            .gsub(/_[A-Z]+/) { |s| downcase_string_unless_acronym(s) }
-        end
-    end
-end

data/lib/rescodegen/code_formatter/swift_code_formatter.rb

@@ -1,11 +0,0 @@
-require_relative 'code_formatter'
-
-module Rescodegen
-    class SwiftCodeFormatter < CodeFormatter
-
-        def format_string(string)
-            string.sub(/^[A-Z]+/) { |s| downcase_string_unless_acronym(s) }
-            .gsub(/_[A-Z]+/) { |s| downcase_string_unless_acronym(s) }
-        end
-    end
-end