zig 0.0.1 → 0.0.2

data/README.md

@@ -1,7 +1,9 @@
 # ZIG
 
-ZIG is a simple data format. It is designed to be edited by hand.
-(Is is also quite easy to parse and generate, though.)
+ZIG is a simple data format. It is designed to be easily edited by hand.
+It is also pretty easy to parse and generate, though.
+
+ZIG is indentation-based, like Python or Coffeescript.
 
 Here is a short example:
 
@@ -15,7 +17,8 @@ Here is a short example:
   description: "
     Check your Internet connection. Restart any router, modem,
     or other network devices you may be using.
+  # TODO: do we need these any more?
   codes: [
     118
     192
-```
+```

data/lib/zig/parser.rb

@@ -15,15 +15,18 @@ class ZIG::Parser
       return object if spaces.size < indent
       raise "[line #{lines.num}] illegal indent" if spaces.size > indent
       lines.next
-      if object.is_a?(Hash)
-        key, value = value.scan(KEY_VALUE).flatten
-        raise "[line #{lines.num}] missing key" if key.nil?
-        object[key.strip.to_sym] = parse_value(indent, lines, value)
-      elsif object.is_a?(Array)
-        object << parse_value(indent, lines, value)
-      else
+      if object.is_a?(String)
         object << "\n" unless object.empty?
         object << value
+      else
+        next if value[0] == '#'
+        if object.is_a?(Hash)
+          key, value = value.scan(KEY_VALUE).flatten
+          raise "[line #{lines.num}] missing key" if key.nil?
+          object[key.strip.to_sym] = parse_value(indent, lines, value)
+        else
+          object << parse_value(indent, lines, value)
+        end
       end
     end
   end

data/lib/zig/version.rb

@@ -1,3 +1,3 @@
 module ZIG
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/test/zig_test.rb

@@ -159,6 +159,41 @@ describe ZIG do
   end
 
   describe "comments" do
+    it "should skip comment lines inside hashes" do
+      doc =
+"{
+  a: 1
+  #b: 2
+  c: 3"
+      assert_equal Hash[a: 1, c: 3], ZIG.parse(doc)
+    end
+
+    it "should skip comment lines inside arrays" do
+      doc =
+"[
+  'one'
+  #'two'
+  'three'"
+      assert_equal %w[one three], ZIG.parse(doc)
+    end
+
+    it "should ignore comment lines inside multiline strings" do
+      doc =
+%{"
+  one house
+  #two houses
+  three houses}
+      assert_equal "one house\n#two houses\nthree houses", ZIG.parse(doc)
+    end
+    it "should reject comments if not properly idented" do
+      doc =
+"{
+  a: 1
+   # TODO: check c
+  c: 3"
+      assert_raises(RuntimeError) { ZIG.parse(doc) }
+    end
+
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zig
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-07 00:00:00.000000000 Z
+date: 2012-11-08 00:00:00.000000000 Z
 dependencies: []
 description: A parser for the ZIG data format.
 email:
@@ -54,7 +54,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A parser for the ZIG data format.