cconfig 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99118dcdb7cbe21b54f559dd45bb67ea1d7ce435
-  data.tar.gz: ba1e90f4309e857b07475d582140d9408d83c8b8
+  metadata.gz: 5ea447e81e322d1bf22dddca71e18e2eab21760d
+  data.tar.gz: 003941dd51eebfa38fea464be15f861bcc49f28c
 SHA512:
-  metadata.gz: 9978dcbd2a24382e8c0ce84b9bd88eb33356ca1f6a8ae34a6d8089098a0e2386e7fcc3af93c4a80ca5951dbc917b3c322b87a62d1589efcac7dba546a80f5f49
-  data.tar.gz: 9e560a472e040ed024af2031ed35981953fd77e6e58dbc7296f7ab2e972226299381607b79500a96963d18a94971c6a1a2c865d2d6415758643c1a26bad8031a
+  metadata.gz: 841ebc1ec251e9490865f5e7f918ef38051402898e604b3b8e2c93ed42fbb2c74609a1b6f39b344d367ad779892e29440840eb218c3a11f122adcea105d98aeb
+  data.tar.gz: 2a18d68a5ea16c626e1d245549d67425c4fe6a0c301e6476f032f562730c3e7484e36acfb8935a5c8d4f8c90a604951013866f9d25e47a4620b3368f33af60bc

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.1.1
+
+- Fixed crash on nested values on the `#enabled?` method. See [#3](https://github.com/mssola/cconfig/issues/3).
+- The `prefix` argument from the constructor now takes a default
+  (`cconfig`). This will make things more predictable I hope.
+
 ## 1.1.0
 
 - Added the `disabled?` method, which is a shorthand for `enabled?`.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cconfig (1.0.0)
+    cconfig (1.1.1)
       safe_yaml (~> 1.0.0, >= 1.0.0)
 
 GEM

data/lib/cconfig/cconfig.rb

@@ -30,14 +30,14 @@ module CConfig
 
     # Instantiate an object with `default` as the path to the default
     # configuration, `local` as the alternate file, and `prefix` as the prefix
-    # for environment variables.
+    # for environment variables. The `prefix` will take "cconfig" as the default.
     #
     # Note: the `local` value will be discarded in favor of the
     # `#{prefix}_LOCAL_CONFIG_PATH` environment variable if it was set.
     def initialize(default:, local:, prefix:)
       @default = default
-      @local   = ENV["#{prefix.upcase}_LOCAL_CONFIG_PATH"] || local
-      @prefix  = prefix
+      @prefix  = prefix || "cconfig"
+      @local   = ENV["#{@prefix.upcase}_LOCAL_CONFIG_PATH"] || local
     end
 
     # Returns a hash with the app configuration contained in it.

data/lib/cconfig/hash_utils.rb

@@ -31,14 +31,16 @@ module CConfig
       #     b:
       #       enabled: true
       def enabled?(feature)
-        objs = feature.split(".")
-        if objs.length == 2
-          return false if !self[objs[0]][objs[1]] || self[objs[0]][objs[1]].empty?
-          self[objs[0]][objs[1]]["enabled"].eql?(true)
-        else
-          return false if !self[feature] || self[feature].empty?
-          self[feature]["enabled"].eql?(true)
+        cur   = self
+        parts = feature.split(".")
+
+        parts.each do |part|
+          cur = cur[part]
+          return false if !cur || cur.empty?
+          return true  if cur.key?("enabled") && cur["enabled"].eql?(true)
         end
+
+        false
       end
 
       # Returns true if the given feature is disabled or doesn't exist. This is

data/lib/cconfig/version.rb

@@ -19,5 +19,5 @@
 
 module CConfig
   # The current version of CConfig.
-  VERSION = "1.1.0".freeze
+  VERSION = "1.1.1".freeze
 end

data/spec/config_spec.rb

@@ -84,9 +84,10 @@ describe CConfig::Config do
     # the local.yml file.
     base  = File.join(File.dirname(__FILE__), "fixtures")
     local = File.join(base, "bad.yml")
-    ENV["TEST_LOCAL_CONFIG_PATH"] = File.join(base, "local.yml")
+    ENV["CCONFIG_LOCAL_CONFIG_PATH"] = File.join(base, "local.yml")
 
-    cfg = ::CConfig::Config.new(default: "config.yml", local: local, prefix: "test")
+    # Passing nil to the prefix on purpose (see SUSE/Portus#1379)
+    cfg = ::CConfig::Config.new(default: "config.yml", local: local, prefix: nil)
     expect { cfg.fetch }.not_to raise_error
   end
 end

data/spec/hash_utils_spec.rb

@@ -65,4 +65,14 @@ describe ::CConfig::HashUtils do
     expect(cfg["ldap"]["count"]).to eq 2          # env
     expect(cfg["ldap"]["string"]).to eq "string"  # env
   end
+
+  # See issue #3
+  it "does not crash on nested default that doesn't exist" do
+    cfg = ConfigMock.new.strict_merge_with_env_test(default: default, local: local, prefix: "test")
+
+    cfg.extend(::CConfig::HashUtils::Extensions)
+    expect(cfg.enabled?("gravatar")).to be_truthy
+    expect(cfg.enabled?("oauth.google_oauth2")).to be_falsey
+    expect(cfg.enabled?("something.that.does.not.exist")).to be_falsey
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cconfig
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - mssola
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-08 00:00:00.000000000 Z
+date: 2017-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: safe_yaml
@@ -155,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Configuration management for container-aware applications.