i18n_flow 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '08d2cf8d25372c57651808089a31dedc34a52f81'
-  data.tar.gz: 2a96774f923502e0dd534c8b632acf4f7e5d232f
+  metadata.gz: a7a3c18156e0fdfebf2f9b9de3f6965eb86e17d2
+  data.tar.gz: 807640fefba2f86593ae49ec5d1abe385592eafc
 SHA512:
-  metadata.gz: '03463815dc69ad05dfb2e4b048201441e212a165947a546f4b8e1828b72f32cda5e1f16ab0d335fe9881bc949cfad7a5fa0eb6acf6ebc50a312cfa5d2080b17b'
-  data.tar.gz: 4bd655b11d659a008101bd28f113c65d8d03ea59ab7fe969c1c702e2dabacca9b52c20da33f4e2b4c3981f9b74af73cc87dbc11ae96fa269f2bcfd00fdc7f591
+  metadata.gz: 7953b9c89839512ca1fa0b07d4e67f58a6d2bc15fe9865640fc21c84c2bdadf2d851f94dfdffbe510166ac9aea40702b3b59044909e90e742b7017a775bef5a7
+  data.tar.gz: f853af82979315aafbcb43d7c5128289ec6e1da90992b6fac1132f1dc2c1497cdd9ba278bb142c44b15fe0925b68c8f79140f8416f91dbcaaf0fffd7f95654f3

data/Gemfile.lock

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

data/lib/i18n_flow/version.rb

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

data/lib/i18n_flow/yaml_ast_proxy/mapping.rb

@@ -57,7 +57,7 @@ module I18nFlow::YamlAstProxy
 
     def sort_keys!
       @indexed_object = indexed_object
-        .sort_by { |k, v| [v.is_a?(Psych::Nodes::Mapping) ? 1 : 0, k] }
+        .sort_by { |k, v| [sort_order(v), k] }
         .to_h
       @cache = nil
       synchronize!
@@ -82,5 +82,14 @@ module I18nFlow::YamlAstProxy
       children = indexed_object.flat_map { |k, v| [Psych::Nodes::Scalar.new(k), v] }
       node.children.replace(children)
     end
+
+    def sort_order(node)
+      case node
+      when Psych::Nodes::Alias then -1
+      when Psych::Nodes::Scalar then node.anchor ? 1 : 0
+      when Psych::Nodes::Mapping then node.anchor ? 1 : 2
+      else 0
+      end
+    end
   end
 end

data/spec/lib/i18n_flow/formatter_spec.rb

@@ -95,7 +95,7 @@ describe I18nFlow::Formatter do
         expect(formatted.to_yaml).to eq(result.to_yaml)
       end
 
-      it 'should move mappings at the bottom' do
+      it 'should move mappings to the bottom' do
         ast = parse_yaml(<<-YAML)
         en:
           alfa: 'A'
@@ -132,6 +132,36 @@ describe I18nFlow::Formatter do
         formatted = format_ast(ast)
         expect(formatted.to_yaml).to eq(result.to_yaml)
       end
+
+      it 'should move anchors before the mappings' do
+        ast = parse_yaml(<<-YAML)
+        en:
+          alfa: 'A'
+          xxx: &xxx
+            echo: 'E'
+            golf: 'G'
+          charlie:
+            <<: *xxx
+            a: 123
+          bravo: 'B'
+          delta: 'D'
+        YAML
+        result = parse_yaml(<<-YAML)
+        en:
+          alfa: 'A'
+          bravo: 'B'
+          delta: 'D'
+          xxx: &xxx
+            echo: 'E'
+            golf: 'G'
+          charlie:
+            <<: *xxx
+            a: 123
+        YAML
+
+        formatted = format_ast(ast)
+        expect(formatted.to_yaml).to eq(result.to_yaml)
+      end
     end
   end
 end

metadata

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