twine 0.7.0 → 0.8.0

data/test/twine_file_dsl.rb

@@ -0,0 +1,46 @@
+module TwineFileDSL
+  def build_twine_file(*languages)
+    @currently_built_twine_file = Twine::StringsFile.new
+    @currently_built_twine_file.language_codes.concat languages
+    yield
+    result = @currently_built_twine_file
+    @currently_built_twine_file = nil
+    return result
+  end
+
+  def add_section(name)
+    return unless @currently_built_twine_file
+    @currently_built_twine_file_section = Twine::StringsSection.new name
+    @currently_built_twine_file.sections << @currently_built_twine_file_section
+    yield
+    @currently_built_twine_file_section = nil
+  end
+
+  def add_row(parameters)
+    return unless @currently_built_twine_file
+    return unless @currently_built_twine_file_section
+
+    # this relies on Ruby 1.9 preserving the order of hash elements
+    key, value = parameters.first
+    row = Twine::StringsRow.new(key.to_s)
+    if value.is_a? Hash
+      value.each do |language, translation|
+        row.translations[language.to_s] = translation
+      end
+    elsif !value.is_a? Symbol
+      language = @currently_built_twine_file.language_codes.first
+      row.translations[language] = value
+    end
+
+    row.comment = parameters[:comment] if parameters[:comment]
+    row.tags = parameters[:tags] if parameters[:tags]
+    if parameters[:ref] || value.is_a?(Symbol)
+      reference_key = (parameters[:ref] || value).to_s
+      row.reference_key = reference_key
+      row.reference = @currently_built_twine_file.strings_map[reference_key]
+    end
+
+    @currently_built_twine_file_section.rows << row
+    @currently_built_twine_file.strings_map[row.key] = row
+  end
+end

data/test/twine_test_case.rb

@@ -0,0 +1,44 @@
+require 'erb'
+require 'minitest/autorun'
+require "mocha/mini_test"
+require 'securerandom'
+require 'stringio'
+require 'twine'
+require 'twine_file_dsl'
+
+class TwineTestCase < Minitest::Test
+  include TwineFileDSL
+
+  KNOWN_LANGUAGES = %w(en fr de es)
+  
+  def setup
+    super
+    Twine::stdout = StringIO.new
+    Twine::stderr = StringIO.new
+    @output_dir = Dir.mktmpdir
+    @output_path = File.join @output_dir, SecureRandom.uuid
+  end
+
+  def teardown
+    FileUtils.remove_entry_secure @output_dir if File.exists? @output_dir
+    super
+  end
+
+  def output_content
+    File.read @output_path
+  end
+
+  def execute(command)
+    command += "  -o #{@output_path}"
+    Twine::Runner.run(command.split(" "))
+  end
+
+  def fixture(filename)
+    File.join File.dirname(__FILE__), 'fixtures', filename
+  end
+  alias :f :fixture
+
+  def content(filename)
+    ERB.new(File.read fixture(filename)).result
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twine
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Sebastian Celis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-08 00:00:00.000000000 Z
+date: 2016-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -16,42 +16,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: safe_yaml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '10.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: '10.4'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.5'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 description: |2
     Twine is a command line tool for managing your strings and their translations.
 
@@ -78,38 +106,41 @@ files:
 - lib/twine/formatters/gettext.rb
 - lib/twine/formatters/jquery.rb
 - lib/twine/formatters/tizen.rb
+- lib/twine/output_processor.rb
+- lib/twine/placeholders.rb
 - lib/twine/plugin.rb
 - lib/twine/runner.rb
 - lib/twine/stringsfile.rb
 - lib/twine/version.rb
-- test/fixtures/en-1.json
-- test/fixtures/en-1.po
-- test/fixtures/en-1.strings
-- test/fixtures/en-2.po
-- test/fixtures/en-3.xml
-- test/fixtures/fr-1.xml
-- test/fixtures/strings-1.txt
-- test/fixtures/strings-2.txt
-- test/fixtures/strings-3.txt
-- test/fixtures/test-json-line-breaks/consumed.txt
-- test/fixtures/test-json-line-breaks/generated.json
-- test/fixtures/test-json-line-breaks/line-breaks.json
-- test/fixtures/test-json-line-breaks/line-breaks.txt
-- test/fixtures/test-output-1.txt
-- test/fixtures/test-output-10.txt
-- test/fixtures/test-output-11.txt
-- test/fixtures/test-output-12.txt
-- test/fixtures/test-output-2.txt
-- test/fixtures/test-output-3.txt
-- test/fixtures/test-output-4.txt
-- test/fixtures/test-output-5.txt
-- test/fixtures/test-output-6.txt
-- test/fixtures/test-output-7.txt
-- test/fixtures/test-output-8.txt
-- test/fixtures/test-output-9.txt
-- test/twine_test.rb
+- test/command_test_case.rb
+- test/fixtures/consume_loc_drop.zip
+- test/fixtures/formatter_android.xml
+- test/fixtures/formatter_apple.strings
+- test/fixtures/formatter_django.po
+- test/fixtures/formatter_flash.properties
+- test/fixtures/formatter_gettext.po
+- test/fixtures/formatter_jquery.json
+- test/fixtures/formatter_tizen.xml
+- test/fixtures/gettext_multiline.po
+- test/fixtures/twine_accent_values.txt
+- test/test_abstract_formatter.rb
+- test/test_cli.rb
+- test/test_consume_loc_drop.rb
+- test/test_consume_string_file.rb
+- test/test_formatters.rb
+- test/test_generate_all_string_files.rb
+- test/test_generate_loc_drop.rb
+- test/test_generate_string_file.rb
+- test/test_output_processor.rb
+- test/test_placeholders.rb
+- test/test_strings_file.rb
+- test/test_strings_row.rb
+- test/test_validate_strings_file.rb
+- test/twine_file_dsl.rb
+- test/twine_test_case.rb
 homepage: https://github.com/mobiata/twine
-licenses: []
+licenses:
+- BSD-3-Clause
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -127,9 +158,21 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Manage strings and their translations for your iOS and Android projects.
 test_files:
-- test/twine_test.rb
+- test/test_abstract_formatter.rb
+- test/test_cli.rb
+- test/test_consume_loc_drop.rb
+- test/test_consume_string_file.rb
+- test/test_formatters.rb
+- test/test_generate_all_string_files.rb
+- test/test_generate_loc_drop.rb
+- test/test_generate_string_file.rb
+- test/test_output_processor.rb
+- test/test_placeholders.rb
+- test/test_strings_file.rb
+- test/test_strings_row.rb
+- test/test_validate_strings_file.rb

data/test/fixtures/en-1.json

@@ -1,5 +0,0 @@
-{
-"key1":"key1-english",
-"key3":"key3-english",
-"key5":"A new string"
-}

data/test/fixtures/en-1.po

@@ -1,16 +0,0 @@
-msgid ""
-msgstr ""
-"Language: en\n"
-"X-Generator: Twine\n"
-
-msgctxt "key1"
-msgid "key1-english"
-msgstr "key1-english"
-
-msgctxt "key3"
-msgid "key3-english"
-msgstr ""
-
-msgctxt "key5"
-msgid "A new string"
-msgstr "A new string"

data/test/fixtures/en-1.strings

@@ -1,10 +0,0 @@
-/**
- * iOS Strings File
- * Generated by Twine
- * Language: en
- */
-
-/* My Strings */
-"key1" = "key1-english";
-"key3" = "key3-english";
-"key5" = "A new string";

data/test/fixtures/en-2.po

