collapsium-config 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 741381d93d430ecc5543a6078668afa243e37411
-  data.tar.gz: 95ede2d38dfa692e8fd280b588af56abd50038e3
+  metadata.gz: b003113648d35417f65b7f142c1e1957df44390e
+  data.tar.gz: 4c6ddaf1aafe5804b918877b5663169a85206afe
 SHA512:
-  metadata.gz: 3395ffe0c860a7b1a87c3ea302aedec670c2c59b0267c7dc2dba223a3a18e29b6c5f36b78ed28696de3000c6af7cee38493d7f7168373d09b3d4ccb5283e7451
-  data.tar.gz: 321173292d3886f27a0686e6286441b2d8ae104cef74a6737bf2639261cd31830870f9b6e393c71365a17cb07548501987f53a56f8a1b75001162f619261621f
+  metadata.gz: 07fd37c0e483fb12ecbd24924a27af10a49f4c07a8ffaff28bf9555b983b26377fdd5ab7b3a29b19ff0687d95a64c746db21df980838b9e87aed4be2a551dfa9
+  data.tar.gz: a0df3d326c1a71bd9001517b5f801fd9d7aab93054dd105d42a4604382881eb8b790c452b7ab2d7245534bb93ce19dc78460c74695eb665fd41cd787cfd3dfed

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    collapsium-config (0.1.0)
+    collapsium-config (0.1.1)
       collapsium (~> 0.1)
 
 GEM

data/lib/collapsium-config.rb

@@ -31,21 +31,24 @@ module Collapsium
       def config_file
         return @config_file || DEFAULT_CONFIG_PATH
       end
+
+      # @api private
+      attr_accessor :config
     end # module ClassMethods
     extend ClassMethods
 
     ##
-    # Access the global configuration
+    # Access the global configuration.
     def config
-      if @config.nil?
+      if Config.config.nil? or Config.config.empty?
         begin
-          @config = Configuration.load_config(Config.config_file)
+          Config.config = Configuration.load_config(Config.config_file)
         rescue Errno::ENOENT
-          @config = {}
+          Config.config = {}
         end
       end
 
-      return @config
+      return Config.config
     end
   end # module Config
 end # module Collapsium

data/lib/collapsium-config/version.rb

@@ -9,6 +9,6 @@
 module Collapsium
   module Config
     # The current release version
-    VERSION = "0.1.0".freeze
+    VERSION = "0.1.1".freeze
   end # module Config
 end # module Collapsium

data/spec/module_spec.rb

@@ -9,17 +9,35 @@ describe Collapsium::Config do
   end
 
   it "fails to load configuration from the default path (it does not exist)" do
+    expect(Collapsium::Config.config_file).to eql \
+      Collapsium::Config::DEFAULT_CONFIG_PATH
     expect(config.empty?).to be_truthy
   end
 
-  it "fails to load configuration files of unrecognized formats" do
-    Collapsium::Config.config_file = File.join(@data_path, 'foo.bar')
-    expect { config.empty? }.to raise_error(ArgumentError)
-  end
+  describe "providing a config file path" do
+    before :each do
+      Collapsium::Config.config_file = Collapsium::Config::DEFAULT_CONFIG_PATH
+    end
+
+    it "fails to load configuration files of unrecognized formats" do
+      Collapsium::Config.config_file = File.join(@data_path, 'foo.bar')
+      expect { config.empty? }.to raise_error(ArgumentError)
+    end
+
+    it "loads configuration from an existing path" do
+      Collapsium::Config.config_file = File.join(@data_path, 'global.yml')
+      expect { config.empty? }.not_to raise_error(ArgumentError)
+      expect(config.empty?).to be_falsy
+    end
+
+    it "does not load the same configuration twice" do
+      Collapsium::Config.config_file = File.join(@data_path, 'global.yml')
+      cfg1 = config
+
+      Collapsium::Config.config_file = File.join(@data_path, 'global.yml')
+      cfg2 = config
 
-  it "loads configuration from an existing path" do
-    Collapsium::Config.config_file = File.join(@data_path, 'global.yml')
-    expect { config.empty? }.not_to raise_error(ArgumentError)
-    expect(config.empty?).to be_falsy
+      expect(cfg1.object_id).to eql cfg2.object_id
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: collapsium-config
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Jens Finkhaeuser