cubus-settingslogic 2.0.6 → 2.1.0

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+== 2.1.0 released 2010-03-15
+
+* Added key_by_path (e.g. Settings.key_by_path "some.nested.setting")
+* Default namespace support (defaults are merged)
+
 == 2.0.2 released 2009-08-22
 
 * Define methods during method_missing instead of during initialization. Allows for modification on the fly.

data/Rakefile

@@ -4,11 +4,11 @@ require 'rake'
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
-    gem.name = "settingslogic"
+    gem.name = "cubus-settingslogic"
     gem.summary = "A simple and straightforward settings solution that uses an ERB enabled YAML file and a singleton design pattern."
     gem.email = "bjohnson@binarylogic.com"
     gem.homepage = "http://github.com/binarylogic/settingslogic"
-    gem.authors = ["Ben Johnson of Binary Logic"]
+    gem.authors = ["Ben Johnson of Binary Logic", "Mihai Târnovan of Cubus Arts", "Gabriel Târnovan of Cubus Arts"]
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 2
-:minor: 0
+:minor: 1
 :build: 
-:patch: 5
+:patch: 0

data/lib/settingslogic.rb

@@ -26,6 +26,14 @@ class Settingslogic < Hash
       end
     end
     
+    def default_namespace(value = nil)
+      if value.nil?
+        @default_namespace || 'defaults'
+      else
+        @default_namespace = value
+      end
+    end
+    
     def key_by_path(key_path, separator = ".")
       # Settings.get_nested_key('some.nested.setting')
       tmp = instance
@@ -85,8 +93,9 @@ class Settingslogic < Hash
       self.replace hash_or_file
     else
       hash = YAML.load(ERB.new(File.read(hash_or_file)).result).to_hash
+      default_hash = hash[self.class.default_namespace] || {}      
       hash = hash[self.class.namespace] if self.class.namespace
-      self.replace hash
+      self.replace default_hash.deep_merge(hash)
     end
     @section = section || hash_or_file  # so end of error says "in application.yml"
     create_accessors!

data/settingslogic.gemspec

@@ -4,13 +4,13 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = "cubus-settingslogic"
-  s.version = "2.0.6"
+  s.name = %q{cubus-settingslogic}
+  s.version = "2.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Ben Johnson of Binary Logic"]
-  s.date = %q{2010-02-01}
-  s.email = %q{bjohnson@binarylogic.com}
+  s.authors = ["Ben Johnson of Binary Logic", "Mihai Târnovan of Cubus Arts", "Gabriel Târnovan of Cubus Arts"]
+  s.date = %q{2010-03-15}
+  s.email = %q{bjohnson@binarylogic.com, mihai.tarnovan@cubus.ro, gabriel.tarnovan@cubus.ro}
   s.extra_rdoc_files = [
     "LICENSE",
      "README.rdoc"
@@ -36,12 +36,13 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/binarylogic/settingslogic}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{A simple and straightforward settings solution that uses an ERB enabled YAML file and a singleton design pattern.}
   s.test_files = [
     "spec/settings.rb",
      "spec/settings2.rb",
      "spec/settings3.rb",
+     "spec/settings4.rb",
      "spec/settingslogic_spec.rb",
      "spec/spec_helper.rb"
   ]

data/spec/settings.yml

@@ -16,4 +16,9 @@ language:
     paradigm: object oriented 
 
 collides:
-  does: not
+  does: not
+  
+default_settings4:
+  haskell:
+    paradigm: voodoo
+    foo: bar

data/spec/settings4.rb

@@ -0,0 +1,5 @@
+class Settings4 < Settingslogic
+  source "#{File.dirname(__FILE__)}/settings.yml"
+  default_namespace 'default_settings4'
+  namespace 'language'
+end

data/spec/settingslogic_spec.rb

@@ -30,6 +30,11 @@ describe "Settingslogic" do
     Settings.namespace.should be_nil
     Settings2.namespace.should == 'setting1'
   end
+  
+  it "should return the default namespace" do
+    Settings.default_namespace.should == 'defaults'
+    Settings4.default_namespace.should == 'default_settings4'
+  end
 
   it "should get a key by a path" do
     Settings.key_by_path("language.haskell.paradigm").should == "functional"
@@ -44,6 +49,12 @@ describe "Settingslogic" do
     Settings3.collides.does.should == 'not'
   end
   
+  it "should merge defaults" do
+    Settings4.haskell.paradigm.should == 'functional'
+    Settings4.haskell.foo.should == 'bar'
+    Settings4.smalltalk.paradigm.should == 'object oriented'
+  end
+  
   it "should raise a helpful error message" do
     e = nil
     begin

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 require 'spec'
 require 'rubygems'
 require 'ruby-debug' if RUBY_VERSION < '1.9'  # ruby-debug does not work on 1.9.1 yet
+require 'active_support'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
@@ -8,6 +9,7 @@ require 'settingslogic'
 require 'settings'
 require 'settings2'
 require 'settings3'
+require 'settings4'
 
 # Needed to test Settings3
 def collides

metadata

@@ -1,20 +1,27 @@
 --- !ruby/object:Gem::Specification 
 name: cubus-settingslogic
 version: !ruby/object:Gem::Version 
-  version: 2.0.6
+  prerelease: false
+  segments: 
+  - 2
+  - 1
+  - 0
+  version: 2.1.0
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
+- "Mihai T\xC3\xA2rnovan of Cubus Arts"
+- "Gabriel T\xC3\xA2rnovan of Cubus Arts"
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-02-01 00:00:00 +02:00
+date: 2010-03-15 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
 description: 
-email: bjohnson@binarylogic.com
+email: bjohnson@binarylogic.com, mihai.tarnovan@cubus.ro, gabriel.tarnovan@cubus.ro
 executables: []
 
 extensions: []
@@ -52,18 +59,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A simple and straightforward settings solution that uses an ERB enabled YAML file and a singleton design pattern.
@@ -71,5 +80,6 @@ test_files:
 - spec/settings.rb
 - spec/settings2.rb
 - spec/settings3.rb
+- spec/settings4.rb
 - spec/settingslogic_spec.rb
 - spec/spec_helper.rb