translatomatic 0.1.0 → 0.1.1

data/lib/translatomatic/resource_file/resw.rb

@@ -0,0 +1,30 @@
+module Translatomatic::ResourceFile
+  class RESW < XML
+
+    # (see Translatomatic::ResourceFile::Base.extensions)
+    def self.extensions
+      %w{resw}
+    end
+
+    # (see Translatomatic::ResourceFile::Base#locale_path)
+    def locale_path(locale)
+      # e.g. strings/en-US/resources.resw
+      dir = path.dirname
+      dir.parent + locale.to_s + path.basename
+    end
+
+    private
+
+    def create_nodemap(doc)
+      result = {}
+      key_values = doc.search('//data/@name|//text()')
+      key_values.each_slice(2) do |key, value|
+        key = key.value
+        value = value
+        result[key] = value
+      end
+      result
+    end
+
+  end # class
+end   # module

data/lib/translatomatic/resource_file/text.rb

@@ -1,28 +1,29 @@
-module Translatomatic::ResourceFile
-  class Text < Base
-
-    def self.extensions
-      %w{txt md text}
-    end
-
-    # (see Translatomatic::ResourceFile::Base#initialize)
-    def initialize(path, locale = nil)
-      super(path, locale)
-      @valid = true
-      @properties = @path.exist? ? read(@path) : {}
-    end
-
-    # (see Translatomatic::ResourceFile::Base#save(target))
-    def save(target = path)
-      values = @properties.values.collect { |i| i.strip + "\n" }
-      target.write(values.join)
-    end
-
-    private
-
-    def read(path)
-      text = path.read
-      { "text" => text }
-    end
-  end
-end
+module Translatomatic::ResourceFile
+  class Text < Base
+
+    # (see Translatomatic::ResourceFile::Base.extensions)
+    def self.extensions
+      %w{txt text}
+    end
+
+    # (see Translatomatic::ResourceFile::Base#initialize)
+    def initialize(path, locale = nil)
+      super(path, locale)
+      @valid = true
+      @properties = @path.exist? ? read(@path) : {}
+    end
+
+    # (see Translatomatic::ResourceFile::Base#save)
+    def save(target = path, options = {})
+      values = @properties.values.collect { |i| i.strip + "\n" }
+      target.write(values.join)
+    end
+
+    private
+
+    def read(path)
+      text = path.read
+      { "text" => text }
+    end
+  end
+end

data/lib/translatomatic/resource_file/xcode_strings.rb

@@ -1,65 +1,71 @@
-module Translatomatic::ResourceFile
-
-  # XCode strings file
-  # @see https://developer.apple.com/library/content/documentation/Cocoa/Conceptual/LoadingResources/Strings/Strings.html
-  class XCodeStrings < Base
-
-    def self.extensions
-      %w{strings}
-    end
-
-    # (see Translatomatic::ResourceFile::Base#initialize)
-    def initialize(path, locale = nil)
-      super(path, locale)
-      @valid = true
-      @properties = @path.exist? ? read(@path) : {}
-    end
-
-    # (see Translatomatic::ResourceFile::Base#locale_path)
-    # @note localization files in XCode use the following file name
-    #   convention: Project/locale.lproj/filename
-    def locale_path(locale)
-      if path.to_s.match(/\/([-\w]+).lproj\/.+.strings$/)
-        # xcode style
-        filename = path.basename
-        path.parent.parent + (locale.to_s + ".lproj") + filename
-      else
-        super(locale)
-      end
-    end
-
-    # (see Translatomatic::ResourceFile::Base#save(target))
-    def save(target = path)
-      out = ""
-      properties.each do |key, value|
-        key = escape(key)
-        value = escape(value)
-        out += %Q{"#{key}" = "#{value}";\n}
-      end
-      target.write(out)
-    end
-
-    private
-
-    def read(path)
-      result = {}
-      content = path.read
-      uncommented = content.gsub(/\/\*.*?\*\//, '')
-      key_values = uncommented.scan(/"(.*?[^\\])"\s*=\s*"(.*?[^\\])"\s*;/m)
-      key_values.each do |entry|
-        key, value = entry
-        result[unescape(key)] = unescape(value)
-      end
-      result
-    end
-
-    def unescape(string)
-      string ? string.gsub(/\\(["'])/) { |i| i } : ''
-    end
-
-    def escape(string)
-      string ? string.gsub(/["']/) { |i| "\\#{i}" } : ''
-    end
-
-  end
-end
+module Translatomatic::ResourceFile
+
+  # XCode strings file
+  # @see https://developer.apple.com/library/content/documentation/Cocoa/Conceptual/LoadingResources/Strings/Strings.html
+  class XCodeStrings < Base
+
+    # (see Translatomatic::ResourceFile::Base.extensions)
+    def self.extensions
+      %w{strings}
+    end
+
+    # (see Translatomatic::ResourceFile::Base#initialize)
+    def initialize(path, locale = nil)
+      super(path, locale)
+      @valid = true
+      @properties = @path.exist? ? read(@path) : {}
+    end
+
+    # (see Translatomatic::ResourceFile::Base#locale_path)
+    # @note localization files in XCode use the following file name
+    #   convention: Project/locale.lproj/filename
+    def locale_path(locale)
+      if path.to_s.match(/\/([-\w]+).lproj\/.+.strings$/)
+        # xcode style
+        filename = path.basename
+        path.parent.parent + (locale.to_s + ".lproj") + filename
+      else
+        super(locale)
+      end
+    end
+
+    # (see Translatomatic::ResourceFile::Base#save)
+    def save(target = path, options = {})
+      out = ""
+      out += comment(created_by) unless options[:no_created_by]
+      properties.each do |key, value|
+        key = escape(key)
+        value = escape(value)
+        out += %Q{"#{key}" = "#{value}";\n}
+      end
+      target.write(out)
+    end
+
+    private
+
+    def comment(text)
+      "/* #{text} */\n"
+    end
+
+    def read(path)
+      result = {}
+      content = path.read
+      uncommented = content.gsub(/\/\*.*?\*\//, '')
+      key_values = uncommented.scan(/"(.*?[^\\])"\s*=\s*"(.*?[^\\])"\s*;/m)
+      key_values.each do |entry|
+        key, value = entry
+        result[unescape(key)] = unescape(value)
+      end
+      result
+    end
+
+    def unescape(string)
+      string ? string.gsub(/\\(["'])/) { |i| i } : ''
+    end
+
+    def escape(string)
+      string ? string.gsub(/["']/) { |i| "\\#{i}" } : ''
+    end
+
+  end
+end

data/lib/translatomatic/resource_file/xml.rb

@@ -1,64 +1,84 @@
-module Translatomatic::ResourceFile
-  class XML < Base
-
-    def self.extensions
-      %w{xml}
-    end
-
-    # (see Translatomatic::ResourceFile::Base#initialize)
-    def initialize(path, locale = nil)
-      super(path, locale)
-      @valid = true
-      @properties = @path.exist? ? read(@path) : {}
-    end
-
-    # (see Translatomatic::ResourceFile::Base#set)
-    def set(key, value)
-      super(key, value)
-      @nodemap[key].content = value if @nodemap.include?(key)
-    end
-
-    # (see Translatomatic::ResourceFile::Base#save(target))
-    def save(target = path)
-      target.write(@doc.to_xml) if @doc
-    end
-
+module Translatomatic::ResourceFile
+  class XML < Base
+
+    # (see Translatomatic::ResourceFile::Base.extensions)
+    def self.extensions
+      %w{xml}
+    end
+
+    # (see Translatomatic::ResourceFile::Base#initialize)
+    def initialize(path, locale = nil)
+      super(path, locale)
+      @valid = true
+      @properties = @path.exist? ? read(@path) : {}
+    end
+
+    # (see Translatomatic::ResourceFile::Base#set)
+    def set(key, value)
+      super(key, value)
+      @nodemap[key].content = value if @nodemap.include?(key)
+    end
+
+    # (see Translatomatic::ResourceFile::Base#save)
+    def save(target = path, options = {})
+      if @doc
+        add_created_by unless options[:no_created_by]
+        target.write(@doc.to_xml)
+      end
+    end
+
     private
 
-    # initialize nodemap from nokogiri document
-    # returns property hash
-    def init_nodemap(doc)
-      # map of key1 => node, key2 => node, ...
-      @nodemap = flatten_xml(doc)
-      # map of key => node content
-      @nodemap.transform_values { |v| v.content }
-    end
-
-    # parse key = value property file
-    def read(path)
-      begin
-        # parse xml with nokogiri
-        @doc = Nokogiri::XML(path.open) do |config|
-          config.noblanks
-        end
-        init_nodemap(@doc)
-      rescue Exception
-        @valid = false
-        {}
-      end
-    end
-
-    def flatten_xml(doc)
-      result = {}
+    def comment(text)
+      @doc.create_comment(text)
+    end
+
+    # initialize nodemap from nokogiri document
+    # returns property hash
+    def init_nodemap(doc)
+      # map of key1 => node, key2 => node, ...
+      @nodemap = create_nodemap(doc)
+      # map of key => node content
+      @nodemap.transform_values { |v| v.content }
+    end
+
+    # parse xml
+    def read(path)
+      begin
+        # parse xml with nokogiri
+        @doc = read_doc(path)
+        init_nodemap(@doc)
+      rescue Exception => e
+        log.error(e.message)
+        @valid = false
+        {}
+      end
+    end
+
+    def read_doc(path)
+      Nokogiri::XML(path.open) do |config|
+        config.noblanks
+      end
+    end
+
+    def create_nodemap(doc)
+      result = {}
       text_nodes = doc.search(text_nodes_xpath)
-      text_nodes.each_with_index do |node, i|
-        result["key#{i + 1}"] = node
-      end
-      result
+      idx = 1
+      text_nodes.each do |node|
+        next if whitespace?(node.content)
+        result["key#{idx}"] = node
+        idx += 1
+      end
+      result
+    end
+
+    def text_nodes_xpath
+      '//text()'
     end
 
-    def text_nodes_xpath
-      '//text()'
-    end
-  end # class
-end   # module
+    def whitespace?(text)
+      text == nil || text.strip.length == 0
+    end
+  end # class
+end   # module

data/lib/translatomatic/resource_file/yaml.rb

@@ -1,80 +1,82 @@
-require 'yaml'
-
-module Translatomatic::ResourceFile
-  class YAML < Base
-
-    def self.extensions
-      %w{yml yaml}
-    end
-
-    # (see Translatomatic::ResourceFile::Base#initialize)
-    def initialize(path, locale = nil)
-      super(path, locale)
-      @valid = true
-      @data = {}
-      @properties = @path.exist? ? read : {}
-    end
-
-    # (see Translatomatic::ResourceFile::Base#locale_path)
-    # @note localization files in rails use the following file name
-    #   convention: config/locales/en.yml.
-    def locale_path(locale)
-      if path.to_s.match(/config\/locales\/[-\w]+.yml$/)
-        # rails style
-        filename = locale.to_s + path.extname
-        path.dirname + filename
-      else
-        super(locale)
-      end
-    end
-
-    # (see Translatomatic::ResourceFile::Base#set)
-    def set(key, value)
-      super(key, value)
-
-      hash = @data
-      path = key.split(/\./)
-      last_key = path.pop
-      path.each { |i| hash = (hash[i] ||= {}) }
-      hash[last_key] = value
-    end
-
-    # (see Translatomatic::ResourceFile::Base#save(target))
-    def save(target = path)
-      out = @data.to_yaml
-      out.sub!(/^---\n/m, '')
-      target.write(out)
-    end
-
-    private
-
-    def read
-      begin
-        @data = ::YAML.load_file(@path) || {}
-        flatten_data(@data)
-      rescue Exception
-        @valid = false
-        {}
-      end
-    end
-
-    def flatten_data(data)
-      result = {}
-      unless data.kind_of?(Hash)
-        @valid = false
-        return {}
-      end
-      data.each do |key, value|
-        if value.kind_of?(Hash)
-          children = flatten_data(value)
-          children.each do |ck, cv|
-            result[key + "." + ck] = cv
-          end
-        else
-          result[key] = value
-        end
-      end
-      result
-    end
-  end
-end
+require 'yaml'
+
+module Translatomatic::ResourceFile
+  class YAML < Base
+
+    # (see Translatomatic::ResourceFile::Base.extensions)
+    def self.extensions
+      %w{yml yaml}
+    end
+
+    # (see Translatomatic::ResourceFile::Base#initialize)
+    def initialize(path, locale = nil)
+      super(path, locale)
+      @valid = true
+      @data = {}
+      @properties = @path.exist? ? read : {}
+    end
+
+    # (see Translatomatic::ResourceFile::Base#locale_path)
+    # @note localization files in rails use the following file name
+    #   convention: config/locales/en.yml.
+    def locale_path(locale)
+      if path.to_s.match(/config\/locales\/[-\w]+.yml$/)
+        # rails style
+        filename = locale.to_s + path.extname
+        path.dirname + filename
+      else
+        super(locale)
+      end
+    end
+
+    # (see Translatomatic::ResourceFile::Base#set)
+    def set(key, value)
+      super(key, value)
+
+      hash = @data
+      path = key.split(/\./)
+      last_key = path.pop
+      path.each { |i| hash = (hash[i] ||= {}) }
+      hash[last_key] = value
+    end
+
+    # (see Translatomatic::ResourceFile::Base#save)
+    def save(target = path, options = {})
+      out = @data.to_yaml
+      out.sub!(/^---\n/m, '')
+      target.write(out)
+    end
+
+    private
+
+    def read
+      begin
+        @data = ::YAML.load_file(@path) || {}
+        flatten_data(@data)
+      rescue Exception => e
+        log.error(e.message)
+        @valid = false
+        {}
+      end
+    end
+
+    def flatten_data(data)
+      result = {}
+      unless data.kind_of?(Hash)
+        @valid = false
+        return {}
+      end
+      data.each do |key, value|
+        if value.kind_of?(Hash)
+          children = flatten_data(value)
+          children.each do |ck, cv|
+            result[key + "." + ck] = cv
+          end
+        else
+          result[key] = value
+        end
+      end
+      result
+    end
+  end
+end