anyway_config 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40e4e0dd7f4d5e1fb19d83de0755be5f0054ac2f
-  data.tar.gz: 555132629ca863a88d84ba53ee9cfd6ce02a2fad
+  metadata.gz: 19177bb68f7f250550ee553fb36c41f33fe181b7
+  data.tar.gz: f6fa6a2cb3f29c3434a0c8f660c97adc74a3f6d1
 SHA512:
-  metadata.gz: 31e46f769ef2a2e550f195232c0fe76e127fc567d56de1c6a1d14e6c0f77e99a05c6f956746ca96a0647ad3edfd74e1d0f5e2301ab1c4f5af9dcc8ce119c939f
-  data.tar.gz: f19f0adfe0d2827c14c4ff83b718ae06f13a2614103dcc4e86cc5cfc5de91dbf4be5f36d885ea57f5cb1a862eca04a60f6e8eed8297eda368bfe2103a368eeb0
+  metadata.gz: e1b58e60a43d24867f9a6e81a4ea032ac94b373592638b150001aa8e105e51dea2289bc84acd2edece19a1956f369c1ec522b62adcd81600b0001a8190e5a936
+  data.tar.gz: 164ea5df4fe0444e6f3e64df243c7602c2c0dbaf5615442c19246e20f75bedf3ba0a662028831eb11852f726109aa3e1fd5546570e3cee0889f3282551c1a8c7

data/README.md

@@ -2,7 +2,7 @@
 
 # Anyway Config
 
-Rails plugin/application configuration using any source: YAML, _secrets_, environment.
+Rails/Ruby plugin/application configuration using any source: YAML, _secrets_, environment.
 
 
 Apps using Anyway Config: 
@@ -98,6 +98,7 @@ Rails 4.2 introduces new feature: `Rails.application.config_for`. It looks very
 | raise errors if file doesn't exist | yes | no |
 
 But the main advantage of Anyway::Config is that it's supported in Rails >= 3.2, Ruby >= 1.9.3.
+And it can be even used [without Rails](#using-without-rails)!
 
 ## How to set env vars
 
@@ -108,6 +109,10 @@ For example, if your module is called "MyCoolGem" then your env var "MYCOOLGEM_P
 *Anyway Config* supports nested (_hashed_) environmental variables. Just separate keys with double-underscore.
 For example, "MYCOOLGEM_OPTIONS__VERBOSE" is transformed to `config.options.verbose`.
 
+## Using without Rails
+
+AnywayConfig can be used without Rails too. 
+Environmental variables remain the same. To load config from YAML add special environment variable 'MYGEM_CONF' containing path to config. But you cannot use one file for different environments (unless you do it yourself).
 
 ## Contributing
 

data/Rakefile

@@ -3,4 +3,8 @@ require "bundler/gem_tasks"
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+RSpec::Core::RakeTask.new(:spec2) do |t|
+  t.pattern = "./spec/**/*_norails.rb"
+end
+
+task :default => [:spec2, :spec]

data/anyway_config.gemspec

@@ -17,6 +17,8 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.required_ruby_version = '>= 1.9.3'
 
+  s.add_dependency "activesupport", ">= 3.2"
+
   s.add_development_dependency 'pry'
   s.add_development_dependency "simplecov", ">= 0.3.8"
   s.add_development_dependency "rspec", "~> 3.0.0"

data/lib/anyway/config.rb

@@ -56,19 +56,20 @@ module Anyway
     end
 
     def load_from_sources(config={}.with_indifferent_access)        
-      # then load from YAML if any
-      config_path = Rails.root.join("config","#{@config_name}.yml")
-      if File.file? config_path
-        require 'yaml'
-        config.deep_merge! (YAML.load_file(config_path)[Rails.env] || {})
-      end
+      load_from_file(config)
+      load_from_env(config)
+    end
 
-      # then load from Rails secrets
-      if Rails.application.respond_to?(:secrets)
-        config.deep_merge! (Rails.application.secrets.send(@config_name)||{})
+    def load_from_file(config)
+      config_path = (Anyway.env.send(@config_name)||{}).delete(:conf)
+      if config_path and File.file?(config_path)
+        require 'yaml'
+        config.deep_merge! (YAML.load_file(config_path) || {})
       end
-
-      # and then load from env
+      config
+    end
+    
+    def load_from_env(config)
       config.deep_merge! (Anyway.env.send(@config_name) || {})
       config
     end

data/lib/anyway/rails/config.rb

@@ -0,0 +1,25 @@
+module Anyway
+  class Config
+    def load_from_sources(config={}.with_indifferent_access)        
+      load_from_file(config)
+      load_from_secrets(config)
+      load_from_env(config)
+    end
+
+    def load_from_file(config)
+      config_path = Rails.root.join("config","#{@config_name}.yml")
+      if File.file? config_path
+        require 'yaml'
+        config.deep_merge! (YAML.load_file(config_path)[Rails.env] || {})
+      end
+      config
+    end
+
+    def load_from_secrets(config)
+      if Rails.application.respond_to?(:secrets)
+        config.deep_merge! (Rails.application.secrets.send(@config_name)||{})
+      end
+      config
+    end
+  end
+end

data/lib/anyway/version.rb

@@ -1,3 +1,3 @@
 module Anyway
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/anyway.rb

@@ -1,7 +1,11 @@
-require "anyway/version"
+require 'active_support/core_ext/hash'
+require 'active_support/core_ext/string'
+require 'active_support/core_ext/object'
 
+require "anyway/version"
 module Anyway
   require "anyway/config"
+  require "anyway/rails/config" if defined?(Rails)
   require "anyway/env"
 
   def self.env

data/spec/anyway.yml

@@ -0,0 +1,2 @@
+api:
+  endpoint: 'localhost'

data/spec/config_spec.rb

@@ -79,24 +79,6 @@ describe Anyway::Config do
     end
   end
 
-  describe "config with default name" do
-    after(:each) { Anyway.env.clear }
-    specify { expect(Anyway::TestConfig.config_name).to eq "anyway" }
-
-    specify do
-      expect(test_conf).to respond_to(:test)
-      expect(test_conf).to respond_to(:api)
-    end
-
-    it "should work" do
-      ENV['ANYWAY_API__KEY'] = 'test1'
-      ENV['ANYWAY_TEST'] = 'test'
-      Anyway.env.reload
-      expect(test_conf.api[:key]).to eq "test1"
-      expect(test_conf.test).to eq "test"
-    end
-  end
-
   describe "config for name" do
     after(:each) { Anyway.env.clear }
     it "should load data by config name" do

data/spec/config_spec_norails.rb

@@ -0,0 +1,43 @@
+require 'spec_norails_helper'
+
+describe Anyway::Config do
+  
+  let(:conf) { Anyway::TestConfig.new }
+
+  describe "config without Rails" do
+    after(:each) { Anyway.env.clear }
+    specify { expect(Anyway::TestConfig.config_name).to eq "anyway" }
+
+    specify do
+      expect(conf).to respond_to(:test)
+      expect(conf).to respond_to(:api)
+    end
+
+    it "should work" do
+      ENV['ANYWAY_CONF'] = File.join(File.dirname(__FILE__),"anyway.yml")
+      ENV['ANYWAY_API__KEY'] = 'test1'
+      ENV['ANYWAY_TEST'] = 'test'
+
+      Anyway.env.reload
+      expect(conf.api[:key]).to eq "test1"
+      expect(conf.api[:endpoint]).to eq "localhost"
+      expect(conf.test).to eq "test"
+    end
+
+    it "should reload config" do
+      expect(conf.api[:key]).to eq ""
+      expect(conf.api[:endpoint]).to be_nil
+      expect(conf.test).to be_nil
+
+      ENV['ANYWAY_CONF'] = File.join(File.dirname(__FILE__),"anyway.yml")
+      ENV['ANYWAY_API__KEY'] = 'test1'
+      ENV['ANYWAY_TEST'] = 'test'
+      Anyway.env.reload
+
+      conf.reload
+      expect(conf.api[:key]).to eq "test1"
+      expect(conf.api[:endpoint]).to eq "localhost"
+      expect(conf.test).to eq "test"
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -3,17 +3,13 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 
 ENV["RAILS_ENV"] ||= 'test'
 
-# require 'simplecov'
-# SimpleCov.root File.join(File.dirname(__FILE__), '..', 'lib')
-# SimpleCov.start
-
 require 'rspec'
 require 'pry'
-require 'anyway'
 
 require 'rails/all'
 require 'rspec/rails'
 
+require 'anyway'
 require "dummy/config/environment"
 
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}

data/spec/spec_norails_helper.rb

@@ -0,0 +1,13 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+
+require 'rspec'
+require 'pry'
+
+require 'anyway'
+
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+
+RSpec.configure do |config|
+  config.mock_with :rspec
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: anyway_config
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Vlad Dem
@@ -10,6 +10,20 @@ bindir: bin
 cert_chain: []
 date: 2015-01-23 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -87,8 +101,12 @@ files:
 - lib/anyway.rb
 - lib/anyway/config.rb
 - lib/anyway/env.rb
+- lib/anyway/rails/config.rb
 - lib/anyway/version.rb
+- spec/anyway.yml
 - spec/config_spec.rb
+- spec/config_spec_norails.rb
+- spec/dummy.yml
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/images/.keep
@@ -134,6 +152,7 @@ files:
 - spec/dummy/public/favicon.ico
 - spec/env_spec.rb
 - spec/spec_helper.rb
+- spec/spec_norails_helper.rb
 - spec/support/cool_config.rb
 - spec/support/test_config.rb
 homepage: http://github.com/palkan/anyway_config