inifile 2.0.0 → 2.0.1

data/History.txt

@@ -1,3 +1,8 @@
+== 2.0.1 / 2012-09-06
+
+Bug Fixes
+  - Better error message for malformed INI files
+
 == 2.0.0 / 2012-08-29
 
 Major Enhancements

data/lib/inifile.rb

@@ -8,7 +8,7 @@ class IniFile
   include Enumerable
 
   class Error < StandardError; end
-  VERSION = '2.0.0'
+  VERSION = '2.0.1'
 
   # Public: Open an INI file and load the contents.
   #
@@ -450,6 +450,8 @@ private
       # special section like a quote, newline, comment, etc.
       else
         tmp = scanner.scan_until(%r/([\n"#{@param}#{@comment}]|\\[\[\]#{@param}#{@comment}"])/m)
+        parse_error if tmp.nil?
+
         len = scanner[1].length
         tmp.slice!(tmp.length - len, len)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inifile
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-29 00:00:00.000000000 Z
+date: 2012-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bones-git
@@ -71,7 +71,6 @@ files:
 - History.txt
 - README.md
 - Rakefile
-- a.rb
 - lib/inifile.rb
 - test/data/bad_1.ini
 - test/data/browscap.ini

data/a.rb

@@ -1,125 +0,0 @@
-require 'strscan'
-require 'pp'
-
-@content = <<CONTENT
-[section_one]
-one = 1
-two = 2
-
-[section_two]  # inline section comment 
-three =         3
-multi = multiline \\ # inline multiline comment
-support
-quote = "quoted # strings are the best!"
-
-; comments should be ignored
-[section three]
-four   =4
-five=5
-six =6
-"[foobar]" = 7
-
-[section_four]
-   [section_five]
- seven and eight= 7 & 8
-CONTENT
-
-@comment = ';#'
-@param = '='
-@default = 'global'
-
-@ini = Hash.new {|h,k| h[k] = Hash.new}
-
-def parse
-
-  string = ''
-  property = ''
-
-  @ini.clear
-  @_line = nil
-  @_section = nil
-
-  scanner = StringScanner.new(@content)
-  until scanner.eos?
-
-    # keep track of the current line for error messages
-    if scanner.bol?
-      @_line = scanner.check(%r/\A.*$/) if scanner.bol?
-      puts "[line] #@_line"
-    end
-
-    # look for escaped special characters \# \" etc
-    if scanner.scan(%r/\\([\[\]#{@param}#{@comment}"])/)
-      string << scanner[1]
-
-    # look for quoted strings
-    elsif scanner.scan(%r/"/)
-      quote = scanner.scan_until(/(?:\A|[^\\])"/)
-      parse_error('Unmatched quote') if quote.nil?
-
-      quote.chomp!('"')
-      string << quote
-
-    # look for comments, empty strings, end of lines
-    elsif scanner.skip(%r/\A\s*(?:[#{@comment}].*)?$/)
-      string << scanner.getch unless scanner.eos?
-
-      process_property(property, string)
-
-    # look for the separator between property name and value
-    elsif scanner.scan(%r/#{@param}/)
-      if property.empty?
-        property = string.strip
-        string.clear
-      else
-        parse_error
-      end
-
-    # look for the start of a new section
-    elsif scanner.scan(%r/\A\s*\[([^\]]+)\]/)
-      @_section = @ini[scanner[1]]
-
-    # store the next character and loop again
-    else
-      tmp = scanner.scan_until(%r/([\n"#{@param}#{@comment}]|\\[\[\]#{@param}#{@comment}"])/m)
-      len = scanner[1].length
-      tmp.slice!(tmp.length - len, len)
-
-      scanner.pos = scanner.pos - len
-      string << tmp
-    end
-  end
-
-  process_property(property, string)
-end
-
-def process_property(property, value)
-  value.chomp!
-  return if property.empty? and value.empty?
-  return if value.sub!(%r/\\\s*\z/, '')
-
-  property.strip!
-  value.strip!
-
-  parse_error if property.empty?
-
-  current_section[property.dup] = value.dup
-
-  property.clear
-  value.clear
-
-  nil
-end
-
-def current_section
-  @_section ||= @ini[@default]
-end
-
-def parse_error( msg = 'Could not parse line' )
-  raise "#{msg}: #{@_line.inspect}"
-end
-
-parse
-
-puts '='*72
-pp @ini