settingslogic 1.0.0 → 1.0.1

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+== 1.0.1 released 2009-04-02
+
+* Inherit from hash.
+
 == 1.0.0 released 2008-12-05
 
 * Only define methods if we have settings.

data/lib/settingslogic/settings.rb

@@ -2,7 +2,7 @@ module Settingslogic
   # = Setting
   #
   # A simple settings solution using a YAML file. See README for more information.
-  class Settings
+  class Settings < Hash
     class << self
       def name # :nodoc:
         instance._settings.key?("name") ? instance.name : super
@@ -37,12 +37,12 @@ module Settingslogic
     def initialize(name_or_hash = Config.settings_file)
       case name_or_hash
       when Hash
-        self._settings = name_or_hash
+        self.update name_or_hash
       when String, Symbol
         root_path = defined?(RAILS_ROOT) ? "#{RAILS_ROOT}/config/" : ""
         file_path = name_or_hash.is_a?(Symbol) ? "#{root_path}#{name_or_hash}.yml" : name_or_hash
-        self._settings = YAML.load(ERB.new(File.read(file_path)).result)
-        self._settings = _settings[RAILS_ENV] if defined?(RAILS_ENV)
+        self.update YAML.load(ERB.new(File.read(file_path)).result).to_hash
+        self.update self[RAILS_ENV] if defined?(RAILS_ENV)
       else
         raise ArgumentError.new("Your settings must be a hash, a symbol representing the name of the .yml file in your config directory, or a string representing the abosolute path to your settings file.")
       end
@@ -55,19 +55,18 @@ module Settingslogic
       end
       
       def define_settings!
-        return if _settings.nil?
-        _settings.each do |key, value|
+        self.each do |key, value|
           case value
           when Hash
             instance_eval <<-"end_eval", __FILE__, __LINE__
               def #{key}
-                @#{key} ||= self.class.new(_settings["#{key}"])
+                @#{key} ||= self.class.new(self["#{key}"])
               end
             end_eval
           else
             instance_eval <<-"end_eval", __FILE__, __LINE__
               def #{key}
-                @#{key} ||= _settings["#{key}"]
+                @#{key} ||= self["#{key}"]
               end
             end_eval
           end

data/lib/settingslogic/version.rb

@@ -67,7 +67,7 @@ module Settingslogic
 
     MAJOR = 1
     MINOR = 0
-    TINY  = 0
+    TINY  = 1
 
     # The current version as a Version instance
     CURRENT = new(MAJOR, MINOR, TINY)

data/settingslogic.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{settingslogic}
-  s.version = "1.0.0"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Johnson of Binary Logic"]
-  s.date = %q{2008-12-05}
+  s.date = %q{2009-04-02}
   s.description = %q{Simple and straightforward application wide settings}
   s.email = %q{bjohnson@binarylogic.com}
   s.extra_rdoc_files = ["CHANGELOG.rdoc", "lib/settingslogic/config.rb", "lib/settingslogic/settings.rb", "lib/settingslogic/version.rb", "lib/settingslogic.rb", "README.rdoc"]
@@ -25,11 +25,8 @@ Gem::Specification.new do |s|
     s.specification_version = 2
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<echoe>, [">= 0"])
     else
-      s.add_dependency(%q<echoe>, [">= 0"])
     end
   else
-    s.add_dependency(%q<echoe>, [">= 0"])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: settingslogic
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -9,19 +9,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-05 00:00:00 -05:00
+date: 2009-04-02 00:00:00 -04:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: echoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
+dependencies: []
+
 description: Simple and straightforward application wide settings
 email: bjohnson@binarylogic.com
 executables: []