abroad 4.5.1 → 4.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0a35002bd8c8d2126673c796bd280aaa873a32d182f6f47d29ba2843540f96d
-  data.tar.gz: cfc465bf70de136e509b7f6ebf048fd5d82250a2d06579be5ee6943a2f4b057e
+  metadata.gz: 5eec9b86e92064221115136a2bf8405efff02d00a3f086e7e7b1e6bf8d672c9f
+  data.tar.gz: ec259696892c01a1dfa395a98f6a15d95e0a1fd411f29a540b5654755fd88a6c
 SHA512:
-  metadata.gz: 442cc1ea0585f26f0cc714a4111e6fc134aa65ee89b15d034ec71e57908a7659e4983fb115e2e7d8fb7af54c212b4ae13777d0f65225535d845bbfd5a09efffd
-  data.tar.gz: dc1629d4c1a14039ade81ef9a40cd1ec257148647ab3c2e1d9b02e27c6f8392984a1d10f68ec8a7c577e589ac528fb83755ab9ab1199cd12c20ed817d0198b48
+  metadata.gz: 2657536bfb1d870a23b79436f4db877e3e268d29351aa979d58c9bec4edb59f6575c32768794770d7643d568dddead12f625af2b7d66e5b03b3dc457db69a691
+  data.tar.gz: ff37008d623e1807eca7cf09f1b2b2244c8cf5b6a5af86a409f346e25446265d416418049c2933a7fa11e86b7f2741aa8cd3e1933b1806d514026988d10f817e

data/abroad.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'htmlentities', '~> 4.0'
   s.add_dependency 'json-stream', '~> 0.0'
-  s.add_dependency 'json-write-stream', '~> 1.2'
+  s.add_dependency 'json-write-stream', '~> 2.0'
   s.add_dependency 'nokogiri', '~> 1.8'
   s.add_dependency 'xml-write-stream', '~> 1.0'
   s.add_dependency 'yaml-write-stream', '~> 2.0'

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

@@ -1,64 +1,56 @@
-require 'json/stream'
-
 module Abroad
   module Extractors
     module Json
 
       class DottedKeyExtractor < JsonExtractor
-
         private
 
-        def each_entry
-          key = []
-          nesting_stack = []
-
-          parser = ::JSON::Stream::Parser.new.tap do |parser|
-            parser.key { |k| key.push(k) }
-
-            parser.value do |val|
-              yield key.join('.'), val
+        def each_entry(options = {}, &block)
+          walk(parse, [], options, &block)
+        end
 
-              case nesting_stack.last
-                when :object
-                  key.pop
+        def parse
+          JSON.parse(stream.read)
+        rescue JSON::ParserError => e
+          raise Abroad::SyntaxError, "Syntax error in yaml: #{e.message}"
+        end
 
-                when :array
-                  key[-1] += 1
+        def walk(obj, cur_path, options, &block)
+          case obj
+            when Hash
+              obj.each_pair do |key, val|
+                segment = is_numeric?(key) ? "'#{key}'" : key
+                walk(val, cur_path + [segment], options, &block)
               end
-            end
-
-            parser.start_array do
-              nesting_stack.push(:array)
-              key.push(0)
-            end
-
-            parser.end_array do
-              nesting_stack.pop
-              key.pop
-
-              if nesting_stack.last == :object
-                key.pop
+            when Array
+              if options[:preserve_arrays] && string_array?(obj)
+                yield cur_path.join('.'), obj
               else
-                key[-1] += 1
+                obj.each_with_index do |val, idx|
+                  walk(val, cur_path + [idx.to_s], options, &block)
+                end
               end
-            end
-
-            parser.start_object do
-              nesting_stack.push(:object)
-            end
+            else
+              yield cur_path.join('.'), obj
+          end
+        end
 
-            parser.end_object do
-              nesting_stack.pop
-              key.pop
+        def string_array?(arr)
+          arr.all? do |elem|
+            case elem
+              when Hash, Array
+                false
+              else
+                true
             end
           end
-
-          parser << stream.read
-        rescue ::JSON::Stream::ParserError => e
-          raise Abroad::SyntaxError, "Syntax error in json: #{e.message}"
         end
 
+        def is_numeric?(str)
+          !!(str.to_s =~ /\A\d+\z/)
+        end
       end
+
     end
   end
 end

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

@@ -4,11 +4,8 @@ module Abroad
 
       class DottedKeyExtractor < YamlExtractor
         def extract_each(options = {}, &block)
-          if block_given?
-            walk(parse, [], options, &block)
-          else
-            to_enum(__method__, options)
-          end
+          return to_enum(__method__, options) unless block_given?
+          walk(parse, [], options, &block)
         end
 
         private

data/lib/abroad/serializers/json/dotted_key_serializer.rb

@@ -39,7 +39,7 @@ module Abroad
           if node
             if node.has_children?
               if children_are_sequence?(node)
-                write_sequence(node, parent_key)
+                write_array(node, parent_key)
               else
                 write_object(node, parent_key)
               end
@@ -75,18 +75,18 @@ module Abroad
           writer.close_object
         end
 
-        def write_sequence(node, parent_key)
+        def write_array(node, parent_key)
           if writer.in_object?
-            writer.write_sequence(parent_key)
+            writer.write_array(parent_key)
           else
-            writer.write_sequence
+            writer.write_array
           end
 
           generate_sequence(node).each do |element|
             write_node(element, nil)
           end
 
-          writer.close_sequence
+          writer.close_array
         end
 
         def children_are_sequence?(node)

data/lib/abroad/serializers/json/json_serializer.rb

@@ -9,7 +9,7 @@ module Abroad
 
         def initialize(stream, locale, options = {})
           super
-          @writer = JsonWriteStream.from_stream(stream, encoding)
+          @writer = JsonWriteStream.from_stream(stream, options)
         end
 
         def write_raw(text)

data/lib/abroad/serializers/json/key_value_serializer.rb

@@ -12,7 +12,7 @@ module Abroad
 
         def write_key_value(key, value)
           writer.write_key_value(
-            key.encode(encoding), value.encode(encoding), write_options
+            key.encode(encoding), value.encode(encoding)
           )
         end
 
@@ -21,28 +21,6 @@ module Abroad
           writer.close_object
           super
         end
-
-        private
-
-        def write_options
-          @write_options ||= { before: before_text, between: between_text }
-        end
-
-        def before_text
-          @before_text ||= pretty? ? "\n#{' ' * indent_spaces}" : ''
-        end
-
-        def between_text
-          @between_text ||= pretty? ? ' ' : ''
-        end
-
-        def indent_spaces
-          options.fetch(:indent_spaces, DEFAULT_INDENT_SPACES)
-        end
-
-        def pretty?
-          options.fetch(:pretty, true)
-        end
       end
 
     end

data/lib/abroad/serializers/serializer.rb

@@ -7,8 +7,8 @@ module Abroad
       attr_reader :stream, :locale, :options
 
       class << self
-        def from_stream(stream, locale)
-          serializer = new(stream, locale)
+        def from_stream(stream, locale, options = {})
+          serializer = new(stream, locale, options)
 
           if block_given?
             yield(serializer).tap do
@@ -19,8 +19,8 @@ module Abroad
           end
         end
 
-        def open(file, locale, mode = 'r', &block)
-          from_stream(File.open(file, mode), locale, &block)
+        def open(file, locale, mode = 'r', options = {}, &block)
+          from_stream(File.open(file, mode), locale, options, &block)
         end
       end
 

data/lib/abroad/version.rb

@@ -1,3 +1,3 @@
 module Abroad
-  VERSION = '4.5.1'
+  VERSION = '4.6.0'
 end

data/spec/extractors/yaml/fixtures.yml

@@ -1,10 +1,4 @@
 :yaml/dotted-key:
-  invalid_single_quote_escape_array.yml:
-    - key: foo.bar.0
-      string: baz'boo
-  invalid_single_quote_escape.yml:
-    - key: foo.bar
-      string: baz'boo
   short.yml:
     - key: foo.bar
       string: baz

data/spec/serializers/json/dotted_key_serializer_spec.rb

@@ -7,7 +7,7 @@ describe Json::DottedKeySerializer do
   let(:locale) { 'fr-FR' }
 
   let(:serializer) do
-    Json::DottedKeySerializer.new(stream, locale)
+    Json::DottedKeySerializer.new(stream, locale, pretty: true)
   end
 
   def serialize
@@ -21,6 +21,32 @@ describe Json::DottedKeySerializer do
       serializer.write_key_value('com.foo.bar', 'baz')
     end
 
-    expect(result).to eq("{\"com\":{\"foo\":{\"bar\":\"baz\"}}}")
+    expect(result).to eq(<<~END.strip)
+      {
+        "com": {
+          "foo": {
+            "bar": "baz"
+          }
+        }
+      }
+    END
+  end
+
+  it 'writes sequences' do
+    result = serialize do
+      serializer.write_key_value('baz.boo.0', 'elem1')
+      serializer.write_key_value('baz.boo.1', 'elem2')
+    end
+
+    expect(result).to eq(<<~END.strip)
+      {
+        "baz": {
+          "boo": [
+            "elem1",
+            "elem2"
+          ]
+        }
+      }
+    END
   end
 end

data/spec/serializers/json/key_value_serializer_spec.rb

@@ -7,7 +7,7 @@ describe Json::KeyValueSerializer do
   let(:locale) { 'fr-FR' }
 
   let(:serializer) do
-    Json::KeyValueSerializer.new(stream, locale)
+    Json::KeyValueSerializer.new(stream, locale, pretty: true)
   end
 
   def serialize
@@ -21,6 +21,6 @@ describe Json::KeyValueSerializer do
       serializer.write_key_value('foo', 'bar')
     end
 
-    expect(result).to eq("{\n    \"foo\": \"bar\"}")
+    expect(result).to eq("{\n  \"foo\": \"bar\"\n}")
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abroad
 version: !ruby/object:Gem::Version
-  version: 4.5.1
+  version: 4.6.0
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-04 00:00:00.000000000 Z
+date: 2019-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -163,8 +163,6 @@ files:
 - spec/extractors/yaml/fixtures.yml
 - spec/extractors/yaml/fixtures/arrays.yml
 - spec/extractors/yaml/fixtures/arrays_and_hashes.yml
-- 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

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

@@ -1,2 +0,0 @@
-foo:
-  bar: "baz\'boo"

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

@@ -1,3 +0,0 @@
-foo:
-  bar:
-    - "baz\'boo"