abroad 3.0.1 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4cbe6a333acda4b792403b71bed3161dd123ee5d
-  data.tar.gz: 20790811f1e0927b0a0b2962f8f433f6e6b7ec7e
+  metadata.gz: fcb32afa30cfd263c2443b4971a543a30a37e982
+  data.tar.gz: 2ba239c1134ab0a8d5b096733d7f0776eb1abe7b
 SHA512:
-  metadata.gz: 2bb927936eff4941f64c053da29d1aca9452b58ba1ac92f0844da29390383c22b7be982ae678ec2c462e346d538fa29b04b2cecd5202ffe8caec7ab37aa47b85
-  data.tar.gz: c23e65ec8f4783daf0e3609aad162996c2e241bf6316bbdb30525d4a62f45c5acb5d76ff380fc85de0f76e7ec632be750c9022a0396846dc7bc7ab655dbb74d4
+  metadata.gz: ad1be8571ab5b171ee69d3ab85e4dc5ccab5bf2f276e79fdf1bfc47deb223b2c41b32edeee6c39ba2c912bf60a80e69031d6fdbf47faefe97dd2fada714d3732
+  data.tar.gz: c78e0ad8cd0561510b86fa4f9cb7d6ce42f47d29aec7434390c6d72ca27a5f3af17a23b6855fad8704cc6522ba78eb96c772c260eb9733ed0f558c6c6260db67

data/lib/abroad/extractors/yaml/dotted_key_extractor.rb

@@ -17,7 +17,8 @@ module Abroad
           case obj
             when Hash
               obj.each_pair do |key, val|
-                walk(val, cur_path + [key], &block)
+                segment = is_numeric?(key) ? "'#{key}'" : key
+                walk(val, cur_path + [segment], &block)
               end
             when Array
               obj.each_with_index do |val, idx|
@@ -28,11 +29,13 @@ module Abroad
           end
         end
 
-        private
-
         def scrub_path(path)
           path  # no-op
         end
+
+        def is_numeric?(str)
+          !!(str.to_s =~ /\d+/)
+        end
       end
 
     end

data/lib/abroad/serializers/yaml/rails_serializer.rb

@@ -39,11 +39,19 @@ module Abroad
           key.split(/\.(?!\s)(?!\z)(?!\.)/)
         end
 
+        def unquote_numeric(str)
+          if match = str.match(/\A'(\d+)'\z/)
+            match.captures.first
+          else
+            str
+          end
+        end
+
         # depth-first
         def write_node(node, parent_key)
           if node
             if node.has_children?
-              if children_are_sequence(node)
+              if children_are_sequence?(node)
                 write_sequence(node, parent_key)
               else
                 write_map(node, parent_key)
@@ -73,7 +81,7 @@ module Abroad
           end
 
           node.each_child do |key, child|
-            write_node(child, key)
+            write_node(child, unquote_numeric(key))
           end
 
           writer.close_map
@@ -93,7 +101,7 @@ module Abroad
           writer.close_sequence
         end
 
-        def children_are_sequence(node)
+        def children_are_sequence?(node)
           node.children.all? { |key, _| key =~ /\A[\d]+\z/ }
         end
 

data/lib/abroad/version.rb

@@ -1,3 +1,3 @@
 module Abroad
-  VERSION = '3.0.1'
+  VERSION = '4.0.0'
 end

data/spec/extractors/yaml/fixtures.yml

@@ -73,3 +73,10 @@
       string: A game room with video games, board games, foosball, ping-pong, and shuffleboard
     - key: en.jobs.benefits.4.body.2
       string: A Culture Team behind office happy hours and Hawai'i holiday parties
+  numeric_keys.yml:
+    - key: en.status_codes.'201'
+      string: Created
+    - key: en.status_codes.'304'
+      string: Redirect
+    - key: en.status_codes.'500'
+      string: Server error

data/spec/extractors/yaml/fixtures/numeric_keys.yml

@@ -0,0 +1,5 @@
+en:
+  status_codes:
+    201: Created
+    304: Redirect
+    500: Server error

data/spec/serializers/yaml/rails_serializer_spec.rb

@@ -169,6 +169,24 @@ describe Yaml::RailsSerializer do
     })
   end
 
+  it 'unquotes numeric keys' do
+    result = serialize do
+      serializer.write_key_value("status_codes.'201'", 'Created')
+      serializer.write_key_value("status_codes.'304'", 'Redirect')
+      serializer.write_key_value("status_codes.'500'", 'Server error')
+    end
+
+    expect(result).to eq({
+      'fr' => {
+        'status_codes' => {
+          201 => 'Created',
+          304 => 'Redirect',
+          500 => 'Server error'
+        }
+      }
+    })
+  end
+
   it 'converts nils to empty strings' do
     result = serialize do
       serializer.write_key_value('foo.bar', nil)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abroad
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 4.0.0
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-14 00:00:00.000000000 Z
+date: 2016-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -153,6 +153,7 @@ files:
 - spec/extractors/yaml/fixtures/invalid_single_quote_escape.yml
 - spec/extractors/yaml/fixtures/invalid_single_quote_escape_array.yml
 - spec/extractors/yaml/fixtures/nesting.yml
+- spec/extractors/yaml/fixtures/numeric_keys.yml
 - spec/extractors/yaml/fixtures/short.yml
 - spec/extractors/yaml/jruby_compat_spec.rb
 - spec/extractors/yaml/yaml_extractor_spec.rb