Merge pull request #14 from CocoaPods/seg-unquoted-string-all-valid-c…

…hars

[Reader] Allow reading all valid characters in unquoted strings

CHANGELOG.md

@@ -8,7 +8,9 @@
 
 ##### Bug Fixes
 
-* None.  
+* Fix reading all supported characters in unquoted strings.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [#13](https://github.com/CocoaPods/Nanaimo/issues/13)
 
 
 ## 0.2.0 (2016-11-02)

lib/nanaimo/reader.rb

@@ -138,7 +138,7 @@ def parse_object
 
     def parse_string
       eat_whitespace!
-      unless match = @scanner.scan(%r{[\w/.$]+})
+      unless match = @scanner.scan(%r{[\w_$/:.-]+}o)
         raise_parser_error ParseError, "Invalid character #{current_character.inspect} in unquoted string"
       end
       Nanaimo::String.new(match, nil)

spec/nanaimo/reader_spec.rb

@@ -107,6 +107,19 @@ module Nanaimo
           expect(subject).to eq Nanaimo::Dictionary.new({ Nanaimo::String.new('key', '') => Nanaimo::String.new('$PROJECT_DIR/mogenerator/mogenerator', '') }, '')
         end
       end
+
+      describe 'that contain' do
+        valid_characters = ('a'..'z').to_a + ('A'..'Z').to_a + ('0'..'9').to_a + %w(_ $ / : . -)
+        valid_characters << valid_characters.join('')
+        valid_characters.each do |c|
+          describe "the valid character `#{c}`" do
+            let(:unquoted_string) { c }
+            it 'is parsed correctly' do
+              expect(subject).to eq Nanaimo::Dictionary.new({ Nanaimo::String.new('key', '') => Nanaimo::String.new(c, '') }, '')
+            end
+          end
+        end
+      end
     end
 
     describe 'quoted strings' do