iniparse 1.3.3 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 495078e17e0358686da8bc6e375483281140bc39
-  data.tar.gz: fdee56564996ea5af6d7ba0dd51cf7952135264f
+  metadata.gz: df89c5288250ac2060dc5fff2d55a8f58ed150ec
+  data.tar.gz: fb378ab6a528d5c718a39b24b1429872a6724a25
 SHA512:
-  metadata.gz: 15751da5f0bea27de9b682a25602c21036136d6b87abf2b3786f4cbd1076d146943ac000214f61986449b48ec0ac6842f3e24b7d40137f9a5855f91b16181df3
-  data.tar.gz: 087fe62daf3a872cf7f13edccdab3a72743a1c2a1474c7137f2dc927e0496ff10548b5453e47571c0e2d18bcebe4210e58eed82f9c0ec7833d668ddb44b92c08
+  metadata.gz: aa5111d419e946cfdab3bc81dd811461594e94e44d2664b891d3271b514d65f6c0475daceef40d56bcf9232808d14481b3e240f0bf0eb63c822fdf0aaed60387
+  data.tar.gz: c6f7dd510ad5beba9120abae324c1ebc7429ae827b046c96a145b8d7c790329c80d2d91d20829c292753aa14ce5faf95c9500554410a188c7dd9024e8b07df7a

data/Rakefile

@@ -51,7 +51,7 @@ task :release => :build do
     puts "You must be on the master branch to release!"
     exit!
   end
-  # sh "git commit --allow-empty -a -m 'Release #{version}'"
+  sh "git commit --allow-empty -a -m 'Release #{version}'"
   sh "git tag v#{version}"
   sh "git push origin master"
   sh "git push origin v#{version}"

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.3.3'
-  s.date              = '2014-10-30'
+  s.version           = '1.4.0'
+  s.date              = '2015-04-06'
   s.rubyforge_project = 'iniparse'
 
   s.summary           = 'A pure Ruby library for parsing INI documents.'

data/lib/iniparse.rb

@@ -7,7 +7,7 @@ require File.join(dir, 'lines')
 require File.join(dir, 'parser')
 
 module IniParse
-  VERSION = '1.3.3'
+  VERSION = '1.4.0'
 
   # A base class for IniParse errors.
   class IniParseError < StandardError; end
@@ -36,7 +36,7 @@ module IniParse
   # IniParse::Document
   #
   def parse(source)
-    IniParse::Parser.new(source).parse
+    IniParse::Parser.new(source.gsub("\\\n", '')).parse
   end
 
   # Opens the file at +path+, reads and parses it's contents.

data/lib/iniparse/document.rb

@@ -51,6 +51,24 @@ module IniParse
 
     alias_method :to_s, :to_ini
 
+    # Returns a has representation of the INI with multi-line options
+    # as an array
+    def to_hash
+      result = {}
+      @lines.entries.each do |section|
+        result[section.key] ||= {}
+        section.entries.each do |option|
+          opts = Array(option)
+          val = opts.map { |o| o.respond_to?(:value) ? o.value : o }
+          val = val.size > 1 ? val : val.first
+          result[section.key][opts.first.key] = val
+        end
+      end
+      result
+    end
+
+    alias_method :to_h, :to_hash
+
     # A human-readable version of the document, for debugging.
     def inspect
       sections = @lines.select { |l| l.is_a?(IniParse::Lines::Section) }

data/lib/iniparse/lines.rb

@@ -21,16 +21,14 @@ module IniParse
       # Returns this line as a string as it would be represented in an INI
       # document.
       def to_ini
-        ini = line_contents
-        ini = @indent + ini if @indent
-
-        if has_comment?
-          ini += ' ' if ini =~ /\S/ # not blank
-          ini  = ini.ljust(@comment_offset)
-          ini += comment
-        end
-
-        ini
+        [*line_contents].map { |ini|
+            if has_comment?
+              ini += ' ' if ini =~ /\S/ # not blank
+              ini  = ini.ljust(@comment_offset)
+              ini += comment
+            end
+            @indent + ini
+          }.join "\n"
       end
 
       # Returns the contents for this line.
@@ -48,6 +46,17 @@ module IniParse
       def blank?
         false
       end
+
+      # Returns the options used to create the line
+      def options
+        {
+          comment: @comment,
+          comment_sep: @comment_sep,
+          comment_prefix: @comment_prefix,
+          comment_offset: @comment_offset,
+          indent: @indent
+        }
+      end
     end
 
     # Represents a section header in an INI document. Section headers consist
@@ -93,13 +102,13 @@ module IniParse
         coll = lines.to_a
 
         if coll.any?
-          super + $/ + coll.to_a.map do |line|
+          [*super,coll.to_a.map do |line|
             if line.kind_of?(Array)
               line.map { |dup_line| dup_line.to_ini }.join($/)
             else
               line.to_ini
             end
-          end.join($/)
+          end].join($/)
         else
           super
         end
@@ -132,7 +141,14 @@ module IniParse
       # new option to be considered a duplicate, use +add_option+ instead.
       #
       def []=(key, value)
-        @lines[key.to_s] = IniParse::Lines::Option.new(key.to_s, value)
+        line = @lines[key.to_s]
+        opts = {}
+        if line.kind_of?(Array)
+          opts = line.first.options
+        elsif line.respond_to? :options
+          opts = line.options
+        end
+        @lines[key.to_s] = IniParse::Lines::Option.new(key.to_s, value, opts)
       end
 
       # Returns the value of an option identified by +key+.
@@ -271,8 +287,14 @@ module IniParse
       private
       #######
 
+      # returns an array to support multiple lines or a single one at once
+      # because of options key duplication
       def line_contents
-        '%s = %s' % [key, value]
+        if value.kind_of?(Array)
+          value.map { |v, i| "#{key} = #{v}" }
+        else
+          "#{key} = #{value}"
+        end
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iniparse
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.4.0
 platform: ruby
 authors:
 - Anthony Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-30 00:00:00.000000000 Z
+date: 2015-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec