Fix empty parse control value (#22)

* Fix empty parse control value
* Add tests for failing control matching

Author: dersnek

lib/ruby-rtf/parser.rb

@@ -104,8 +104,8 @@ def parse_control(src, current_pos = 0)
 
       contents = src[start, current_pos - start]
       m = contents.match(/([\*a-z]+)(\-?\d+)?\*?/)
-      ctrl = m[1].to_sym
-      val = m[2].to_i unless m[2].nil?
+      ctrl = m[1].to_sym unless m.nil? || m[1].nil?
+      val = m[2].to_i unless m.nil? || m[2].nil?
 
       # we advance past the optional space if present
       current_pos += 1 if src[current_pos] == ' '

spec/parser_spec.rb

@@ -172,6 +172,13 @@
       section[1][:modifiers].has_key?(:underline).should == false
       section[1][:text].should == 'World'
     end
+
+    it 'parses text when control matching fails' do
+      src = '{\rtf1 Hello\~{World}}'
+      section = parser.parse(src).sections
+      section[0][:text].should == 'Hello'
+      section[1][:text].should == 'World'
+    end
   end
 
   context '#parse_control' do
@@ -232,6 +239,10 @@
     it 'advances the current positon past the optional space' do
       parser.parse_control('Test ansi test', 5).last.should == 10
     end
+
+    it 'does not fail when control matching fails' do
+      parser.parse_control('~}')[0, 2].should == ['', nil]
+    end
   end
 
   context 'character set' do