global 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93e3427e1eb0655bda5b432903488038d53ffa6f
-  data.tar.gz: 8dd72fdd5856a96a15e9cf0c4b63448e45298b9a
+  metadata.gz: bf9612fdc8fa99d0ccb806cdd8f6c997d5341fd2
+  data.tar.gz: 2fb51ee37ba5a8a8a84030d3a9ca88c659b92546
 SHA512:
-  metadata.gz: 55e64a30578abff796bc7305095857a624e5af9bf3defe5da465461fdb0db316f7d29e42497d76d1ef8e1a36646c3527adfb46b551b4b06542ed73b464d447b9
-  data.tar.gz: 0d4f0672ce23acadeb374cf3dbf3695e5828b2d53718a956c52886d5bb5b547072e53e39d88a5f13525c2e645a4595a91c9717b6ab214b7abaeeb7ad6f3c7e8f
+  metadata.gz: 3c4cd0806d42bc1c84225b93c70d9ce64c6b4d4de551605d0686144b2c1c6acb62a7b99edeecedc08a0253c1764940f3e123f8959cd17eec5a455d1b3748c98f
+  data.tar.gz: e7c5106419074bd61dbba4ea5ba80f23b237a0a05b6e40aafc1cba80e57588e786f46b87d2777388dd1513cc2983f0415506c064c8b99f72218c2ff59386b494

data/README.md

@@ -1,4 +1,4 @@
-# global [![Build Status](https://travis-ci.org/paladiy/global.png)](https://travis-ci.org/paladiy/global) [![Code Climate](https://codeclimate.com/github/paladiy/global.png)](https://codeclimate.com/github/paladiy/global)
+# global [![Build Status](https://travis-ci.org/railsware/global.png)](https://travis-ci.org/railsware/global) [![Code Climate](https://codeclimate.com/github/railsware/global.png)](https://codeclimate.com/github/railsware/global)
 
 ## Description
 
@@ -17,24 +17,104 @@ gem 'global'
 > Global.config_directory = "PATH_TO_DIRECTORY_WITH_FILES"
 ```
 
-##Usage
+For rails put initialization into `config/initializers/global.rb`
 
-Loading configuration from: `PATH_TO_DIRECTORY_WITH_FILES/hosts.yml`
+```ruby
+Global.environment = Rails.env.to_s
+Global.config_directory = Rails.root.join('config/global').to_s
+```
+
+## Usage
+
+### General
+
+Config file `config/global/hosts.yml`:
+
+```yml
+test:
+  web: localhost
+  api: api.localhost
+development:
+  web: localhost
+  api: api.localhost
+production:
+  web: myhost.com
+  api: api.myhost.com
+```
+
+Now for development environment we have next data:
 
 ```ruby
 > Global.hosts
-=> { "api" => "api.localhost.dev", "app" => "localhost.dev" }
+=> { "api" => "api.localhost", "web" => "localhost" }
 > Global.hosts.api
-=> { "api" => "api.localhost.dev" }
+=> "api.localhost"
+```
+
+### Namespacing
+
+Config file `config/global/web/basic_auth.yml` with:
+
+```yml
+test:
+  username: user
+  password: secret
+development:
+  username: user
+  password: secret
+production:
+  username: production_user
+  password: supersecret
+```
+
+After that in development environment we have:
+
+```ruby
+> Global.web.basic_auth
+=> { "username" => "development_user", "password" => "secret" }
+> Global.web.basic_auth.username
+=> "development_user"
+```
+
+### Default section
+
+Config file example:
+
+```yml
+default:
+  web: localhost
+  api: api.localhost
+production:
+  web: myhost.com
+  api: api.myhost.com
+```
+
+Data from default section uses until it's overridden in specific environment.
+
+### ERB support
+
+Config file 'global/file_name.yml' with:
+
+```yml
+test:
+  key: <%=1+1%>
+development:
+  key: <%=2+2%>
+production:
+  key: <%=3+3%>
+```
+
+As a result in development environment we have:
+
+```ruby
+> Global.file_name.key
+=> 4
 ```
 
-Loading recursive from: `PATH_TO_DIRECTORY_WITH_FILES/sites/api.yml`
+### Reload configuration data
 
 ```ruby
-> Global.sites.api
-=> { "host" => "api.localhost.dev", "port" => 3000 }
-> Global.sites.api.host
-=> "api.localhost.dev"
+> Global.reload!
 ```
 
 ## Contributing to global

data/global.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.homepage = "http://github.com/paladiy/global"
+  s.homepage = "https://github.com/railsware/global"
   s.licenses = ["MIT"]
 
   s.add_development_dependency "rspec",     "~> 2.14.1"

data/lib/global/base.rb

@@ -2,15 +2,19 @@ require "erb"
 
 module Global
   module Base
-    def configuration(env = nil)
-      @configuration = nil if env
-      @configuration ||= load_configuration(config_directory, env.is_a?(String) ? env : environment)
+    def configuration
+      @configuration ||= load_configuration(config_directory, environment)
+    end
+
+    def reload!
+      @configuration = nil
+      configuration
     end
 
     def environment=(env)
       @environment = env
     end
-    
+
     def config_directory=(dir)
       @config_directory = dir
     end
@@ -24,10 +28,10 @@ module Global
     end
 
     protected
-    
+
     def load_configuration(dir, env)
       config = load_from_file(dir, env)
-      
+
       config.deep_merge!(load_from_directory(dir, env))
 
       Configuration.new(config)
@@ -35,10 +39,10 @@ module Global
 
     def load_from_file(dir, env)
       config = {}
-      
+
       if File.exists?(file = "#{dir}.yml")
         configurations = YAML::load(ERB.new(IO.read(file)).result)
-        config = configurations[:default] || {}
+        config = configurations[:default] || configurations["default"] || {}
         config.deep_merge!(configurations[env] || {})
       end
 
@@ -47,7 +51,7 @@ module Global
 
     def load_from_directory(dir, env)
       config = {}
-      
+
       if File.directory?(dir)
         Dir["#{dir}/*"].each do |entry|
           namespace = entry.gsub(/^#{dir}\/?/, '').gsub(/\.yml$/, '')
@@ -55,9 +59,9 @@ module Global
         end
       end
 
-      config 
+      config
     end
-    
+
     def method_missing(method, *args, &block)
       configuration.key?(method) ? configuration[method] : super
     end

data/lib/global/version.rb

@@ -1,3 +1,3 @@
 module Global
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/files/rspec_config.yml

@@ -1,4 +1,8 @@
 :default:
   default_value: "default value"
+
 test:
-  test_value: "test value"
+  test_value: "test value"
+
+development: 
+  test_value: "development value"

data/spec/global_spec.rb

@@ -50,6 +50,23 @@ describe Global do
     end
   end
 
+  context ".reload!" do
+    subject{ described_class.reload! }
+
+    before do
+      described_class.configuration
+      described_class.environment = "development"
+    end
+
+    after do
+      described_class.environment = "test"
+      described_class.reload!
+    end
+
+    it{ should be_instance_of(Global::Configuration) }
+    its("rspec_config.to_hash"){ should == {"default_value"=>"default value", "test_value"=>"development value"} }      
+  end
+
   describe ".method_missing" do
     context "when file exists" do
       subject{ described_class.rspec_config }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: global
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - paladiy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-18 00:00:00.000000000 Z
+date: 2013-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -90,7 +90,7 @@ files:
 - spec/global/configuration_spec.rb
 - spec/global_spec.rb
 - spec/spec_helper.rb
-homepage: http://github.com/paladiy/global
+homepage: https://github.com/railsware/global
 licenses:
 - MIT
 metadata: {}