youthtree-settings 0.3.0 → 1.0.0

data/.gitignore

@@ -0,0 +1,21 @@
+## MAC OS
+.DS_Store
+
+## TEXTMATE
+*.tmproj
+tmtags
+
+## EMACS
+*~
+\#*
+.\#*
+
+## VIM
+*.swp
+
+## PROJECT::GENERAL
+coverage
+rdoc
+pkg
+
+## PROJECT::SPECIFIC

data/Rakefile

@@ -1,56 +1,7 @@
 require 'rubygems'
 require 'rake'
+require 'bundler/gem_tasks'
 
 require 'active_support'
 require 'active_support/core_ext'
 require File.expand_path('lib/youth_tree/settings', File.dirname(__FILE__))
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name        = "youthtree-settings"
-    gem.summary     = "Simple Settings for Rails Applications"
-    gem.description = %Q{Lets you use config/settings.yml in a rails application to manage settings on a per-env basis.}
-    gem.email       = "sutto@sutto.net"
-    gem.homepage    = "http://github.com/YouthTree/youthtree-settings"
-    gem.authors     = ["Darcy Laycock"]
-    gem.version     = YouthTree::Settings::VERSION
-    gem.add_dependency "activesupport", "~> 3.0.1"
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
-
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/*_test.rb'
-  test.verbose = true
-end
-
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/*_test.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
-end
-
-task :test => :check_dependencies
-
-task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "youthtree-settings #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/lib/youth_tree/settings.rb

@@ -4,12 +4,7 @@ require 'erb'
 module YouthTree
   class Settings
 
-    VERSION = "0.3.0".freeze
-
-    cattr_reader :settings_path
-    def self.settings_path
-      @@settings_path ||= Rails.root.join("config", "settings.yml")
-    end
+    VERSION = "1.0.0".freeze
 
     def initialize(hash = {})
       @hash = Hash.new { |h,k| h[k] = self.class.new }
@@ -64,24 +59,36 @@ module YouthTree
 
     class << self
 
+      def setup(value = nil, &blk)
+        @@setup_callback = (blk || value)
+      end
+
+      def settings_path
+        @@settings_path ||= Rails.root.join("config", "settings.yml").to_s
+      end
+
       def load_from_file
-        contents = File.read(self.settings_path)
+        if !File.readable?(settings_path)
+          $stderr.puts "Unable to load settings from #{settings_path} - Please check it exists and is readable."
+          return {}
+        end
+        # Otherwise, try loading...
+        contents = File.read(settings_path)
         contents = ERB.new(contents).result
         contents = YAML.load(contents)
         (contents["default"] || {}).deep_merge(contents[Rails.env] || {})
       end
 
       def default
-        @@__default ||= begin
-          groups = [load_from_file]
-          self.new(groups.inject({}) { |a,v| a.deep_merge(v) })
-        end
+        @@default ||= new(load_from_file)
       end
 
       def reset!
-        @@__default = nil
+        @@default = nil
         default # Force us to reload the settings
         YouthTree::Settings.setup_mailer!
+        # If a setup block is defined, call it post configuration.
+        @setup_callback.call if defined?(@setup_callback) && @setup_callback
         true
       end
 

data/youthtree-settings.gemspec

@@ -1,45 +1,20 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
+require File.expand_path('lib/youth_tree/settings', File.dirname(__FILE__))
+
 Gem::Specification.new do |s|
-  s.name = %q{youthtree-settings}
-  s.version = "0.3.0"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Darcy Laycock"]
-  s.date = %q{2011-05-17}
-  s.description = %q{Lets you use config/settings.yml in a rails application to manage settings on a per-env basis.}
-  s.email = %q{sutto@sutto.net}
-  s.extra_rdoc_files = [
-    "LICENSE",
-    "README.md"
-  ]
-  s.files = [
-    ".document",
-    "LICENSE",
-    "README.md",
-    "Rakefile",
-    "lib/youth_tree/settings.rb",
-    "lib/youthtree-settings.rb",
-    "youthtree-settings.gemspec"
-  ]
-  s.homepage = %q{http://github.com/YouthTree/youthtree-settings}
+  s.name          = "youthtree-settings"
+  s.summary       = "Simple Settings for Rails Applications"
+  s.description   = %Q{Lets you use config/settings.yml in a rails application to manage settings on a per-env basis.}
+  s.authors       = ["Darcy Laycock"]
+  s.email         = ["sutto@sutto.net"]
+  s.homepage      = "http://github.com/YouthTree/youthtree-settings"
+  s.files         = `git ls-files`.split($\)
+  s.executables   = s.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Simple Settings for Rails Applications}
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, ["~> 3.0.1"])
-    else
-      s.add_dependency(%q<activesupport>, ["~> 3.0.1"])
-    end
-  else
-    s.add_dependency(%q<activesupport>, ["~> 3.0.1"])
-  end
-end
+  s.version       = YouthTree::Settings::VERSION.dup
+  s.add_dependency "activesupport", "~> 3.0.1"
 
+end

metadata

@@ -1,89 +1,70 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: youthtree-settings
-version: !ruby/object:Gem::Version 
-  hash: 19
+version: !ruby/object:Gem::Version
+  version: 1.0.0
   prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 0
-  version: 0.3.0
 platform: ruby
-authors: 
+authors:
 - Darcy Laycock
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-17 00:00:00 +08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-04-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 3
-        - 0
-        - 1
+      - !ruby/object:Gem::Version
         version: 3.0.1
   type: :runtime
-  version_requirements: *id001
-description: Lets you use config/settings.yml in a rails application to manage settings on a per-env basis.
-email: sutto@sutto.net
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.1
+description: Lets you use config/settings.yml in a rails application to manage settings
+  on a per-env basis.
+email:
+- sutto@sutto.net
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- LICENSE
-- README.md
-files: 
+extra_rdoc_files: []
+files:
 - .document
+- .gitignore
 - LICENSE
 - README.md
 - Rakefile
 - lib/youth_tree/settings.rb
 - lib/youthtree-settings.rb
 - youthtree-settings.gemspec
-has_rdoc: true
 homepage: http://github.com/YouthTree/youthtree-settings
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Simple Settings for Rails Applications
 test_files: []
-