tomlrb 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 752cc47c45ecffc6b2c80ec8ff41ba2bec5481d6
-  data.tar.gz: de853f73c1ce4b01827c642ae894ad21d0ddc2a7
+  metadata.gz: 38bbb338f065b9b460b975285aeecad0e7bdf691
+  data.tar.gz: cd43529b21ee755922200f9ea492a84c1bb2f315
 SHA512:
-  metadata.gz: 3a16252642e7a281b696cb44f008d00bb85ecd2a7d50986ffa9e8eec710588a3bcde859285a3e954b9bd850b0a6d2750a975c94c53a07067c2b5cb48218bea5d
-  data.tar.gz: 65ef3514b3fe8f93c9cfc3f535401f9340e57a2910a5b2afdf13d7d8ad578eefb739bc1b9e637215fcfede56e76496d22c4ee1cde134d0a4f67a78409d954c60
+  metadata.gz: a90025b382ec0cc530029b423f17a698b524333981907ca0559f5c37192bb7e9594df1af57f32c11adcbca04adb1423b4eaeb671ec1ec4803029542b24e88315
+  data.tar.gz: 82429533f65caaabbfdc21df7fe4800e34047e5b0680541501c39e1954ec713179abd61cf12b83a7a773072af142387963c16f1198b51723100204bd3fa73951

data/README.md

@@ -7,10 +7,9 @@ A Racc based [TOML](https://github.com/toml-lang/toml) parser supporting the 0.4
 
 ## TODO
 
-* Error handling
+* YARD documentation
 * Better tests
 * Dumper
-* Refactoring
 
 ## Installation
 

data/lib/tomlrb.rb

@@ -7,12 +7,18 @@ require "tomlrb/parser"
 require "tomlrb/handler"
 
 module Tomlrb
+  class ParseError < StandardError; end
 
   def self.parse(string_or_io, **options)
     io = string_or_io.is_a?(String) ? StringIO.new(string_or_io) : string_or_io
     scanner = Scanner.new(io)
     parser = Parser.new(scanner, options)
-    handler = parser.parse
+    begin
+      handler = parser.parse
+    rescue Racc::ParseError => e
+      raise ParseError.new(e.message)
+    end
+
     handler.output
   end
 

data/lib/tomlrb/handler.rb

@@ -6,6 +6,7 @@ module Tomlrb
       @output = {}
       @current = @output
       @stack = []
+      @array_names = []
       @symbolize_keys = options[:symbolize_keys]
     end
 
@@ -28,7 +29,14 @@ module Tomlrb
 
     def deal_with_array_of_tables(identifiers, is_array_of_tables)
       identifiers.map!{|n| n.gsub("\"", '')}
-      last_identifier = identifiers.pop if is_array_of_tables
+      stringified_identifier = identifiers.join('.')
+
+      if is_array_of_tables
+        @array_names << stringified_identifier
+        last_identifier = identifiers.pop
+      elsif @array_names.include?(stringified_identifier)
+        raise ParseError.new('Cannot define a normal table with the same name as an already established array')
+      end
 
       yield(identifiers)
 
@@ -56,7 +64,6 @@ module Tomlrb
     def end_(type)
       array = []
       while (value = @stack.pop) != [type]
-        raise if value.nil?
         array.unshift(value)
       end
       array

data/lib/tomlrb/version.rb

@@ -1,3 +1,3 @@
 module Tomlrb
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tomlrb
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Francois Bernier
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-04-20 00:00:00.000000000 Z
+date: 2015-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler