anvl 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/anvl.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{anvl}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chris Beer"]
-  s.date = %q{2010-11-26}
+  s.date = %q{2010-11-28}
   s.email = %q{chris@cbeer.info}
   s.extra_rdoc_files = [
     "LICENSE.txt",

data/lib/anvl.rb

@@ -1,45 +1,107 @@
 module ANVL
-  def self.parse str
-    data = {}
-    entries = []
-    lines = str.split("\n")
-
-    lines.each do |l|
-      case l
-        when /^\#/
-	  # comment
-	  next
-        when /^\s/
-          entries.last << l.gsub(/^\s+/, ' ') 
-	else
-          entries << l
+  class Document # < Hash
+
+    def self.parse str
+      anvl = ANVL::Document.new  str
+      anvl
+    end
+
+    attr_reader :entries
+
+    def initialize obj = nil
+      @entries = {}
+
+      case obj
+        when Hash
+          obj.each do |key, value|
+            @entries[key.to_sym] = value
+	  end
+	when String
+	  lines = obj.gsub(/\s?\n\s+/, ' ').split("\n")
+
+	  lines.each_with_index do |str, i|
+	    case str
+	      when /^#/
+                parse_comment str, i
+	      else  
+                parse_entry str, i
+	    end  
+	  end  
+
+      end if obj
+
+      @entries.public_methods(false).each do |meth|
+        (class << self; self; end).class_eval do
+          define_method meth do |*args|
+            @entries.send meth, *args
+	  end unless self.respond_to? meth
+	end
       end
+
+      cleanup_entries
     end
 
-    entries.each do |e|
-      key, value = e.split ":", 2
-      data[key.to_sym] ||= []
-      data[key.to_sym] << value.strip
+    def to_s
+      @entries.reject { |key, value| value.nil? }.map do |key, value|
+        if value.is_a? Array
+          value.map do |v|
+            "#{key}: #{v}"
+          end
+        else
+          "#{key}: #{value}" 
+        end
+      end.join "\n"
     end
 
-    data.each do |key, value|
-      data[key] = value.first if value.length == 1
+    def [] key
+      @entries[key] ||= []
+      return @entries[key]
     end
 
-    data
-  end
+    def []= key, value
+      @entries[key] = value
+    end
 
-  def self.to_anvl h
-    lines = []
-    h.each do |key, value|
-      if value.respond_to? :each
-        value.each do |v|
-          lines << "#{key}: #{v}"
-        end
-      else
-        lines << "#{key}: #{value}" 
+    def push hash
+      hash.each do |key, value|
+        @entries[key] ||= []
+	if value.is_a? Array
+	  value.each do |v|      
+	    @entries[key] << v
+	  end
+        else
+          @entries[key] << value
+	end
       end
+      @entries
     end
-    lines.join "\n"
+    alias_method :'<<', :push
+
+    private
+
+    def parse_comment str, line=0
+
+    end
+
+    def parse_entry str, line=0
+      key, value = str.split ":", 2
+      @entries[key.to_sym] ||= []
+      @entries[key.to_sym] << value.strip
+    end
+
+    def cleanup_entries
+      @entries.each do |key, value|
+        @entries[key] = value.first if value.length == 1
+      end
+    end
+  end
+
+  def self.parse *args
+    Document.parse *args
+  end
+
+  def self.to_anvl *args
+    anvl = Document.parse *args
+    anvl.to_s
   end
 end

data/test/test_anvl.rb

@@ -3,12 +3,12 @@ require 'helper'
 class TestAnvl < Test::Unit::TestCase
   def test_parse_empty
     h = ANVL.parse ''
-    assert_equal(h, {})
+    assert_equal(h.entries.length, 0)
   end
 
   def test_parse_comment
     h = ANVL.parse '#'
-    assert_equal(h, {})
+    assert_equal(h.entries.length, 0)
   end
 
   def test_first_draft

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: anvl
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Chris Beer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-26 00:00:00 -05:00
+date: 2010-11-28 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency