bragi-app 0.2.4 → 0.2.5

data/README.rdoc

@@ -72,13 +72,12 @@ For new projects:
 Configure:
 
   # config/environment.rb
-  config.gem "stephencelis-app", :lib     => "app",
-                                 :source  => "http://gems.github.com",
-                                 :version => ">= 0.2.2"
+  config.gem "app"
+
 
 And install:
 
-  % sudo rake gems:install
+  % rake gems:install
 
 
 === Or as a plugin:
@@ -117,11 +116,11 @@ Namespaces avoid collisions:
 
 (c) 2009-* Stephen Celis, stephen@stephencelis.com.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy 
-of this software and associated documentation files (the "Software"), to deal 
-in the Software without restriction, including without limitation the rights 
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
-copies of the Software, and to permit persons to whom the Software is 
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all

data/lib/app.rb

@@ -2,9 +2,10 @@
 #
 # What would your app be without it? Still an app, but without App.
 module App
-  VERSION = "0.2.2"
+  VERSION = "0.2.5"
+  HASH_KLASS = Object.const_defined?("HashWithIndifferentAccess") ? HashWithIndifferentAccess : Hash
 
-  @@config = {} # Initialize.
+  @@config = HASH_KLASS.new # Initialize.
   class << self
     # Returns the application configuration hash, as defined in
     # "config/app.yml".
@@ -21,6 +22,7 @@ module App
     #
     #   App.apis("flickr")
     def config(*args)
+      read_config unless @@config
       @@config if args.empty?
       args.inject(@@config) { |config, arg| config && config[arg] }
     end
@@ -35,16 +37,18 @@ module App
     def method_missing(method, *args)
       self[method.to_s, *args] || self[method, *args]
     end
-  end
-
-  begin
-    raw = File.read Rails.root.join("config", "#{name.underscore}.yml")
-    all = YAML.load ERB.new(raw).result
-    @@config = all[Rails.env] || all
-    @@config.freeze
-  rescue Errno::ENOENT => e
     
-    puts '** App: no file "config/app.yml". Run `script/generate app_config`.'
+    def read_config
+      begin
+        raw = File.read Rails.root.join("config", "#{name.underscore}.yml")
+        all = HASH_KLASS.new.merge(YAML.load ERB.new(raw).result)
+        @@config = all[Rails.env] || all
+        @@config.freeze
+      rescue Errno::ENOENT => e
+        puts '** App: no file "config/app.yml". Run `script/generate app_config`.'
+        raise e
+      end
+    end
   end
 end
 
@@ -65,11 +69,11 @@ unless __FILE__ == "(eval)"
 
     # Recognize all parents.
     line = name.split "::"
-    line.inject line.shift do |parentage, descendant|
+    line.inject do |parentage, descendant|
       eval "module #{parentage}; end"
       "#{parentage}::#{descendant}"
     end
 
     eval File.read(__FILE__).sub("module App", "module #{name}")
   end
-end
+end

data/test/app_test.rb

@@ -65,4 +65,8 @@ class AppTest < ActiveSupport::TestCase
   test "should ignore null nested keys" do
     assert_nil App.config("missing_scope", "nested_missing_key")
   end
+  
+  test "should be indifferent to class of key if possible" do
+    assert_equal App['welcome_message'], App[:welcome_message]
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bragi-app
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors: 
 - Stephen Celis
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-02 00:00:00 -07:00
+date: 2009-06-02 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -71,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: app
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 3
 summary: Move the config out of your app, and into App