iniparse 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 208591a4d54a9cd42aa9d47a5a4ed8ebca97723e
-  data.tar.gz: 9c351364ea35799017d026dfd77d522e3e3bfc0b
+  metadata.gz: ef588e81126741da025ef4c347f46c02b6a63037
+  data.tar.gz: 3ecdabf11a24fc32e1241a6371e8e721cc49770a
 SHA512:
-  metadata.gz: b3a507a45fd4a0f8191999fc688acfe8b759ec9e2885aef775c20de1a94114549753d5d2153694e93eb4aa74c0467cfb74e51bebc902fd982ddcd3307e6fc783
-  data.tar.gz: 86ebaa68bddf947264e7359d137d758660de3d880f7c94728244d82a67782434b04918fad22b679f225a6dcde5e7dc14b3a2b08ccb8f87cd0f23d0d7c2fdbe70
+  metadata.gz: 74eeab1bc5dbf530b3f8655794dcdc602efbe82e5950feae867d1d3a9e775ce9c82859ec53bb1d8ea0ac64d2a707b7d6691f1767874f36e4182fa07696744648
+  data.tar.gz: 1158894ac7fe9d37a44a00b01b90325dbfec459e887cc343772af308407b015a482ff0c4e193dff53ee1d5caeef589d2cae6726e67001ed60c1dd9aeb4977454

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.4.2'
-  s.date              = '2015-12-03'
+  s.version           = '1.4.3'
+  s.date              = '2017-06-01'
   s.rubyforge_project = 'iniparse'
 
   s.summary           = 'A pure Ruby library for parsing INI documents.'
@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files  = %w(LICENSE README.rdoc)
 
   # Dependencies.
-  s.add_development_dependency('rspec', '~> 2.14')
+  s.add_development_dependency('rspec', '~> 3.4')
 
   # = MANIFEST =
   s.files = %w[

data/lib/iniparse.rb

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

data/lib/iniparse/line_collection.rb

@@ -111,7 +111,7 @@ module IniParse
     include LineCollection
 
     def <<(line)
-      if line.kind_of?(IniParse::Lines::Option)
+      if line.kind_of?(IniParse::Lines::Option) || (has_key?('__anonymous__') && (line.blank? || line.kind_of?(IniParse::Lines::Comment)))
         option = line
         line   = IniParse::Lines::AnonymousSection.new
 

data/lib/iniparse/lines.rb

@@ -11,6 +11,7 @@ module IniParse
         @comment_prefix = opts.fetch(:comment_prefix, ' ')
         @comment_offset = opts.fetch(:comment_offset, 0)
         @indent         = opts.fetch(:indent, '')
+        @option_sep     = opts.fetch(:option_sep, nil)
       end
 
       # Returns if this line has an inline comment.
@@ -54,7 +55,8 @@ module IniParse
           comment_sep: @comment_sep,
           comment_prefix: @comment_prefix,
           comment_offset: @comment_offset,
-          indent: @indent
+          indent: @indent,
+          option_sep: @option_sep
         }
       end
     end
@@ -248,9 +250,9 @@ module IniParse
     class Option
       include Line
 
-      @regex = /^\s*([^=]+)  # Option
-                 =
-                 (.*?)$      # Value
+      @regex = /^\s*([^=]+?)  # Option, not greedy
+                 (\s*=\s*)    # Separator, greedy
+                 (.*?)$       # Value
                /x
 
       attr_accessor :key, :value
@@ -263,11 +265,13 @@ module IniParse
       def initialize(key, value, opts = {})
         super(opts)
         @key, @value = key.to_s, value
+        @option_sep = opts.fetch(:option_sep, ' = ')
       end
 
       def self.parse(line, opts)
         if m = @regex.match(line)
-          [:option, m[1].strip, typecast(m[2].strip), opts]
+          opts[:option_sep] = m[2]
+          [:option, m[1].strip, typecast(m[3].strip), opts]
         end
       end
 
@@ -291,9 +295,9 @@ module IniParse
       # because of options key duplication
       def line_contents
         if value.kind_of?(Array)
-          value.map { |v, i| "#{key} = #{v}" }
+          value.map { |v, i| "#{key}#{@option_sep}#{v}" }
         else
-          "#{key} = #{value}"
+          "#{key}#{@option_sep}#{value}"
         end
       end
     end

data/lib/iniparse/parser.rb

@@ -29,7 +29,7 @@ module IniParse
     # source<String>:: The source string.
     #
     def initialize(source)
-      @source = source.dup
+      @source = source.dup.sub(/\n\z/,'')
     end
 
     # Parses the source string and returns the resulting data structure.
@@ -88,8 +88,6 @@ module IniParse
             line[(m[1].length..-1)].index(m[2]) + m[1].length
 
           line = m[1]
-        else
-          line.rstrip!
         end
 
         [line, opts]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iniparse
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Anthony Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-03 00:00:00.000000000 Z
+date: 2017-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.4'
 description: A pure Ruby library for parsing INI documents. Preserves the structure
   of the original document, including whitespace and comments
 email: hi@antw.me
@@ -66,9 +66,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: iniparse
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 2
 summary: A pure Ruby library for parsing INI documents.
 test_files: []
-has_rdoc: