app_konfig 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e1beb7cc3fb94c0ee429c119367f0f178e94c82
-  data.tar.gz: 1736fb7476e641fa00b1475e178b2cf906199db3
+  metadata.gz: acc70f7bfa0cce596647ce885058b92dd7f213b9
+  data.tar.gz: c9dd25965b13dc90aacc2e9f1af645b6a8373e40
 SHA512:
-  metadata.gz: 5a31a9e27f8fa7df33a60cfac1401a3d6206246c471f55e67a92e5b56c156a5f4fe297002b93fe10bafe75116714d96deff052bfcdb9f2d58a6b5dea8a1a18d5
-  data.tar.gz: 2d1056801936125a3171d254642d26bf8da547c7195376d5fbb6bd4db9229cab865c22799a9e65750818781c26f91064ca509f0d791201a7d85b00ec105a16f2
+  metadata.gz: e095dd35cde544a0a8dbb1546b7ff02ed548940519c9c30e2ab466af512b2a4deccde90f84234e0293646e64a62295c174f18148ef074e5e787c2e6f6d9d0757
+  data.tar.gz: c8cce7af00dd510bcd93d33d042e862b5ab62c82032966ecf18c0f2964074f2ac2098fcc330e69cedf78f15e2f40fff58453b8b826036fcb6200025bb79b1cc2

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

data/CHANGELOG.MD

@@ -0,0 +1,6 @@
+0.1.0
+
+- Lessen rails dependency - minimal version is now 3.0 (@nekath)
+- Add tests (@nekath)
+- Keep config keys as strings (@nekath)
+- Improve readme (@nekath)

data/README.md

@@ -1,6 +1,6 @@
 # AppKonfig
 
-Lightweight app configuration for Rails
+Lightweight app configuration for Rails >= 3.0
 
 ## Installation
 
@@ -21,14 +21,23 @@ In `config/config.yml`:
 ```yaml
 development:
   value: 1
+  proxy:
+    ip: 127.0.0.1
+    port: 8080
   secret_key: DEV_TOKEN
 
 test:
   value: 2
+  proxy:
+    ip: 127.0.0.1
+    port: 8080
   secret_key: TEST_TOKEN
 
 production:
   value: 3
+  proxy:
+    ip: 10.0.0.10
+    port: 8080
 ```
 
 In `config/secrets.yml`: (optional, not included in version control)
@@ -40,6 +49,7 @@ production:
 Anywhere in the app:
 ```ruby
 AppConfig.value
+AppConfig.proxy.ip
 AppConfig.secret_key
 ```
 

data/app_konfig.gemspec

@@ -6,8 +6,8 @@ require 'app_konfig/version'
 Gem::Specification.new do |spec|
   spec.name          = "app_konfig"
   spec.version       = AppKonfig::VERSION
-  spec.authors       = ["Bartosz Kopiński"]
-  spec.email         = ["bartosz@kopinski.pl"]
+  spec.authors       = ["Bartosz Kopiński", "Radosław Piątek"]
+  spec.email         = ["bartosz@kopinski.pl", "radek.nekath@gmail.com"]
   spec.summary       = "Lightweight app configuration for Rails"
   spec.homepage      = "https://github.com/netguru/app_konfig"
   spec.license       = "MIT"
@@ -17,7 +17,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activesupport", ">= 3.2"
+  spec.add_dependency "activesupport", ">= 3.0"
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rspec", "~> 3.3"
 end

data/config/config.yml

@@ -0,0 +1,15 @@
+development:
+  proxy:
+    port: 3000
+  hostname: example.com
+  secret_key: <%= ENV["SECRET_KEY"] %>
+  array_key:
+    - first
+    - second
+    - third
+
+test:
+  hostname: test.example.com
+
+production:
+  hostname: ''

data/config/secrets.yml

@@ -0,0 +1,6 @@
+production:
+  hostname: 'production.example.com'
+  array_key:
+    - first_new
+    - second_new
+    - third_new

data/lib/app_konfig/config.rb

