dsc 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4787149bb2c2781b6eaccfcb771da5e29b4913a8
-  data.tar.gz: 55f0d98a84006955fadce9012671a123c9fee539
+  metadata.gz: 881de7b8a80bcf2a8890713e1483230cceed1d18
+  data.tar.gz: f71dc27b103396a7b05e5cca6b39f15143b5383d
 SHA512:
-  metadata.gz: b52c5efb4eeaa41935d0e73a9075013156c6a8666076cb235798a87e8f188734414a50cf4dae7313069f114e92372eac5265e63872af682f5887bc6b9bbb0584
-  data.tar.gz: 9a4121ba1728cbbd3202255f3754a4dba9984ced97d1392f6f4e516b91042076f6a9a2642dde275923d638309570a4a22de9ec8cd4c6b673b0e5295e553802c0
+  metadata.gz: e2ecf4b9812855f3270dc58cfc86349295a882fdcd62276a598ea9caf3d7206bbfcdc1908d541aac524a5fb9f3a3d5c85614f38261697933d770396a5a2e1baf
+  data.tar.gz: a9d5bce57bfcf40c962fdcacb28d8bafd95165af66eb8fc07a88514c19a0eaa4be2b7d5d86bec615fc889663d1c20d379c7b899ae7e1fc45683f3228f602ad6d

data/.travis.yml

@@ -0,0 +1,11 @@
+language: ruby
+rvm:
+  - 2.0
+  - 2.1
+  - ruby-head
+  - rbx-2
+  - jruby-head
+
+matrix:
+  allow_failures:
+    - rvm: rbx-2

data/README.md

@@ -1,3 +1,7 @@
+[![Gem Version](https://badge.fury.io/rb/dsc.svg)](http://badge.fury.io/rb/dsc)
+[![Travis CI](https://api.travis-ci.org/wimdu/dsc.svg?branch=master)](https://travis-ci.org/wimdu/dsc)
+[![Code Climate](https://codeclimate.com/github/wimdu/dsc/badges/gpa.svg)](https://codeclimate.com/github/wimdu/dsc)
+
 # Dead simple configuration
 
 Read configuration from a YAML/JSON file and expose the keys as methods.
@@ -20,7 +24,7 @@ Or install it yourself as:
 
 ## Usage
 
-Create a config file:
+Create a config file (you can use ERB):
 
 ```yaml
 development:
@@ -30,6 +34,7 @@ production:
   username: hugo
   password: secret
   pool: 42
+  url: <%= ENV["DATABASE_URL"] %>
 ```
 
 Open the file and use it:
@@ -39,10 +44,19 @@ require 'dsc'
 
 database_config = Dsc.load_file('config/database.yml', env: 'production')
 database_config.username # => 'hugo'
+database_config.url      # => 'adapter://hostname:4567/database'
 ```
 
 That's it!
 
+### Optional attributes
+
+If you want to be able to not specify some of the configuration options:
+
+```ruby
+config = Dsc.load_file('config/config.yml', env: 'production', optional: [:pool, :password])
+```
+
 ## Contributing
 
 1. Fork it

data/Rakefile

@@ -1,2 +1,11 @@
 require "bundler/gem_tasks"
 
+begin
+  require 'rspec/core/rake_task'
+
+  RSpec::Core::RakeTask.new(:spec)
+
+  task default: :spec
+rescue LoadError
+  # no rspec available
+end

data/dsc.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.0'
 
   spec.add_dependency "hashie", "~> 3.0"
-  spec.add_development_dependency "bundler", "~> 1.7"
+  spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.1"
 end

data/lib/dsc.rb

@@ -1,13 +1,17 @@
-require "dsc/version"
 require "hashie/mash"
+require "erb"
 require "yaml"
+
+require "dsc/version"
 require "dsc/mash"
 
 module Dsc
   UndefinedAttribute = Class.new(NoMethodError)
 
-  def self.load_file(file_path, env: "development")
-    config_hash = YAML::load_file(file_path)[env]
+  def self.load_file(file_path, env: "development", optional: [])
+    optional_hash = optional.map { |key| [key, nil] }.to_h
+    config_yaml = ERB.new(File.read(file_path)).result
+    config_hash = optional_hash.merge(YAML::load(config_yaml)[env])
 
     Dsc::Mash.new(config_hash)
   end

data/lib/dsc/version.rb

@@ -1,3 +1,3 @@
 module Dsc
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

data/spec/dsc_spec.rb

@@ -9,6 +9,7 @@ RSpec.describe Dsc do
 production:
   host: 'http://www.wimdu.com'
   awesome: true
+  some_inline_erb: <%= ENV['works_too'] %>
 development:
   host: 'http://example.com'
   stable: false
@@ -18,12 +19,15 @@ development:
     works: 'aswell'
 EOF
       end
+
+      ENV['works_too'] = "yep, it works"
     end
 
-    subject(:dsc) { Dsc.load_file(config_file, env: env) }
+    subject(:dsc) { Dsc.load_file(config_file, env: env, optional: optional) }
 
     let(:config_file) { File.expand_path(__FILE__ + '/../../tmp/config.yml') }
     let(:env) { 'development' }
+    let(:optional) { [] }
 
     it 'works' do
       expect(dsc).to have_attributes(
@@ -44,6 +48,14 @@ EOF
       )
     end
 
+    context "when there are optional attributes" do
+      let(:optional) { %i(awesome) }
+
+      it "does not raise error when trying to access undefined but optional attribute" do
+        expect(dsc.awesome).to eq(nil)
+      end
+    end
+
     context 'with env production' do
       let(:env) { 'production' }
 
@@ -53,6 +65,27 @@ EOF
           awesome: true
         )
       end
+
+      context "when there are optional attributes" do
+        let(:optional) { %i(awesome) }
+
+        it "provides these attributes properly" do
+          expect(dsc).to have_attributes(
+            host: 'http://www.wimdu.com',
+            awesome: true
+          )
+        end
+      end
+    end
+
+    describe 'ERB parsing' do
+      let(:env) { 'production' }
+
+      it 'works' do
+        expect(dsc).to have_attributes(
+          some_inline_erb: 'yep, it works'
+        )
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dsc
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Johannes Barre
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-17 00:00:00.000000000 Z
+date: 2015-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -77,6 +77,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md