i18n_flow 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 157be720fa6ecf3e7525a75e8ce298e60287e65c
-  data.tar.gz: f21d1957ec6bcfe491df0768e2205f30cffef921
+  metadata.gz: e702abf0558b8dd1ebdd15e1f7823d677b649d6a
+  data.tar.gz: 99d568369b4ed3cd399147147174df3588ffcadd
 SHA512:
-  metadata.gz: 262fd31678a1aefa44651f0a5210431988d265857939ecf56b2fd69e7cb944f496f470d6a32533fa960658deedf0a259a46a580e6fb20b708410e2b602da5c3d
-  data.tar.gz: a8802ced6c6dcb06136c967bf5c074da02e4b4c9571eafb3850e940c67b5fb0e2892a47f64b7630827390e81674ac0f96933926d015d127f711b579e70463b25
+  metadata.gz: a786734b4ae407a51ab284cef2f610aa237ce49c3f8e8ff8ae7717b278954e82ebc448d7773b5f51fba7f98cc84816c174a7069ccacf46105a3377d3524948aa
+  data.tar.gz: b1798e0ff0fb80750521f5decbe8db769371518192edb0831b7b627c87831661897d22db36db273b91ac40a6d7a03f44c5821c29b5a7fdcd2a3887b07ee598aa

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    i18n_flow (0.2.2)
+    i18n_flow (0.2.3)
       psych (>= 3.0)
 
 GEM

data/lib/i18n_flow/version.rb

@@ -1,7 +1,7 @@
 module I18nFlow
   MAJOR    = 0
   MINOR    = 2
-  REVISION = 2
+  REVISION = 3
 
   VERSION = [MAJOR, MINOR, REVISION].join('.')
 end

data/lib/i18n_flow/yaml_ast_proxy.rb

@@ -90,4 +90,8 @@ private
       .tap { |n| break unless n.is_a?(Psych::Nodes::Mapping) }
       &.tap { |n| break n.children[layout_offset] }
   end
+
+  def self.scalar_scanner
+    @scalar_scanner ||= Psych::ScalarScanner.new(Psych::ClassLoader.new)
+  end
 end

data/lib/i18n_flow/yaml_ast_proxy/mapping.rb

@@ -79,7 +79,7 @@ module I18nFlow::YamlAstProxy
     def synchronize!
       return if @locked
 
-      children = indexed_object.flat_map { |k, v| [Psych::Nodes::Scalar.new(k), v] }
+      children = indexed_object.flat_map { |k, v| [key_node(k), v] }
       node.children.replace(children)
     end
 
@@ -95,5 +95,14 @@ module I18nFlow::YamlAstProxy
       else node.anchor ? -2 : 0
       end
     end
+
+    def key_node(str)
+      needs_quote = !I18nFlow::YamlAstProxy.scalar_scanner.tokenize(str).is_a?(String)
+      if needs_quote
+        Psych::Nodes::Scalar.new(str, nil, nil, true, true, Psych::Nodes::Scalar::DOUBLE_QUOTED)
+      else
+        Psych::Nodes::Scalar.new(str, nil, nil, true, false, Psych::Nodes::Scalar::PLAIN)
+      end
+    end
   end
 end

data/spec/lib/i18n_flow/formatter_spec.rb

@@ -8,6 +8,28 @@ describe I18nFlow::Formatter do
   end
 
   describe '#format!' do
+    it 'should quote non-string keys' do
+      ast = parse_yaml(<<-YAML)
+      en:
+        1: alpha
+        1.2: bravo
+        foo: chalie
+        true: delta
+      YAML
+      result = parse_yaml(<<-YAML)
+      en:
+        "1": alpha
+        "1.2": bravo
+        foo: chalie
+        "true": delta
+      YAML
+
+      p ast
+
+      formatted = format_ast(ast)
+      expect(formatted.to_yaml).to eq(result.to_yaml)
+    end
+
     it 'should remove extra whitespaces' do
       ast = parse_yaml(<<-YAML)
       en:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: i18n_flow
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Yuki Iwanaga