twine 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e7971931654800b4d398dd6c3d9e86b96e4f5ba
-  data.tar.gz: 64a1eccc6c604439e10c82bded869527b123f8db
+  metadata.gz: 7eafefd496b0b0b32cdf00d9581ad752d089e2bf
+  data.tar.gz: 610848a3c93b4e17276b619561029daadfb30d50
 SHA512:
-  metadata.gz: 808d4045076dfef7fcba6d26797eb05d7638fd3c2adc964c24059a20f378beb8c5d978f1598d651e1117a13a1fbdbdf102d21c767aee3a68c7eb5699fae7215a
-  data.tar.gz: a63755c14cbadb14c0bba2960ff178a5785280bbb72e300dba5dc449ea510c823c6e248a1b848306f7c5de532c658ef8d4f034e80347f58ec2a4525673cf1ab6
+  metadata.gz: d350f728eee0e6bebdb35d33cc935e4df7fa1f2ef83fd688bc2fdf9bc0eec91bb132db3e6d0f4ffee10db690b51c763ef720fc87ff0b09217ed535bce4d4382f
+  data.tar.gz: d34c508686b8dda827b622f2742f947b05e0be859d75c0ca78ca6a8a69e0c57d5f447d4c6347a67e7bba3df5c89718c75f87dbf90427863173e4e53e498e3bd0

data/lib/twine/placeholders.rb

@@ -24,7 +24,7 @@ module Twine
       # %@ -> %s
       value = convert_twine_string_placeholder(input)
 
-      number_of_placeholders = number_of_twine_placeholders(input)
+      number_of_placeholders = number_of_twine_placeholders(value)
 
       return value if number_of_placeholders == 0
 

data/lib/twine/plugin.rb

@@ -1,3 +1,4 @@
+require 'date'
 require 'safe_yaml/load'
 
 SafeYAML::OPTIONS[:suppress_warnings] = true

data/lib/twine/version.rb

@@ -1,3 +1,3 @@
 module Twine
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 end

data/test/test_placeholders.rb

@@ -79,6 +79,10 @@ class PlaceholderTest < TwineTest
         to_android("some %d second %2$f")
       end
     end
+
+    def test_complicated_float_placeholders
+      assert_equal "%1$.0f%2$s (apparent: %3$.0f)", to_android("%.0f%@ (apparent: %.0f)")
+    end
   end
 
   class FromAndroid < PlaceholderTest

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: twine
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Sebastian Celis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-20 00:00:00.000000000 Z
+date: 2018-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: safe_yaml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         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: minitest-ci
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
 - !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
@@ -105,58 +105,58 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
-- LICENSE
 - README.md
-- bin/twine
+- LICENSE
 - lib/twine.rb
-- lib/twine/cli.rb
-- lib/twine/encoding.rb
-- lib/twine/formatters.rb
-- lib/twine/formatters/abstract.rb
-- lib/twine/formatters/android.rb
+- lib/twine/placeholders.rb
+- lib/twine/plugin.rb
 - lib/twine/formatters/apple.rb
-- lib/twine/formatters/django.rb
-- lib/twine/formatters/flash.rb
-- lib/twine/formatters/gettext.rb
 - lib/twine/formatters/jquery.rb
+- lib/twine/formatters/flash.rb
+- lib/twine/formatters/android.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/formatters/gettext.rb
+- lib/twine/formatters/django.rb
+- lib/twine/formatters/abstract.rb
+- lib/twine/cli.rb
 - lib/twine/twine_file.rb
+- lib/twine/encoding.rb
+- lib/twine/output_processor.rb
 - lib/twine/version.rb
+- lib/twine/formatters.rb
+- lib/twine/runner.rb
+- bin/twine
+- test/test_formatters.rb
+- test/test_output_processor.rb
+- test/test_consume_localization_file.rb
+- test/test_consume_localization_archive.rb
+- test/test_abstract_formatter.rb
+- test/test_cli.rb
+- test/test_twine_file.rb
+- test/test_generate_localization_file.rb
+- test/test_generate_all_localization_files.rb
+- test/twine_test.rb
+- test/test_generate_localization_archive.rb
 - test/command_test.rb
-- test/fixtures/consume_localization_archive.zip
-- test/fixtures/enc_utf16be.dummy
+- test/twine_file_dsl.rb
+- test/test_twine_definition.rb
+- test/fixtures/formatter_apple.strings
 - test/fixtures/enc_utf16be_bom.dummy
-- test/fixtures/enc_utf16le.dummy
-- test/fixtures/enc_utf16le_bom.dummy
+- test/fixtures/gettext_multiline.po
 - test/fixtures/enc_utf8.dummy
 - test/fixtures/formatter_android.xml
-- test/fixtures/formatter_apple.strings
+- test/fixtures/consume_localization_archive.zip
+- test/fixtures/twine_accent_values.txt
+- test/fixtures/enc_utf16be.dummy
 - test/fixtures/formatter_django.po
-- test/fixtures/formatter_flash.properties
-- test/fixtures/formatter_gettext.po
-- test/fixtures/formatter_jquery.json
+- test/fixtures/enc_utf16le.dummy
 - 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_localization_archive.rb
-- test/test_consume_localization_file.rb
-- test/test_formatters.rb
-- test/test_generate_all_localization_files.rb
-- test/test_generate_localization_archive.rb
-- test/test_generate_localization_file.rb
-- test/test_output_processor.rb
+- test/fixtures/formatter_jquery.json
+- test/fixtures/formatter_gettext.po
+- test/fixtures/formatter_flash.properties
+- test/fixtures/enc_utf16le_bom.dummy
 - test/test_placeholders.rb
-- test/test_twine_definition.rb
-- test/test_twine_file.rb
 - test/test_validate_twine_file.rb
-- test/twine_file_dsl.rb
-- test/twine_test.rb
 homepage: https://github.com/mobiata/twine
 licenses:
 - BSD-3-Clause
@@ -167,31 +167,31 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Manage strings and their translations for your iOS, Android and other projects.
 test_files:
+- test/test_formatters.rb
+- test/test_output_processor.rb
+- test/test_consume_localization_file.rb
+- test/test_consume_localization_archive.rb
 - test/test_abstract_formatter.rb
 - test/test_cli.rb
-- test/test_consume_localization_archive.rb
-- test/test_consume_localization_file.rb
-- test/test_formatters.rb
+- test/test_twine_file.rb
+- test/test_generate_localization_file.rb
 - test/test_generate_all_localization_files.rb
 - test/test_generate_localization_archive.rb
-- test/test_generate_localization_file.rb
-- test/test_output_processor.rb
-- test/test_placeholders.rb
 - test/test_twine_definition.rb
-- test/test_twine_file.rb
+- test/test_placeholders.rb
 - test/test_validate_twine_file.rb