app_config 1.0.2 → 1.1.0

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 # Dependencies in .gemspec
 gemspec

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    app_config (1.0.1)
+    app_config (1.0.3)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     bson (1.3.1)
     bson_ext (1.3.1)

data/README.md

@@ -3,6 +3,7 @@
 An easy to use, customizable library to easily store and retrieve application
 (or library) configuration, API keys or basically anything in 'key/value' pairs.
 
+AppConfig requires at least Ruby 1.9.
 
 ## Usage
 

data/lib/app_config.rb

@@ -1,7 +1,7 @@
 require 'core_ext/hashish'
 
 module AppConfig
-  VERSION = '1.0.2'
+  VERSION = '1.1.0'
 
   autoload :Error,   'app_config/error'
   autoload :Storage, 'app_config/storage'
@@ -12,7 +12,6 @@ module AppConfig
     # See each storage method's documentation for their specific options.
     #
     # Valid storage methods:
-    # * `:memory` - {AppConfig::Storage::Memory AppConfig::Storage::Memory}
     # * `:mongo` - {AppConfig::Storage::Mongo AppConfig::Storage::Mongo}
     # * `:yaml` - {AppConfig::Storage::YAML AppConfig::Storage::YAML}
     def setup(options = {}, &block)
@@ -23,7 +22,7 @@ module AppConfig
       elsif @@options[:mongo]
         @@storage = AppConfig::Storage::Mongo.new(@@options.delete(:mongo))
       else
-        @@storage = AppConfig::Storage::Memory.new(@@options)
+        @@storage = Hash.new(&Storage::DEEP_HASH)
       end
 
       yield @@storage if block_given?
@@ -63,11 +62,20 @@ module AppConfig
     end
 
     def to_hash
-      setup? ? storage.to_hash : Hashish.new
+      unless setup?
+        @@storage = default_storage
+      end
+
+      storage.to_hash
     end
 
     private
 
+    # Returns a nested Hash as a sane default.
+    def default_storage
+      Hash.new(&Storage::DEEP_HASH)
+    end
+
     def environment
       (@@options[:environment] || @@options[:env]) || nil
     end

data/lib/app_config/storage.rb

@@ -1,7 +1,9 @@
 module AppConfig
   module Storage
+    # Used when creating a new, infinitely nested Hash.
+    DEEP_HASH = lambda { |h, k| h[k] = Hash.new(&h.default_proc) }
+
     autoload :Base,   'app_config/storage/base'
-    autoload :Memory, 'app_config/storage/memory'
     autoload :Mongo,  'app_config/storage/mongo'
     autoload :YAML,   'app_config/storage/yaml'
   end

data/lib/app_config/storage/base.rb

@@ -7,7 +7,7 @@ module AppConfig
       end
 
       def to_hash
-        Hashish.new(@data.to_hash)
+        defined?(@data) ? @data.to_hash : Hash.new(&Storage::DEEP_HASH)
       end
 
     end # Base

data/lib/app_config/storage/mongo.rb

@@ -60,7 +60,10 @@ module AppConfig
 
       def fetch_data!
         raise 'Not connected to MongoDB' unless connected?
+
         @data = Hashish.new(collection.find_one)
+        @data.default_proc = Storage::DEEP_HASH
+
         @_id = @data.delete('_id')
       end
 

data/lib/app_config/storage/yaml.rb

@@ -6,12 +6,12 @@ module AppConfig
     # YAML storage method.
     class YAML < Storage::Base
 
-      DEFAULT_PATH = File.expand_path(File.join(ENV['HOME'], '.app_config.yml'))
+      DEFAULT_PATH = File.join(Dir.home, '.app_config.yml')
 
       # Loads `@data` with the YAML file located at `path`.
       # `@data` will be the Hashish that is accessed with `AppConfig[:key]`.
       #
-      # Defaults to `$HOME/.app_config.yml`
+      # Defaults to `Dir.home/.app_config.yml`
       def initialize(path = DEFAULT_PATH)
         # Make sure to use the top-level YAML module here.
         @data = Hashish.new(::YAML.load_file(path))

data/lib/core_ext/hashish.rb

@@ -1,4 +1,4 @@
-# Stolen from Rails Active Support and renamed to Hashish.
+# Stolen from Rails `ActiveSupport::HashWithIndifferentAccess` and renamed to Hashish.
 #
 # This class has dubious semantics and we only have it so that
 # people can write `params[:key]` instead of `params['key']`

data/spec/app_config/storage/mongo_spec.rb

@@ -19,7 +19,7 @@ describe AppConfig::Storage::Mongo do
   end
 
   it 'should not have the Mongo _id in storage' do
-    AppConfig['_id'].should be_nil
+    AppConfig['_id'].should be_empty
   end
 
   it 'should have a @_id variable for the Mongo ID' do

data/spec/app_config/storage/yaml_spec.rb

@@ -19,4 +19,10 @@ describe AppConfig::Storage::YAML do
     AppConfig[:new_key].should == 'new value'
   end
 
+  it "requires the use of 'Dir.home'" do
+    unless Dir.respond_to?(:home)
+      fail "Requires 'Dir.home' which is available in Ruby 1.9"
+    end
+  end
+
 end

data/spec/app_config_spec.rb

@@ -20,7 +20,7 @@ describe AppConfig do
 
   it 'should have to_hash' do
     config_for_yaml
-    AppConfig.to_hash.class.should == Hashish
+    AppConfig.to_hash.class.should == Hash
   end
 
   it 'should reset @@storage' do
@@ -28,7 +28,7 @@ describe AppConfig do
     config_for_yaml(:api_key => 'API_KEY')
     # then reset
     AppConfig.reset!
-    AppConfig[:api_key].should be_nil
+    AppConfig[:api_key].should be_empty
   end
 
   it 'to_hash() returns an empty hash if storage not set' do
@@ -55,21 +55,26 @@ describe AppConfig do
   end
 
   it 'should create nested keys' do
-    pending 'Implement nested keys'
     AppConfig.reset!
     AppConfig.setup
 
-    AppConfig[:name][:first] = 'Dale'
-    AppConfig[:name][:first].should == 'Dale'
+    AppConfig[:person][:name][:first] = 'Dale'
+    AppConfig[:person][:name][:first].should == 'Dale'
   end
 
-  it 'returns a Hashish on setup' do
+  it 'returns a Hash on setup' do
     AppConfig.reset!
     config = AppConfig.setup do |c|
       c[:name] = 'Dale'
       c[:nick] = 'Oshuma'
     end
-    config.should be_instance_of(Hashish)
+    config.should be_instance_of(Hash)
+  end
+
+  it '.default_storage() returns a nested Hash' do
+    hash = AppConfig.send(:default_storage)
+    hash[:name][:first] = 'Dale'
+    hash[:name][:first].should == 'Dale'
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: app_config
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-27 00:00:00.000000000 Z
+date: 2013-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext
@@ -143,7 +143,6 @@ files:
 - lib/app_config/error.rb
 - lib/app_config/storage.rb
 - lib/app_config/storage/base.rb
-- lib/app_config/storage/memory.rb
 - lib/app_config/storage/mongo.rb
 - lib/app_config/storage/yaml.rb
 - lib/core_ext/hashish.rb

data/lib/app_config/storage/memory.rb

@@ -1,23 +0,0 @@
-module AppConfig
-  module Storage
-    class Memory < Storage::Base
-
-      def initialize(options)
-        @data = Hashish.new(options)
-      end
-
-      def [](key)
-        @data[key]
-      end
-
-      def []=(key, value)
-        @data[key] = value
-      end
-
-      def empty?
-        @data.empty?
-      end
-
-    end # Memory
-  end # Storage
-end # AppConfig