twine 0.8.1 → 0.9.0

data/test/test_generate_loc_drop.rb

@@ -1,30 +1,30 @@
 require 'command_test_case'
 
 class TestGenerateLocDrop < CommandTestCase
-  def setup
-    super
-
+  def new_runner(twine_file = nil)
     options = {}
     options[:output_path] = @output_path
     options[:format] = 'apple'
 
-    @twine_file = build_twine_file 'en', 'fr' do
-      add_section 'Section' do
-        add_row key: 'value'
+    unless twine_file
+      twine_file = build_twine_file 'en', 'fr' do
+        add_section 'Section' do
+          add_row key: 'value'
+        end
       end
     end
 
-    @runner = Twine::Runner.new(options, @twine_file)
+    Twine::Runner.new(options, twine_file)
   end
 
   def test_generates_zip_file
-    @runner.generate_loc_drop
+    new_runner.generate_loc_drop
 
-    assert File.exists?(@output_path), "language folder should not be created"
+    assert File.exists?(@output_path), "zip file should exist"
   end
 
   def test_zip_file_structure
-    @runner.generate_loc_drop
+    new_runner.generate_loc_drop
 
     names = []
     Zip::File.open(@output_path) do |zipfile|
@@ -37,12 +37,18 @@ class TestGenerateLocDrop < CommandTestCase
 
   def test_uses_formatter
     formatter = prepare_mock_formatter Twine::Formatters::Apple
-    formatter.expects(:write_file).twice.with() { |path, lang| FileUtils.touch path }
+    formatter.expects(:format_file).twice
+
+    new_runner.generate_loc_drop
+  end
 
-    @runner.generate_loc_drop
+  def test_prints_empty_file_warnings
+    empty_twine_file = build_twine_file('en') {}
+    new_runner(empty_twine_file).generate_loc_drop
+    assert_match "Skipping file", Twine::stderr.string
   end
 
-  class TestDeliberate < CommandTestCase
+  class TestValidate < CommandTestCase
     def new_runner(validate)
       options = {}
       options[:output_path] = @output_path

data/test/test_generate_string_file.rb

@@ -12,31 +12,31 @@ class TestGenerateStringFile < CommandTestCase
     Twine::Runner.new(options, strings)
   end
 
-  def prepare_mock_write_file_formatter(formatter_class)
+  def prepare_mock_format_file_formatter(formatter_class)
     formatter = prepare_mock_formatter(formatter_class)
-    formatter.expects(:write_file)
+    formatter.expects(:format_file).returns(true)
   end
 
   def test_deducts_android_format_from_output_path
-    prepare_mock_write_file_formatter Twine::Formatters::Android
+    prepare_mock_format_file_formatter Twine::Formatters::Android
 
     new_runner('fr', 'fr.xml').generate_string_file
   end
 
   def test_deducts_apple_format_from_output_path
-    prepare_mock_write_file_formatter Twine::Formatters::Apple
+    prepare_mock_format_file_formatter Twine::Formatters::Apple
 
     new_runner('fr', 'fr.strings').generate_string_file
   end
 
   def test_deducts_jquery_format_from_output_path
-    prepare_mock_write_file_formatter Twine::Formatters::JQuery
+    prepare_mock_format_file_formatter Twine::Formatters::JQuery
 
     new_runner('fr', 'fr.json').generate_string_file
   end
 
   def test_deducts_gettext_format_from_output_path
-    prepare_mock_write_file_formatter Twine::Formatters::Gettext
+    prepare_mock_format_file_formatter Twine::Formatters::Gettext
 
     new_runner('fr', 'fr.po').generate_string_file
   end
@@ -44,12 +44,21 @@ class TestGenerateStringFile < CommandTestCase
   def test_deducts_language_from_output_path
     random_language = KNOWN_LANGUAGES.sample
     formatter = prepare_mock_formatter Twine::Formatters::Android
-    formatter.expects(:write_file).with(anything, random_language)
+    formatter.expects(:format_file).with(random_language).returns(true)
 
     new_runner(nil, "#{random_language}.xml").generate_string_file
   end
 
-  class TestDeliberate < CommandTestCase
+  def test_returns_error_if_nothing_written
+    formatter = prepare_mock_formatter Twine::Formatters::Android
+    formatter.expects(:format_file).returns(false)
+
+    assert_raises Twine::Error do
+      new_runner('fr', 'fr.xml').generate_string_file
+    end
+  end
+
+  class TestValidate < CommandTestCase
     def new_runner(validate)
       options = {}
       options[:output_path] = @output_path

data/test/test_output_processor.rb

@@ -43,14 +43,14 @@ class TestOutputProcessor < TwineTestCase
   end
 
   def test_include_translated
-    processor = Twine::Processors::OutputProcessor.new(@strings, { include: 'translated' })
+    processor = Twine::Processors::OutputProcessor.new(@strings, { include: :translated })
     result = processor.process('fr')
 
     assert_equal %w(key4), result.strings_map.keys.sort
   end
 
   def test_include_untranslated
-    processor = Twine::Processors::OutputProcessor.new(@strings, { include: 'untranslated' })
+    processor = Twine::Processors::OutputProcessor.new(@strings, { include: :untranslated })
     result = processor.process('fr')
 
     assert_equal %w(key1 key2 key3), result.strings_map.keys.sort

data/test/test_strings_file.rb

@@ -6,7 +6,7 @@ class TestStringsFile < TwineTestCase
       super
 
       @strings = Twine::StringsFile.new
-      @strings.read fixture('twine_accent_values.txt')
+      @strings.read fixture_path('twine_accent_values.txt')
     end
 
     def test_reading_keeps_leading_accent
@@ -50,7 +50,7 @@ class TestStringsFile < TwineTestCase
 
       @strings.write @output_path
 
-      assert_equal content('twine_accent_values.txt'), output_content
+      assert_equal content('twine_accent_values.txt'), File.read(@output_path)
     end
 
   end

data/test/twine_file_dsl.rb

@@ -20,7 +20,7 @@ module TwineFileDSL
     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
+    # this relies on Ruby preserving the order of hash elements
     key, value = parameters.first
     row = Twine::StringsRow.new(key.to_s)
     if value.is_a? Hash

data/test/twine_test_case.rb

@@ -29,21 +29,20 @@ class TwineTestCase < Minitest::Test
     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)
+  def fixture_path(filename)
     File.join File.dirname(__FILE__), 'fixtures', filename
   end
-  alias :f :fixture
 
   def content(filename)
-    ERB.new(File.read fixture(filename)).result
+    ERB.new(File.read fixture_path(filename)).result
+  end
+
+  def content_io(filename)
+    StringIO.new ERB.new(File.read fixture_path(filename)).result
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twine
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Sebastian Celis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-22 00:00:00.000000000 Z
+date: 2016-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -114,6 +114,11 @@ files:
 - lib/twine/version.rb
 - test/command_test_case.rb
 - test/fixtures/consume_loc_drop.zip
+- test/fixtures/enc_utf16be.dummy
+- test/fixtures/enc_utf16be_bom.dummy
+- test/fixtures/enc_utf16le.dummy
+- test/fixtures/enc_utf16le_bom.dummy
+- test/fixtures/enc_utf8.dummy
 - test/fixtures/formatter_android.xml
 - test/fixtures/formatter_apple.strings
 - test/fixtures/formatter_django.po