globals 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7542984347db703149f4405cb03327ad4887eb3d
-  data.tar.gz: e9c740c9a8b129c56f41a091b10dc67e0a78a2f6
+  metadata.gz: 8f1e3877c0a1ad58b4d779ccb9fc27c3b7884dd7
+  data.tar.gz: 5d98f47841f74d2dde7a69de8b8ca943b0001345
 SHA512:
-  metadata.gz: 53299d7c08715a7e8f8dafff7af306855ae83a1ffd4165c9f21893576f915e20585e4535317128eb879a7b862d1f0635e0c5e1a8c0de67983097836d3e364e16
-  data.tar.gz: 4c24aca1a3898e0248f4fc4aecb6c27541dfc2839b537185a81ceffafc932cc5597478bf3d1bc1d30f75004d0ea777674ff827ceebb584515ae66f5fa3fac3cf
+  metadata.gz: 8618d0aac56e4c24c9db766bdeb468c35455152619d16932287ad1ab90ad0f5bec8abff897251dcecb575306e20e016875529ebe1a3295e3da98c7ef10107202
+  data.tar.gz: 6e448deea08f5dc25df480b002863b79addc7dab18d4e66634b5757faca379fe362eb80c258ab06e7d98dd976e657da1d47b155c586b04bebf9980c5f98e6f86

data/lib/globals.rb

@@ -4,8 +4,7 @@ require 'yaml'
 class Hash
   def recursive_merge!(that)
     that.each_pair do |k, v|
-      if v.is_a? Hash
-        self[k] ||= {}
+      if v.is_a?(Hash) && self[k].is_a?(Hash)
         self[k].recursive_merge!(v)
       else
         self[k] = v
@@ -15,42 +14,40 @@ class Hash
 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
-
-    globals = load(globals_file, env)
+  def initialize(hash, env)
+    @globals = hash
+    @environment = env
+    @cache = {}
 
-    new(globals, env)
+    define_accessors
   end
 
-  def initialize(globals, env)
-    @globals = globals
-    @environment = env
-    @cache = {}
+  def self.load(filename, env)
+    yaml = YAML.load ERB.new(File.read filename).result
+    hash = yaml['defaults'] || {}
+    hash.recursive_merge!(yaml[env] || {})
 
-    unless @globals["feature"].nil?
-      @globals["feature"].each_pair do |k, v|
+    unless hash["feature"].nil?
+      hash["feature"].each_pair do |k, v|
         raise "A feature can only be true or false." if ![true, false].include?(v)
       end
     end
 
-    define_accessors
+    hash
+  end
+
+  def self.read(filename, env='development')
+    env = env.to_s
+    hash = load(filename, env)
+    new(hash, env)
   end
 
   def override(override_file_path)
-    puts "Override file is " + override_file_path
     overrides = self.class.load(override_file_path, @environment)
 
     if overrides
-      @cache.clear
       @globals.recursive_merge! overrides
+      @cache.clear
       define_accessors
     end
 
@@ -75,15 +72,4 @@ class Globals
       end
     end
   end
-
-  def self.recursive_merge(a, b)
-    b.each_pair do |k, v|
-      if v.is_a? Hash
-        a[k] ||= {}
-        recursive_merge(a[k], v)
-      else
-        a[k] = v
-      end
-    end
-  end
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: globals
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Sujoy Gupta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-12 00:00:00.000000000 Z
+date: 2013-11-14 00:00:00.000000000 Z
 dependencies: []
-description: A simple way to define globals for use in a rails application.
+description: A simple way to define globals for use in a Ruby application.
 email: sujoyg@gmail.com
 executables: []
 extensions: []
@@ -40,5 +40,5 @@ rubyforge_project:
 rubygems_version: 2.1.4
 signing_key: 
 specification_version: 4
-summary: A simple way to define globals for use in a rails application.
+summary: A simple way to define globals for use in a Ruby application.
 test_files: []