nanaimo 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53e87cd361361b93ae0c78503a44da0ad261cdcbdcaf3ec5aedc0434640790ca
-  data.tar.gz: dac56be099c658037a703af6bfa8f2b6bed3c02c8c98fe7ae2bea17cd9116bb3
+  metadata.gz: a5c776733dc2e81f8c653f7825a5313a7cb1c0e8588f76c6bc07178ee6dc1486
+  data.tar.gz: fe1b3fdacf28874194c37fc0c112202f972c251979e444fa31832f04fbd266d8
 SHA512:
-  metadata.gz: 1bd45db073a2b9a3bc5da56ed5ca97d384e616378234859211a2a675719e296fbd5a075b3631c2a4e5844fd0fea459467b2a9e47967a90d1e1eba2b59f227870
-  data.tar.gz: 4ebeab355e2d531d0b55f83e4575fa8dca7d27c4a3501fc4f7fe00b8d3ac0e7f4c5803d1e04e337b8e0cc1f797ca276e6a7201e1812be046e93db7e01c124fe5
+  metadata.gz: b40376d8b00dc4cbed495c40503f0b5f7b99b1bb8f68f383eab8de510940db9277d3704e6ee5cdb85159124f22938c32412430099813aff25f14118e4e9757e1
+  data.tar.gz: 3047fc03c205700b4408f3efa7e4ae7b286daa5d139bb6a12f8539e6a55c497c9d0781c36027fe4d512dc26975cb0157a8a4678ead8350d6f132d23777bbaa4b

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Nanaimo Changelog
 
+## 0.2.5 (2018-04-04)
+
+##### Enhancements
+
+* None.  
+
+##### Bug Fixes
+
+* Fix parsing arrays that contain a comment after a trailing comma.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#26](https://github.com/CocoaPods/Nanaimo/issues/26)
+
+
 ## 0.2.4 (2018-03-22)
 
 ##### Enhancements

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nanaimo (0.2.4)
+    nanaimo (0.2.5)
 
 GEM
   remote: https://rubygems.org/

data/lib/nanaimo/reader.rb

@@ -124,8 +124,8 @@ module Nanaimo
       # TODO
     end
 
-    def parse_object
-      _comment = skip_to_non_space_matching_annotations
+    def parse_object(already_parsed_comment: false)
+      _comment = skip_to_non_space_matching_annotations unless already_parsed_comment
       start_pos = @scanner.pos
       raise_parser_error ParseError, 'Unexpected end of string while parsing' if @scanner.eos?
       if @scanner.skip(/\{/)
@@ -163,10 +163,10 @@ module Nanaimo
     def parse_array
       objects = []
       until @scanner.eos?
-        eat_whitespace!
+        _comment = skip_to_non_space_matching_annotations
         break if @scanner.skip(/\)/)
 
-        objects << parse_object
+        objects << parse_object(already_parsed_comment: true)
 
         eat_whitespace!
         break if @scanner.skip(/\)/)
@@ -181,10 +181,10 @@ module Nanaimo
     def parse_dictionary
       objects = {}
       until @scanner.eos?
-        skip_to_non_space_matching_annotations
+        _comment = skip_to_non_space_matching_annotations
         break if @scanner.skip(/}/)
 
-        key = parse_object
+        key = parse_object(already_parsed_comment: true)
         eat_whitespace!
         unless @scanner.skip(/=/)
           raise_parser_error ParseError, "Dictionary missing value for key #{key.as_ruby.inspect}, expected '=' and found #{current_character.inspect}"
@@ -263,8 +263,6 @@ module Nanaimo
           next
         end
 
-        eat_whitespace!
-
         break
       end
       annotation

data/lib/nanaimo/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Nanaimo
-  VERSION = '0.2.4'.freeze
+  VERSION = '0.2.5'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nanaimo
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Danielle Tomlinson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-22 00:00:00.000000000 Z
+date: 2018-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler