simple-conf 0.1.2 → 0.2.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NzdmMGFjYjEyYmZhYWQxOGUzNzRlN2ZlYmY4ZGMxZWZlMDdiODBiMg==
+  data.tar.gz: !binary |-
+    YzhjNTM5ZWQyMWFlNmYzNzBkNzNjZjVhN2U4YzhiMTJhYTdkODcyZg==
+SHA512:
+  metadata.gz: !binary |-
+    Y2M4NDMwYmY2YzZhZDI3ZTMyNDZhMjRkY2NiMDRlYmRmNWUwYTFlNzZlODgy
+    MTU0YTQ5MmUyYjk5YTVjMzg4ODgxMzk4NTg2MmVkMzFlNjQxMDg2MjcwNzY1
+    MjhmYjdhMjVkMTZlZDhhOWI5ODlmMTg0ODEwNWI3MTNkYzZjMGQ=
+  data.tar.gz: !binary |-
+    Y2MxNmEzN2JhYTYxN2QxM2EzYTMwMjlmMmU5MGNkNWQxZTRhNDdkODUzMmY1
+    NTdkNjA4ZjJmZGRmZDU5N2RiMzEyZDVhZTFhM2E1Nzc5Yzc4ZWQ2MzQ5Mjdh
+    NDBhZWZjYTdhY2VjMmVjMGY2NThkNGNmMjU2MWE4Y2EyYTQyNDI=

data/.vimrc

@@ -0,0 +1,5 @@
+
+let g:turbux_command_prefix=''
+let g:turbux_command_rspec = 'rspec'
+let g:turbux_command_test_unit = 'ruby -Itest'
+let g:turbux_command_cucumber = 'cucumber'

data/config/options2.local.yml

@@ -0,0 +1,2 @@
+group2:
+  key2: value2

data/config/options2.yml

@@ -0,0 +1,2 @@
+group1:
+  key1: value1

data/lib/simple-conf/loader.rb

@@ -5,30 +5,36 @@ require 'erb'
 module SimpleConf
   Loader = Struct.new(:klass) do
     def run
-      yaml_file.each_pair do |key, value|
-        set(key, value)
-      end
+      paths.each do |path|
+        yaml_file(path).each_pair do |key, value|
+          set(key, value)
+        end
 
-      yaml_file.fetch(Rails.env, {}).each_pair do |key, value|
-        set(key, value)
-      end if rails_environment_defined?
+        yaml_file(path).fetch(Rails.env, {}).each_pair do |key, value|
+          set(key, value)
+        end if rails_environment_defined?
 
-      yaml_file.fetch(klass.env, {}).each_pair do |key, value|
-        set(key, value)
-      end if klass.respond_to?(:env)
+        yaml_file(path).fetch(klass.env, {}).each_pair do |key, value|
+          set(key, value)
+        end if klass.respond_to?(:env)
+      end
     end
 
-    def path
-      "./config/#{config_file_name}"
+    def paths
+      [
+        "./config/#{config_file_name}.yml",
+        "./config/#{config_file_name}.local.yml",
+      ]
     end
 
     def config_file_name
       klass.respond_to?(:config_file_name) ?
         klass.config_file_name :
-        "#{klass.name.downcase.split("::").last}.yml"
+        "#{klass.name.downcase.split("::").last}"
     end
 
-    def yaml_file
+    def yaml_file(path)
+      return {} unless File.exists?(path)
       content = File.open(path).read
       YAML.load(ERB.new(content).result)
     end

data/lib/simple-conf/version.rb

@@ -1,3 +1,3 @@
 module SimpleConf
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/spec/simple_conf_spec.rb

@@ -30,7 +30,7 @@ end
 
 class SettingsWithFilename
   def self.config_file_name
-    'settings.yml'
+    'settings'
   end
 
   include SimpleConf
@@ -38,41 +38,42 @@ end
 
 describe SimpleConf do
   context "on include to config class generate properties" do
-    it { Configuration.staging.domain.should == "staging.example.com" }
+    it { Configuration.staging.domain.should eq("staging.example.com") }
 
     it "should work properly with collections" do
-      Configuration.staging.links.should == [
+      expect(Configuration.staging.links).to eq([
         "test1.example.com",
-        "test2.example.com"
-      ]
+        "test2.example.com",
+      ])
     end
 
-    it { Configuration.production.domain.should == "production.example.com" }
+    it { expect(Configuration.production.domain).to eq("production.example.com") }
   end
 
   context "on include to options class generate properties with only one key and value" do
-    it { Options.domain.should == "example.com" }
+    it { expect(Options.domain).to eq("example.com") }
   end
 end
 
 describe SimpleConf do
   context "on include properties depending on rails environment" do
-    it { Configuration.domain.should == "staging.example.com" }
+    it { expect(Configuration.domain).to eq("staging.example.com") }
   end
 end
 
 describe SimpleConf do
-  context 'on include properties depenending on env method' do
-    Settings.domain.should == 'test.example.com'
+  it 'on include properties depenending on env method' do
+    expect(Settings.domain).to eq('test.example.com')
   end
 end
 
-class TestObject ; end
-
 describe SimpleConf do
+  class TestObject ; end
+
   before do
+    File.stub(:exists?).and_return(true)
     file = double('file', :read => attrib('test').to_yaml)
-    File.stub!(:open).and_return file
+    File.stub(:open).and_return(file)
   end
 
   context "when we have env params in the configuration file" do
@@ -86,11 +87,11 @@ describe SimpleConf do
       before { loader.run }
 
       it "should return username" do
-        TestObject.test.username.should == 'fred'
+        expect(TestObject.test.username).to eq('fred')
       end
 
       it "should return password fetched from the environment" do
-        TestObject.test.password.should == 'password'
+        expect(TestObject.test.password).to eq('password')
       end
     end
   end
@@ -107,7 +108,18 @@ end
 
 describe SimpleConf do
   it 'should be possible to use defined name in the settings class for loading the configuration file' do
-    SettingsWithFilename.test.domain.should == 'test.example.com'
+    expect(SettingsWithFilename.test.domain).to eq('test.example.com')
+  end
+end
+
+class Options2
+  include SimpleConf
+end
+
+describe SimpleConf do
+  it 'supports .local.yml file for loading extra options' do
+    expect(Options2).to respond_to(:group1)
+    expect(Options2).to respond_to(:group2)
   end
 end
 

data/spec/spec_helper.rb

@@ -4,3 +4,11 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'rubygems'
 require 'simple-conf'
 
+RSpec.configure do |config|
+  require 'rspec/expectations'
+  config.include RSpec::Matchers
+
+  config.mock_with :rspec
+
+  config.backtrace_exclusion_patterns = [%r{lib\/rspec\/(core|expectations|matchers|mocks)}]
+end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: simple-conf
 version: !ruby/object:Gem::Version
-  version: 0.1.2
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Alexander Korsak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-14 00:00:00.000000000 Z
+date: 2014-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,6 +35,7 @@ files:
 - .gitignore
 - .rspec
 - .rvmrc
+- .vimrc
 - Gemfile
 - Guardfile
 - LICENSE
@@ -45,6 +43,8 @@ files:
 - Rakefile
 - config/configuration.yml
 - config/options.yml
+- config/options2.local.yml
+- config/options2.yml
 - config/settings.yml
 - lib/simple-conf.rb
 - lib/simple-conf/loader.rb
@@ -55,33 +55,26 @@ files:
 homepage: http://github.com/oivoodoo/simple-conf/
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -847311465064856186
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -847311465064856186
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Simple configuration library for yml files for loading from the config folder
 test_files:
 - spec/simple_conf_spec.rb