ruby_hocon 0.0.1 → 0.0.2

data/README.md

@@ -1,10 +1,8 @@
-ruby-hocon
+ruby-typesafe-config
 ==========
 
 This is a port of the [Typesafe Config](https://github.com/typesafehub/config) library to Ruby.
 
-The library provides Ruby support for the [HOCON](https://github.com/typesafehub/config/blob/master/HOCON.md) configuration file format.
-
 At present, the only features it supports are explicit parsing of config files (.conf/HOCON, .json, .properties) via `ConfigFactory.parse_file`, and rendering a parsed config object back to a String.  Testing is minimal and not all data types are supported yet.  It also does not yet support `include` or interpolated settings.
 
 The implementation is intended to be as close to a line-for-line port as the two languages allow, in hopes of making it fairly easy to port over new changesets from the Java code base over time.
@@ -13,7 +11,7 @@ Basic Usage
 ===========
 
 ```rb
-require 'hocon/config_factory'
+require 'typesafe/config/config_factory'
 
-conf = Hocon::ConfigFactory.parse_file("myapp.conf")
+conf = Typesafe::Config::ConfigFactory.parse_file("myapp.conf")
 conf_map = conf.root.unwrapped

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_hocon
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,54 +9,18 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-16 00:00:00.000000000 Z
+date: 2014-03-14 00:00:00.000000000 Z
 dependencies: []
-description: == A port of the Java {Typesafe Config}[https://github.com/typesafehub/config]
-  library to Ruby
+description: == This gem has been replaced by the {HOCON}[https://rubygems.org/gems/hocon]
+  gem
 email: chris@puppetlabs.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/hocon.rb
-- lib/hocon/config_object.rb
-- lib/hocon/config_error.rb
-- lib/hocon/impl/simple_includer.rb
-- lib/hocon/impl/config_number.rb
-- lib/hocon/impl/simple_config.rb
-- lib/hocon/impl/config_int.rb
-- lib/hocon/impl/resolve_status.rb
-- lib/hocon/impl/simple_config_origin.rb
-- lib/hocon/impl/token.rb
-- lib/hocon/impl/config_string.rb
-- lib/hocon/impl/config_float.rb
-- lib/hocon/impl/full_includer.rb
-- lib/hocon/impl/parser.rb
-- lib/hocon/impl/tokens.rb
-- lib/hocon/impl/tokenizer.rb
-- lib/hocon/impl/abstract_config_object.rb
-- lib/hocon/impl/simple_include_context.rb
-- lib/hocon/impl/token_type.rb
-- lib/hocon/impl/path_builder.rb
-- lib/hocon/impl/parseable.rb
-- lib/hocon/impl/path.rb
-- lib/hocon/impl/unmergeable.rb
-- lib/hocon/impl/config_impl_util.rb
-- lib/hocon/impl/simple_config_object.rb
-- lib/hocon/impl/simple_config_list.rb
-- lib/hocon/impl/config_impl.rb
-- lib/hocon/impl/config_concatenation.rb
-- lib/hocon/impl/abstract_config_value.rb
-- lib/hocon/impl/origin_type.rb
-- lib/hocon/config_factory.rb
-- lib/hocon/impl.rb
-- lib/hocon/config_parse_options.rb
-- lib/hocon/config_render_options.rb
-- lib/hocon/config_value_type.rb
-- lib/hocon/config_syntax.rb
 - LICENSE
 - README.md
-homepage: https://github.com/cprice404/ruby-hocon
+homepage: https://github.com/cprice404/ruby-typesafe-config
 licenses:
 - Apache License, v2
 post_install_message: 
@@ -80,5 +44,5 @@ rubyforge_project:
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: HOCON Config Library
+summary: Typesafe Config
 test_files: []

data/lib/hocon.rb

@@ -1,2 +0,0 @@
-module Hocon
-end

data/lib/hocon/config_error.rb

@@ -1,12 +0,0 @@
-require 'hocon'
-
-class Hocon::ConfigError < StandardError
-  def initialize(origin, message, cause)
-    super(message)
-    @origin = origin
-    @cause = cause
-  end
-
-  class ConfigParseError < Hocon::ConfigError
-  end
-end

data/lib/hocon/config_factory.rb

@@ -1,9 +0,0 @@
-require 'hocon'
-require 'hocon/config_parse_options'
-require 'hocon/impl/parseable'
-
-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
-end

data/lib/hocon/config_object.rb

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

data/lib/hocon/config_parse_options.rb

@@ -1,53 +0,0 @@
-require 'hocon'
-
-class Hocon::ConfigParseOptions
-  attr_accessor :syntax, :origin_description, :allow_missing, :includer
-
-  def self.defaults
-    self.new(nil, nil, true, nil)
-  end
-
-  def initialize(syntax, origin_description, allow_missing, includer)
-    @syntax = syntax
-    @origin_description = origin_description
-    @allow_missing = allow_missing
-    @includer = includer
-  end
-
-  def allow_missing?
-    @allow_missing
-  end
-
-  def with_syntax(syntax)
-    if @syntax == syntax
-      self
-    else
-      Hocon::ConfigParseOptions.new(syntax,
-                                    @origin_description,
-                                    @allow_missing,
-                                    @includer)
-    end
-  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

data/lib/hocon/config_render_options.rb

@@ -1,46 +0,0 @@
-require 'hocon'
-
-class Hocon::ConfigRenderOptions
-  def initialize(origin_comments, comments, formatted, json)
-    @origin_comments = origin_comments
-    @comments = comments
-    @formatted = formatted
-    @json = json
-  end
-
-  attr_writer :origin_comments, :comments, :formatted, :json
-
-  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
-    Hocon::ConfigRenderOptions.new(false, false, false, true)
-  end
-end

data/lib/hocon/config_syntax.rb

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

data/lib/hocon/config_value_type.rb

@@ -1,26 +0,0 @@
-require 'hocon'
-
-#
-# 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

data/lib/hocon/impl.rb

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

data/lib/hocon/impl/abstract_config_object.rb

@@ -1,64 +0,0 @@
-require 'hocon/impl'
-require 'hocon/impl/abstract_config_value'
-require 'hocon/impl/simple_config'
-require 'hocon/config_object'
-require 'hocon/config_value_type'
-require 'hocon/impl/resolve_status'
-require 'hocon/impl/simple_config_origin'
-
-class Hocon::Impl::AbstractConfigObject < Hocon::Impl::AbstractConfigValue
-  include Hocon::ConfigObject
-
-  def initialize(origin)
-    super(origin)
-    @config = Hocon::Impl::SimpleConfig.new(self)
-  end
-
-  def to_config
-    @config
-  end
-
-  def to_fallback_value
-    self
-  end
-
-  def value_type
-    Hocon::ConfigValueType::OBJECT
-  end
-
-  def new_copy(origin)
-    new_copy_with_status(resolve_status, origin)
-  end
-
-  def merge_origins(stack)
-    if stack.empty?
-      raise ConfigBugError, "can't merge origins on empty list"
-    end
-    origins = []
-    first_origin = nil
-    num_merged = 0
-    stack.each do |v|
-      if first_origin.nil?
-        first_origin = v.origin
-      end
-
-      if (v.is_a?(Hocon::Impl::AbstractConfigObject)) &&
-          (v.resolve_status == Hocon::Impl::ResolveStatus::RESOLVED) &&
-          v.empty?
-        # don't include empty files or the .empty()
-        # config in the description, since they are
-        # likely to be "implementation details"
-      else
-        origins.push(v.origin)
-        num_merged += 1
-      end
-    end
-
-    if num_merged == 0
-      # the configs were all empty, so just use the first one
-      origins.push(first_origin)
-    end
-
-    Hocon::Impl::SimpleConfigOrigin.merge_origins(origins)
-  end
-end

data/lib/hocon/impl/abstract_config_value.rb

@@ -1,130 +0,0 @@
-require 'hocon/impl'
-require 'stringio'
-require 'hocon/config_render_options'
-require 'hocon/config_object'
-require 'hocon/impl/resolve_status'
-require 'hocon/impl/unmergeable'
-require 'hocon/impl/abstract_config_object'
-require 'hocon/impl/config_impl_util'
-
-##
-## Trying very hard to avoid a parent reference in config values; when you have
-## a tree like this, the availability of parent() tends to result in a lot of
-## improperly-factored and non-modular code. Please don't add parent().
-##
-class Hocon::Impl::AbstractConfigValue
-  ConfigImplUtil = Hocon::Impl::ConfigImplUtil
-
-  def initialize(origin)
-    @origin = origin
-  end
-
-  attr_reader :origin
-
-  def resolve_status
-    Hocon::Impl::ResolveStatus::RESOLVED
-  end
-
-  # this is virtualized rather than a field because only some subclasses
-  # really need to store the boolean, and they may be able to pack it
-  # with another boolean to save space.
-  def ignores_fallbacks?
-    # if we are not resolved, then somewhere in this value there's
-    # a substitution that may need to look at the fallbacks.
-    resolve_status == Hocon::Impl::ResolveStatus::RESOLVED
-  end
-
-  # the withFallback() implementation is supposed to avoid calling
-  # mergedWith* if we're ignoring fallbacks.
-  def require_not_ignoring_fallbacks
-    if ignores_fallbacks?
-      raise ConfigBugError, "method should not have been called with ignoresFallbacks=true #{self.class.name}"
-    end
-  end
-
-  def with_origin(origin)
-    if @origin == origin
-      self
-    else
-      new_copy(origin)
-    end
-  end
-
-  def with_fallback(mergeable)
-    if ignores_fallbacks?
-      self
-    else
-      other = mergeable.to_fallback_value
-      if other.is_a?(Hocon::Impl::Unmergeable)
-        merged_with_the_unmergeable(other)
-      elsif other.is_a?(Hocon::Impl::AbstractConfigObject)
-        merged_with_object(other)
-      else
-        merged_with_non_object(other)
-      end
-    end
-  end
-
-  def to_s
-    sb = StringIO.new
-    render_to_sb(sb, 0, true, nil, Hocon::ConfigRenderOptions.concise)
-    "#{self.class.name}(#{sb.string})"
-  end
-
-  def indent(sb, indent_size, options)
-    if options.formatted?
-      remaining = indent_size
-      while remaining > 0
-        sb << "    "
-        remaining -= 1
-      end
-    end
-  end
-
-  def render_to_sb(sb, indent, at_root, at_key, options)
-    if !at_key.nil?
-      rendered_key =
-          if options.json?
-            ConfigImplUtil.render_json_string(at_key)
-          else
-            ConfigImplUtil.render_string_unquoted_if_possible(at_key)
-          end
-
-      sb << rendered_key
-
-      if options.json?
-        if options.formatted?
-          sb << " : "
-        else
-          sb << ":"
-        end
-      else
-        # in non-JSON we can omit the colon or equals before an object
-        if self.is_a?(Hocon::ConfigObject)
-          if options.formatted?
-            sb << ' '
-          end
-        else
-          sb << "="
-        end
-      end
-    end
-    render_value_to_sb(sb, indent, at_root, options)
-  end
-
-  # to be overridden by subclasses
-  def render_value_to_sb(sb, indent, at_root, options)
-    u = unwrapped
-    sb << u.to_s
-  end
-
-  def render(options = Hocon::ConfigRenderOptions.defaults)
-    sb = StringIO.new
-    render_to_sb(sb, 0, true, nil, options)
-    # We take a substring that ends at sb.pos, because we've been decrementing
-    # sb.pos at various points in the code as a means to remove characters from
-    # the end of the StringIO
-    sb.string[0, sb.pos]
-  end
-
-end