@@ -0,0 +1,42 @@
+require 'active_support/core_ext/hash/deep_merge'
+require 'yaml'
+require 'erb'
+
+module AppKonfig
+  class Config < Hash
+    DEFAULT_ENV = 'development'
+    CONFIG_PATH = {
+      public: './config/config.yml',
+      secret: './config/secrets.yml',
+    }
+
+    def initialize
+      super
+      deep_merge!(pub_config).deep_merge!(sec_config)
+    end
+
+    def method_missing(key)
+      key = key.to_s
+      return self[key] unless self[key].is_a?(Hash)
+      ::AppKonfig::Config[self[key]]
+    end
+
+    private
+
+    def pub_config
+      load_config(CONFIG_PATH[:public])
+    end
+
+    def sec_config
+      load_config(CONFIG_PATH[:secret]) rescue {}
+    end
+
+    def load_config(path)
+      YAML.load(ERB.new(File.read(path)).result).fetch(env)
+    end
+
+    def env
+      ENV.fetch('RAILS_ENV'){ DEFAULT_ENV }
+    end
+  end
+end

data/lib/app_konfig/version.rb

@@ -1,3 +1,3 @@
 module AppKonfig
-  VERSION = "0.0.1"
+  VERSION = '0.1.0'.freeze
 end

data/lib/app_konfig.rb

@@ -1,38 +1,4 @@
-require "active_support/ordered_options"
-require "yaml"
-require "erb"
-
-require "app_konfig/version"
-
-module AppKonfig
-  class Config < ActiveSupport::OrderedOptions
-    DEFAULT_ENV = "development"
-    CONFIG_PATH = {
-      public: './config/config.yml',
-      secret: './config/secrets.yml',
-    }
-
-    def initialize
-      super
-      deep_merge!(pub_config).deep_merge!(sec_config)
-    end
-
-    def pub_config
-      load_config(CONFIG_PATH[:public])
-    end
-
-    def sec_config
-      load_config(CONFIG_PATH[:secret]) rescue {}
-    end
-
-    def load_config path
-      YAML.load(ERB.new(File.read(path)).result).fetch(env)
-    end
-
-    def env
-      ENV.fetch("RAILS_ENV"){ DEFAULT_ENV }
-    end
-  end
-end
+require 'app_konfig/version'
+require 'app_konfig/config'
 
 AppConfig = AppKonfig::Config.new

data/spec/app_konfig_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+require 'app_konfig/config'
+
+RSpec.describe AppKonfig::Config do
+  it 'is a Hash' do
+    expect(subject).to be_a(Hash)
+  end
+
+  it 'loads config based on RAILS_ENV' do
+    allow(ENV).to receive(:fetch).and_return('test')
+    expect(subject.hostname).to eq('test.example.com')
+  end
+
+  it 'uses development config by default' do
+    expect(described_class::DEFAULT_ENV).to eq('development')
+    expect(subject.hostname).to eq('example.com')
+  end
+
+  it 'handles nested keys' do
+    expect(subject.proxy.port).to eq(3000)
+  end
+
+  it 'merges config from secrets file' do
+    allow(ENV).to receive(:fetch).and_return('production')
+    expect(subject.hostname).to eq('production.example.com')
+    expect(subject.array_key).to eq(['first_new', 'second_new', 'third_new'])
+  end
+
+  it 'allows to embed ruby inside a config file' do
+    allow(ENV).to receive(:[]).with('SECRET_KEY').and_return('value_from_env')
+    expect(subject.secret_key).to eq('value_from_env')
+  end
+
+  context 'when secrets file is not found' do
+    it 'fails silently' do
+      stub_const('AppKonfig::Config::CONFIG_PATH', {
+        public: './config/config.yml',
+        secret: '',
+      })
+      expect{ subject }.not_to raise_error
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,9 @@
+RSpec.configure do |config|
+  config.expect_with :rspec do |expectations|
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  config.mock_with :rspec do |mocks|
+    mocks.verify_partial_doubles = true
+  end
+end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: app_konfig
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Bartosz Kopiński
+- Radosław Piątek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+date: 2015-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -52,22 +53,44 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
 description: 
 email:
 - bartosz@kopinski.pl
+- radek.nekath@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".ruby-version"
+- CHANGELOG.MD
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - app_konfig.gemspec
+- config/config.yml
+- config/secrets.yml
 - lib/app_konfig.rb
+- lib/app_konfig/config.rb
 - lib/app_konfig/version.rb
+- spec/app_konfig_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/netguru/app_konfig
 licenses:
 - MIT
@@ -88,9 +111,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Lightweight app configuration for Rails
-test_files: []
-has_rdoc: 
+test_files:
+- spec/app_konfig_spec.rb
+- spec/spec_helper.rb