lokale 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8306f8c00603bf616bf961689c9936e9a28f901a
-  data.tar.gz: e7d128b7bca1c820bfd51372a688679f1be7cf0e
+  metadata.gz: 6425966414bd882a98b6cbb366a9f48df3b0776d
+  data.tar.gz: 9b5a5fe54afcbda06146fa65e937dde04c16ece6
 SHA512:
-  metadata.gz: e257d6840e3d282a1255a77570eda0db65956dde7fb26a863befd216f6efe5393c00025463611dc4547360a35582e959664be6849258f14fcd531f7ad5085227
-  data.tar.gz: '09a4e2acce57ba98840c9b097eac20195f6df8ed8933a5547868533cc3b1c5e0469743dbbe8f0a48fbc29bc785cfb6be74627a40c35f6b8a38c03db5c4e3b47f'
+  metadata.gz: fd132a13d0249ea7f8c94ddeed7779829180d843dc3436caf2437d3473ade3d54e25d73be77eebd920dd506be983d064d6d8654ba6132945320ccb36f57f3e48
+  data.tar.gz: 2ec72066af3f7dfab0fc17543e71c046cca22e10a8aa1fbd20e55f6e2d0371111e7d76cabb1cf67542c6c3d9dbc85b80916dbb356e4f4d176855d2b24a5d8724

data/lib/lokale.rb

@@ -45,6 +45,11 @@ module Lokale
       print "Creating config file...".blue
       Config.get.create_default_file
     end
+
+    def perform_add_to_proj(agent, reporter)
+      print "Creating project file...".blue
+      agent.write_to_project_file
+    end
   end
 end
 

data/lib/lokale/.lokale

@@ -1,6 +1,7 @@
 
 add_macro "NSLocalizedString" do |m|
   m.localization_file = "Localizable.strings"
+  m.project_file = "Strings.swift"
 
   m.regex = /NSLocalizedString\("(.+?)",\s*comment:\s*"(.*?)"\)/
   m.key_index = 0

data/lib/lokale/agent.rb

@@ -6,6 +6,32 @@ require "xliffle"
 require "xliffer"
 require "set"
 
+class Hash
+  def set_by_key_path(key_path, val)
+    last_hash = self
+    last_key = key_path.pop
+    key_path.each do |k|
+      if last_hash.has_key? k 
+        last_hash = last_hash[k]
+      else
+        new_hash = Hash.new
+        last_hash[k] = new_hash
+        last_hash = new_hash
+      end
+    end
+    
+    last_hash[last_key] = val
+  end
+end
+
+class String
+  def camelize(type=:upper)
+    case type
+    when :upper then return self[0].upcase + self[1..-1]
+    when :lower then return self[0].downcase + self[1..-1]
+    end       
+  end
+end
 
 module Lokale
   class LFile
@@ -29,7 +55,10 @@ module Lokale
 
   class LString
     def write_format
-      note = @note || "(no comment)"
+      note = @note unless @note.empty?
+      note = @source if note.nil?
+      note = "(no comment)" if note.nil?
+
       "/* #{note} */\n\"#{key}\" = \"#{str}\";\n"
     end
 
@@ -43,10 +72,6 @@ module Lokale
       str
     end
 
-
-
-    attr_accessor :source
-
     def for_export(lang)
       str = LString.new(@key, nil, @note, lang)
       str.source = @str
@@ -59,11 +84,12 @@ end
 
 module Lokale 
   class Agent
-    attr_reader :proj_path, :macros, :lfiles, :sfiles_proceeded
+    attr_reader :proj_path, :macros, :lfiles, :sfiles_proceeded, :project_lfiles
 
     def initialize(proj_path, macros)
       @proj_path = proj_path
       @macros = macros
+      @project_lfiles = []
 
       @writer = Writer.new
       @exporter = Exporter.new
@@ -83,6 +109,10 @@ module Lokale
       end
     end
 
