globals 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc10e1c3cc9df63d43274c1ac740a0069198e72f
-  data.tar.gz: 6958d209f44226436fb00cd859b7e98fb4b15657
+  metadata.gz: 7542984347db703149f4405cb03327ad4887eb3d
+  data.tar.gz: e9c740c9a8b129c56f41a091b10dc67e0a78a2f6
 SHA512:
-  metadata.gz: f724ecee9a67fc8a61a219313a769a2a5e2b164e4c87a6d60c14a97721da123816c0f4a149bf844758599c13ec4a166438226dbf620413fe972a66eff09af649
-  data.tar.gz: 19eefdcc9ee5c6872f7097df5c6138f11f895654a3046228cb6cce64d62a2a3e666b5a21d613f8b0df1a419b557b60ea0811164ffd20b4cd9b0213977ff1117d
+  metadata.gz: 53299d7c08715a7e8f8dafff7af306855ae83a1ffd4165c9f21893576f915e20585e4535317128eb879a7b862d1f0635e0c5e1a8c0de67983097836d3e364e16
+  data.tar.gz: 4c24aca1a3898e0248f4fc4aecb6c27541dfc2839b537185a81ceffafc932cc5597478bf3d1bc1d30f75004d0ea777674ff827ceebb584515ae66f5fa3fac3cf

data/lib/globals.rb

@@ -1,13 +1,33 @@
 require 'erb'
 require 'yaml'
 
+class Hash
+  def recursive_merge!(that)
+    that.each_pair do |k, v|
+      if v.is_a? Hash
+        self[k] ||= {}
+        self[k].recursive_merge!(v)
+      else
+        self[k] = v
+      end
+    end
+  end
+end
+
 class Globals
+  def self.load(globals_file, env)
+    yaml = YAML.load ERB.new(File.read globals_file).result
+    globals = yaml['defaults'] || {}
+    globals.recursive_merge!(yaml[env] || {})
+    globals
+  end
+
   def self.read(globals_file, env='development')
     raise "#{globals_file} does not exist." unless File.exists? globals_file
 
-    env = env.to_s
-    yaml = YAML.load ERB.new(File.read globals_file).result
-    new(yaml[env] || {}, env)
+    globals = load(globals_file, env)
+
+    new(globals, env)
   end
 
   def initialize(globals, env)
@@ -25,12 +45,16 @@ class Globals
   end
 
   def override(override_file_path)
-    overrides = YAML.load(ERB.new(File.read(override_file_path)).result)[@environment]
+    puts "Override file is " + override_file_path
+    overrides = self.class.load(override_file_path, @environment)
+
     if overrides
       @cache.clear
-      recursive_merge @globals, overrides
+      @globals.recursive_merge! overrides
       define_accessors
     end
+
+    self
   end
 
   def to_hash
@@ -52,7 +76,7 @@ class Globals
     end
   end
 
-  def recursive_merge(a, b)
+  def self.recursive_merge(a, b)
     b.each_pair do |k, v|
       if v.is_a? Hash
         a[k] ||= {}

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: globals
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Sujoy Gupta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-08 00:00:00.000000000 Z
+date: 2013-11-12 00:00:00.000000000 Z
 dependencies: []
-description: 
+description: A simple way to define globals for use in a rails application.
 email: sujoyg@gmail.com
 executables: []
 extensions: []
@@ -18,7 +18,8 @@ extra_rdoc_files: []
 files:
 - lib/globals.rb
 homepage: http://rubygems.org/gems/globals
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []