easy_config 0.0.3 → 0.9.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 37a54051f2c3e78f2e00d2dcdbc8450b8724c14e
+  data.tar.gz: 334f91afdccd24f82a66895aa2876bf911f83b25
+SHA512:
+  metadata.gz: 5a50a18e368ca181999c1a52c3305485f86f1db287f2aa55394b32c3c4070f6c5f5794ef549e2e303af6bd07ca24d4370d385dbc8fd70009d0439a6b1ef0df79
+  data.tar.gz: 884fc56924af3dd73d9afc3c5a3a2c0a7eab17befc0c5a5cf71f395b13234e246dd3811d8f05e7b3ae952633cd07129869b4761716416b5cd77a99cb38621e9f

data/.rspec

@@ -0,0 +1 @@
+--color

data/.ruby-version

@@ -0,0 +1 @@
+2.1.3

data/.travis.yml

@@ -1,13 +1,9 @@
 language: ruby
-script: rspec
 rvm:
-  - 1.8.7
-  - 1.9.2
+  - 2.1.3
+  - 2.0.0
   - 1.9.3
-  - jruby-18mode
-  - jruby-19mode
-  - rbx-18mode
-  - rbx-19mode
-  - ruby-head
-  - jruby-head
   - ree
+addons:
+  code_climate:
+    repo_token: 0b115a677691f1e1382af37e5047e640fdfcefae321d410478ba9ec401f131bb

data/CHANGELOG.md

@@ -0,0 +1,20 @@
+## 0.9.0 - 2014-10-23
+
+* Support to ERB inside yaml config file (#2)
+* Allow multiple config paths (#3)
+* Add license info (MIT)
+
+## 0.0.3 - 2012-08-16
+
+* Allow to set custom environment
+
+## 0.0.2 - 2012-08-15
+
+* Reload methods on reset!
+* Raises error when configuration isn't available
+* Add support to custom config path
+* Raises error when config path is unknown
+
+## 0.0.1 - 2012-03-17
+
+* First version

data/Gemfile

@@ -1,3 +1,6 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gemspec
+
+gem "codeclimate-test-reporter", :group => :test, :require => nil
+gem "json", :group => :test, :platforms => :mri_18

data/Gemfile.lock

@@ -1,15 +1,22 @@
 PATH
   remote: .
   specs:
-    easy_config (0.0.2)
-      methodize (~> 0.2.1)
+    easy_config (0.9.0)
+      erubis
+      methodize (~> 0.2)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
+    codeclimate-test-reporter (0.4.1)
+      simplecov (>= 0.7.1, < 1.0.0)
     diff-lcs (1.1.3)
-    methodize (0.2.1)
-    rake (0.9.2.2)
+    docile (1.1.5)
+    erubis (2.7.0)
+    json (1.8.1)
+    methodize (0.3.1)
+    multi_json (1.10.1)
+    rake (10.3.2)
     rspec (2.9.0)
       rspec-core (~> 2.9.0)
       rspec-expectations (~> 2.9.0)
@@ -18,12 +25,19 @@ GEM
     rspec-expectations (2.9.0)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.9.0)
+    simplecov (0.9.1)
+      docile (~> 1.1.0)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (>= 1.0.0)
+  codeclimate-test-reporter
   easy_config!
+  json
   rake
   rspec (~> 2.9.0)

data/README.md

@@ -1,17 +1,24 @@
 # Easy config
 Rails and Rack applications configuration made easy.
 
-[![Build Status](https://secure.travis-ci.org/felipecvo/easy_config.png?branch=master)](http://travis-ci.org/felipecvo/easy_config)
+[![Build Status](https://secure.travis-ci.org/felipecvo/easy_config.png?branch=master)](http://travis-ci.org/felipecvo/easy\_config)
+[![Code Climate](https://codeclimate.com/github/felipecvo/easy_config/badges/gpa.svg)](https://codeclimate.com/github/felipecvo/easy_config)
+[![Test Coverage](https://codeclimate.com/github/felipecvo/easy_config/badges/coverage.svg)](https://codeclimate.com/github/felipecvo/easy_config)
+[![Dependency Status](https://gemnasium.com/felipecvo/easy_config.svg)](https://gemnasium.com/felipecvo/easy_config)
 
-# Installation
+## Installation
 
-`gem install easy-config`
+[![Gem Version](https://badge.fury.io/rb/easy_config.svg)](http://badge.fury.io/rb/easy_config)
+
+`gem install easy_config`
 
 or in your Gemfile
 
-`gem "easy-config"`
+`gem "easy_config"`
+
+See [Changelog](CHANGELOG.md).
 
-# How it works
+## How it works
 
 EasyConfig allows you to access your config files easily. All you have to do is
 to put your files in config dir and be a valid YAML file (with .yml as extension).
@@ -19,16 +26,25 @@ to put your files in config dir and be a valid YAML file (with .yml as extension
 If you desire you can split your configurations by environment. Easy config treats it
 automatically.
 
-## Example
+### Example
 
 We can access database.yml file as:
 
 `EasyConfig.database.adapter`
 
-And if you have your our custom config file named my_customs.yml:
+And if you have your our custom config file named my\_customs.yml:
 
 `EasyConfig.my_customs.custom_var`
 
-# TODO
+## Supported rubies
+
+* 2.1
+* 2.0
+* 1.9.3
+* ree
+
+## License
+
+[The MIT License](http://opensource.org/licenses/MIT)
 
-Support ENV['DATABASE_URL'] to EasyConfig.database.url
+Copyright (c) 2012-2014 Felipe Oliveira <[http://felipecvo.github.io/](http://felipecvo.github.io/)>

data/Rakefile

@@ -1,11 +1,9 @@
 require 'rubygems'
 require 'bundler'
+require 'rspec/core/rake_task'
 
 Bundler::GemHelper.install_tasks
 
-desc "run the spec suite"
-task :spec do
-    system "rspec -cfp spec"
-end
+RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec

data/easy_config.gemspec

@@ -3,6 +3,7 @@ require File.expand_path("../lib/easy_config/version", __FILE__)
 Gem::Specification.new do |s|
   s.name        = 'easy_config'
   s.version     = EasyConfig::VERSION
+  s.licenses    = ['MIT']
   s.date        = '2012-03-17'
   s.summary     = "Easy config, Rails and Rack application's configuration made easy."
   s.description = s.summary
@@ -16,7 +17,8 @@ Gem::Specification.new do |s|
   s.test_files   = `git ls-files -- {spec}/*`.split("\n")
   s.require_path = 'lib'
 
-  s.add_dependency "methodize", "~> 0.2.1"
+  s.add_dependency "methodize", "~> 0.2"
+  s.add_dependency "erubis"
 
   s.add_development_dependency "bundler", ">= 1.0.0"
   s.add_development_dependency "rspec", "~> 2.9.0"

data/lib/easy_config/config_file.rb

@@ -11,20 +11,37 @@ class EasyConfig::ConfigFile
   end
 
   def create_configuration
-    yaml = YAML::load_file(@path)
+    yaml = yaml_data
 
     yaml = yaml[EasyConfig::Env.current] if EasyConfig::Env.has_environment?(yaml)
 
     EasyConfig::Configuration.new(yaml)
   end
 
-  def self.all
-    @all ||= Dir.glob(EasyConfig::PathResolver.config_path).map do |path|
-      EasyConfig::ConfigFile.new path
-    end
+  def yaml_data
+    input = File.read(@path)
+    eruby = ERB.new(input)
+    YAML.load(eruby.result)
   end
 
-  def self.reset!
-    @all = nil
+  class << self
+    def all
+      @all ||= load_all
+    end
+
+    def reset!
+      @all = nil
+    end
+
+    private
+    def load_all
+      all = []
+      EasyConfig::PathResolver.config_paths.each do |config_path|
+        Dir.glob(File.join(config_path, '*.yml')).each do |yaml_file|
+          all << EasyConfig::ConfigFile.new(yaml_file)
+        end
+      end
+      all
+    end
   end
 end

data/lib/easy_config/path_resolver.rb

@@ -1,17 +1,20 @@
 module EasyConfig::PathResolver
-  def self.config_path=(value)
-    @config_path = value
-  end
+  class << self
+    def config_paths
+      @config_paths ||= [default_config_path].compact
+    end
+
+    def clear!
+      @config_paths = nil
+    end
 
-  def self.config_path
-    if defined?(@config_path) and @config_path
-      File.join(@config_path, '*.yml')
-    elsif defined?(Rails)
-      File.join(Rails.root, 'config', '*.yml')
-    elsif defined?(Sinatra)
-      File.join(Sinatra::Application.root, 'config', '*.yml')
-    else
-      raise EasyConfig::UnknownConfigPath.new
+    private
+    def default_config_path
+      if defined?(Rails)
+        File.join(Rails.root, 'config')
+      elsif defined?(Sinatra)
+        File.join(Sinatra::Application.root, 'config')
+      end
     end
   end
 end

data/lib/easy_config/setup.rb

@@ -0,0 +1,47 @@
+module EasyConfig
+  module Setup
+    def method_missing(name)
+      unless @loaded
+        setup_config
+        self.send name
+      else
+        raise ConfigurationNotFound.new("Configuration for '#{name}' was not found.")
+      end
+    end
+
+    def setup_config
+      EasyConfig::ConfigFile.all.each do |f|
+        add_config_method(f)
+      end
+      @loaded = true
+    end
+
+    def add_config_method(config)
+      (class << self; self; end).instance_eval do
+        define_method config.name do
+          config.configuration
+        end
+      end
+    end
+
+    def config_path=(path)
+      EasyConfig::PathResolver.clear!
+      EasyConfig::PathResolver.config_paths << path
+      self.reset!
+    end
+
+    def reset!
+      EasyConfig::ConfigFile.reset!
+      @loaded = false
+      setup_config
+    end
+
+    def environment
+      EasyConfig::Env.current
+    end
+
+    def environment=(env)
+      EasyConfig::Env.set(env)
+    end
+  end
+end

data/lib/easy_config/version.rb

@@ -1,3 +1,3 @@
 module EasyConfig
-  VERSION = "0.0.3"
+  VERSION = "0.9.0"
 end

data/lib/easy_config.rb

@@ -1,52 +1,12 @@
-module EasyConfig
-  class ConfigurationNotFound < NoMethodError; end
-  class UnknownConfigPath < ArgumentError; end
-
-  def self.method_missing(name)
-    unless @loaded
-      setup_config
-      self.send name
-    else
-      raise ConfigurationNotFound.new("Configuration for '#{name}' was not found.")
-    end
-  end
-
-  def self.setup_config
-    EasyConfig::ConfigFile.all.each do |f|
-      add_config_method(f)
-    end
-    @loaded = true
-  end
-
-  def self.add_config_method(config)
-    (class << self; self; end).instance_eval do
-      define_method config.name do
-        config.configuration
-      end
-    end
-  end
-
-  def self.config_path=(path)
-    EasyConfig::PathResolver.config_path = path
-    self.reset!
-  end
-
-  def self.reset!
-    EasyConfig::ConfigFile.reset!
-    @loaded = false
-    setup_config
-  end
-
-  def self.environment
-    EasyConfig::Env.current
-  end
-
-  def self.environment=(env)
-    EasyConfig::Env.set(env)
-  end
-end
-
+require 'yaml'
+require 'easy_config/setup'
 require 'easy_config/config_file'
 require 'easy_config/configuration'
 require 'easy_config/env'
 require 'easy_config/path_resolver'
+
+module EasyConfig
+  class ConfigurationNotFound < NoMethodError; end
+
+  extend Setup
+end

data/spec/easy_config/config_file_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
 describe EasyConfig::ConfigFile do
-  before { EasyConfig::PathResolver.config_path = './spec/fixtures' }
-  after { EasyConfig::PathResolver.config_path = nil }
+  before { EasyConfig::PathResolver.config_paths << './spec/fixtures' }
+  after { EasyConfig::PathResolver.clear! }
 
   context "all files" do
     subject { EasyConfig::ConfigFile.all }
@@ -29,4 +29,14 @@ describe EasyConfig::ConfigFile do
     its('configuration.host') { should eq 'localhost' }
     its('configuration.port') { should eq 4567 }
   end
+
+  context "ERB support" do
+    before do
+      ENV['redis_password'] = 'sTrOnGpAssWorD'
+      EasyConfig.reset!
+    end
+
+    subject { EasyConfig::ConfigFile.all.find { |c| c.name == :redis } }
+    its('configuration.password') { should eq 'sTrOnGpAssWorD' }
+  end
 end

data/spec/easy_config/path_resolver_spec.rb

@@ -1,42 +1,33 @@
 require 'spec_helper'
 
 describe EasyConfig::PathResolver do
-  context "#config_path" do
-    context "resolve Rails config dir" do
+  context "#config_paths" do
+    before { EasyConfig::PathResolver.clear! }
+
+    context "include Rails config dir" do
       before { module ::Rails; def self.root; "./"; end; end }
       after { Object.send(:remove_const, :Rails) }
-      subject { EasyConfig::PathResolver.config_path }
-      it { should eq "./config/*.yml" }
+      subject { EasyConfig::PathResolver.config_paths }
+      it { should include("./config") }
     end
 
-    context "resolve Sinatra config dir" do
+    context "include Sinatra config dir" do
       before { module ::Sinatra; module Application; def self.root; "/sinatra/"; end; end; end }
       after { Object.send(:remove_const, :Sinatra) }
-      subject { EasyConfig::PathResolver.config_path }
-      it { should eq "/sinatra/config/*.yml" }
-    end
-
-    context "allow custom config path" do
-      before { EasyConfig::PathResolver.config_path = './my_custom_path/' }
-      subject { EasyConfig::PathResolver.config_path }
-      it { should eq "./my_custom_path/*.yml" }
+      subject { EasyConfig::PathResolver.config_paths }
+      it { should include "/sinatra/config" }
     end
 
-    context "allow reset custom config path" do
-      before { EasyConfig::PathResolver.config_path = './my_custom_path/' }
-      subject {
-        EasyConfig::PathResolver.config_path = nil
-        module ::Rails; def self.root; "./"; end; end
-        EasyConfig::PathResolver.config_path
-      }
-      after { Object.send(:remove_const, :Rails) }
-      it { should eq "./config/*.yml" }
+    context "empty set" do
+      it "doesn't raise exception" do
+        EasyConfig::PathResolver.config_paths.size.should eq 0
+      end
     end
 
-    context "unknow config path" do
-      it "should throw exception" do
-        lambda { EasyConfig::PathResolver.config_path }.should raise_error(EasyConfig::UnknownConfigPath)
-      end
+    it "allows multiple paths" do
+      EasyConfig::PathResolver.config_paths << './spec/config'
+      EasyConfig::PathResolver.config_paths << './config'
+      EasyConfig::PathResolver.config_paths.size.should eq 2
     end
   end
 end

data/spec/easy_config_spec.rb

@@ -34,7 +34,11 @@ describe EasyConfig do
   end
 
   context "set custom environment" do
-    before { EasyConfig.environment = "test" }
+    before do
+      @env = EasyConfig.environment
+      EasyConfig.environment = "test"
+    end
+    after { EasyConfig.environment = @env }
     subject { EasyConfig.environment }
     it { should eq "test" }
   end

data/spec/fixtures/redis.yml

@@ -1,6 +1,7 @@
 development:
   host: 'localhost'
   port: 4567
+  password: <%= ENV['redis_password'] %>
 
 production:
   host: 'redis.easyconfig.com'

data/spec/spec_helper.rb

@@ -1,4 +1,9 @@
 require 'bundler/setup'
+if RUBY_VERSION > "1.8.7"
+  require "codeclimate-test-reporter"
+  CodeClimate::TestReporter.start
+end
+
 require 'easy_config'
 
 ENV['RACK_ENV'] = nil

metadata

@@ -1,95 +1,96 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: easy_config
-version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 3
-  version: 0.0.3
+version: !ruby/object:Gem::Version
+  version: 0.9.0
 platform: ruby
-authors: 
+authors:
 - Felipe Oliveira
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-17 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: methodize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 0
-        - 2
-        - 1
-        version: 0.2.1
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: erubis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 2
-        - 9
-        - 0
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
         version: 2.9.0
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.9.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Easy config, Rails and Rack application's configuration made easy.
 email: felipecvo@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gitignore
-- .travis.yml
+files:
+- ".gitignore"
+- ".rspec"
+- ".ruby-version"
+- ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -100,6 +101,7 @@ files:
 - lib/easy_config/configuration.rb
 - lib/easy_config/env.rb
 - lib/easy_config/path_resolver.rb
+- lib/easy_config/setup.rb
 - lib/easy_config/version.rb
 - spec/easy_config/config_file_spec.rb
 - spec/easy_config/configuration_spec.rb
@@ -111,39 +113,27 @@ files:
 - spec/fixtures/redis.yml
 - spec/spec_helper.rb
 homepage: http://rubygems.org/gems/easy_config
-licenses: []
-
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.19
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Easy config, Rails and Rack application's configuration made easy.
 test_files: []
-