figly 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92096fbb361ef15bd69d38780f8a5d1c4b2d1093
-  data.tar.gz: 54be27cfa55e83e7b4a12eea18f6e0f38d53e13e
+  metadata.gz: 65ac42decd3b9d8da0ffa6a4d00401300a0e83dc
+  data.tar.gz: d257ea30a2c4242b96d4e3213a4aab91540e213f
 SHA512:
-  metadata.gz: 9ecce235ec39a27f398de581105cfaa69f4beafc83838a73c4a61ee7e815b5b960786c93126c7ac46b6244d6cc34745925a9d48b2cfd224079f72ec4ee6ef285
-  data.tar.gz: 32b0cdc33f3691a5f006fdc9f13ca09fd4b3bdb5ec9de9aa2a99e9ed77f605e800e4a1893b7fda8764386f19ad560510cfffef3f638d297fa86b37141798fd75
+  metadata.gz: 170370e713d00bfc38576067ce7ae0b6b4d82bea2febbebb1224c6ecf220aefeef1d88894a5130c18b4344ae96e07276d68d5640134c1cfa52946c87dd2e64b4
+  data.tar.gz: 7e04253fef6b344ad1c7a36d54c33344835f14c831033b0fabf18f24a904e69bd4b5174483bdef7ce1de1658269abe028ec17e3b0b59d28b9d0c436ad54e3380

data/lib/figly.rb

@@ -5,6 +5,7 @@ module Figly
   class ParserError < StandardError; end
   class UnsupportedFormatError < StandardError; end
   class ConfigNotFoundError < StandardError; end
+  class ConfigNotLoaded < StandardError; end
 
   def self.load_file(path)
     raise ConfigNotFoundError, "File does not exist: #{path}" unless File.exists?(path)
@@ -47,7 +48,7 @@ module Figly
     end
 
     # Here we merge config files if there are multiple load calls
-    if defined?(@@data) && !@@data.nil?
+    if _config_loaded?
       _deep_merge(@@data, data)
     else
       @@data = data
@@ -60,6 +61,7 @@ module Figly
   end
 
   def self.data
+    _ensure_loaded!
     @@data
   end
 
@@ -67,4 +69,14 @@ module Figly
     merger = proc { |key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2 }
     first.merge!(second, &merger)
   end
+
+  def self._ensure_loaded!
+    unless _config_loaded?
+      raise ConfigNotLoaded, "You must first load the config before attempting to access it"
+    end
+  end
+
+  def self._config_loaded?
+    defined?(@@data) && @@data
+  end
 end

data/lib/figly/version.rb

@@ -1,3 +1,3 @@
 module Figly
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

data/spec/figly_spec.rb

@@ -59,6 +59,8 @@ describe Figly do
   end
 
   context 'errors' do
+    after { Figly.clean }
+
     context 'ParserError' do
       it 'should error on bad.yml' do
         expect{Figly.load_file('spec/support/bad.yml')}.to raise_error(Figly::ParserError)
@@ -81,5 +83,9 @@ describe Figly do
     it 'should raise an error on an unsupported config file format' do
       expect{ Figly.load_file("spec/support/config.ini") }.to raise_error(Figly::UnsupportedFormatError)
     end
+
+    it 'should raise an exception if data is trying to be accessed before Figly has been loaded' do
+      expect{ Figly::Settings.a.b }.to raise_error(Figly::ConfigNotLoaded)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: figly
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Ryan Canty