nifty_settings 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b6bf0f7185a056b1f5f819929cf00278f2cf47c
-  data.tar.gz: 4274adcaca0b70429539063124e027cd619f7e19
+  metadata.gz: d69c55980e686ed5ccc21d0d8fd7de395167016c
+  data.tar.gz: a4c73431de6fe4842197714100f6c2de742506ce
 SHA512:
-  metadata.gz: 0ac640647e74bccffa263602d1ea2bc45eb84b601bec120d27b78bc2babb1dd98d7647c9b09095463179d37ffbda4da87b5032b16a22642066c8456a1869a863
-  data.tar.gz: b2081dc73b7e25d3234451a4a0ba81d677602b9e3bc8cb125871d4ffc581cb65dc6fadc04d99139a2aa80d551884966664ae8ed0556b26dca0c729df8503ae32
+  metadata.gz: e98c48636bb4061f903d5c5bed4094125b55e21de576cd754f47e90cb1ccd0a730d2e47ea8f159d513c102db987aa7fe00227ad02b9ff55ace828a1bfe068b6e
+  data.tar.gz: 739d7a10134c442bc00b3bec378d36725a3ca93111ec42271fa71051fcbb98e056c7816450600da16cd5bc97c803a0f1f4ed86392e376ef40fe0174bef3ca61a

data/CHANGELOG.md

@@ -0,0 +1,4 @@
+# 1.1.6 - 2014-07-15
+
+* Enable setting a custom settings file path via `NiftySettings::Settings.settings_path = '...'`
+* Don't throw an exception when settings file is empty

data/lib/nifty_settings/settings.rb

@@ -76,6 +76,10 @@ module NiftySettings
         @@settings_path ||= root.join('config', 'settings.yml').to_s
       end
 
+      def settings_path=(value)
+        @@settings_path = value
+      end
+
       def load_from_file
         if !File.readable?(settings_path)
           $stderr.puts "Unable to load settings from #{settings_path} - Please check it exists and is readable."
@@ -84,7 +88,7 @@ module NiftySettings
         # Otherwise, try loading...
         contents = File.read(settings_path)
         contents = ERB.new(contents).result
-        contents = YAML.load(contents)
+        contents = YAML.load(contents) || {}
         if env.nil?
           contents
         else

data/lib/nifty_settings/version.rb

@@ -1,3 +1,3 @@
 module NiftySettings
-  VERSION = '1.1.5'
+  VERSION = '1.1.6'
 end

data/nifty_settings.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |gem|
   gem.email         = 'manuel@krautcomputing.com'
   gem.summary       = 'Settings'
   gem.description   = 'Settings'
-  gem.homepage      = ''
+  gem.homepage      = 'http://krautcomputing.github.io/nifty_settings'
   gem.license       = 'MIT'
 
   gem.files         = `git ls-files`.split($/)

data/spec/nifty_settings/settings_spec.rb

@@ -85,4 +85,35 @@ describe NiftySettings::Settings do
       end
     end
   end
+
+  describe '.load_from_file' do
+    it 'loads the settings from the default location' do
+      # Reset settings path in case it has been modified
+      NiftySettings::Settings.settings_path = nil
+
+      # Copy settings file to default location
+      settings_file = File.expand_path('../../support/settings.yml', __FILE__)
+      config_dir    = File.expand_path('../../../config', __FILE__)
+      FileUtils.mkdir_p config_dir
+      FileUtils.cp settings_file, config_dir
+
+      settings = NiftySettings::Settings.load_from_file
+      expect(settings).to eq('foo' => 'bar')
+
+      # Delete settings file again
+      FileUtils.rm File.join(config_dir, 'settings.yml')
+    end
+
+    it 'can load the settings from a custom location' do
+      NiftySettings::Settings.settings_path = File.expand_path('../../support/settings.yml', __FILE__)
+      settings = NiftySettings::Settings.load_from_file
+      expect(settings).to eq('foo' => 'bar')
+    end
+
+    it 'can load empty settings' do
+      NiftySettings::Settings.settings_path = File.expand_path('../../support/settings_empty.yml', __FILE__)
+      settings = NiftySettings::Settings.load_from_file
+      expect(settings).to eq({})
+    end
+  end
 end

data/spec/support/settings.yml

@@ -0,0 +1 @@
+foo: bar

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: nifty_settings
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Manuel Meurer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-21 00:00:00.000000000 Z
+date: 2014-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.2.0
 description: Settings
@@ -72,7 +72,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .travis.yml
+- ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -85,7 +86,9 @@ files:
 - nifty_settings.gemspec
 - spec/nifty_settings/settings_spec.rb
 - spec/spec_helper.rb
-homepage: ''
+- spec/support/settings.yml
+- spec/support/settings_empty.yml
+homepage: http://krautcomputing.github.io/nifty_settings
 licenses:
 - MIT
 metadata: {}
@@ -95,12 +98,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -112,4 +115,6 @@ summary: Settings
 test_files:
 - spec/nifty_settings/settings_spec.rb
 - spec/spec_helper.rb
+- spec/support/settings.yml
+- spec/support/settings_empty.yml
 has_rdoc: