locraft 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 585cc878bec06aabeb780f92d6fdd1fabb16daf0
-  data.tar.gz: 6589e550e52cbb96f59b79e35af0928a11fdeb94
+  metadata.gz: bdf343f6f36939651039593e5dfb560ac7c9ec59
+  data.tar.gz: 7c005f83fb385fc1b14374d9e8737b76bd7380f0
 SHA512:
-  metadata.gz: 4fcc07735e43f7ffd3e2ded9ea69b817b9e1d088cfaf78b5817710862665b9023aa03a127818809e0a8fad7065d222a9eba6790a02765133c1e186f39fd274f0
-  data.tar.gz: 1026ace142c16d6f13621f584ba3b28107cc1f3f329fb7ca8fe9451cc1bccc923153a9421ba8fdfb78d54225d52146d82779a0fb1533e395cbddbed751213f35
+  metadata.gz: e23ce904dd832c5047e931708f9b3d0123f2a7852252634236724bc566645f9619cdd617a3c69bfba5f22b77bbe7e20ab4894ab56f09d3f9d5a4ec31331dbabe
+  data.tar.gz: 9bcb8f395b64df18c6270c12f4fb169d6c34419503095dbad02b6346be5095a4e1d0f4df64005e50635939221eb3011325b7296968f652573f147ca1627065c3

data/lib/locraft/config.rb

@@ -1,7 +1,7 @@
 module Locraft
-  STRINGS_EXTENSION = '.strings'
-  SWIFT = 'swift'
-  OBJC = 'objc'
+  STRINGS_EXTENSION = '.strings'.freeze
+  SWIFT = 'swift'.freeze
+  OBJC = 'objc'.freeze
 
   class Config
     attr_accessor :langs
@@ -22,7 +22,7 @@ module Locraft
 
     # fill automatically in load_from method
     attr_accessor :from_file
-
+    
     def initialize
       self.default_lang = 'English'
       self.gdoc_sheet = 0

data/lib/locraft/extractor.rb

@@ -1,8 +1,8 @@
 require_relative 'config'
 require_relative 'csv_parser'
-require_relative 'info_plist_generator'
-require_relative 'constants_generator'
-require_relative 'strings_generator'
+require_relative 'generators/info_plist_generator'
+require_relative 'generators/constants_generator'
+require_relative 'generators/strings_generator'
 require_relative 'google_drive_wrapper'
 
 module Locraft
@@ -34,7 +34,11 @@ module Locraft
 
     def generate_constant(localizations_hash)
       localizations = localizations_hash[@config.default_lang]
-      ConstantsGenerator.new(@config, localizations).generate
+      if @config.dev_lang.equal? OBJC
+        ObjcConstantsGenerator.new(@config, localizations).generate
+      else
+        SwiftConstantsGenerator.new(@config, localizations).generate
+      end
     end
   end
 end

data/lib/locraft/generators/constants_generator.rb

@@ -0,0 +1,46 @@
+require_relative '../config'
+require 'fileutils'
+
+module Locraft
+  class ConstantsGenerator
+    include FileUtils
+
+    def initialize(config, localizations)
+      @config = config
+      @localizations = localizations
+    end
+
+    def generate
+      raise NotImplementedError
+    end
+
+    def write_file_content(file, content)
+      File.open(file, 'w+') do |f|
+        f.puts files_header + "\n"
+        f.puts content
+      end
+    end
+
+    def files_name
+      @config.dev_prefix + @config.macro_file
+    end
+
+    def constants_keys
+      @localizations.select(&:valid?).map do |l|
+        { key: l.key, const: constant_from(l.key) }
+      end
+    end
+
+    def constant_from(_key)
+      raise NotImplementedError
+    end
+
+    def files_header
+      resource_file('macro_files_header.txt')
+    end
+
+    def resource_file(file)
+      File.read(File.expand_path("../../resources/#{file}", __FILE__))
+    end
+  end
+end

data/lib/locraft/{info_plist_generator.rb → generators/info_plist_generator.rb}

@@ -1,5 +1,5 @@
-require_relative 'config'
-require_relative 'localization'
+require_relative '../config'
+require_relative '../localization'
 require 'fileutils'
 
 module Locraft

data/lib/locraft/generators/objc_constants_generator.rb

