iniparse 1.1.5 → 1.1.6

data/Gemfile

@@ -0,0 +1,2 @@
+source :rubygems
+gemspec

data/README.rdoc

@@ -1,4 +1,4 @@
-= IniParse
+= IniParse {<img src="https://secure.travis-ci.org/antw/iniparse.png" alt="Build Status" />}[http://travis-ci.org/antw/iniparse]
 
 IniParse is a pure Ruby library for parsing
 INI[http://en.wikipedia.org/wiki/INI_file] configuration and data
@@ -34,7 +34,7 @@ IniFile gem does all you need.
 
 Parsing an INI file is fairly simple:
 
-    IniParse.parse( File.open('path/to/my/file.ini') ) # => IniParse::Document
+    IniParse.parse( File.read('path/to/my/file.ini') ) # => IniParse::Document
 
 IniParse.parse returns an IniParse::Document instance which represents the
 passed "INI string". Assuming you know the structure of the document, you can

data/iniparse.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'iniparse'
-  s.version           = '1.1.5'
-  s.date              = '2011-12-21'
+  s.version           = '1.1.6'
+  s.date              = '2012-11-07'
   s.rubyforge_project = 'iniparse'
 
   s.summary           = 'A pure Ruby library for parsing INI documents.'
@@ -27,10 +27,11 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files  = %w(History LICENSE README.rdoc)
 
   # Dependencies.
-  s.add_development_dependency('rspec', '>= 2.0.0.beta.20')
+  s.add_development_dependency('rspec', '>= 2.11.0')
 
   # = MANIFEST =
   s.files = %w[
+    Gemfile
     History
     LICENSE
     README.rdoc

data/lib/iniparse.rb

@@ -7,7 +7,7 @@ require File.join(dir, 'lines')
 require File.join(dir, 'parser')
 
 module IniParse
-  VERSION = '1.1.5'
+  VERSION = '1.1.6'
 
   # A base class for IniParse errors.
   class IniParseError < StandardError; end

data/lib/iniparse/parser.rb

@@ -77,8 +77,8 @@ module IniParse
       # Strips in inline comment from a line (or value), removes trailing
       # whitespace and sets the comment options as applicable.
       def strip_comment(line, opts)
-        if m = /^(.*?)(?:\s+(;|\#)\s*(.*))$/.match(line) ||
-           m = /(^)(?:(;|\#)\s*(.*))$/.match(line) # Comment lines.
+        if m = /^(^)(?:(;|\#)\s*(.*))$$/.match(line) ||
+           m = /^(.*?)(?:\s+(;|\#)\s*(.*))$/.match(line) # Comment lines.
           opts[:comment] = m[3].rstrip
           opts[:comment_sep] = m[2]
           # Remove the line content (since an option value may contain a

data/spec/parser/document_parsing_spec.rb

@@ -37,6 +37,15 @@ describe 'Parsing a document' do
     @doc['first_section'].lines.to_a.first.should be_kind_of(IniParse::Lines::Blank)
   end
 
+  it 'should permit comments on their own line' do
+    lambda {
+      @doc = IniParse::Parser.new(fixture(:comment_line)).parse
+    }.should_not raise_error
+
+    line = @doc['first_section'].lines.to_a.first
+    line.comment.should eql('; block comment ;')
+  end
+
   it 'should raise an error if an option preceeds the first section' do
     lambda {
       IniParse::Parser.new(fixture(:option_before_section)).parse

data/spec/spec_fixtures.rb

@@ -53,3 +53,10 @@ IniParse::Test::Fixtures[:section_with_equals] = <<-FIX.gsub(/^  /, '')
   [another_section = a name]
   another = thing
 FIX
+
+IniParse::Test::Fixtures[:comment_line] = <<-FIX.gsub(/^  /, '')
+  [first_section]
+  ; block comment ;
+  ; with more lines ;
+  key = value
+FIX

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iniparse
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,19 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-21 00:00:00.000000000 Z
+date: 2012-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70270665077040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0.beta.20
+        version: 2.11.0
   type: :development
   prerelease: false
-  version_requirements: *70270665077040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.11.0
 description: 
 email: hi@antw.me
 executables: []
@@ -31,6 +36,7 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files:
+- Gemfile
 - History
 - LICENSE
 - README.rdoc
@@ -80,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: iniparse
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 2
 summary: A pure Ruby library for parsing INI documents.
@@ -98,3 +104,4 @@ test_files:
 - spec/spec_fixtures.rb
 - spec/spec_helper.rb
 - spec/spec_helper_spec.rb
+has_rdoc: