inireader 0.0.1 → 0.1.1

data/lib/ini_reader.rb

@@ -1,5 +1,5 @@
 require "inireader/version"
 require "inireader/base"
 
-module IniReader
+class IniReader
 end

data/lib/inireader/base.rb

@@ -1,39 +1,37 @@
-module IniReader
-  class Base
-    def initialize( string = '')
-      @section_hash = {}
-      parse(StringIO.new(string))
-    end
+class IniReader
+  def initialize( string = '')
+    @section_hash = {}
+    parse(StringIO.new(string))
+  end
 
-    def self.parse(filename)
-      reader = IniReader::Base.new
-      reader.send(:parse, File.open(filename, "r"))
-      return reader
-    end
+  def self.parse(filename)
+    reader = IniReader.new
+    reader.send(:parse, File.open(filename, "r"))
+    return reader
+  end
 
-    #returns the hash for a section of the inifile
-    def []( section_name )
-      return @section_hash[section_name]
-    end
+  #returns the hash for a section of the inifile
+  def []( section_name )
+    return @section_hash[section_name]
+  end
 
-    private
-    def parse(io)
-      current_section = nil
-      io.each do |line|
-        if line[0] == ';'
-          next
-        elsif ( matchdata = line.match(/^\[(.+)\]$/) ) != nil
-          current_section = @section_hash[matchdata[1].to_sym] || {}
-          @section_hash[matchdata[1].to_sym] = current_section
-        elsif ( matchdata = line.match(/^([^=]*)=(.*)$/) )
-          current_section[matchdata[1].to_sym] = matchdata[2].to_s
-        elsif line.strip == ""
-          next
-        else
-          raise Exception("Could not parse line: #{line}")
-        end
+  private
+  def parse(io)
+    current_section = nil
+    io.each do |line|
+      line = line.strip
+      if line[0] == ';'
+        next
+      elsif ( matchdata = line.match(/^\[(.+)\]$/) ) != nil
+        current_section = @section_hash[matchdata[1].to_sym] || {}
+        @section_hash[matchdata[1].to_sym] = current_section
+      elsif ( matchdata = line.match(/^([^=]*)=(.*)$/) )
+        current_section[matchdata[1].to_sym] = matchdata[2].to_s
+      elsif line.strip == ""
+        next
+      else
+        raise Exception("Could not parse line: #{line}")
       end
     end
-
   end
 end

data/lib/inireader/version.rb

@@ -1,3 +1,3 @@
-module IniReader
-  VERSION = "0.0.1"
+class IniReader
+  VERSION = "0.1.1"
 end

data/spec/ini_reader_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe IniReader do
   it "Should exist" do
     lambda do
-      IniReader.class == Module
+      IniReader.class == Class
     end.should_not raise_error
   end
 end

data/spec/inireader/base_spec.rb

@@ -1,12 +1,12 @@
-describe IniReader::Base do
+describe IniReader do
   it "should exist" do
     lambda do
-      reader = IniReader::Base.new
+      reader = IniReader.new
     end.should_not raise_error
   end
 
   it "should return nil if looking for a section that doesn't exist" do
-    reader = IniReader::Base.new
+    reader = IniReader.new
     reader[:section_name].should == nil
   end
 
@@ -15,7 +15,7 @@ describe IniReader::Base do
       "blah blah blah\n" +
       "key1=val1\n"
     lambda do
-      reader = IniReader::Base.new(section_string)
+      reader = IniReader.new(section_string)
     end.should raise_error
   end
 
@@ -24,7 +24,7 @@ describe IniReader::Base do
       ";blah blah blah\n" +
       "key1=val1\n"
     lambda do
-      reader = IniReader::Base.new(section_string)
+      reader = IniReader.new(section_string)
     end.should_not raise_error
   end
 
@@ -33,21 +33,21 @@ describe IniReader::Base do
       "\n" +
       "key1=val1\n"
     lambda do
-      reader = IniReader::Base.new(section_string)
+      reader = IniReader.new(section_string)
     end.should_not raise_error
   end
 
   describe "sections" do
     it "should add a section when it sees a section header" do
       section_string = "[section_name]\n"
-      reader = IniReader::Base.new(section_string)
+      reader = IniReader.new(section_string)
       reader[:section_name].should_not == nil
     end
 
     it "should allow for different section names" do
       section_string = "[section_name]\n" +
         "[section_name_2]\n"
-      reader = IniReader::Base.new(section_string)
+      reader = IniReader.new(section_string)
       reader[:section_name].should_not == nil
       reader[:section_name_2].should_not == nil
     end
@@ -55,7 +55,7 @@ describe IniReader::Base do
     it "should force the section to have a name" do
       section_string = "[]\n"
       lambda do
-        reader = IniReader::Base.new(section_string)
+        reader = IniReader.new(section_string)
       end.should raise_error
     end
   end
@@ -65,14 +65,14 @@ describe IniReader::Base do
       section_string = "[section_name]\n" +
         "key1=val1\n"
       lambda do
-        reader = IniReader::Base.new(section_string)
+        reader = IniReader.new(section_string)
       end.should_not raise_error
     end
 
     it "should add a pair to the associated section" do
       section_string = "[section_name]\n" +
         "key1=val1\n"
-      reader = IniReader::Base.new(section_string)
+      reader = IniReader.new(section_string)
       reader[:section_name].class.should == Hash
       reader[:section_name][:key1].should == "val1"
     end
@@ -81,7 +81,7 @@ describe IniReader::Base do
       section_string = "[section_name]\n" +
         "[section_name2]\n" +
         "key1=val1\n"
-      reader = IniReader::Base.new(section_string)
+      reader = IniReader.new(section_string)
       reader[:section_name][:key1].should == nil
     end
 
@@ -90,7 +90,7 @@ describe IniReader::Base do
         "key1=val1\n" +
         "[section_name]\n" +
         "key3=val3\n"
-      reader = IniReader::Base.new(section_string)
+      reader = IniReader.new(section_string)
       reader[:section_name][:key3].should == "val3"
     end
 
@@ -99,7 +99,7 @@ describe IniReader::Base do
         "key1=val1\n" +
         "[section_name]\n" +
         "key3=val3\n"
-      reader = IniReader::Base.new(section_string)
+      reader = IniReader.new(section_string)
       reader[:section_name][:key1].should == "val1"
     end
   end
@@ -117,7 +117,7 @@ describe IniReader::Base do
       outfile = File.new("./string", "w")
       outfile.write(string)
       outfile.close
-      reader = IniReader::Base.parse("./string")
+      reader = IniReader.parse("./string")
       reader[:section].should == {key1: "val3", key2: "val2"}
       reader[:section2].should == {key1:"key2=val1", key3:"val2"}
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inireader
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -103,6 +103,7 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- inireader-0.0.1.gem
 - inireader.gemspec
 - lib/ini_reader.rb
 - lib/inireader/base.rb