hocon 0.0.5 → 0.0.6

data/lib/hocon.rb

@@ -1,13 +1,5 @@
 module Hocon
   require 'hocon/config_factory'
-  require 'hocon/config_parse_options'
-  require 'hocon/config_error'
-  require 'hocon/config_object'
-  require 'hocon/config_parse_options'
-  require 'hocon/config_render_options'
-  require 'hocon/config_syntax'
-  require 'hocon/config_value_factory'
-  require 'hocon/config_value_type'
 
   def self.load(file)
     config = Hocon::ConfigFactory.parse_file(file)

data/lib/hocon/config_factory.rb

@@ -1,5 +1,6 @@
 require 'hocon'
 require 'hocon/impl/parseable'
+require 'hocon/config_parse_options'
 
 class Hocon::ConfigFactory
   def self.parse_file(file_path, options = Hocon::ConfigParseOptions.defaults)

data/lib/hocon/impl/config_impl_util.rb

@@ -80,7 +80,7 @@ class Hocon::Impl::ConfigImplUtil
     # this implementation is *not* a port of the java code. Ruby can strip
     # unicode whitespace much easier than Java can, and relies on a lot of
     # Java functions that don't really have straight equivalents in Ruby.
-    s.gsub(/[[:space]]/, ' ')
+    s.gsub(/[:space]/, ' ')
     s.strip
   end
-end
+end

data/lib/hocon/impl/path.rb

@@ -6,6 +6,7 @@ require 'stringio'
 class Hocon::Impl::Path
 
   ConfigBugOrBrokenError = Hocon::ConfigError::ConfigBugOrBrokenError
+  ConfigImplUtil = Hocon::Impl::ConfigImplUtil
 
   # this doesn't have a very precise meaning, just to reduce
   # noise from quotes in the rendered path for average cases

data/lib/hocon/impl/tokenizer.rb

@@ -1,6 +1,7 @@
 require 'hocon/impl'
 require 'hocon/impl/config_impl_util'
 require 'hocon/impl/tokens'
+require 'hocon/config_error'
 require 'stringio'
 require 'forwardable'
 
@@ -8,6 +9,13 @@ class Hocon::Impl::Tokenizer
   Tokens = Hocon::Impl::Tokens
 
   class TokenizerProblemError < StandardError
+    def initialize(problem)
+      @problem = problem
+    end
+
+    def problem
+      @problem
+    end
   end
 
   class TokenIterator
@@ -67,6 +75,13 @@ class Hocon::Impl::Tokenizer
     # chars that stop an unquoted string
     NOT_IN_UNQUOTED_TEXT = "$\"{}[]:=,+#`^?!@*&\\"
 
+    def self.problem(origin, what, message, suggest_quotes, cause)
+      if what.nil? || message.nil?
+        throw Hocon::ConfigError::ConfigBugOrBrokenError.new("internal error, creating bad TokenizerProblemError", nil)
+      end
+      TokenizerProblemError.new(Tokens.new_problem(origin, what, message, suggest_quotes, cause))
+    end
+
     def self.simple_value?(t)
       Tokens.substitution?(t) ||
           Tokens.unquoted_text?(t) ||
@@ -128,7 +143,7 @@ class Hocon::Impl::Tokenizer
     def next_char_raw
       if @buffer.empty?
         begin
-          @input.readchar
+          @input.readchar.chr
         rescue EOFError
           -1
         end
@@ -245,8 +260,8 @@ class Hocon::Impl::Tokenizer
           # not a number after all, see if it's an unquoted string.
           s.each do |u|
             if NOT_IN_UNQUOTED_TEXT.index
-              raise problem(u, "Reserved character '#{u}'" +
-                "is not allowed outside quotes", true)
+              raise self.problem(@line_origin, u, "Reserved character '#{u}'" +
+                "is not allowed outside quotes", true, nil)
             end
           end
           # no evil chars so we just decide this was a string and
@@ -265,7 +280,7 @@ class Hocon::Impl::Tokenizer
       while c != '"'
         c = next_char_raw
         if c == -1
-          raise problem("End of input but string quote was still open")
+          raise self.problem(@line_origin, c, "End of input but string quote was still open", false, nil)
         end
 
         if c == "\\"
@@ -273,8 +288,8 @@ class Hocon::Impl::Tokenizer
         elsif c == '"'
           # done!
         elsif c =~ /[[:cntrl:]]/
-          raise problem(c, "JSON does not allow unescaped #{c}" +
-                            " in quoted strings, use a backslash escape")
+          raise self.problem(@line_origin, c, "JSON does not allow unescaped #{c}" +
+                            " in quoted strings, use a backslash escape", false, nil)
         else
           sb << c
         end
@@ -326,7 +341,7 @@ class Hocon::Impl::Tokenizer
             if FIRST_NUMBER_CHARS.index(c)
               t = pull_number(c)
             elsif NOT_IN_UNQUOTED_TEXT.index(c)
-              raise problem(c, "Reserved character '#{c}' is not allowed outside quotes", true)
+              raise Hocon::Impl::Tokenizer::TokenIterator.problem(@line_origin, c, "Reserved character '#{c}' is not allowed outside quotes", true, nil)
             else
               put_back(c)
               t = pull_unquoted_text

data/lib/hocon/impl/tokens.rb

@@ -4,6 +4,7 @@ require 'hocon/impl/token_type'
 require 'hocon/impl/config_number'
 require 'hocon/impl/config_string'
 require 'hocon/impl/config_boolean'
+require 'hocon/config_error'
 
 # FIXME the way the subclasses of Token are private with static isFoo and accessors is kind of ridiculous.
 class Hocon::Impl::Tokens
@@ -79,12 +80,56 @@ class Hocon::Impl::Tokens
       @suggest_quotes = suggest_quotes
       @cause = cause
     end
+
+    def what
+      @what
+    end
+
+    def message
+      @message
+    end
+
+    def suggest_quotes
+      @suggest_quotes
+    end
+
+    def cause
+      @cause
+    end
+  end
+
+  def self.get_problem_message(token)
+    if token.is_a?(Problem)
+      token.message
+    else
+      raise Hocon::ConfigError::ConfigBugOrBrokenError.new("tried to get problem message from #{token}", nil)
+    end
+  end
+
+  def self.get_problem_suggest_quotes(token)
+    if token.is_a?(Problem)
+      token.suggest_quotes
+    else
+      raise Hocon::ConfigError::ConfigBugOrBrokenError.new("tried to get problem suggest_quotes from #{token}", nil)
+    end
+  end
+
+  def self.get_problem_cause(token)
+    if token.is_a?(Problem)
+      token.cause
+    else
+      raise Hocon::ConfigError::ConfigBugOrBrokenError.new("tried to get problem cause from #{token}", nil)
+    end
   end
 
   def self.new_line(origin)
     Line.new(origin)
   end
 
+  def self.new_problem(origin, what, message, suggest_quotes, cause)
+    Problem.new(origin, what, message, suggest_quotes, cause)
+  end
+
   def self.new_comment(origin, text)
     Comment.new(origin, text)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hocon
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-01 00:00:00.000000000 Z
+date: 2014-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler