Skip to content

Commit

Permalink
Merge pull request #323 from adrienthebo/maint/master/settings-contai…
Browse files Browse the repository at this point in the history
…ner-inheritance

Add Settings::Container#reset!, set up inheritance relationship
  • Loading branch information
adrienthebo committed Feb 28, 2015
2 parents cc14815 + 67efff2 commit d8e6ec0
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 0 deletions.
6 changes: 6 additions & 0 deletions lib/r10k/settings/container.rb
Expand Up @@ -74,6 +74,12 @@ def valid_key?(key)
end
end

# Clear all existing settings in this container. Valid settings are left alone.
# @return [void]
def reset!
@settings = {}
end

private

def validate_key!(key)
Expand Down
9 changes: 9 additions & 0 deletions lib/r10k/settings/mixin.rb
Expand Up @@ -41,5 +41,14 @@ def defaults
def settings
@settings ||= R10K::Settings::Container.new(defaults)
end

# Allow subclasses to use the settings of the parent class as default values
#
# @return [void]
def inherited(subclass)
subclass.instance_eval do
@settings = R10K::Settings::Container.new(superclass.settings)
end
end
end
end
17 changes: 17 additions & 0 deletions spec/unit/settings/container_spec.rb
Expand Up @@ -65,4 +65,21 @@
end
end
end

describe "resetting" do
before do
subject.add_valid_key :v
end

it "unsets all settings" do
subject[:v] = "hi"
subject.reset!
expect(subject[:v]).to be_nil
end

it "doesn't remove valid values" do
subject.reset!
expect(subject.valid_key?(:v)).to be_truthy
end
end
end

0 comments on commit d8e6ec0

Please sign in to comment.