From 0820c8d84608925dc14cabfef113f10ff237eef3 Mon Sep 17 00:00:00 2001
From: Nic <bboyceo@hotmail.com>
Date: Sat, 3 Feb 2018 00:51:54 +0800
Subject: [PATCH] Add `zip` to the list of reserved keywords (#197)

---
 CHANGELOG.md                        |  1 +
 lib/config/options.rb               |  2 +-
 spec/fixtures/reserved_keywords.yml |  7 ++++---
 spec/options_spec.rb                | 23 +++++++++++++----------
 4 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5518da6c..d0923bbb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 * Fix `key?` and `has_key?`, which raise NoMethodError in non Rails environment, by using ActiveSupport `#delegate` implicitly ([#185](https://github.com/railsconfig/config/pull/185))
 * Update `deep_merge` dependency to latest version (v1.2.1) ([#191](https://github.com/railsconfig/config/pull/191))
 * Upgrade `rubocop` to version 0.52.1 ([#193](https://github.com/railsconfig/config/pull/193))
+* Add `zip` to the list of reserved keywords ([#197](https://github.com/railsconfig/config/pull/197))
 
 ## 1.6.0
 
diff --git a/lib/config/options.rb b/lib/config/options.rb
index 69247df1..81127b12 100644
--- a/lib/config/options.rb
+++ b/lib/config/options.rb
@@ -134,7 +134,7 @@ def merge!(hash)
     end
 
     # Some keywords that don't play nicely with OpenStruct
-    SETTINGS_RESERVED_NAMES = %w{select collect test count}
+    SETTINGS_RESERVED_NAMES = %w[select collect test count zip].freeze
 
     # An alternative mechanism for property access.
     # This let's you do foo['bar'] along with foo.bar.
diff --git a/spec/fixtures/reserved_keywords.yml b/spec/fixtures/reserved_keywords.yml
index 0ac0c37d..b39f1c84 100644
--- a/spec/fixtures/reserved_keywords.yml
+++ b/spec/fixtures/reserved_keywords.yml
@@ -1,3 +1,4 @@
-select: 123
-collect: 456
-count: 789
+select: apple
+collect: banana
+count: lemon
+zip: cherry
diff --git a/spec/options_spec.rb b/spec/options_spec.rb
index 2598754a..504f0150 100644
--- a/spec/options_spec.rb
+++ b/spec/options_spec.rb
@@ -8,19 +8,22 @@
     end
 
     it 'should allow to access them via object member notation' do
-      expect(config.select).to eq(123)
-      expect(config.collect).to eq(456)
-      expect(config.count).to eq(789)
+      expect(config.select).to eq('apple')
+      expect(config.collect).to eq('banana')
+      expect(config.count).to eq('lemon')
+      expect(config.zip).to eq('cherry')
     end
 
     it 'should allow to access them using [] operator' do
-      expect(config['select']).to eq(123)
-      expect(config['collect']).to eq(456)
-      expect(config['count']).to eq(789)
-
-      expect(config[:select]).to eq(123)
-      expect(config[:collect]).to eq(456)
-      expect(config[:count]).to eq(789)
+      expect(config['select']).to eq('apple')
+      expect(config['collect']).to eq('banana')
+      expect(config['count']).to eq('lemon')
+      expect(config['zip']).to eq('cherry')
+
+      expect(config[:select]).to eq('apple')
+      expect(config[:collect]).to eq('banana')
+      expect(config[:count]).to eq('lemon')
+      expect(config[:zip]).to eq('cherry')
     end
   end