@@ -0,0 +1,35 @@
+require_relative 'constants_generator'
+
+module Locraft
+  class ObjcConstantsGenerator < ConstantsGenerator
+    OBJC_CONST_TEMPLATE_H = 'extern NSString *const __nonnull %{const};'.freeze
+    OBJC_CONST_TEMPLATE_M = 'NSString *const %{const} = @"%{key}";'.freeze
+
+    def generate
+      destination_dir = @config.relative_macro_destination
+      mkdir_p destination_dir unless Dir.exist?(destination_dir)
+      write_file_content("#{destination_dir}/#{files_name}.h", h_file)
+      write_file_content("#{destination_dir}/#{files_name}.m", m_file)
+      puts 'constants files was created for [objc] language'
+    end
+
+    def m_file
+      content = %(#import "#{files_name}.h"\n\n)
+      content += constants_keys.map { |d| OBJC_CONST_TEMPLATE_M % d }.join("\n")
+      resource_file('objc_m_macro_template.txt') % content
+    end
+
+    def h_file
+      content = constants_keys.map { |d| OBJC_CONST_TEMPLATE_H % d }.join("\n")
+      resource_file('objc_h_macro_template.txt') % content
+    end
+
+    def constant_from(key)
+      parts = key.split(/\W/).select { |p| !p.empty? }.map do |p|
+        p[0] = p[0].capitalize
+        p
+      end
+      "k#{@config.dev_prefix}#{parts.join}Localized"
+    end
+  end
+end

data/lib/locraft/{strings_generator.rb → generators/strings_generator.rb}

@@ -1,5 +1,5 @@
-require_relative 'config'
-require_relative 'localization'
+require_relative '../config'
+require_relative '../localization'
 require 'fileutils'
 
 module Locraft
@@ -25,7 +25,7 @@ module Locraft
     end
 
     def strings_file_with(localizations)
-      localizations.select { |l| l.valid? }.map(&:to_line).join("\n")
+      localizations.select(&:valid?).map(&:to_line).join("\n")
     end
   end
 end

data/lib/locraft/generators/swift_constants_generator.rb

@@ -0,0 +1,35 @@
+require_relative 'constants_generator'
+
+module Locraft
+  class SwiftConstantsGenerator < ConstantsGenerator
+    def generate
+      destination_dir = @config.relative_macro_destination
+      mkdir_p destination_dir unless Dir.exist?(destination_dir)
+      write_file_content("#{destination_dir}/#{files_name}.swift", file)
+      puts 'constants files was created for [swift] language'
+    end
+
+
+    def file
+      content = constants_keys.map { |d| const_template % d }.join("\n")
+      resource_file('swift_macro_template.txt') % content
+    end
+
+    def const_template
+      <<EOF
+    static var %{const}: String {
+        return localized("%{key}")
+    }
+EOF
+    end
+
+    def constant_from(key)
+      parts = key.split(/\W/).select { |p| !p.empty? }
+      parts.map! do |p|
+        p[0] = p[0].capitalize if p != parts[0]
+        p
+      end
+      parts.join
+    end
+  end
+end

data/lib/locraft/initializer.rb

@@ -1,7 +1,7 @@
 module Locraft
 
-  SAMPLE_CONFIG_DIR = 'locraft'
-  SAMPLE_CONFIG_FILE = 'locraft.config'
+  SAMPLE_CONFIG_DIR = 'locraft'.freeze
+  SAMPLE_CONFIG_FILE = 'locraft.config'.freeze
 
   class Initializer
     def self.init
@@ -10,7 +10,7 @@ module Locraft
         warn 'ERROR: Initialization failed. There is already exists some locraft.config.'
       else
         Dir.mkdir(SAMPLE_CONFIG_DIR) unless Dir.exist?(SAMPLE_CONFIG_DIR)
-        File.write(SAMPLE_CONFIG_FILE, config)
+        File.write(File.join(SAMPLE_CONFIG_DIR, SAMPLE_CONFIG_FILE), config)
       end
     end
 

data/lib/locraft/resources/objc_h_macro_template.txt

@@ -0,0 +1,3 @@
+@import Foundation;
+
+%s

data/lib/locraft/resources/objc_m_macro_template.txt

@@ -0,0 +1 @@
+%s

data/lib/locraft/resources/sample_locraft.config

@@ -8,20 +8,26 @@ Locraft::Config.new do |conf|
   # @!optional
   ############
   conf.langs = {
-      'English' => 'en',
-      'Russian' => 'ru'
+    'English' => 'en',
+    'Russian' => 'ru'
   } # default: { 'English' => 'en', 'Russian' => 'ru' }
   conf.default_lang = 'English' # default: 'English'
   conf.gdoc_sheet = 0 # default: 0
   conf.gdoc_keys_column = 'Keys' # default: 'Keys'
   conf.gdoc_comments_column = 'Comments' # default: 'Comments'
-  conf.dev_lang = OBJC # OBJC or SWIFT, default: OBJC
+  conf.dev_lang = SWIFT # OBJC or SWIFT, default: SWIFT
   conf.dev_prefix = 'XYZ' # default: 'XYZ'
   conf.keys_map = {}
   conf.macro_file = 'LocalizedConstants' # default: 'LocalizedConstants'
   conf.macro_destination = './' # default: './'
+
+  # strings destination directory
+  # related to this file, default: './Localizations'
+  conf.strings_destination = './Localizations'
   conf.strings_basename = 'Localizable' # default: 'Localizable'
-  conf.strings_destination = './Localizations' # strings destination directory related to this file, default: './Localizations'
+
+  # info plist destination directory
+  # related to this file, default: './Localizations'
+  conf.info_plist_destination = './Localizations'
   conf.info_plist_basename = 'InfoPlist' # default: 'InfoPlist'
-  conf.info_plist_destination = './Localizations' # info plist destination directory related to this file, default: './Localizations'
 end

data/lib/locraft/resources/swift_macro_template.txt

@@ -0,0 +1,10 @@
+import Foundation
+
+struct Localized {
+    private static func localized(_ key: String, comment: String = "") -> String {
+        return NSLocalizedString(key, comment: comment)
+    }
+
+%s
+}
+

data/lib/locraft.rb

@@ -3,6 +3,8 @@ require_relative 'locraft/localization'
 require_relative 'locraft/initializer'
 require_relative 'locraft/runner'
 require_relative 'locraft/extractor'
-require_relative 'locraft/info_plist_generator'
-require_relative 'locraft/constants_generator'
-require_relative 'locraft/strings_generator'
+require_relative 'locraft/generators/info_plist_generator'
+require_relative 'locraft/generators/constants_generator'
+require_relative 'locraft/generators/swift_constants_generator'
+require_relative 'locraft/generators/objc_constants_generator'
+require_relative 'locraft/generators/strings_generator'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: locraft
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - sroik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-21 00:00:00.000000000 Z
+date: 2017-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google_drive
@@ -91,17 +91,22 @@ files:
 - bin/locraft
 - lib/locraft.rb
 - lib/locraft/config.rb
-- lib/locraft/constants_generator.rb
 - lib/locraft/csv_parser.rb
 - lib/locraft/extractor.rb
+- lib/locraft/generators/constants_generator.rb
+- lib/locraft/generators/info_plist_generator.rb
+- lib/locraft/generators/objc_constants_generator.rb
+- lib/locraft/generators/strings_generator.rb
+- lib/locraft/generators/swift_constants_generator.rb
 - lib/locraft/google_drive_wrapper.rb
-- lib/locraft/info_plist_generator.rb
 - lib/locraft/initializer.rb
 - lib/locraft/localization.rb
-- lib/locraft/resources/constants_files_header.txt
+- lib/locraft/resources/macro_files_header.txt
+- lib/locraft/resources/objc_h_macro_template.txt
+- lib/locraft/resources/objc_m_macro_template.txt
 - lib/locraft/resources/sample_locraft.config
+- lib/locraft/resources/swift_macro_template.txt
 - lib/locraft/runner.rb
-- lib/locraft/strings_generator.rb
 homepage: https://github.com/app-craft/locraft
 licenses:
 - MIT
@@ -122,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: locraft

data/lib/locraft/constants_generator.rb

@@ -1,73 +0,0 @@
-require_relative 'config'
-require 'fileutils'
-
-module Locraft
-  class ConstantsGenerator
-    include FileUtils
-
-    OBJC_CONST_TEMPLATE_H = 'extern NSString *const __nonnull %{const};'
-    OBJC_CONST_TEMPLATE_M = 'NSString *const %{const} = @"%{key}";'
-    SWIFT_CONST_TEMPLATE = 'let %{const}: String = "%{key}"'
-
-    def initialize(config, localizations)
-      @config = config
-      @localizations = localizations
-    end
-
-    def generate
-      destination_dir = @config.relative_macro_destination
-      mkdir_p destination_dir unless Dir.exist?(destination_dir)
-      if @config.dev_lang.equal?(OBJC)
-        write_to("#{destination_dir}/#{files_name}.h", h_file)
-        write_to("#{destination_dir}/#{files_name}.m", m_file)
-      else
-        write_to("#{destination_dir}/#{files_name}.swift", swift_file)
-      end
-      puts "constants files was created for [#{@config.dev_lang}] language"
-    end
-
-    def write_to(file, content)
-      File.open(file, 'w+') do |f|
-        f.puts files_header + "\n"
-        f.puts content
-      end
-    end
-
-    def files_header
-      File.read(File.expand_path('../resources/constants_files_header.txt', __FILE__))
-    end
-
-    def files_name
-      @config.dev_prefix + @config.macro_file
-    end
-
-    def m_file
-      file = %(#import "#{files_name}.h"\n)
-      file + constants_keys.map { |d| OBJC_CONST_TEMPLATE_M % d }.join("\n")
-    end
-
-    def h_file
-      file = "@import Foundation;\n"
-      file + constants_keys.map { |d| OBJC_CONST_TEMPLATE_H % d }.join("\n")
-    end
-
-    def swift_file
-      file = "import Foundation\n"
-      file + constants_keys.map { |d| SWIFT_CONST_TEMPLATE % d }.join("\n")
-    end
-
-    def constants_keys
-      @localizations.select(&:valid?).map do |l|
-        { key: l.key, const: constant_from(l.key) }
-      end
-    end
-
-    def constant_from(key)
-      parts = key.split(/\W/).select { |p| !p.empty? }.map do |p|
-        p[0] = p[0].capitalize
-        p
-      end
-      "k#{@config.dev_prefix}#{parts.join}Localized"
-    end
-  end
-end