+    def self.source_file?(path)
+      (File.directory?(path) == false) && (path =~ /\/Pods\//).nil? && ((path =~ /\.(swift|h|m)$/) != nil)
+    end
+
     def get_localization_files
       return @lfiles unless @lfiles.nil?
       @lfiles = proj_files.map { |file| LFile.try_to_read(file) }.compact
@@ -93,7 +123,7 @@ module Lokale
 
       @sfiles_proceeded = 0
       proj_files do |file| 
-        next unless file.source_file?        
+        next unless Agent.source_file? file
 
         file_content = File.read(file)
         @macros.each { |macro| macro.read_from file_content }
@@ -101,9 +131,25 @@ module Lokale
       end
     end
 
+    def find_project_lfiles
+      macro_proj_files = @macros.map { |m| m.project_file }.compact
+      return if macro_proj_files.empty?
+
+      h = Hash.new
+      proj_files do |f|
+        macro_proj_files.each do |pf|
+          h[pf] = f if f.chomp(pf) != f
+        end
+      end
+
+      return h
+    end
+
     ###
 
     def copy_base
+      return if Config.get.base_lang.nil? || Config.get.main_lang.nil?
+
       main_lfiles = @lfiles.group_by { |f| f.lang }[Config.get.main_lang].select { |f| f.strings_file? }
       base_lfiles = @lfiles.group_by { |f| f.lang }[Config.get.base_lang].select { |f| f.strings_file? }
 
@@ -142,6 +188,20 @@ module Lokale
     def try_to_import
       @importer.import_strings(self, @writer)
     end
+
+    def write_to_project_file
+      strings_to_write = Hash.new { |h, k| h[k] = [] }
+      @macros.each do |m|
+        next if m.project_file.nil?
+        next if m.found_strings.nil?
+        strings_to_write[m.project_file] += m.found_strings.keys
+      end
+
+      pfiles_pathes = find_project_lfiles
+      strings_to_write.each do |file, lstrings|
+        @writer.write_to_project_file(lstrings, pfiles_pathes[file])
+      end
+    end
   end
 
   class Writer 
@@ -175,6 +235,35 @@ module Lokale
       content.insert(append_at, data_to_append)
       file.write(content)
     end
+
+    def hash_string(hash, depth)
+      total_string = ""
+      tab = "    " * depth
+      hash.each do |k, v|
+        case v
+        when LString
+          total_string += tab + "static let #{v.key.split(".")[-1].camelize(:lower)} = NSLocalizedString(\"#{v.key}\", comment:\"#{v.note}\")\n"
+        when Hash
+          total_string += tab + "\n"
+          total_string += tab + "class #{k.camelize} {\n"
+          total_string += hash_string(v, depth + 1)
+          total_string += tab + "}\n\n"
+        end
+      end
+
+      total_string
+    end
+
+    def write_to_project_file(lstrings, file)
+      root = Hash.new
+      lstrings.each do |ls|
+        root.set_by_key_path ls.key.split("."), ls
+      end
+
+      content = "\nextension String {\n\n" + hash_string(root, 1) + "}\n"
+      File.write(file, content)
+
+    end
   end
 
 

data/lib/lokale/config.rb

@@ -16,6 +16,7 @@ module Lokale
     def self.export;           Action.new(:export)          end  
     def self.import;           Action.new(:import)          end  
     def self.create_config;    Action.new(:create_config)   end  
+    def self.add_to_proj;      Action.new(:add_to_proj)     end
   end
 
   class Config
@@ -54,6 +55,10 @@ module Lokale
           actions << Action.create_config
         end
 
+        opts.on("-p", "--add-to-project", "Creates project strings file") do |n|
+          actions << Action.add_to_proj
+        end
+
         opts.on("-h", "--help", "Prints this help") do
           puts opts
           exit

data/lib/lokale/lokalefile.rb

@@ -7,6 +7,7 @@ module Lokale
 
 add_macro "NSLocalizedString" do |m|
   m.localization_file = "Localizable.strings"
+  m.project_file = "Strings.swift"
 
   m.regex = /NSLocalizedString\\("(.+?)",\\s*comment:\\s*"(.*?)"\\)/
   m.key_index = 0

data/lib/lokale/model.rb

@@ -1,21 +1,7 @@
 
-class String
-  def localization_file?
-    File.directory?(self) == false &&
-        (self =~ /\/Pods\//) == nil &&
-        (self =~ /\.bundle\//) == nil &&
-        (self =~ /\/(.{1,8})\.lproj\//)
-  end
-
-  def source_file?
-    (File.directory?(self) == false) && (self =~ /\/Pods\//).nil? && ((self =~ /\.(swift|h|m)$/) != nil)
-  end
-end
-
-
 module Lokale
   class LString
-    attr_accessor :key, :str, :note, :target
+    attr_accessor :key, :str, :note, :target, :source
 
     def initialize(key, str, note, target)
       @key = key; @str = str; @note = note; @target = target
@@ -46,12 +32,19 @@ module Lokale
       @lang = $1
     end
 
+    def self.localization_file?(path)
+	    File.directory?(path) == false &&
+        (path =~ /\/Pods\//) == nil &&
+        (path =~ /\.bundle\//) == nil &&
+        (path =~ /\/(.{1,8})\.lproj\//)
+	  end
+
     def self.try_to_read(file_path)
-      return nil unless file_path.localization_file?
+      return nil unless localization_file? file_path
       LFile.new(file_path)
     end
 
-    def inspect 
+    def inspect
       "<LF:#{@lang}/#{full_name}>"
     end
 
@@ -84,7 +77,7 @@ module Lokale
   #
 
   class Macro
-    attr_accessor :regex, :name, :localization_file, :key_index, :note_index
+    attr_accessor :regex, :name, :localization_file, :key_index, :note_index, :project_file
     attr_reader :found_strings
 
     def initialize(name)
@@ -113,7 +106,6 @@ module Lokale
     def total_count
       @found_strings.values.reduce(:+) || 0
     end
-
   end
 end
 

data/lib/lokale/util.rb

@@ -6,6 +6,10 @@ class String
   def lpadded(count=20)
     "%#{count}.#{count}s" % self
   end
+
+  def nil?
+    empty?
+  end
 end
 
 module Then

data/lib/lokale/version.rb

@@ -1,3 +1,3 @@
 module Lokale
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lokale
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Anton Onizhuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-19 00:00:00.000000000 Z
+date: 2017-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xliffle