anvl 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/anvl.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{anvl}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chris Beer"]

data/lib/anvl.rb

@@ -9,7 +9,7 @@ module ANVL
     attr_reader :entries
 
     def initialize obj = nil
-      @entries = {}
+      @entries = Hash.new { |h,k| h[k] = [] }
 
       case obj
         when Hash
@@ -30,19 +30,14 @@ module ANVL
 
       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
+      add_entries_methods
 
-      cleanup_entries
+      gc!
     end
 
     def to_s
-      @entries.reject { |key, value| value.nil? }.map do |key, value|
+      gc!
+      @entries.map do |key, value|
         if value.is_a? Array
           value.map do |v|
             "#{key}: #{v}"
@@ -53,18 +48,23 @@ module ANVL
       end.join "\n"
     end
 
+    def to_h
+      gc!
+      @entries
+    end
+
     def [] key
-      @entries[key] ||= []
       return @entries[key]
     end
 
     def []= key, value
+      value = [value] unless value.is_a? Array
       @entries[key] = value
     end
 
     def push hash
       hash.each do |key, value|
-        @entries[key] ||= []
+        @entries[key] = [@entries[key]] unless @entries[key].is_a? Array
 	if value.is_a? Array
 	  value.each do |v|      
 	    @entries[key] << v
@@ -73,6 +73,7 @@ module ANVL
           @entries[key] << value
 	end
       end
+      gc!
       @entries
     end
     alias_method :'<<', :push
@@ -85,13 +86,24 @@ module ANVL
 
     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
+    def add_entries_methods
+      @entries.public_methods(false).reject { |x| self.respond_to? x }.each do |meth|
+        (class << self; self; end).class_eval do
+          define_method meth do |*args|
+            @entries.send meth, *args
+	  end 
+	end
+      end
+    end  
+
+    def gc!
+      @entries.delete_if { |key, value| value.nil? or (value.is_a? Array and value.empty?) }
+
       @entries.each do |key, value|
-        @entries[key] = value.first if value.length == 1
+        @entries[key] = value.first if value.is_a? Array and value.length == 1
       end
     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.entries.length, 0)
+    assert_equal(0, h.entries.length)
   end
 
   def test_parse_comment
     h = ANVL.parse '#'
-    assert_equal(h.entries.length, 0)
+    assert_equal(0, h.entries.length)
   end
 
   def test_first_draft
@@ -18,15 +18,48 @@ who: Gilbert, W.S. | Sullivan, Arthur
 what: The Yeomen of
       the Guard 
 when/created: 1888'
-    assert_equal(h[:entry], "")
-    assert_equal(h[:who], 'Gilbert, W.S. | Sullivan, Arthur')
-    assert_equal(h[:what], "The Yeomen of the Guard")
-    assert_equal(h[:"when/created"], "1888")
+    assert_equal("", h[:entry])
+    assert_equal('Gilbert, W.S. | Sullivan, Arthur', h[:who])
+    assert_equal("The Yeomen of the Guard", h[:what])
+    assert_equal("1888", h[:"when/created"])
+  end
+
+  def test_multiple_values
+    h = ANVL::Document.parse 'entry:
+a: 1
+a: 2'
+    assert_equal({:a => ["1","2"], :entry => ""}, h.to_h)
+  end
+
+  def test_key_access
+    h = ANVL::Document.new
+    assert_equal([], h[:a])
+    h[:a] = 'a'
+    assert_equal({:a => 'a' }, h.to_h)
+    h[:a] = ['a', 'b']
+    assert_equal({:a => ['a', 'b'] }, h.to_h)
+    h[:a] << 'c'
+    assert_equal({:a => ['a', 'b', 'c'] }, h.to_h)
+    assert_equal(['a', 'b', 'c'], h[:a])
+
+    h[:b]
+    assert_equal({:a => ['a', 'b', 'c'] }, h.to_h)
+
+    h << { :a => 'd' }
+    assert_equal({:a => ['a', 'b', 'c', 'd'] }, h.to_h)
+
+    h << { :c => 1 }
+    assert_equal(1, h[:c])
+
+    h << { :c => 2 }
+    assert_equal([1, 2], h[:c])
+
+    assert_equal("a: a\na: b\na: c\na: d\nc: 1\nc: 2", h.to_s)
   end
 
   def test_fmt_empty
     str = ANVL.to_anvl({})
-    assert_equal(str, '')
+    assert_equal('', str)
   end
   
   def test_fmt_first_draft

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: anvl
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Chris Beer