complex_config 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2ddd63fa3baff35f04957e3a84840ac417a83e0
-  data.tar.gz: 5cf7b7610df168f0b90c052ed97074c35c57f5b0
+  metadata.gz: 5e4e0620c33cd0efa7e74a00baedee019c521119
+  data.tar.gz: e06d717a659587ebeb40c417c7f0e2af49f29c6b
 SHA512:
-  metadata.gz: 109d842367862e0cbdee94a26221d47e9b4e4150f540b2cf801738bf6a9da5d0eff50426e567dd7f84ac4c204a69d2dec41131090798ef7aece88a9deacfbb0c
-  data.tar.gz: 6f824ff2f1314a8c5bf0d6014afd20239ba4629ed06d099f2d184b85cdd8cb63f66e2295e4b1dc63dce02ca7f173df8677de9a223d5967087f81193d47036394
+  metadata.gz: adb8a5f25523b30d50c059836ef86b392c975f3339e891f0655a007a620177fc83645562b8ef3973a6a210b4ac67f7cafec24351210aeac7b3472bcd99c61b47
+  data.tar.gz: 8c9739828e4054a81c0700f9126fa3dba68c43518984149bdf7307f5494397bac6c140f71cb9227ba58b7099eebad40efb95b63076734a60ba29bdb4f4d70d58

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.3.0

data/complex_config.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: complex_config 0.2.3 ruby lib
+# stub: complex_config 0.3.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "complex_config"
-  s.version = "0.2.3"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Florian Frank"]
-  s.date = "2015-03-24"
+  s.date = "2015-04-28"
   s.description = "This library allows you to access configuration files via a simple interface"
   s.email = "flori@ping.de"
   s.extra_rdoc_files = ["README.md", "lib/complex_config.rb", "lib/complex_config/errors.rb", "lib/complex_config/plugins.rb", "lib/complex_config/plugins/enable.rb", "lib/complex_config/plugins/money.rb", "lib/complex_config/plugins/uri.rb", "lib/complex_config/provider.rb", "lib/complex_config/rude.rb", "lib/complex_config/settings.rb", "lib/complex_config/shortcuts.rb", "lib/complex_config/version.rb"]
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.homepage = "https://github.com/flori/complex_config"
   s.licenses = ["Apache-2.0"]
   s.rdoc_options = ["--title", "ComplexConfig -- configuration library", "--main", "README.md"]
-  s.rubygems_version = "2.4.5"
+  s.rubygems_version = "2.4.6"
   s.summary = "configuration library"
   s.test_files = ["spec/complex_config/plugins_spec.rb", "spec/complex_config/provider_spec.rb", "spec/complex_config/settings_spec.rb", "spec/complex_config/shortcuts_spec.rb", "spec/spec_helper.rb"]
 
@@ -24,20 +24,20 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<gem_hadar>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<gem_hadar>, ["~> 1.2.1"])
       s.add_development_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_runtime_dependency(%q<json>, [">= 0"])
     else
-      s.add_dependency(%q<gem_hadar>, ["~> 1.0.0"])
+      s.add_dependency(%q<gem_hadar>, ["~> 1.2.1"])
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<simplecov>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<json>, [">= 0"])
     end
   else
-    s.add_dependency(%q<gem_hadar>, ["~> 1.0.0"])
+    s.add_dependency(%q<gem_hadar>, ["~> 1.2.1"])
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<simplecov>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])

data/lib/complex_config/plugins/money.rb

@@ -1,4 +1,5 @@
 begin
+  require 'forwardable' # XXX monetize forgets to require this
   require 'monetize'
 rescue LoadError
   if $DEBUG

data/lib/complex_config/settings.rb

@@ -31,10 +31,45 @@ class ComplexConfig::Settings < JSON::GenericObject
     end
   end
 
-  def to_s
-    to_h.to_yaml
+  def to_s(pair_sep: ' = ', path_sep: ?.)
+    pathes(path_sep: path_sep).inject('') do |result, (path, value)|
+      result << "#{path}#{pair_sep}#{value.inspect}\n"
+    end
+  end
+
+  def pathes(hash = table, path_sep: ?., prefix: '', result: {})
+    hash.each do |key, value|
+      path = prefix.empty? ? key.to_s : "#{prefix}#{path_sep}#{key}"
+      case value
+      when ComplexConfig::Settings
+        pathes(
+          value,
+          path_sep: path_sep,
+          prefix:   path,
+          result:   result
+        )
+      when Array
+        value.each_with_index do |v, i|
+          sub_path = path + "[#{i}]"
+          if ComplexConfig::Settings === v
+            pathes(
+              v,
+              path_sep: path_sep,
+              prefix:   sub_path,
+              result:   result
+            )
+          else
+            result[sub_path] = v
+          end
+        end
+      else
+        result[path] = value
+      end
+    end
+    result
   end
 
+
   def to_ary(*a, &b)
     table_enumerator.__send__(:to_a, *a, &b)
   end

data/lib/complex_config/version.rb

@@ -1,6 +1,6 @@
 module ComplexConfig
   # ComplexConfig version
-  VERSION         = '0.2.3'
+  VERSION         = '0.3.0'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/spec/complex_config/settings_spec.rb

@@ -39,13 +39,28 @@ RSpec.describe ComplexConfig::Settings do
     expect(settings.foo.to_h).to eq(bar: { baz: true }, qux: 'quux')
   end
 
+  it 'can return a hash with pathes as keys' do
+    expect(settings.pathes(path_sep: ?:)).to eq(
+      'foo:bar:baz' => true,
+      'foo:qux'     => "quux"
+    )
+  end
+
   it 'can be represented as a string' do
+    expect(settings.to_s(pair_sep: ' → ', path_sep: ?/)).to eq <<EOT
+foo/bar/baz → true
+foo/qux → "quux"
+EOT
+  end
+
+  it 'can be represented as a string if it has arrays' do
+    settings[:ary] = ComplexConfig::Settings[ [ 1, { nested: 2 }, 3 ] ]
     expect(settings.to_s).to eq <<EOT
----
-:foo:
-  :bar:
-    :baz: true
-  :qux: quux
+foo.bar.baz = true
+foo.qux = "quux"
+ary[0] = 1
+ary[1].nested = 2
+ary[2] = 3
 EOT
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: complex_config
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-24 00:00:00.000000000 Z
+date: 2015-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -151,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: configuration library