Address edge case with table config param (rubyconfig#339) by @krasno…

…ukhov

lib/confset/options.rb

@@ -114,7 +114,7 @@ def merge!(hash)
     end
 
     # Some keywords that don't play nicely with OpenStruct
-    SETTINGS_RESERVED_NAMES = %w[select collect test count zip min max exit!].freeze
+    SETTINGS_RESERVED_NAMES = %w[select collect test count zip min max exit! table].freeze
 
     # An alternative mechanism for property access.
     # This let's you do foo['bar'] along with foo.bar.
@@ -134,11 +134,11 @@ def []=(param, value)
     end
 
     def key?(key)
-      table.key?(key)
+      @table.key?(key)
     end
 
     def has_key?(key)
-      table.has_key?(key)
+      @table.has_key?(key)
     end
 
     def method_missing(method_name, *args)

spec/fixtures/reserved_keywords.yml

@@ -5,3 +5,4 @@ zip: cherry
 max: kumquat
 min: fig
 exit!: taro
+table: strawberry

spec/options_spec.rb

@@ -20,6 +20,7 @@
       expect(config.max).to eq("kumquat")
       expect(config.min).to eq("fig")
       expect(config.exit!).to eq("taro")
+      expect(config.table).to eq("strawberry")
     end
 
     it "should allow to access them using [] operator" do
@@ -30,6 +31,7 @@
       expect(config["max"]).to eq("kumquat")
       expect(config["min"]).to eq("fig")
       expect(config["exit!"]).to eq("taro")
+      expect(config["table"]).to eq("strawberry")
 
       expect(config[:select]).to eq("apple")
       expect(config[:collect]).to eq("banana")
@@ -38,6 +40,26 @@
       expect(config[:max]).to eq("kumquat")
       expect(config[:min]).to eq("fig")
       expect(config[:exit!]).to eq("taro")
+      expect(config[:table]).to eq("strawberry")
+    end
+  end
+
+  context "when empty" do
+    let(:config) do
+      Confset.load_files("#{fixture_path}/empty1.yml")
+    end
+
+    it "should allow to access them via object member notation" do
+      expect(config.select).to be_nil
+      expect(config.table).to be_nil
+    end
+
+    it "should allow to access them using [] operator" do
+      expect(config["select"]).to be_nil
+      expect(config["table"]).to be_nil
+
+      expect(config[:select]).to be_nil
+      expect(config[:table]).to be_nil
     end
   end
 

spec/spec_helper.rb

@@ -10,6 +10,7 @@
 RSpec.configure do |config|
   # Turn the deprecation warnings into errors, giving you the full backtrace
   config.raise_errors_for_deprecations!
+  config.include FixtureHelper
 
   config.before(:suite) do
     Confset.module_eval do