hocon 0.0.4 → 0.0.5

data/README.md

@@ -23,3 +23,11 @@ require 'hocon/config_factory'
 conf = Hocon::ConfigFactory.parse_file("myapp.conf")
 conf_map = conf.root.unwrapped
 ```
+
+Testing
+=======
+
+```sh
+bundle install
+bundle exec rake spec
+```

data/lib/hocon.rb

@@ -1,6 +1,14 @@
-require 'hocon/config_factory'
-
 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)
     return config.root.unwrapped

data/lib/hocon/config_error.rb

@@ -1,15 +1,37 @@
-module Hocon
-  class ConfigError < StandardError
-    def initialize(origin, message, cause)
-      super(message)
-      @origin = origin
-      @cause = cause
-    end
+require 'hocon'
+
+class Hocon::ConfigError < StandardError
+  def initialize(origin, message, cause)
+    super(message)
+    @origin = origin
+    @cause = cause
+  end
 
-    class ConfigParseError < Hocon::ConfigError
+  class ConfigMissingError < Hocon::ConfigError
+  end
+
+  class ConfigNullError < Hocon::ConfigError::ConfigMissingError
+    def self.make_message(path, expected)
+      if not expected.nil?
+        "Configuration key '#{path}' is set to nil but expected #{expected}"
+      else
+        "Configuration key '#{path}' is nil"
+      end
     end
+  end
 
-    class ConfigWrongTypeError < Hocon::ConfigError
+  class ConfigParseError < Hocon::ConfigError
+  end
+
+  class ConfigWrongTypeError < Hocon::ConfigError
+  end
+
+  class ConfigBugOrBrokenError < Hocon::ConfigError
+    def initialize(message, cause)
+      super(nil, message, cause)
     end
   end
+
+  class ConfigNotResolvedError < Hocon::ConfigError::ConfigBugOrBrokenError
+  end
 end

data/lib/hocon/config_factory.rb

@@ -1,14 +1,12 @@
-require 'hocon/config_parse_options'
+require 'hocon'
 require 'hocon/impl/parseable'
 
-module Hocon
-  class ConfigFactory
-    def self.parse_file(file_path, options = Hocon::ConfigParseOptions.defaults)
-      Hocon::Impl::Parseable.new_file(file_path, options).parse.to_config
-    end
+class Hocon::ConfigFactory
+  def self.parse_file(file_path, options = Hocon::ConfigParseOptions.defaults)
+    Hocon::Impl::Parseable.new_file(file_path, options).parse.to_config
+  end
 
-    def self.parse_string(string, options = Hocon::ConfigParseOptions.defaults)
-      Hocon::Impl::Parseable.new_string(string, options).parse.to_config
-    end
+  def self.parse_string(string, options = Hocon::ConfigParseOptions.defaults)
+    Hocon::Impl::Parseable.new_string(string, options).parse.to_config
   end
 end

data/lib/hocon/config_object.rb

@@ -1,4 +1,4 @@
-module Hocon
-  module ConfigObject
-  end
-end
+require 'hocon'
+
+module Hocon::ConfigObject
+end

data/lib/hocon/config_parse_options.rb

@@ -1,53 +1,53 @@
-module Hocon
-  class ConfigParseOptions
-    attr_accessor :syntax, :origin_description, :allow_missing, :includer
+require 'hocon'
 
-    def self.defaults
-      self.new(nil, nil, true, nil)
-    end
+class Hocon::ConfigParseOptions
+  attr_accessor :syntax, :origin_description, :allow_missing, :includer
 
-    def initialize(syntax, origin_description, allow_missing, includer)
-      @syntax = syntax
-      @origin_description = origin_description
-      @allow_missing = allow_missing
-      @includer = includer
-    end
+  def self.defaults
+    self.new(nil, nil, true, nil)
+  end
 
-    def allow_missing?
-      @allow_missing
-    end
+  def initialize(syntax, origin_description, allow_missing, includer)
+    @syntax = syntax
+    @origin_description = origin_description
+    @allow_missing = allow_missing
+    @includer = includer
+  end
 
-    def with_syntax(syntax)
-      if @syntax == syntax
-        self
-      else
-        Hocon::ConfigParseOptions.new(syntax,
-                                      @origin_description,
-                                      @allow_missing,
-                                      @includer)
-      end
-    end
+  def allow_missing?
+    @allow_missing
+  end
 
-    def with_includer(includer)
-      if @includer == includer
-        self
-      else
-        Hocon::ConfigParseOptions.new(@syntax,
-                                      @origin_description,
-                                      @allow_missing,
-                                      includer)
-      end
+  def with_syntax(syntax)
+    if @syntax == syntax
+      self
+    else
+      Hocon::ConfigParseOptions.new(syntax,
+                                    @origin_description,
+                                    @allow_missing,
+                                    @includer)
     end
+  end
 
-    def append_includer(includer)
-      if @includer == includer
-        self
-      elsif @includer
-        with_includer(@includer.with_fallback(includer))
-      else
-        with_includer(includer)
-      end
+  def with_includer(includer)
+    if @includer == includer
+      self
+    else
+      Hocon::ConfigParseOptions.new(@syntax,
+                                    @origin_description,
+                                    @allow_missing,
+                                    includer)
     end
+  end
 
+  def append_includer(includer)
+    if @includer == includer
+      self
+    elsif @includer
+      with_includer(@includer.with_fallback(includer))
+    else
+      with_includer(includer)
+    end
   end
-end
+
+end

data/lib/hocon/config_render_options.rb

@@ -1,46 +1,46 @@
-module Hocon
-  class ConfigRenderOptions
-    def initialize(origin_comments, comments, formatted, json)
-      @origin_comments = origin_comments
-      @comments = comments
-      @formatted = formatted
-      @json = json
-    end
+require 'hocon'
 
-    attr_writer :origin_comments, :comments, :formatted, :json
+class Hocon::ConfigRenderOptions
+  def initialize(origin_comments, comments, formatted, json)
+    @origin_comments = origin_comments
+    @comments = comments
+    @formatted = formatted
+    @json = json
+  end
 
-    def origin_comments?
-      @origin_comments
-    end
-    def comments?
-      @comments
-    end
-    def formatted?
-      @formatted
-    end
-    def json?
-      @json
-    end
+  attr_writer :origin_comments, :comments, :formatted, :json
 
-    #
-    # Returns the default render options which are verbose (commented and
-    # formatted). See {@link ConfigRenderOptions#concise} for stripped-down
-    # options. This rendering will not be valid JSON since it has comments.
-    #
-    # @return the default render options
-    #
-    def self.defaults
-      ConfigRenderOptions.new(true, true, true, true)
-    end
+  def origin_comments?
+    @origin_comments
+  end
+  def comments?
+    @comments
+  end
+  def formatted?
+    @formatted
+  end
+  def json?
+    @json
+  end
+
+  #
+  # Returns the default render options which are verbose (commented and
+  # formatted). See {@link ConfigRenderOptions#concise} for stripped-down
+  # options. This rendering will not be valid JSON since it has comments.
+  #
+  # @return the default render options
+  #
+  def self.defaults
+    Hocon::ConfigRenderOptions.new(true, true, true, true)
+  end
 
-    #
-    # Returns concise render options (no whitespace or comments). For a
-    # resolved {@link Config}, the concise rendering will be valid JSON.
-    #
-    # @return the concise render options
-    #
-    def self.concise
-      ConfigRenderOptions.new(false, false, false, true)
-    end
+  #
+  # Returns concise render options (no whitespace or comments). For a
+  # resolved {@link Config}, the concise rendering will be valid JSON.
+  #
+  # @return the concise render options
+  #
+  def self.concise
+    Hocon::ConfigRenderOptions.new(false, false, false, true)
   end
-end
+end

data/lib/hocon/config_syntax.rb

@@ -1,7 +1,7 @@
-module Hocon
-  module ConfigSyntax
-    JSON = 0
-    CONF = 1
-    PROPERTIES = 2
-  end
-end
+require 'hocon'
+
+module Hocon::ConfigSyntax
+  JSON = 0
+  CONF = 1
+  PROPERTIES = 2
+end

data/lib/hocon/config_value_factory.rb

@@ -0,0 +1,10 @@
+require 'hocon'
+require 'hocon/impl/config_impl'
+
+class Hocon::ConfigValueFactory
+  ConfigImpl = Hocon::Impl::ConfigImpl
+
+  def self.from_any_ref(object, origin_description)
+    ConfigImpl.from_any_ref(object, origin_description)
+  end
+end

data/lib/hocon/config_value_type.rb

@@ -1,26 +1,26 @@
-module Hocon
-  #
-  # The type of a configuration value (following the <a
-  # href="http://json.org">JSON</a> type schema).
-  #
-  module ConfigValueType
-    OBJECT = 0
-    LIST = 1
-    NUMBER = 2
-    BOOLEAN = 3
-    NULL = 4
-    STRING = 5
+require 'hocon'
 
-    def self.name(config_value_type)
-      case config_value_type
-        when OBJECT then "OBJECT"
-        when LIST then "LIST"
-        when NUMBER then "NUMBER"
-        when BOOLEAN then "BOOLEAN"
-        when NULL then "NULL"
-        when STRING then "STRING"
-        else raise ConfigBugError, "Unrecognized value type '#{config_value_type}'"
-      end
+#
+# The type of a configuration value (following the <a
+# href="http://json.org">JSON</a> type schema).
+#
+module Hocon::ConfigValueType
+  OBJECT = 0
+  LIST = 1
+  NUMBER = 2
+  BOOLEAN = 3
+  NULL = 4
+  STRING = 5
+
+  def self.name(config_value_type)
+    case config_value_type
+      when OBJECT then "OBJECT"
+      when LIST then "LIST"
+      when NUMBER then "NUMBER"
+      when BOOLEAN then "BOOLEAN"
+      when NULL then "NULL"
+      when STRING then "STRING"
+      else raise ConfigBugError, "Unrecognized value type '#{config_value_type}'"
     end
   end
-end
+end

data/lib/hocon/impl.rb

@@ -1,4 +1,5 @@
-module Hocon
-  module Impl
-  end
-end
+require 'hocon'
+
+module Hocon::Impl
+
+end

data/lib/hocon/impl/abstract_config_object.rb

@@ -5,10 +5,15 @@ require 'hocon/config_object'
 require 'hocon/config_value_type'
 require 'hocon/impl/resolve_status'
 require 'hocon/impl/simple_config_origin'
+require 'hocon/config_error'
+require 'hocon/impl/config_impl'
 
 class Hocon::Impl::AbstractConfigObject < Hocon::Impl::AbstractConfigValue
   include Hocon::ConfigObject
 
+  ConfigBugOrBrokenError = Hocon::ConfigError::ConfigBugOrBrokenError
+  ConfigNotResolvedError = Hocon::ConfigError::ConfigNotResolvedError
+
   def initialize(origin)
     super(origin)
     @config = Hocon::Impl::SimpleConfig.new(self)
@@ -61,4 +66,48 @@ class Hocon::Impl::AbstractConfigObject < Hocon::Impl::AbstractConfigValue
 
     Hocon::Impl::SimpleConfigOrigin.merge_origins(origins)
   end
+
+  def peek_assuming_resolved(key, original_path)
+    begin
+      attempt_peek_with_partial_resolve(key)
+    rescue ConfigNotResolvedError => e
+      raise Hocon::Impl::ConfigImpl.improve_not_resolved(original_path, e)
+    end
+  end
+
+  def peek_path(path)
+    begin
+      return peek_path_impl(self, path, nil)
+    rescue ConfigNotResolvedError => e
+      raise ConfigBugOrBrokenError.new("NotPossibleToResolve happened though we had no ResolveContext in peek_path", nil)
+    end
+  end
+
+  def peek_path_impl(me, path, context)
+    begin
+      if not context.nil?
+        partially_resolved = context.restrict(path).resolve(me)
+        if partially_resolved.is_a?(self.class)
+          return peek_path_impl(partially_resolved, path, nil)
+        else
+          raise ConfigBugOrBrokenError.new(
+              "resolved object to non-object #{me} to #{partially_resolved}", nil)
+        end
+      else
+        remainder = path.remainder
+        v = me.attempt_peek_with_partial_resolve(path.first)
+        if remainder.nil?
+          return v
+        else
+          if v.is_a?(self.class)
+            return peek_path_impl(v, remainder, nil)
+          else
+            return nil
+          end
+        end
+      end
+    rescue ConfigNotResolvedError => e
+      raise Hocon::Impl::ConfigImpl.improve_not_resolved(path, e)
+    end
+  end
 end