@@ -1,23 +0,0 @@
-msgid ""
-msgstr ""
-"Language: en\n"
-"X-Generator: Twine\n"
-
-msgctxt "key1"
-msgid "key1-english"
-msgstr "key1-english"
-
-msgctxt "key3"
-msgid "key3-english"
-msgstr ""
-
-msgctxt "key4"
-msgid "key4"
-"multiline"
-msgstr "A multi"
-"line string\n"
-"can occur"
-
-msgctxt "key5"
-msgid "A new string"
-msgstr "A new string"

data/test/fixtures/en-3.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Android Strings File -->
-<!-- Generated by Twine 0.5.0 -->
-<!-- Language: en -->
-<resources>
-	<!-- SECTION: My Strings -->
-	<string name="string_with_spaces">\u0020string with spaces\u0020\u0020</string>
-</resources>

data/test/fixtures/fr-1.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Android Strings File -->
-<!-- Generated by Twine -->
-<!-- Language: fr -->
-<resources>
-	<!-- This is a comment -->
-	<string name="key1">key1-french</string>
-	<string name="key2">key2-french</string>
-	<string name="key3">key3-french</string>
-</resources>

data/test/fixtures/strings-1.txt

@@ -1,17 +0,0 @@
-[[My Strings]]
-	[key1]
-		en = key1-english
-		tags = tag1
-		comment = This is a comment
-		es = key1-spanish
-		fr = key1-french
-	[key2]
-		en = key2-english
-		tags = tag2
-		fr = key2-french
-	[key3]
-		en = key3-english
-		tags = tag1,tag2
-		es = key3-spanish
-	[key4]
-		en = key4-english

data/test/fixtures/strings-2.txt

@@ -1,5 +0,0 @@
-[[My Strings]]
-	[key with space ]
-		en = `string with space `
-		tags = tag1
-		comment = String ends with space

data/test/fixtures/strings-3.txt

@@ -1,5 +0,0 @@
-[[My Strings]]
-    [parameterized_string]
-        en = The %@ brown fox jumps over the %@ dog %d times.
-    [percentage_string]
-        en = This product is %d%% off.

data/test/fixtures/test-json-line-breaks/consumed.txt

@@ -1,5 +0,0 @@
-[[Line Break Strings]]
-	[line_breaking]
-		en = This\nstring\ncontains\nline\nbreaks
-		tags = tag1
-		fr = This\nstring\nalso\ncontains\nline\nbreaks

data/test/fixtures/test-json-line-breaks/generated.json

@@ -1,3 +0,0 @@
-{
-"line_breaking":"This\nstring\ncontains\nline\nbreaks"
-}

data/test/fixtures/test-json-line-breaks/line-breaks.json

@@ -1,3 +0,0 @@
-{
-"line_breaking":"This\nstring\nalso\ncontains\nline\nbreaks"
-}

data/test/fixtures/test-json-line-breaks/line-breaks.txt

@@ -1,4 +0,0 @@
-[[Line Break Strings]]
-    [line_breaking]
-        en = This\nstring\ncontains\nline\nbreaks
-        tags = tag1

data/test/fixtures/test-output-1.txt

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Android Strings File -->
-<!-- Generated by Twine <%= Twine::VERSION %> -->
-<!-- Language: fr -->
-<resources>
-	<!-- SECTION: My Strings -->
-	<!-- This is a comment -->
-	<string name="key1">key1-french</string>
-	<string name="key2">key2-french</string>
-	<string name="key3">key3-english</string>
-	<string name="key4">key4-english</string>
-</resources>

data/test/fixtures/test-output-10.txt

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Android Strings File -->
-<!-- Generated by Twine <%= Twine::VERSION %> -->
-<!-- Language: en -->
-<resources>
-	<!-- SECTION: My Strings -->
-	<!-- String ends with space -->
-	<string name="key with space ">string with space\u0020</string>
-</resources>

data/test/fixtures/test-output-11.txt

@@ -1,9 +0,0 @@
-[[Uncategorized]]
-	[string_with_spaces]
-		en = ` string with spaces  `
-
-[[My Strings]]
-	[key with space ]
-		en = `string with space `
-		tags = tag1
-		comment = String ends with space