iniparse 1.0.0 → 1.1.1

data/Rakefile

@@ -60,7 +60,7 @@ desc "Run all examples"
 Spec::Rake::SpecTask.new(:spec) do |spec|
   spec.libs << 'lib' << 'spec'
   spec.spec_files = FileList['spec/**/*_spec.rb']
-  spec.spec_opts = ['-c -f s']
+  spec.spec_opts = ['-c -f p']
 end
 
 desc "Run all examples with RCov"

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.1

data/lib/iniparse.rb

@@ -1,17 +1,13 @@
-require 'extlib'
+dir = File.expand_path('iniparse', File.dirname(__FILE__))
 
-dir = Pathname(__FILE__).dirname.expand_path / 'iniparse'
-
-require dir / 'document'
-require dir / 'generator'
-require dir / 'line_collection'
-require dir / 'lines'
-require dir / 'parser'
+require File.join(dir, 'document')
+require File.join(dir, 'generator')
+require File.join(dir, 'line_collection')
+require File.join(dir, 'lines')
+require File.join(dir, 'parser')
 
 module IniParse
-  VERSION = File.read(
-    Pathname(__FILE__).dirname.expand_path / '..' / 'VERSION'
-  ).strip
+  VERSION = File.read('VERSION').strip
 
   # A base class for IniParse errors.
   class IniParseError < StandardError; end

data/lib/iniparse/document.rb

@@ -57,7 +57,7 @@ module IniParse
     #
     def save(path = nil)
       @path = path if path
-      raise IniParseError, 'No path given to Document#save' if @path.blank?
+      raise IniParseError, 'No path given to Document#save' if @path !~ /\S/
       File.open(@path, 'w') { |f| f.write(self.to_ini) }
     end
   end

data/lib/iniparse/generator.rb

@@ -145,10 +145,9 @@ module IniParse
       )
     rescue LineNotAllowed
       # Tried to add an Option to a Document.
-      raise NoSectionError, <<-EOS.compress_lines
-        Your INI document contains an option before the first section is
-        declared which is not allowed.
-      EOS
+      raise NoSectionError,
+        'Your INI document contains an option before the first section is ' \
+        'declared which is not allowed.'
     end
 
     # Adds a new comment line to the document.

data/lib/iniparse/line_collection.rb

@@ -58,7 +58,9 @@ module IniParse
     #
     def each(include_blank = false)
       @lines.each do |line|
-        yield(line) if include_blank || (! line.blank?)
+        if include_blank || ! (line.is_a?(Array) ? line.empty? : line.blank?)
+          yield(line)
+        end
       end
     end
 

data/lib/iniparse/lines.rb

@@ -24,7 +24,7 @@ module IniParse
         ini = @indent + ini if @indent
 
         if has_comment?
-          ini += ' ' unless ini.blank?
+          ini += ' ' if ini =~ /\S/ # not blank
           ini  = ini.ljust(@comment_offset)
           ini += comment
         end
@@ -42,6 +42,11 @@ module IniParse
       def comment
         '%s %s' % [@comment_sep, @comment]
       end
+
+      # Returns whether this is a line which has no data.
+      def blank?
+        false
+      end
     end
 
     # Represents a section header in an INI document. Section headers consist
@@ -249,7 +254,7 @@ module IniParse
       end
 
       def self.parse(line, opts)
-        if line.blank?
+        if line !~ /\S/ # blank
           if opts[:comment].nil?
             [:blank]
           else
@@ -283,7 +288,7 @@ module IniParse
       # but without a comment, just the seperator will be returned.
       #
       def comment
-        @comment.blank? ? @comment_sep : super
+        @comment !~ /\S/ ? @comment_sep : super
       end
     end
   end # Lines

data/lib/iniparse/parser.rb

@@ -1,9 +1,27 @@
 module IniParse
   class Parser
