twine 0.8.1 → 0.9.0

data/lib/twine/formatters/django.rb

@@ -29,73 +29,41 @@ module Twine
         return
       end
 
-      def read_file(path, lang)
+      def read(io, lang)
         comment_regex = /#\. *"?(.*)"?$/
         key_regex = /msgid *"(.*)"$/
         value_regex = /msgstr *"(.*)"$/m
 
-        encoding = Twine::Encoding.encoding_for_path(path)
-        sep = nil
-        if !encoding.respond_to?(:encode)
-          # This code is not necessary in 1.9.3 and does not work as it did in 1.8.7.
-          if encoding.end_with? 'LE'
-            sep = "\x0a\x00"
-          elsif encoding.end_with? 'BE'
-            sep = "\x00\x0a"
-          else
-            sep = "\n"
+        last_comment = nil
+        while line = io.gets          
+          comment_match = comment_regex.match(line)
+          if comment_match
+            comment = comment_match[1]
           end
-        end
-
-        if encoding.index('UTF-16')
-          mode = "rb:#{encoding}"
-        else
-          mode = "r:#{encoding}"
-        end
-
-        File.open(path, mode) do |f|
-          last_comment = nil
-          while line = (sep) ? f.gets(sep) : f.gets
-            if encoding.index('UTF-16')
-              if line.respond_to? :encode!
-                line.encode!('UTF-8')
-              else
-                require 'iconv'
-                line = Iconv.iconv('UTF-8', encoding, line).join
-              end
-            end
-            
-            comment_match = comment_regex.match(line)
-            if comment_match
-              comment = comment_match[1]
-            end
-
-            key_match = key_regex.match(line)
-            if key_match
-                key = key_match[1].gsub('\\"', '"')
-            end
-            value_match = value_regex.match(line)
-            if value_match
-                value = value_match[1].gsub(/"\n"/, '').gsub('\\"', '"')
-            end
 
+          key_match = key_regex.match(line)
+          if key_match
+            key = key_match[1].gsub('\\"', '"')
+          end
+          value_match = value_regex.match(line)
+          if value_match
+            value = value_match[1].gsub(/"\n"/, '').gsub('\\"', '"')
+          end
 
-            if key and key.length > 0 and value and value.length > 0
-                set_translation_for_key(key, lang, value)
-                if comment and comment.length > 0 and !comment.start_with?("--------- ")
-                    set_comment_for_key(key, comment)
-                end
-                key = nil
-                value = nil
-                comment = nil
+          if key and key.length > 0 and value and value.length > 0
+            set_translation_for_key(key, lang, value)
+            if comment and comment.length > 0 and !comment.start_with?("--------- ")
+              set_comment_for_key(key, comment)
             end
-
+            key = nil
+            value = nil
+            comment = nil
           end
         end
       end
 
-      def format_file(strings, lang)
-        @default_lang = strings.language_codes[0]
+      def format_file(lang)
+        @default_lang = @strings.language_codes[0]
         result = super
         @default_lang = nil
         result

data/lib/twine/formatters/flash.rb

@@ -21,57 +21,31 @@ module Twine
         return
       end
 
-      def read_file(path, lang)
-        encoding = Twine::Encoding.encoding_for_path(path)
-        sep = nil
-        if !encoding.respond_to?(:encode)
-          # This code is not necessary in 1.9.3 and does not work as it did in 1.8.7.
-          if encoding.end_with? 'LE'
-            sep = "\x0a\x00"
-          elsif encoding.end_with? 'BE'
-            sep = "\x00\x0a"
+      def read(io, lang)
+        last_comment = nil
+        while line = io.gets
+          match = /((?:[^"\\]|\\.)+)\s*=\s*((?:[^"\\]|\\.)*)/.match(line)
+          if match
+            key = match[1]
+            value = match[2].strip
+            value.gsub!(/\{[0-9]\}/, '%@')
+            set_translation_for_key(key, lang, value)
+            if last_comment
+              set_comment_for_key(key, last_comment)
+            end
+          end
+          
+          match = /# *(.*)/.match(line)
+          if match
+            last_comment = match[1]
           else
-            sep = "\n"
+            last_comment = nil
           end
         end
+      end
 
-        if encoding.index('UTF-16')
-          mode = "rb:#{encoding}"
-        else
-          mode = "r:#{encoding}"
-        end
-
-        File.open(path, mode) do |f|
-          last_comment = nil
-          while line = (sep) ? f.gets(sep) : f.gets
-            if encoding.index('UTF-16')
-              if line.respond_to? :encode!
-                line.encode!('UTF-8')
-              else
-                require 'iconv'
-                line = Iconv.iconv('UTF-8', encoding, line).join
-              end
-            end
-            match = /((?:[^"\\]|\\.)+)\s*=\s*((?:[^"\\]|\\.)*)/.match(line)
-            if match
-              key = match[1]
-              value = match[2].strip
-              value.gsub!(/\{[0-9]\}/, '%@')
-              set_translation_for_key(key, lang, value)
-              if last_comment
-                set_comment_for_key(key, last_comment)
-              end
-            end
-            
-            match = /# *(.*)/.match(line)
-            if match
-              last_comment = match[1]
-            else
-              last_comment = nil
-            end
-
-          end
-        end
+      def format_sections(strings, lang)
+        super + "\n"
       end
 
       def format_header(lang)

data/lib/twine/formatters/gettext.rb

@@ -31,40 +31,39 @@ module Twine
         return
       end
 
-      def read_file(path, lang)
+      def read(io, lang)
         comment_regex = /#.? *"(.*)"$/
         key_regex = /msgctxt *"(.*)"$/
         value_regex = /msgstr *"(.*)"$/m
-        File.open(path, 'r:UTF-8') do |f|
-          while item = f.gets("\n\n")
-            key = nil
-            value = nil
-            comment = nil
-
-            comment_match = comment_regex.match(item)
-            if comment_match
-              comment = comment_match[1]
-            end
-            key_match = key_regex.match(item)
-            if key_match
-              key = key_match[1].gsub('\\"', '"')
-            end
-            value_match = value_regex.match(item)
-            if value_match
-              value = value_match[1].gsub(/"\n"/, '').gsub('\\"', '"')
-            end
-            if key and key.length > 0 and value and value.length > 0
-              set_translation_for_key(key, lang, value)
-              if comment and comment.length > 0 and !comment.start_with?("SECTION:")
-                set_comment_for_key(key, comment)
-              end
-              comment = nil
+        
+        while item = io.gets("\n\n")
+          key = nil
+          value = nil
+          comment = nil
+
+          comment_match = comment_regex.match(item)
+          if comment_match
+            comment = comment_match[1]
+          end
+          key_match = key_regex.match(item)
+          if key_match
+            key = key_match[1].gsub('\\"', '"')
+          end
+          value_match = value_regex.match(item)
+          if value_match
+            value = value_match[1].gsub(/"\n"/, '').gsub('\\"', '"')
+          end
+          if key and key.length > 0 and value and value.length > 0
+            set_translation_for_key(key, lang, value)
+            if comment and comment.length > 0 and !comment.start_with?("SECTION:")
+              set_comment_for_key(key, comment)
             end
+            comment = nil
           end
         end
       end
 
-      def format_file(strings, lang)
+      def format_file(lang)
         @default_lang = strings.language_codes[0]
         result = super
         @default_lang = nil

data/lib/twine/formatters/jquery.rb

@@ -29,23 +29,23 @@ module Twine
         return
       end
 
-      def read_file(path, lang)
+      def read(io, lang)
         begin
           require "json"
         rescue LoadError
           raise Twine::Error.new "You must run 'gem install json' in order to read or write jquery-localize files."
         end
 
-        open(path) do |io|
-          json = JSON.load(io)
-          json.each do |key, value|
-            set_translation_for_key(key, lang, value)
-          end
+        json = JSON.load(io)
+        json.each do |key, value|
+          set_translation_for_key(key, lang, value)
         end
       end
 
-      def format_file(strings, lang)
-        "{\n#{super}\n}"
+      def format_file(lang)
+        result = super
+        return result unless result
+        "{\n#{super}\n}\n"
       end
 
       def format_sections(strings, lang)

data/lib/twine/formatters/tizen.rb

@@ -49,7 +49,7 @@ module Twine
         return
       end
 
-      def read_file(path, lang)
+      def read(io, lang)
         resources_regex = /<resources(?:[^>]*)>(.*)<\/resources>/m
         key_regex = /<string name="(\w+)">/
         comment_regex = /<!-- (.*) -->/
@@ -58,35 +58,33 @@ module Twine
         value = nil
         comment = nil
 
-        File.open(path, 'r:UTF-8') do |f|
-          content_match = resources_regex.match(f.read)
-          if content_match
-            for line in content_match[1].split(/\r?\n/)
-              key_match = key_regex.match(line)
-              if key_match
-                key = key_match[1]
-                value_match = value_regex.match(line)
-                if value_match
-                  value = value_match[1]
-                  value = CGI.unescapeHTML(value)
-                  value.gsub!('\\\'', '\'')
-                  value.gsub!('\\"', '"')
-                  value = convert_placeholders_from_android_to_twine(value)
-                  value.gsub!(/(\\u0020)*|(\\u0020)*\z/) { |spaces| ' ' * (spaces.length / 6) }
-                else
-                  value = ""
-                end
-                set_translation_for_key(key, lang, value)
-                if comment and comment.length > 0 and !comment.start_with?("SECTION:")
-                  set_comment_for_key(key, comment)
-                end
-                comment = nil
+        content_match = resources_regex.match(io.read)
+        if content_match
+          for line in content_match[1].split(/\r?\n/)
+            key_match = key_regex.match(line)
+            if key_match
+              key = key_match[1]
+              value_match = value_regex.match(line)
+              if value_match
+                value = value_match[1]
+                value = CGI.unescapeHTML(value)
+                value.gsub!('\\\'', '\'')
+                value.gsub!('\\"', '"')
+                value = convert_placeholders_from_android_to_twine(value)
+                value.gsub!(/(\\u0020)*|(\\u0020)*\z/) { |spaces| ' ' * (spaces.length / 6) }
+              else
+                value = ""
               end
-
-              comment_match = comment_regex.match(line)
-              if comment_match
-                comment = comment_match[1]
+              set_translation_for_key(key, lang, value)
+              if comment and comment.length > 0 and !comment.start_with?("SECTION:")
+                set_comment_for_key(key, comment)
               end
+              comment = nil
+            end
+
+            comment_match = comment_regex.match(line)
+            if comment_match
+              comment = comment_match[1]
             end
           end
         end
@@ -101,7 +99,7 @@ module Twine
         
         result += super + "\n"
 
-        result += '</string_table>'
+        result += "</string_table>\n"
       end
 
       def format_section_header(section)

data/lib/twine/output_processor.rb

@@ -31,9 +31,9 @@ module Twine
 
             value = row.translated_string_for_lang(language)
 
-            next if value && @options[:include] == 'untranslated'
+            next if value && @options[:include] == :untranslated
 
-            if value.nil? && @options[:include] != 'translated'
+            if value.nil? && @options[:include] != :translated
               value = row.translated_string_for_lang(fallback_languages(language))
             end
 

data/lib/twine/runner.rb

@@ -48,7 +48,12 @@ module Twine
       lang = nil
       lang = @options[:languages][0] if @options[:languages]
 
-      write_string_file(@options[:output_path], lang)
+      formatter, lang = prepare_read_write(@options[:output_path], lang)
+      output = formatter.format_file(lang)
+
+      raise Twine::Error.new "Nothing to generate! The resulting file would not contain any strings." unless output
+
+      IO.write(@options[:output_path], output, encoding: encoding)
     end
 
     def generate_all_string_files
@@ -69,7 +74,51 @@ module Twine
         raise Twine::Error.new "Could not determine format given the contents of #{@options[:output_path]}"
       end
 
-      formatter.write_all_files(@options[:output_path])
+      file_name = @options[:file_name] || formatter.default_file_name
+      if @options[:create_folders]
+        @strings.language_codes.each do |lang|
+          output_path = File.join(@options[:output_path], formatter.output_path_for_language(lang))
+
+          FileUtils.mkdir_p(output_path)
+
+          file_path = File.join(output_path, file_name)
+
+          output = formatter.format_file(lang)
+          unless output
+            Twine::stderr.puts "Skipping file at path #{file_path} since it would not contain any strings."
+            next
+          end
+
+          IO.write(file_path, output, encoding: encoding)
+        end
+      else
+        language_found = false
+        Dir.foreach(@options[:output_path]) do |item|
+          next if item == "." or item == ".."
+
+          output_path = File.join(@options[:output_path], item)
+          next unless File.directory?(output_path)
+
+          lang = formatter.determine_language_given_path(output_path)
+          next unless lang
+
+          language_found = true
+
+          file_path = File.join(output_path, file_name)
+          output = formatter.format_file(lang)
+          unless output
+            Twine::stderr.puts "Skipping file at path #{file_path} since it would not contain any strings."
+            next
+          end
+
+          IO.write(file_path, output, encoding: encoding)
+        end
+
+        unless language_found
+          raise Twine::Error.new("Failed to generate any files: No languages found at #{@options[:output_path]}")
+        end
+      end
+
     end
 
     def consume_string_file
@@ -111,7 +160,7 @@ module Twine
         File.delete(@options[:output_path])
       end
 
-      Dir.mktmpdir do |dir|
+      Dir.mktmpdir do |temp_dir|
         Zip::File.open(@options[:output_path], Zip::File::CREATE) do |zipfile|
           zipfile.mkdir('Locales')
 
@@ -119,10 +168,17 @@ module Twine
           @strings.language_codes.each do |lang|
             if @options[:languages] == nil || @options[:languages].length == 0 || @options[:languages].include?(lang)
               file_name = lang + formatter.extension
-              real_path = File.join(dir, file_name)
+              temp_path = File.join(temp_dir, file_name)
               zip_path = File.join('Locales', file_name)
-              formatter.write_file(real_path, lang)
-              zipfile.add(zip_path, real_path)
+
+              output = formatter.format_file(lang)
+              unless output
+                Twine::stderr.puts "Skipping file #{file_name} since it would not contain any strings."
+                next
+              end
+              
+              IO.write(temp_path, output, encoding: encoding)
+              zipfile.add(zip_path, temp_path)
             end
           end
         end
@@ -136,18 +192,18 @@ module Twine
         raise Twine::Error.new("File does not exist: #{@options[:input_path]}")
       end
 
-      Dir.mktmpdir do |dir|
+      Dir.mktmpdir do |temp_dir|
         Zip::File.open(@options[:input_path]) do |zipfile|
           zipfile.each do |entry|
-            if !entry.name.end_with?'/' and !File.basename(entry.name).start_with?'.'
-              real_path = File.join(dir, entry.name)
-              FileUtils.mkdir_p(File.dirname(real_path))
-              zipfile.extract(entry.name, real_path)
-              begin
-                read_string_file(real_path)
-              rescue Twine::Error => e
-                Twine::stderr.puts "#{e.message}"
-              end
+            next if entry.name.end_with? '/' or File.basename(entry.name).start_with? '.'
+
+            real_path = File.join(temp_dir, entry.name)
+            FileUtils.mkdir_p(File.dirname(real_path))
+            zipfile.extract(entry.name, real_path)
+            begin
+              read_string_file(real_path)
+            rescue Twine::Error => e
+              Twine::stderr.puts "#{e.message}"
             end
           end
         end
@@ -204,6 +260,10 @@ module Twine
 
     private
 
+    def encoding
+      @options[:output_encoding] || 'UTF-8'
+    end
+
     def require_rubyzip
       begin
         require 'zip'
@@ -236,12 +296,12 @@ module Twine
 
       formatter, lang = prepare_read_write(path, lang)
 
-      formatter.read_file(path, lang)
-    end
+      encoding = @options[:encoding] || Twine::Encoding.encoding_for_path(path)
 
-    def write_string_file(path, lang)
-      formatter, lang = prepare_read_write(path, lang)
-      formatter.write_file(path, lang)
+      IO.open(IO.sysopen(path, 'rb'), 'rb', external_encoding: encoding, internal_encoding: 'UTF-8') do |io|
+        io.read(2) if Twine::Encoding.has_bom?(path)
+        formatter.read(io, lang)
+      end
     end
 
     def prepare_read_write(path, lang)