dc-settingslogic 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b99784f5ea316afb0a97ad07755540a89bf0e55
-  data.tar.gz: ccdfb941953d43fa57d70236807ab6fa5f548f92
+  metadata.gz: baa7a6a2cbc706b9012c7ab12630b4a749fdb2d0
+  data.tar.gz: b8bfb0f1cc84a0205881710f75ac506f0c625115
 SHA512:
-  metadata.gz: c04822d02195eb8c005167b8a7cb0630060c0413ee6b686ad918da5e5bdcbf099f9b6bbb72ab39057a1966286e175da50df05bf20227dafbc5ce151ca669417f
-  data.tar.gz: 4733c6ddca69d39aa9434e20cdbcd07bfefb94e16efddb07aeb608b484f69eb1584bef0d5a040321be400e42050995ee0d22d2d92668e1ccee3e7c04e5a75867
+  metadata.gz: e0188b0b7b8eb0535a190ef9b460868d2c8ad49c400ba4288ec7e7a38c7ce5e7b1058465d532b6599bdc19dc1be8f71acd0754b425337a19c1201b18d43fc1e7
+  data.tar.gz: b561e7adec7d37196c7abb59e336084d292baecf9b279cc813550cd44f3d1bbfa37dbad33cabfeba52e3b31ae47dc21b9746932db52226d3ab52ba8819893ed4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dc-settingslogic (2.1.0)
+    dc-settingslogic (2.1.1)
 
 GEM
   remote: https://rubygems.org/

data/lib/settingslogic.rb

@@ -106,7 +106,8 @@ class Settingslogic < Hash
         next unless File.exist? file
 
         file_contents = open(file).read
-        single_hash = file_contents.empty? ? {} : YAML.load(ERB.new(file_contents).result).to_hash
+        raw_result = YAML.load(ERB.new(file_contents).result)
+        single_hash = raw_result ? raw_result : {}
         hash.merge! single_hash
       end
       if self.class.namespace

data/settingslogic.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "dc-settingslogic"
-  s.version     = "2.1.0"
+  s.version     = "2.1.1"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Ben Johnson", "Jeong, Jiung"]
   s.email       = ["bjohnson@binarylogic.com", "ethernuiel@sanultari.com"]

data/spec/commented.yml

@@ -0,0 +1,2 @@
+---
+#empty file

data/spec/commented_config.rb

@@ -0,0 +1,3 @@
+class CommentedConfig < Settingslogic
+  source "#{File.dirname(__FILE__)}/commented.yml"
+end

data/spec/settingslogic_spec.rb

@@ -175,6 +175,10 @@ describe "Settingslogic" do
     expect(MultiSourceConfig.name).to eq("test")
   end
 
+  it "should handle empty file having comments" do
+    expect(CommentedConfig.keys).to be_empty
+  end
+
   describe "#to_hash" do
     it "should return a new instance of a Hash object" do
       expect(Settings.to_hash).to be_a Hash

data/spec/spec_helper.rb

@@ -7,6 +7,7 @@ require_relative 'settings3'
 require_relative 'settings4'
 require_relative 'multi_source_config'
 require_relative 'settings_empty'
+require_relative 'commented_config'
 
 # Needed to test Settings3
 Object.send :define_method, 'collides' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dc-settingslogic
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Ben Johnson
@@ -56,6 +56,8 @@ files:
 - Rakefile
 - lib/settingslogic.rb
 - settingslogic.gemspec
+- spec/commented.yml
+- spec/commented_config.rb
 - spec/multi_source_config.rb
 - spec/override.yml
 - spec/settings.rb
@@ -92,6 +94,8 @@ specification_version: 4
 summary: A simple and straightforward settings solution that uses an ERB enabled YAML
   file and a singleton design pattern.
 test_files:
+- spec/commented.yml
+- spec/commented_config.rb
 - spec/multi_source_config.rb
 - spec/override.yml
 - spec/settings.rb