-    cattr_accessor :parse_types
-    @@parse_types = [ IniParse::Lines::Option,
-                      IniParse::Lines::Section,
-                      IniParse::Lines::Blank ]
+
+    # Returns the line types.
+    #
+    # ==== Returns
+    # Array
+    #
+    def self.parse_types
+      @@parse_types ||= []
+    end
+
+    # Sets the line types. Handy if you want to add your own custom Line
+    # classes.
+    #
+    # ==== Parameters
+    # types<Array[IniParse::Lines::Line]>:: An array containing Line classes.
+    #
+    def self.parse_types=(types)
+      parse_types.replace(types)
+    end
+
+    self.parse_types = [ IniParse::Lines::Option,
+      IniParse::Lines::Section, IniParse::Lines::Blank ]
 
     # Creates a new Parser instance for parsing string +source+.
     #
@@ -44,10 +62,9 @@ module IniParse
         end
 
         if parsed.nil?
-          raise IniParse::ParseError, <<-EOS.compress_lines
-            A line of your INI document could not be parsed to a LineType:
-            '#{line}'.
-          EOS
+          raise IniParse::ParseError,
+            "A line of your INI document could not be parsed to a " \
+            "LineType: '#{line}'."
         end
 
         parsed

data/spec/lines_spec.rb

@@ -250,24 +250,22 @@ describe 'IniParse::Lines::Section' do
       )
       @section.lines << IniParse::Lines::Option.new('b', 'val2')
 
-      @section.to_ini.should == <<-INI.margin
-        [a section]
-        a = val1
-
-        ; my comment
-        b = val2
-      INI
+      @section.to_ini.should ==
+        "[a section]\n" \
+        "a = val1\n" \
+        "\n" \
+        "; my comment\n" \
+        "b = val2"
     end
 
     it 'should include duplicate lines' do
       @section.lines << IniParse::Lines::Option.new('a', 'val1')
       @section.lines << IniParse::Lines::Option.new('a', 'val2')
 
-      @section.to_ini.should == <<-INI.margin
-        [a section]
-        a = val1
-        a = val2
-      INI
+      @section.to_ini.should ==
+        "[a section]\n" \
+        "a = val1\n" \
+        "a = val2"
     end
   end
 

data/spec/spec_fixtures.rb

@@ -7,40 +7,42 @@ module IniParse
         if @@fixtures.has_key?(fix)
           @@fixtures[fix]
         else
-          @@fixtures[fix] = File.read(Pathname(__FILE__).dirname.expand_path / 'fixtures' / fix)
+          @@fixtures[fix] = File.read(
+            File.join(File.expand_path('fixtures', File.dirname(__FILE__)), fix)
+          )
         end
       end
 
       def self.[]=(fix, val)
-        @@fixtures[fix] = val.margin
+        @@fixtures[fix] = val
       end
     end
   end
 end
 
-IniParse::Test::Fixtures[:comment_before_section] = <<-FIX
+IniParse::Test::Fixtures[:comment_before_section] = <<-FIX.gsub(/^  /, '')
   ; This is a comment
   [first_section]
   key = value
 FIX
 
-IniParse::Test::Fixtures[:blank_before_section] = <<-FIX
+IniParse::Test::Fixtures[:blank_before_section] = <<-FIX.gsub(/^  /, '')
 
   [first_section]
   key = value
 FIX
 
-IniParse::Test::Fixtures[:blank_in_section] = <<-FIX
+IniParse::Test::Fixtures[:blank_in_section] = <<-FIX.gsub(/^  /, '')
   [first_section]
 
   key = value
 FIX
 
-IniParse::Test::Fixtures[:option_before_section] = <<-FIX
+IniParse::Test::Fixtures[:option_before_section] = <<-FIX.gsub(/^  /, '')
   key = value
   [first_section]
 FIX
 
-IniParse::Test::Fixtures[:invalid_line] = <<-FIX
+IniParse::Test::Fixtures[:invalid_line] = <<-FIX.gsub(/^  /, '')
   this line is not valid
 FIX

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: iniparse
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  prerelease: false
+  segments: 
+  - 1
+  - 1
+  - 1
+  version: 1.1.1
 platform: ruby
 authors: 
 - Anthony Williams
@@ -9,29 +14,37 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-05 00:00:00 +00:00
+date: 2010-02-23 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: extlib
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 9
         version: 0.9.9
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 0
         version: 1.2.0
-    version: 
+  type: :development
+  version_requirements: *id002
 description: A pure Ruby library for parsing INI documents.
 email: anthony@ninecraft.com
 executables: []
@@ -82,18 +95,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A pure Ruby library for parsing INI documents.